fix: allowance follow-ups

Bitkit/AppScene.swift

@@ -365,6 +365,7 @@ struct AppScene: View {
         activityChanges: CoreService.shared.activity.activitiesChangedPublisher
     )
     @State private var paykitAllowanceManager = PaykitAllowanceManager()
+    @State private var activatedAutomaticPaykitIdentity: String?
 
     @State private var hideSplash = false
     @State private var removeSplash = false
@@ -611,33 +612,23 @@ struct AppScene: View {
                 receivedPaymentBackfillCache.invalidate()
                 if authState == .authenticated, let pk = pubkyProfile.publicKey {
                     paykitPaymentRequestManager.activate(identity: pk)
-                    Task {
-                        guard let session = pubkyProfile.automaticPaykitSession,
-                              PubkyPublicKeyFormat.matches(pk, session.publicKey)
-                        else { return }
-                        await paykitAllowanceManager.activate(identity: pk)
-                        await handlePendingPaykitSubscriptionNotification()
-                        guard pubkyProfile.automaticPaykitSession == session else { return }
-                        try? await contactsManager.loadContacts(for: pk)
-                        if !PaykitFeatureFlags.isUIEnabled, wallet.walletExists == true {
-                            await retryPendingPaykitEndpointRemoval()
-                        }
-                        guard isPaykitSceneActive, pubkyProfile.authState == .authenticated,
-                              PubkyPublicKeyFormat.matches(pk, pubkyProfile.publicKey)
-                        else { return }
-                        await refreshPrivateOnlyPaykitApp()
-                        await refreshIncomingPaykitPaymentRequests(presentItems: false, onlyWhileActive: true)
-                        if PaykitSubscriptionNotificationTargetStore.load() == nil {
-                            await presentNextIncomingPaykitItem()
-                        }
-                    }
+                    startAutomaticPaykitSession()
                 } else if authState == .idle {
+                    activatedAutomaticPaykitIdentity = nil
                     contactsManager.reset()
                     paykitPaymentRequestManager.clear()
                     paykitAllowanceManager.deactivate()
                     hasPendingExpiryToast = false
                 }
             }
