Hotfix for presenting cancelled payment in a nicer way

mullvad · Jul 17, 2023 · f3f5e3b · f3f5e3b
1 parent 16af77d
commit f3f5e3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ios/MullvadVPN/Extensions/SKError+Localized.swift b/ios/MullvadVPN/Extensions/SKError+Localized.swift
@@ -29,7 +29,7 @@ extension SKError: LocalizedError {
             return NSLocalizedString(
                 "PAYMENT_CANCELLED",
                 tableName: "StoreKitErrors",
-                value: "User cancelled the request.",
+                value: "The payment request was cancelled.",
                 comment: ""
             )
         case .paymentInvalid:

diff --git a/ios/MullvadVPN/Extensions/StorePaymentManagerError+Display.swift b/ios/MullvadVPN/Extensions/StorePaymentManagerError+Display.swift
@@ -80,7 +80,11 @@ extension StorePaymentManagerError: DisplayError {
             return errorString
 
         case let .storePayment(storeError):
-            return (storeError as? SKError)?.errorDescription ?? storeError.localizedDescription
+            guard let error = storeError as? SKError else { return storeError.localizedDescription }
+            if error.code.rawValue == 0, error.underlyingErrorChain.map({ $0 as NSError }).first?.code == 825 {
+                return SKError(.paymentCancelled).errorDescription
+            }
+            return SKError(error.code).errorDescription
         }
     }
 }