PM-15377: Rolled back review prompt legacy api

BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ReviewModifier.swift

@@ -0,0 +1,79 @@
+import StoreKit
+import SwiftUI
+
+/// A view modifier that requests a review when the view appears.
+@available(iOS 16.0, *)
+struct ReviewModifier: ViewModifier {
+    /// The environment key for the request review function.
+    @Environment(\.requestReview) var requestReview
+
+    /// The eligibility for requesting a review.
+    let isEligible: Bool
+
+    /// The closure to execute after requesting a review.
+    let afterClosure: () -> Void
+
+    func body(content: Content) -> some View {
+        content
+            .task(id: isEligible) {
+                if isEligible {
+                    requestReview()
+                    afterClosure()
+                }
+            }
+    }
+}
+
+/// A view modifier that requests a review via legacy API when the view appears.
+struct RequestReviewLegacyModifier: ViewModifier {
+    /// The eligibility for requesting a review.
+    let isEligible: Bool
+
+    /// The window scene to request a review.
+    let windowScene: UIWindowScene
+
+    /// The closure to execute after requesting a review.
+    let afterClosure: () -> Void
+
+    func body(content: Content) -> some View {
+        content
+            .task(id: isEligible) {
+                if isEligible {
+                    SKStoreReviewController.requestReview(in: windowScene)
+                    afterClosure()
+                }
+            }
+    }
+}
+
+/// A view extension that requests a review when the view appears.
+extension View {
+    func requestReview(windowScene: UIWindowScene?, isEligible: Bool, afterClosure: @escaping () -> Void) -> some View {
+        apply { view in
+            if #available(iOS 16.0, *) {
+                view.modifier(
+                    ReviewModifier(
+                        isEligible: isEligible,
+                        afterClosure: afterClosure
+                    )
+                )
+            } else {
+                if let windowScene {
+                    view.modifier(
+                        RequestReviewLegacyModifier(
+                            isEligible: isEligible,
+                            windowScene: windowScene,
+                            afterClosure: afterClosure
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+/// An error that represents a window scene error.
+public enum WindowSceneError: Error, Equatable {
+    /// The window scene is null.
+    case nullWindowScene
+}

BitwardenShared/UI/Vault/Vault/VaultCoordinator.swift

@@ -289,10 +289,15 @@ final class VaultCoordinator: Coordinator, HasStackNavigator {
             )
         )
         let store = Store(processor: processor)
+        let windowScene = stackNavigator?.rootViewController?.view.window?.windowScene
         let view = VaultListView(
             store: store,
-            timeProvider: services.timeProvider
+            timeProvider: services.timeProvider,
+            windowScene: windowScene
         )
+        if windowScene == nil {
+            services.errorReporter.log(error: WindowSceneError.nullWindowScene)
+        }
         stackNavigator?.replace(view, animated: false)
     }
 

BitwardenShared/UI/Vault/Vault/VaultCoordinatorTests.swift

@@ -199,6 +199,7 @@ class VaultCoordinatorTests: BitwardenTestCase {
         let action = try XCTUnwrap(stackNavigator.actions.last)
         XCTAssertEqual(action.type, .replaced)
         XCTAssertTrue(action.view is VaultListView)
+        XCTAssertEqual(errorReporter.errors.last as? WindowSceneError, WindowSceneError.nullWindowScene)
     }
 
     /// `navigate(to:)` with `.lockVault` navigates the user to the login view.

BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift

@@ -1,7 +1,6 @@
 // swiftlint:disable file_length
 
 import BitwardenSdk
-import StoreKit
 import SwiftUI
 
 // MARK: - SearchableVaultListView
@@ -283,6 +282,9 @@
     /// The `TimeProvider` used to calculate TOTP expiration.
     var timeProvider: any TimeProvider
 
+    /// The window scene for requesting a review.
+    var windowScene: UIWindowScene?
+
     var body: some View {
         ZStack {
             SearchableVaultListView(
@@ -346,12 +348,6 @@
         .task(id: store.state.vaultFilterType) {
             await store.perform(.streamVaultList)
         }
-        .task(id: store.state.isEligibleForAppReview) {
-            if store.state.isEligibleForAppReview {
-                requestReview()
-                store.send(.appReviewPromptShown)
-            }
-        }
         .onAppear {
             Task {
                 await store.perform(.checkAppReviewEligibility)
@@ -360,6 +356,9 @@
         .onDisappear {
             store.send(.disappeared)
         }
+        .requestReview(windowScene: windowScene, isEligible: store.state.isEligibleForAppReview) {
+            store.send(.appReviewPromptShown)
+        }
     }
 
     // MARK: Private properties
@@ -380,15 +379,6 @@
             )
         )
     }
-
-    /// Requests a review of the app.
-    private func requestReview() {
-        if #available(iOS 16.0, *) {
-            Environment(\.requestReview).wrappedValue()
-        } else {
-            SKStoreReviewController.requestReview()
-        }
-    }
 }
 
 // MARK: Previews