17. Subscription Review Fixes (#2547)

Task/Issue URL: https://app.asana.com/0/1204099484721401/1206757416402738/f

Description:

Copy and layout updates in Subscription > Add device
Properly update account email when changes in the Add Device page
Prevent showing the "Subscription Activation in progress" error while fetching subscription info

DuckDuckGo/SettingsSubscriptionView.swift

@@ -172,17 +172,20 @@ struct SettingsSubscriptionView: View {
     var body: some View {
         if viewModel.state.subscription.enabled {
             Section(header: Text(UserText.settingsPProSection)) {
+
                 if viewModel.state.subscription.hasActiveSubscription {
-
-                    // Allow managing the subscription if we have some entitlements
-                    if viewModel.shouldShowDBP || viewModel.shouldShowITP || viewModel.shouldShowNetP {
-                        subscriptionDetailsView
+
+                    if !viewModel.isLoadingSubscriptionState {
 
-                    // If no entitlements it should mean the backend is still out of sync
-                    } else {
-                        noEntitlementsAvailableView
+                        // Allow managing the subscription if we have some entitlements
+                        if viewModel.shouldShowDBP || viewModel.shouldShowITP || viewModel.shouldShowNetP {
+                            subscriptionDetailsView
+
+                            // If no entitlements it should mean the backend is still out of sync
+                        } else {
+                            noEntitlementsAvailableView
+                        }
                     }
-
                 } else {
                     purchaseSubscriptionView
 

DuckDuckGo/SettingsViewModel.swift

@@ -56,6 +56,7 @@ final class SettingsViewModel: ObservableObject {
     // Sheet Presentation & Navigation
     @Published var isRestoringSubscription: Bool = false
     @Published var shouldDisplayRestoreSubscriptionError: Bool = false
+    @Published var isLoadingSubscriptionState: Bool = false
     @Published var shouldShowNetP = false
     @Published var shouldShowDBP = false
     @Published var shouldShowITP = false
@@ -351,6 +352,7 @@ extension SettingsViewModel {
             return
         }
 
+        isLoadingSubscriptionState = true
         // Fetch available subscriptions from the backend (or sign out)
         switch await SubscriptionService.getSubscription(accessToken: token) {
 
@@ -372,8 +374,11 @@ extension SettingsViewModel {
                     }
                 }
             }
+            isLoadingSubscriptionState = false
+
         default:
             // Account is active but there's not a valid subscription / entitlements
+            isLoadingSubscriptionState = false
             signOutUser()
         }
     }

DuckDuckGo/Subscription/ViewModel/SubscriptionRestoreViewModel.swift

@@ -55,6 +55,7 @@ final class SubscriptionRestoreViewModel: ObservableObject {
     }
 
     func initializeView() {
+        Task { await updateAccountEmail() }
         Pixel.fire(pixel: .privacyProSettingsAddDevice)
         subscriptionEmail = accountManager.email
         if accountManager.isUserAuthenticated {
@@ -119,6 +120,15 @@ final class SubscriptionRestoreViewModel: ObservableObject {
         }
     }
 
+    @MainActor
+    private func updateAccountEmail() async {
+        if let token = accountManager.authToken,
+        case let .success(accountDetails) = await accountManager.fetchAccountDetails(with: token) {
+            accountManager.storeAccount(token: token, email: accountDetails.email, externalID: accountDetails.externalID)
+            subscriptionEmail = accountDetails.email
+        }
+    }
+
 
 }
 #endif

DuckDuckGo/Subscription/Views/SubscriptionRestoreView.swift

@@ -239,6 +239,7 @@ struct SubscriptionRestoreView: View {
                 }
                 .padding(Constants.cellPadding)
                 .background(Color(designSystemColor: .panel))
+                .cornerRadius(Constants.cornerRadius)
                 .overlay(
                     RoundedRectangle(cornerRadius: Constants.cornerRadius)
                         .stroke(Color(designSystemColor: .lines), lineWidth: Constants.borderWidth)

DuckDuckGo/UserText.swift

@@ -1096,8 +1096,8 @@ But if you *do* want a peek under the hood, you can find more information about
 
     // Add to other devices (AppleID / Email)
     public static let subscriptionAddDeviceTitle = NSLocalizedString("subscription.add.device.title", value: "Add Device", comment: "Add to another device view title")
-    public static let subscriptionAddDeviceHeaderTitle = NSLocalizedString("subscription.add.device.header.title", value: "Use your subscription on all your devices", comment: "Add subscription to other device title ")
-    public static let subscriptionAddDeviceDescription = NSLocalizedString("subscription.add.device.description", value: "Access your Privacy Pro subscription on other devices via an email address.", comment: "Subscription Add device Info")
+    public static let subscriptionAddDeviceHeaderTitle = NSLocalizedString("subscription.add.device.header.title", value: "Use your subscription on other devices", comment: "Add subscription to other device title ")
+    public static let subscriptionAddDeviceDescription = NSLocalizedString("subscription.add.device.description", value: "Access your Privacy Pro subscription via an email address.", comment: "Subscription Add device Info")
     public static let subscriptionAvailableInApple = NSLocalizedString("subscription.available.apple", value: "Privacy Pro is available on any device signed in to the same Apple ID.", comment: "Subscription availability message on Apple devices")
     public static let subscriptionManageEmailResendInstructions = NSLocalizedString("subscription.add.device.resend.instructions", value: "Resend Instructions", comment: "Resend activation instructions button")
 

DuckDuckGo/en.lproj/Localizable.strings

@@ -2005,10 +2005,10 @@ But if you *do* want a peek under the hood, you can find more information about
 "subscription.add.device.button" = "Add to Another Device";
 
 /* Subscription Add device Info */
-"subscription.add.device.description" = "Access your Privacy Pro subscription on other devices via an email address.";
+"subscription.add.device.description" = "Access your Privacy Pro subscription via an email address.";
 
 /* Add subscription to other device title  */
-"subscription.add.device.header.title" = "Use your subscription on all your devices";
+"subscription.add.device.header.title" = "Use your subscription on other devices";
 
 /* Resend activation instructions button */
 "subscription.add.device.resend.instructions" = "Resend Instructions";