Apply code review suggestions to 90 day payment

9 files changed, 7 insertions, 17 deletions

diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
index adae6ad574..32abb7f779 100644
--- a/ios/MullvadVPN.xcodeproj/project.pbxproj
+++ b/ios/MullvadVPN.xcodeproj/project.pbxproj
@@ -3136,7 +3136,6 @@
 		583FE02329C1AC9F006E85F9 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				F998EFF92D3656B100D88D01 /* SKProduct+Sorting.swift */,
 				5891BF1B25E3E3EB006D6FB0 /* Bundle+ProductVersion.swift */,
 				F06200092CB7EB42002E6DB9 /* CGSize+Helpers.swift */,
 				587EB669270EFACB00123C75 /* CharacterSet+IPAddress.swift */,
@@ -3153,6 +3152,7 @@
 				58B9EB142489139B00095626 /* RESTError+Display.swift */,
 				58A8EE592976BFBB009C0F8D /* SKError+Localized.swift */,
 				58FD5BEF24238EB300112C88 /* SKProduct+Formatting.swift */,
+				F998EFF92D3656B100D88D01 /* SKProduct+Sorting.swift */,
 				58A8EE5D2976DB00009C0F8D /* StorePaymentManagerError+Display.swift */,
 				E158B35F285381C60002F069 /* String+AccountFormatting.swift */,
 				7A09C98029D99215000C2CAC /* String+FuzzyMatch.swift */,
diff --git a/ios/MullvadVPN/Coordinators/AccountCoordinator.swift b/ios/MullvadVPN/Coordinators/AccountCoordinator.swift
index 1654748231..7b238e53b4 100644
--- a/ios/MullvadVPN/Coordinators/AccountCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/AccountCoordinator.swift
@@ -85,7 +85,7 @@ final class AccountCoordinator: Coordinator, Presentable, Presenting, @unchecked
         didRequestPurchase: @escaping (_ product: SKProduct) -> Void
     ) {
         let localizedString = NSLocalizedString(
-            "BUY_CREDIT_BUTTON",
+            "ADD_TIME",
             tableName: "Welcome",
             value: "Add Time",
             comment: ""
diff --git a/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift b/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift
index 7feb60bd35..ccf8e442c0 100644
--- a/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/OutOfTimeCoordinator.swift
@@ -90,7 +90,7 @@ class OutOfTimeCoordinator: Coordinator, Presenting, @preconcurrency OutOfTimeVi
         didRequestPurchase: @escaping (SKProduct) -> Void
     ) {
         let localizedString = NSLocalizedString(
-            "BUY_CREDIT_BUTTON",
+            "ADD_TIME_BUTTON",
             tableName: "Welcome",
             value: "Add Time",
             comment: ""
diff --git a/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift b/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift
index 87ce2bb779..0c1fc7c9df 100644
--- a/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/WelcomeCoordinator.swift
@@ -156,7 +156,7 @@ extension WelcomeCoordinator: @preconcurrency WelcomeViewControllerDelegate {
         accountNumber: String
     ) {
         let localizedString = NSLocalizedString(
-            "BUY_CREDIT_BUTTON",
+            "ADD_TIME_BUTTON",
             tableName: "Welcome",
             value: "Add Time",
             comment: ""
diff --git a/ios/MullvadVPN/View controllers/Account/AccountViewController.swift b/ios/MullvadVPN/View controllers/Account/AccountViewController.swift
index 0ff929e676..41fd3bef25 100644
--- a/ios/MullvadVPN/View controllers/Account/AccountViewController.swift
+++ b/ios/MullvadVPN/View controllers/Account/AccountViewController.swift
@@ -196,7 +196,6 @@ class AccountViewController: UIViewController, @unchecked Sendable {
             activityIndicator.stopAnimating()
         }
 
-//        purchaseButton.setTitle(productState.purchaseButtonTitle, for: .normal)
         contentView.purchaseButton.isLoading = isFetchingProducts
 
         purchaseButton.isEnabled = !isFetchingProducts && isInteractionEnabled
@@ -322,7 +321,7 @@ class AccountViewController: UIViewController, @unchecked Sendable {
             return
         }
 
-        let productIdentifiers = Set(StoreSubscription.allCases).map { $0.rawValue }
+        let productIdentifiers = StoreSubscription.allCases.map { $0.rawValue }
 
         setPaymentState(.makingStoreKit2Purchase, animated: true)
 
diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift
index e338295cff..3ded47c9a2 100644
--- a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift
+++ b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeContentView.swift
@@ -110,7 +110,7 @@ final class WelcomeContentView: UIView, Sendable {
         let button = InAppPurchaseButton()
         button.setAccessibilityIdentifier(.purchaseButton)
         let localizedString = NSLocalizedString(
-            "BUY_CREDIT_BUTTON",
+            "ADD_TIME_BUTTON",
             tableName: "Welcome",
             value: "Add time",
             comment: ""
diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeInteractor.swift b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeInteractor.swift
index 9b3e465e95..9294498be9 100644
--- a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeInteractor.swift
+++ b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeInteractor.swift
@@ -25,14 +25,6 @@ final class WelcomeInteractor: @unchecked Sendable {
 
     var didAddMoreCredit: (() -> Void)?
 
-    var viewDidLoad = false {
-        didSet {
-            guard viewDidLoad else { return }
-//            Might trigger a popup without user interaction do we want that?
-//            requestAccessToStore()
-        }
-    }
-
     var viewWillAppear = false {
         didSet {
             guard viewWillAppear else { return }
diff --git a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift
index 69e0edc9e3..5b19fb073e 100644
--- a/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift
+++ b/ios/MullvadVPN/View controllers/CreationAccount/Welcome/WelcomeViewController.swift
@@ -64,7 +64,6 @@ class WelcomeViewController: UIViewController, RootContainment {
         super.viewDidLoad()
         configureUI()
         contentView.viewModel = interactor.viewModel
-        interactor.viewDidLoad = true
     }
 
     override func viewWillAppear(_ animated: Bool) {
diff --git a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift
index bc25fee820..8c70610f9c 100644
--- a/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift
+++ b/ios/MullvadVPN/View controllers/OutOfTime/OutOfTimeViewController.swift
@@ -224,7 +224,7 @@ class OutOfTimeViewController: UIViewController, RootContainment {
     // MARK: - Actions
 
     @objc private func requestStoreProducts() {
-        guard let accountData = interactor.deviceState.accountData else {
+        guard interactor.deviceState.accountData != nil else {
             return
         }
         let productIdentifiers = Set(StoreSubscription.allCases)