From 7019fb7654df6470aa426d54a22f940d48a29a6e Mon Sep 17 00:00:00 2001
From: iorgamgabriel <iorgamgabriel@yahoo.com>
Date: Thu, 17 Aug 2023 17:40:53 +0300
Subject: [PATCH] Bug 1844960 - Bookmark suggestions should appear unconcerned
 with the search suggestions setting.

---
 .../org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt | 5 ++---
 .../mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 2286fa723e..3c56c0b15b 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -188,6 +188,7 @@ class AwesomeBarView(
                 title = R.string.search_engine_suggestions_title,
                 description = activity.getString(R.string.search_engine_suggestions_description),
                 searchIcon = searchWithBitmap,
+                suggestionsHeader = getSearchEngineSuggestionsHeader(),
             )
 
         searchSuggestionProviderMap = HashMap()
@@ -318,9 +319,7 @@ class AwesomeBarView(
             providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true))
         }
 
-        if (!activity.settings().showUnifiedSearchFeature) {
-            providersToAdd.add(searchEngineSuggestionProvider)
-        }
+        providersToAdd.add(searchEngineSuggestionProvider)
 
         return providersToAdd
     }
diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
index 3cbc2a0aa2..00570df98d 100644
--- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
@@ -765,7 +765,7 @@ class AwesomeBarViewTest {
     }
 
     @Test
-    fun `GIVEN unified search feature is enabled WHEN configuring providers THEN don't add the engine suggestions provider`() {
+    fun `GIVEN unified search feature is enabled WHEN configuring providers THEN add the engine suggestions provider`() {
         val settings: Settings = mockk(relaxed = true) {
             every { showUnifiedSearchFeature } returns true
         }
@@ -776,7 +776,7 @@ class AwesomeBarViewTest {
 
         val result = awesomeBarView.getProvidersToAdd(state)
 
-        assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
+        assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
     }
 
     @Test
@@ -834,7 +834,7 @@ class AwesomeBarViewTest {
     }
 
     @Test
-    fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN don't add any provider`() {
+    fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN add any provider`() {
         val settings: Settings = mockk(relaxed = true) {
             every { showUnifiedSearchFeature } returns true
         }
@@ -862,7 +862,7 @@ class AwesomeBarViewTest {
         assertEquals(0, result.filterIsInstance<SearchSuggestionProvider>().size)
         assertEquals(0, result.filterIsInstance<SyncedTabsStorageSuggestionProvider>().size)
         assertEquals(0, result.filterIsInstance<SessionSuggestionProvider>().size)
-        assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
+        assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
     }
 
     @Test