Subscriptions: 24. Properly dismiss view on selecting feature (#2640)

duckduckgo · Mar 26, 2024 · 5158917 · 5158917
1 parent 5b81a5d
commit 5158917
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/DuckDuckGo/Subscription/ViewModel/SubscriptionEmailViewModel.swift b/DuckDuckGo/Subscription/ViewModel/SubscriptionEmailViewModel.swift
@@ -152,6 +152,11 @@ final class SubscriptionEmailViewModel: ObservableObject {
                     self.selectedFeature = .dbp
                 }
                 self.state.shouldDismissStack = true
+
+                // Reset shouldDismissStack after dismissal to ensure it can be triggered again
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                    self.state.shouldDismissStack = false
+                }
             }
 
         }

diff --git a/DuckDuckGo/Subscription/Views/SubscriptionEmailView.swift b/DuckDuckGo/Subscription/Views/SubscriptionEmailView.swift
@@ -86,6 +86,10 @@ struct SubscriptionEmailView: View {
             shouldDisplayNavigationError = value
         }
 
+        .onChange(of: viewModel.state.shouldDismissStack) { _ in
+            onDismissStack?()
+        }
+
         // Observe changes to shouldDismissView
         .onChange(of: viewModel.state.shouldDismissView) { shouldDismiss in
             if shouldDismiss {