Rebase fixes.

brave · Aug 4, 2023 · 02d072a · 02d072a
1 parent 8c3d685
commit 02d072a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/App/iOS/Delegates/AppDelegate.swift b/App/iOS/Delegates/AppDelegate.swift
@@ -176,9 +176,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     if isFirstLaunch {
       Preferences.PrivacyReports.ntpOnboardingCompleted.value = false
-      Preferences.Privacy.shouldShowPersistentPrivateBrowsingAlert.value = false
-    } else {
-      Preferences.Privacy.shouldShowPersistentPrivateBrowsingAlert.value = true
     }
 
     Preferences.General.isFirstLaunch.value = false

diff --git a/...ave/Frontend/Browser/BrowserViewController/BrowserViewController+TabManagerDelegate.swift b/...ave/Frontend/Browser/BrowserViewController/BrowserViewController+TabManagerDelegate.swift
@@ -326,7 +326,7 @@ extension BrowserViewController: TabManagerDelegate {
           handler: UIAction.deferredActionHandler { [weak self] _ in
             guard let self = self else { return }
 
-            if PrivateBrowsingManager.shared.isPrivateBrowsing {
+            if privateBrowsingManager.isPrivateBrowsing {
               return
             }
 

diff --git a/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift b/Sources/BraveWallet/Crypto/Stores/KeyringStore.swift
@@ -456,7 +456,7 @@ extension KeyringStore: BraveWalletKeyringServiceObserver {
   }
 
   public func keyringCreated(_ keyringId: BraveWallet.KeyringId) {
-    if isOnboardingVisible, !isCreatingWallet, keyringId == BraveWallet.DefaultKeyringId {
+    if isOnboardingVisible, !isCreatingWallet, keyringId == BraveWallet.KeyringId.default {
       // Another window has created a wallet. We should dismiss onboarding on this
       // window and allow the other window to continue with it's onboarding flow.
       isOnboardingVisible = false
@@ -476,7 +476,7 @@ extension KeyringStore: BraveWalletKeyringServiceObserver {
   }
 
   public func keyringRestored(_ keyringId: BraveWallet.KeyringId) {
-    if isOnboardingVisible && !isRestoringWallet, keyringId == BraveWallet.DefaultKeyringId {
+    if isOnboardingVisible && !isRestoringWallet, keyringId == BraveWallet.KeyringId.default {
       // Another window has restored a wallet. We should dismiss onboarding on this
       // window and allow the other window to continue with it's onboarding flow.
       isOnboardingVisible = false