Uplift of #25957 (squashed) to release

brave · Oct 14, 2024 · 0f726bd · 0f726bd
1 parent 7d51df6
commit 0f726bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift b/ios/brave-ios/Sources/BraveWallet/Crypto/Stores/CryptoStore.swift
@@ -80,7 +80,8 @@ public class CryptoStore: ObservableObject, WalletObserverStore {
   @Published var isPresentingPendingRequest: Bool = false {
     didSet {
       if !isPresentingPendingRequest {
-        confirmationStore = nil
+        closeConfirmationStore()
+        closeSignMessageRequestStore()
       }
     }
   }

diff --git a/ios/brave-ios/Sources/BraveWallet/Panels/RequestContainerView.swift b/ios/brave-ios/Sources/BraveWallet/Panels/RequestContainerView.swift
@@ -102,11 +102,5 @@ struct RequestContainerView<DismissContent: ToolbarContent>: View {
       }
     }
     .navigationViewStyle(.stack)
-    .onDisappear {
-      // `onDisappear` on individual views will trigger for navigation pushes.
-      // Close stores when navigation covers manual dismiss & onDismiss() cases.
-      cryptoStore.closeConfirmationStore()
-      cryptoStore.closeSignMessageRequestStore()
-    }
   }
 }