From bc23ca287aea65c241ee44706f034909bacd9b92 Mon Sep 17 00:00:00 2001
From: Roger Yang <royang@mozilla.com>
Date: Tue, 28 Sep 2021 22:10:47 -0400
Subject: [PATCH] Fix recent tabs intermittent tests (#21557)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 .../org/mozilla/fenix/ext/BrowserState.kt     |  5 +----
 .../fenix/home/recenttabs/view/RecentTabs.kt  | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt b/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt
index ed67aa676c2e..8b8851172f91 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/BrowserState.kt
@@ -9,7 +9,6 @@ import mozilla.components.browser.state.selector.selectedNormalTab
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.feature.tabs.ext.hasMediaPlayed
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.home.recenttabs.RecentTab
 import org.mozilla.fenix.tabstray.browser.TabGroup
 import org.mozilla.fenix.tabstray.browser.maxActiveTime
@@ -35,9 +34,7 @@ fun BrowserState.asRecentTabs(): List<RecentTab> {
             inProgressMediaTab?.let { add(RecentTab.Tab(it)) }
         }
 
-        if (FeatureFlags.tabGroupFeature) {
-            lastSearchGroup?.let { add(it) }
-        }
+        lastSearchGroup?.let { add(it) }
     }
 }
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt b/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt
index 2ea26bd90cba..48ff303a16e0 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/recenttabs/view/RecentTabs.kt
@@ -43,6 +43,7 @@ import mozilla.components.browser.icons.compose.Placeholder
 import mozilla.components.browser.icons.compose.WithIcon
 import mozilla.components.support.ktx.kotlin.getRepresentativeSnippet
 import mozilla.components.ui.colors.PhotonColors
+import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.components
 import org.mozilla.fenix.home.recenttabs.RecentTab
@@ -77,14 +78,16 @@ fun RecentTabs(
                     )
                 }
                 is RecentTab.SearchGroup -> {
-                    RecentSearchGroupItem(
-                        searchTerm = tab.searchTerm,
-                        tabId = tab.tabId,
-                        url = tab.url,
-                        thumbnail = tab.thumbnail,
-                        count = tab.count,
-                        onSearchGroupClicked = onRecentSearchGroupClicked
-                    )
+                    if (FeatureFlags.tabGroupFeature) {
+                        RecentSearchGroupItem(
+                            searchTerm = tab.searchTerm,
+                            tabId = tab.tabId,
+                            url = tab.url,
+                            thumbnail = tab.thumbnail,
+                            count = tab.count,
+                            onSearchGroupClicked = onRecentSearchGroupClicked
+                        )
+                    }
                 }
             }
         }