fixed onboarding showing logic

Client/Frontend/Browser/BrowserViewController.swift

@@ -927,10 +927,7 @@ class BrowserViewController: UIViewController {
         if shouldShowCliqzSearch {
             if self.shouldShowSearchOnboarding() {
                 LegacyTelemetryHelper.logOnboarding(action: "show", topic: "search")
-            } else {
-                /// Never show onboarding if Lumen was already a search engine
-                UserPreferences.instance.showSearchOnboarding = false
-            }
+            } 
 
             homePanelController?.view?.isHidden = true
 
@@ -1009,9 +1006,7 @@ class BrowserViewController: UIViewController {
     }
 
     private func shouldShowSearchOnboarding() -> Bool {
-        let showOboarding = UserPreferences.instance.showSearchOnboarding
-        let isLumenDefault = SettingsPrefs.shared.isLumenDefaultSearchEngine
-        return showOboarding && !isLumenDefault
+        return UserPreferences.instance.showSearchOnboarding
     }
 
     func hideSearchController() {
@@ -2369,7 +2364,7 @@ extension BrowserViewController: IntroViewControllerDelegate {
         /* Cliqz: determining the first launch. */
         let isFirstLaunch = profile.prefs.intForKey(PrefsKeys.IntroSeen) == nil
         if isFirstLaunch {
-            UserPreferences.instance.showSearchOnboarding = false
+//            UserPreferences.instance.showSearchOnboarding = false
         }
 
         if force || isFirstLaunch {

Cliqz/Extensions/BrowserViewController/SearchViewDelegate.swift

@@ -32,4 +32,12 @@ extension BrowserViewController: SearchViewDelegate {
             updateSearchQuery(query: query)
         }
     }
+
+    func makeLumenDefaultSearch() {
+        let lumenSearchEngine = self.profile.searchEngines.orderedEngines.filter { $0.shortName == LumenSearchEngineDisplayName }.first
+        if let engine = lumenSearchEngine {
+            self.profile.searchEngines.defaultEngine = engine
+            self.urlBar.updatePlaceHolders()
+        }
+    }
 }

Cliqz/React Components/Modules/JSBridge.swift

@@ -96,8 +96,10 @@ class JSBridge : RCTEventEmitter {
 
     @objc(getConfig:reject:)
     func getConfig(resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-        let shouldShowOnboarding = UserPreferences.instance.showSearchOnboarding && !SettingsPrefs.shared.isLumenDefaultSearchEngine
-        resolve(["onboarding": shouldShowOnboarding])
+        if SettingsPrefs.shared.isLumenDefaultSearchEngine {
+            UserPreferences.instance.showSearchOnboarding = false
+        }
+        resolve(["onboarding": UserPreferences.instance.showSearchOnboarding])
     }
 
     /// Call an action over the JSBridge and execute a callback with the result. Invokation of the callback is

Cliqz/Search/CliqzSearchViewController.swift

@@ -29,6 +29,7 @@ protocol SearchViewDelegate: class {
     func autoCompeleteQuery(_ autoCompleteText: String)
 	func dismissKeyboard()
     func closeSearchOnboarding()
+    func makeLumenDefaultSearch()
 }
 
 let OpenURLIsSearchEngineKey = "OpenURLIsSearchEngineKey"
@@ -301,10 +302,7 @@ extension CliqzSearchViewController {
         LegacyTelemetryHelper.logOnboarding(action: "click", target: "try", topic: "search")
         UserPreferences.instance.showSearchOnboarding = false
         if !SettingsPrefs.shared.isLumenDefaultSearchEngine {
-            let lumenSearchEngine = self.profile.searchEngines.orderedEngines.filter { $0.shortName == LumenSearchEngineDisplayName }.first
-            if let engine = lumenSearchEngine {
-                self.profile.searchEngines.defaultEngine = engine
-            }
+           delegate?.makeLumenDefaultSearch()
         }
     }