+            // A sign-in, or a session that was still changing or being deleted, has no automatic session yet when
+            // authState turns authenticated; activate allowances and load contacts once it appears.
+            .onReceive(PubkyProfileManager.sessionSettledPublisher) { startAutomaticPaykitSession() }
+            .onChange(of: pubkyProfile.isDeletingProfile) { _, isDeleting in
+                if !isDeleting {
+                    startAutomaticPaykitSession()
+                }
+            }
             .onReceive(contactsManager.savedContactsChangedPublisher) { contacts in
                 let publicKeys = contacts.map(\.publicKey)
                 guard PaykitFeatureFlags.isUIEnabled,
@@ -1261,7 +1252,9 @@ struct AppScene: View {
                 if !PaykitFeatureFlags.isUIEnabled {
                     await retryPendingPaykitEndpointRemoval()
                 }
-                guard PaykitFeatureFlags.isUIEnabled, isPaykitSceneActive else { return }
+                guard PaykitFeatureFlags.isUIEnabled else { return }
+                await paykitAllowanceManager.recoverOpenAttempts()
+                guard isPaykitSceneActive else { return }
                 await refreshPrivateOnlyPaykitApp()
                 await PrivatePaykitAddressReservationStore.shared.reconcileReservedIndexesWithLdk()
                 await prepareSavedPaykitContacts()
@@ -2016,16 +2009,56 @@ struct AppScene: View {
         }
     }
 
-    private func announceAcceptedAllowanceOffers(_ offers: [PaykitAllowanceEntry]) {
-        for offer in offers {
-            let title = t("subscriptions__allowance_offer_accepted_title")
-            let description = t("subscriptions__allowance_offer_accepted_description", variables: ["name": contactName(offer.counterparty)])
-            PaykitAllowanceNotifier.post(title: title, body: description, fallback: {
-                app.toast(type: .success, title: title, description: description, accessibilityIdentifier: "AllowanceOfferAcceptedToast")
-            })
+    private func startAutomaticPaykitSession() {
+        guard let session = pubkyProfile.automaticPaykitSession,
+              !PubkyPublicKeyFormat.matches(session.publicKey, activatedAutomaticPaykitIdentity)
+        else { return }
+        let pk = session.publicKey
+        activatedAutomaticPaykitIdentity = pk
+        Task {
+            await paykitAllowanceManager.activate(identity: pk)
+            await handlePendingPaykitSubscriptionNotification()
+            guard pubkyProfile.automaticPaykitSession == session else {
+                // A deletion or session change cut this start short; let the session's next appearance run it again.
+                if activatedAutomaticPaykitIdentity == pk {
+                    activatedAutomaticPaykitIdentity = nil
+                }
+                // A new session for the same key may already have appeared while this one waited.
+                startAutomaticPaykitSession()
+                return
+            }
+            try? await contactsManager.loadContacts(for: pk)
+            if !PaykitFeatureFlags.isUIEnabled, wallet.walletExists == true {
+                await retryPendingPaykitEndpointRemoval()
+            }
+            guard isPaykitSceneActive, pubkyProfile.authState == .authenticated,
+                  PubkyPublicKeyFormat.matches(pk, pubkyProfile.publicKey)
+            else { return }
+            await refreshPrivateOnlyPaykitApp()
+            await refreshIncomingPaykitPaymentRequests(presentItems: false, onlyWhileActive: true)
+            if PaykitSubscriptionNotificationTargetStore.load() == nil {
+                await presentNextIncomingPaykitItem()
+            }
         }
     }
 
+    /// One announcement for all offers accepted in a refresh, since each fallback toast would replace the one before it.
+    private func announceAcceptedAllowanceOffers(_ offers: [PaykitAllowanceEntry]) {
+        var counterparties: [String] = []
+        for offer in offers where !counterparties.contains(where: { PubkyPublicKeyFormat.matches($0, offer.counterparty) }) {
+            counterparties.append(offer.counterparty)
+        }
+        let names = counterparties.map(contactName)
+        guard let first = names.first else { return }
+        let title = t("subscriptions__allowance_offer_accepted_title")
+        let description = names.count == 1
+            ? t("subscriptions__allowance_offer_accepted_description", variables: ["name": first])
+            : t("subscriptions__allowance_offers_accepted_description", variables: ["names": ListFormatter.localizedString(byJoining: names)])
+        PaykitAllowanceNotifier.post(title: title, body: description, fallback: {
+            app.toast(type: .success, title: title, description: description, accessibilityIdentifier: "AllowanceOfferAcceptedToast")
+        })
+    }
+
     private func contactName(_ publicKey: String) -> String {
         contactsManager.contacts.first { PubkyPublicKeyFormat.matches($0.publicKey, publicKey) }?.displayName
             ?? PubkyPublicKeyFormat.displayTruncated(publicKey)

Bitkit/Managers/PubkyProfileManager.swift

@@ -1,3 +1,4 @@
+import Combine
 import Foundation
 import enum Paykit.PaykitError
 import struct Paykit.PubkySessionBootstrapResult
@@ -145,6 +146,17 @@ class PubkyProfileManager: ObservableObject {
 
     private static func endSessionMutation() {
         sessionMutationCount -= 1
+        if sessionMutationCount == 0 {
+            sessionSettledSubject.send()
+        }
+    }
+
+    private static let sessionSettledSubject = PassthroughSubject<Void, Never>()
+
+    /// Fires when the last session change in flight ends. `currentSession` reads nil until then, and nothing published
+    /// changes at that moment, so work that needs the session (a sign-in completing during that change) waits for this.
+    static var sessionSettledPublisher: AnyPublisher<Void, Never> {
+        sessionSettledSubject.eraseToAnyPublisher()
     }
 
     init(

Bitkit/Models/PaykitAllowanceStateBackup.swift

@@ -0,0 +1,192 @@
+import Foundation
+
+/// The allowance states of a wallet backup by identity. An entry this version can't read is dropped instead of failing the
+/// rest of the wallet backup it travels in.
+struct PaykitAllowanceStateBackups: Codable {
+    let byIdentity: [String: PaykitAllowanceStateBackup]
+
+    init(_ byIdentity: [String: PaykitAllowanceStateBackup]) {
+        self.byIdentity = byIdentity
+    }
+
+    init(from decoder: Decoder) throws {
+        let entries = (try? decoder.singleValueContainer().decode([String: Lenient].self)) ?? [:]
+        byIdentity = entries.compactMapValues(\.value)
+        if byIdentity.count != entries.count {
+            Logger.warn("Skipped \(entries.count - byIdentity.count) unreadable allowance states in a backup", context: "PaykitAllowance")
+        }
+    }
+
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+        try container.encode(byIdentity)
+    }
+
+    private struct Lenient: Decodable {
+        let value: PaykitAllowanceStateBackup?
+
+        init(from decoder: Decoder) throws {
+            value = try? PaykitAllowanceStateBackup(from: decoder)
+        }
+    }
+}
+
+/// One identity's local allowance state in the wallet backup, in the format both apps read: the USD labels of each
+/// grant and the attempt journal restart recovery verifies from. Timestamps are RFC 3339, USD amounts decimal strings.
+struct PaykitAllowanceStateBackup: Codable {
+    struct Limits: Codable {
+        let perPaymentUsd: String
+        let monthlyUsd: String
+        let perPaymentSats: UInt64
+        let monthlySats: UInt64
+    }
+
+    struct Group: Codable {
+        let id: String
+        let counterparty: String
+        let limits: Limits
+        let allowanceIds: [String]
+        let createdAt: String
+    }
+
+    struct JournalEntry: Codable {
+        let attemptId: String
+        let isAutomatic: Bool
+        let requestId: PaykitPaymentStateBackup.RequestID
+        let allowanceId: String?
+        let amountSats: UInt64
+        let paymentEndpointIdentifier: String
+        let paymentHash: String?
+        let onchainAddress: String?
+        let transactionId: String?
+        let stage: PaykitAllowanceLocalState.Stage
+        let createdAt: String
+        let paymentListVersion: UInt64?
+        let previousPaymentListVersion: UInt64?
+
+        /// Android requires every key, so an absent optional is written as null rather than left out.
+        func encode(to encoder: Encoder) throws {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+            try container.encode(attemptId, forKey: .attemptId)
+            try container.encode(isAutomatic, forKey: .isAutomatic)
+            try container.encode(requestId, forKey: .requestId)
+            try container.encode(allowanceId, forKey: .allowanceId)
+            try container.encode(amountSats, forKey: .amountSats)
+            try container.encode(paymentEndpointIdentifier, forKey: .paymentEndpointIdentifier)
+            try container.encode(paymentHash, forKey: .paymentHash)
+            try container.encode(onchainAddress, forKey: .onchainAddress)
+            try container.encode(transactionId, forKey: .transactionId)
+            try container.encode(stage, forKey: .stage)
+            try container.encode(createdAt, forKey: .createdAt)
+            try container.encode(paymentListVersion, forKey: .paymentListVersion)
+            try container.encode(previousPaymentListVersion, forKey: .previousPaymentListVersion)
+        }
+    }
+
+    let groups: [Group]
+    let journal: [JournalEntry]
+    let presentedProposalIds: Set<String>
+    let unannouncedOfferIds: Set<String>
+    let notifiedRequestIds: Set<String>
+    let lastTrustedTime: String?
+
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(groups, forKey: .groups)
+        try container.encode(journal, forKey: .journal)
+        try container.encode(presentedProposalIds, forKey: .presentedProposalIds)
+        try container.encode(unannouncedOfferIds, forKey: .unannouncedOfferIds)
+        try container.encode(notifiedRequestIds, forKey: .notifiedRequestIds)
+        try container.encode(lastTrustedTime, forKey: .lastTrustedTime)
+    }
+
+    init(_ state: PaykitAllowanceLocalState) {
+        groups = state.groups.map { group in
+            Group(
+                id: group.id,
+                counterparty: group.counterparty,
+                limits: Limits(
+                    perPaymentUsd: "\(group.limits.perPaymentUsd)",
+                    monthlyUsd: "\(group.limits.monthlyUsd)",
+                    perPaymentSats: group.limits.perPaymentSats,
+                    monthlySats: group.limits.monthlySats
+                ),
+                allowanceIds: group.allowanceIds,
+                createdAt: PaykitAllowanceTime.format(group.createdAt)
+            )
+        }
+        journal = state.journal.map { entry in
+            JournalEntry(
+                attemptId: entry.attemptId,
+                isAutomatic: entry.isAutomatic,
+                requestId: PaykitPaymentStateBackup.RequestID(entry.requestId, billingPeriod: nil),
+                allowanceId: entry.allowanceId,
+                amountSats: entry.amountSats,
+                paymentEndpointIdentifier: entry.paymentEndpointIdentifier,
+                paymentHash: entry.paymentHash,
+                onchainAddress: entry.onchainAddress,
+                transactionId: entry.transactionId,
+                stage: entry.stage,
+                createdAt: PaykitAllowanceTime.format(entry.createdAt),
+                paymentListVersion: entry.paymentListVersion,
+                previousPaymentListVersion: entry.previousPaymentListVersion
+            )
+        }
+        presentedProposalIds = state.presentedProposalIds
+        unannouncedOfferIds = state.unannouncedOfferIds
+        notifiedRequestIds = state.notifiedRequestIds
+        lastTrustedTime = state.lastTrustedTime.map(PaykitAllowanceTime.format)
+    }
+
+    func restored() throws -> PaykitAllowanceLocalState {
+        try PaykitAllowanceLocalState(
+            groups: groups.map { group in
+                guard let perPaymentUsd = Decimal(string: group.limits.perPaymentUsd, locale: Locale(identifier: "en_US_POSIX")),
+                      let monthlyUsd = Decimal(string: group.limits.monthlyUsd, locale: Locale(identifier: "en_US_POSIX"))
+                else { throw Self.invalidBackup("Invalid allowance limits") }
+                return try PaykitAllowanceLocalState.Group(
+                    id: group.id,
+                    counterparty: group.counterparty,
+                    limits: PaykitAllowanceLimits(
+                        perPaymentUsd: perPaymentUsd,
+                        monthlyUsd: monthlyUsd,
+                        perPaymentSats: group.limits.perPaymentSats,
+                        monthlySats: group.limits.monthlySats
+                    ),
+                    allowanceIds: group.allowanceIds,
+                    createdAt: Self.date(group.createdAt)
+                )
+            },
+            journal: journal.map { entry in
+                try PaykitAllowanceLocalState.JournalEntry(
+                    attemptId: entry.attemptId,
+                    isAutomatic: entry.isAutomatic,
+                    requestId: entry.requestId.restored(billingPeriod: nil),
+                    allowanceId: entry.allowanceId,
+                    amountSats: entry.amountSats,
+                    paymentEndpointIdentifier: entry.paymentEndpointIdentifier,
+                    paymentHash: entry.paymentHash,
+                    onchainAddress: entry.onchainAddress,
+                    transactionId: entry.transactionId,
+                    stage: entry.stage,
+                    createdAt: Self.date(entry.createdAt),
+                    paymentListVersion: entry.paymentListVersion,
+                    previousPaymentListVersion: entry.previousPaymentListVersion
+                )
+            },
+            presentedProposalIds: presentedProposalIds,
+            unannouncedOfferIds: unannouncedOfferIds,
+            notifiedRequestIds: notifiedRequestIds,
+            lastTrustedTime: lastTrustedTime.map(Self.date)
+        )
+    }
+
+    private static func date(_ value: String) throws -> Date {
+        guard let date = PaykitAllowanceTime.parse(value) else { throw invalidBackup("Invalid allowance timestamp") }
+        return date
+    }
+
+    private static func invalidBackup(_ message: String) -> NSError {
+        NSError(domain: "BackupService", code: -1, userInfo: [NSLocalizedDescriptionKey: message])
+    }
+}

Bitkit/Models/PaykitPaymentStateBackup.swift

@@ -8,6 +8,8 @@ struct PaykitPaymentStateBackup: Codable {
     var activeOnchainAttempt: ActiveOnchainAttempt? = nil
     var usdt: PaykitUsdtStateBackup? = nil
     var acceptedOneTimeRequests: [String: [RequestID]]? = nil
+    /// Local allowance state by identity, so a restored wallet keeps its USD labels and can still verify open attempts.
+    var allowances: PaykitAllowanceStateBackups? = nil
 
     struct RequestID: Codable {
         let paymentRequestId: String

Bitkit/Resources/Localization/ar.lproj/Localizable.strings

@@ -539,6 +539,7 @@
 "security__pin_forgot_text" = "هل نسيت رمز PIN؟ أعد التعيين واستعد محفظة Bitkit باستخدام عبارة الاسترداد. قم بتعيين رمز PIN جديد بعد إكمال الاستعادة.";
 "security__pin_forgot_reset" = "إعادة التعيين (يتطلب عبارة الاسترداد)";
 "security__pin_send" = "يرجى إدخال رمز PIN الخاص بك لتأكيد وإرسال هذه الدفعة.";
+"security__pin_allowance" = "يرجى إدخال رمز PIN الخاص بك لتأكيد هذا التغيير في المخصص.";
 "security__pin_send_title" = "أدخل رمز PIN";
 "security__pin_use_biometrics" = "استخدام {biometricsName}";
 "security__bio" = "المقاييس الحيوية";
@@ -1635,6 +1636,7 @@
 "subscriptions__allowance_executed_description" = "أرسل الدفع التلقائي {amount} إلى {name}";
 "subscriptions__allowance_offer_accepted_title" = "تمت إضافة مخصص";
 "subscriptions__allowance_offer_accepted_description" = "أعدّ {name} مخصصًا لك";
+"subscriptions__allowance_offers_accepted_description" = "أعدّ {names} مخصصات لك";
 "subscriptions__allowance_limit_title" = "تم بلوغ الحد";
 "subscriptions__allowance_limit_description" = "طلب بقيمة {amount} من {name} يتجاوز مخصصك. راجعه للدفع.";
 "subscriptions__allowance_auto_paid" = "مدفوع تلقائيًا";