From 9c492f801ddab95ccd4434ad32b9884b2c40cec2 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Tue, 9 Apr 2019 15:38:24 -0700
Subject: [PATCH] For #1397 - Updates changelog

---
 CHANGELOG.md                                                  | 3 +++
 .../library/history/viewholders/HistoryListItemViewHolder.kt  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36bf9df59..5012d5f14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #1068 - Adds the ability to quickly copy the URL by long clicking the URLBar
 - #1170: Allow user to add a new site exception to site permissions
 - #1430 - Adds the Fenix Snackbar
+- #1397 - Adds favicons to the history view
+
+>>>>>>> For #1397 - Updates changelog
 ### Changed
 - #1429 - Updated site permissions ui for MVP
 ### Removed
\ No newline at end of file
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
index 68a0d8ba5..ab62e9ea8 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
@@ -96,8 +96,8 @@ class HistoryListItemViewHolder(
         url.text = item.url
 
         val isEditing = mode is HistoryState.Mode.Editing
-        checkbox.visibility = if (isEditing) { View.VISIBLE } else { View.GONE }
-        favicon.visibility = if (isEditing) { View.INVISIBLE } else { View.VISIBLE }
+        checkbox.visibility = if (isEditing) View.VISIBLE else View.GONE
+        favicon.visibility = if (isEditing) View.INVISIBLE else View.VISIBLE
 
         if (mode is HistoryState.Mode.Editing) {
             checkbox.setOnCheckedChangeListener(null)