Merge branch 'add-more-logs-to-payment-flows'

Author: rablador

ios/MullvadLogging/Date+LogFormat.swift

@@ -19,6 +19,16 @@ extension Date {
         return formatter.string(from: self)
     }
 
+    public var safeLogFormatted: String {
+        let formatter = DateFormatter()
+
+        formatter.dateFormat = "dd/MM/yyyy"
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
+
+        return formatter.string(from: self)
+    }
+
     public var logFileFormatted: String {
         let formatter = DateFormatter()
 

ios/MullvadVPN/StorePaymentManager/StorePaymentManager.swift

@@ -69,6 +69,8 @@ final actor StorePaymentManager: @unchecked Sendable {
     }
 
     func purchase(product: Product) async {
+        logger.debug("Purchasing product: \(product.id)")
+
         let token: UUID
         do {
             token = try await self.getPaymentToken()
@@ -140,12 +142,16 @@ final actor StorePaymentManager: @unchecked Sendable {
     }
 
     static func finishOutstandingSandboxAndOldAPITransactions() async {
+        let logger = Logger(label: "StorePaymentManager")
+
+        logger.debug("Finishing outstanding sandbox and old transactions")
+
         for await verification in Transaction.unfinished {
             guard let payload = try? verification.payloadValue else {
+                logger.debug("Verification is missing a valid payload")
                 continue
             }
 
-            let logger = Logger(label: "StorePaymentManager")
             logger.debug("Unfinished transaction environment is \(payload.environment)")
 
             let isStagingEnvironment = payload.environment != .production
@@ -155,8 +161,13 @@ final actor StorePaymentManager: @unchecked Sendable {
 
             if isStagingEnvironment || isOldAPI {
                 logger.debug(
-                    "Finishing transaction. isStagingEnvironment: \(isStagingEnvironment), isOldAPI: \(isOldAPI)")
+                    "Finishing transaction. isStagingEnvironment: \(isStagingEnvironment), isOldAPI: \(isOldAPI)"
+                )
                 await payload.finish()
+            } else {
+                logger.debug(
+                    "Skipping transaction. isStagingEnvironment: \(isStagingEnvironment), isOldAPI: \(isOldAPI)"
+                )
             }
         }
     }
@@ -173,7 +184,15 @@ final actor StorePaymentManager: @unchecked Sendable {
     }
 
     private func uploadReceipt(verification: VerificationResult<Transaction>) async throws {
-        logger.debug("Uploading receipt")
+        let payload = try verification.payloadValue
+
+        let logMessage: String =
+            "Uploading receipt. "
+            + "Product ID: \(payload.productID), "
+            + "Environment: \(payload.environment), "
+            + "Purchase date: \(payload.purchaseDate.safeLogFormatted), "
+            + "Revocation date: \(payload.revocationDate?.safeLogFormatted ?? "none")"
+        logger.debug(.init(stringLiteral: logMessage))
 
         let result = await interactor.checkPayment(jwsRepresentation: verification.jwsRepresentation)
 

ios/MullvadVPN/View controllers/InAppPurchase/InAppPurchaseViewController.swift

@@ -6,10 +6,12 @@
 //  Copyright © 2026 Mullvad VPN AB. All rights reserved.
 //
 
+import MullvadLogging
 import StoreKit
 import UIKit
 
 class InAppPurchaseViewController: UIViewController, StorePaymentObserver {
+    private let logger = Logger(label: "InAppPurchaseViewController")
     private let storePaymentManager: StorePaymentManager
     private let accountNumber: String
     private let paymentAction: PaymentAction
@@ -81,6 +83,7 @@ class InAppPurchaseViewController: UIViewController, StorePaymentObserver {
     }
 
     func startRestorationBeforePurchaseFlow() async {
+        logger.debug("Restoring purchases before starting payment flow")
         spinnerView.startAnimating()
 
         do {
@@ -106,6 +109,7 @@ class InAppPurchaseViewController: UIViewController, StorePaymentObserver {
     }
 
     func startPaymentFlow() async {
+        logger.debug("Starting payment flow")
         spinnerView.startAnimating()
 
         var products: [Product]