From 93120eec9d23da0bad671acc3f5b7a0133733e02 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 8 Oct 2026 19:14:39 +0300 Subject: [PATCH 01/30] feat(dashpay): sign in to an app with one DashConnect QR from protocol 14 From protocol version 14 the wallet answers a `dash-key:` request by itself: it derives the request's session key (DIP-13 application session authentication, leaf `hash256` of the app's ephemeral key), registers it on the identity as an AUTHENTICATION / HIGH / ECDSA_HASH160 key bound to the requested contract with a budget and an expiry, and only then publishes the encrypted key to the App Connect system contract. The app no longer sends a `dash-st:` key registration. Earlier responses for the same app are deleted by their values first; the published values are recorded for that. Below protocol 14 the two-QR flow runs unchanged. Testnet's SDK is pinned to protocol 13, so testnet stays on it until that pin moves. Also ports the `dash-st:` parser to the SDK's `ParsedStateTransition` summary (dashpay/platform#4844): a key registration maps as before, and a batch is accepted only as a lone, complete token direct purchase. Needs dashpay/platform#4844 and the delete-by-values entry point. The budget and lifetime are placeholders. Mainnet is still gated off, the approval sheet and disconnect are unchanged. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 242 +++++++++++++++ .../PlatformDashConnectDataSource.swift | 236 ++++++++++++++- .../PlatformDashConnectDataSourceTests.swift | 280 +++++++++++++++++- 3 files changed, 739 insertions(+), 19 deletions(-) create mode 100644 DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift new file mode 100644 index 0000000000..097e916401 --- /dev/null +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -0,0 +1,242 @@ +import CryptoKit +import Foundation +import os +import SwiftDashSDK + +/// The one-QR login (DashConnect v2): the wallet derives a session key for +/// the request, registers it on the identity, and only then publishes the +/// encrypted key to the App Connect system contract. There is no `dash-st:` +/// step. +/// +/// Everything here is pure; `PlatformDashConnectDataSource` owns the Platform +/// calls and their order. +enum AppConnect { + /// The protocol version that registers the App Connect system contract. + /// Below it the contract does not exist and the two-QR login is the only + /// one that can work. + static let minimumProtocolVersion: UInt32 = 14 + + /// Same id on every network (`docs/protocol/app-connect.md` in + /// dashpay/platform). + static let contractId = "H8F9mP1BM55TE1ShsxPZHzhyinaMdY9bMmP85mkDhcJJ" + static let documentType = "loginKeyResponse" + + /// Limits put on every session key. + /// TODO(app-connect-limits): the protocol leaves both values to the + /// wallet and nothing has fixed them yet; they are not user-selectable. + static let sessionKeyBudgetCredits: UInt64 = 5_000_000_000 // 0.05 DASH + static let sessionKeyLifetime: TimeInterval = 90 * 24 * 60 * 60 + + static func isAvailable(protocolVersion: UInt32) -> Bool { + protocolVersion >= minimumProtocolVersion + } + + /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral + /// public key. Not the lookup key of the response, which is `hash160` of + /// the same bytes. + static func requestId(appEphemeralPubKey: Data) -> Data { + Data(SHA256.hash(data: Data(SHA256.hash(data: appEphemeralPubKey)))) + } + + static func expiresAt(from now: Date) -> UInt64 { + UInt64((now.addingTimeInterval(sessionKeyLifetime).timeIntervalSince1970 * 1000).rounded()) + } + + /// What the identity already holds for a derived session key. + enum SessionKeyState: Equatable { + /// Not on the identity: register it. + case absent + /// Registered and able to sign: publish without an identity update. + case usable(keyId: UInt32) + /// Registered but disabled or expired. Platform never re-adds a key, + /// so this request cannot be answered; the app has to ask again. + case unusable + } + + static func sessionKeyState( + publicKeyHash160: Data, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + now: Date + ) -> SessionKeyState { + guard let key = currentIdentityPublicKeys.first(where: { + $0.keyType == .ecdsaHash160 && $0.data == publicKeyHash160 + }) else { + return .absent + } + let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) + guard key.purpose == .authentication, + key.securityLevel == .high, + key.disabledAt == nil, + key.expiresAt.map({ $0 > nowMilliseconds }) ?? true else { + return .unusable + } + return .usable(keyId: UInt32(bitPattern: key.keyId)) + } + + static func nextKeyId( + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> UInt32 { + (currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0) + 1 + } + + /// The key an app is given: it can only sign for the contract the request + /// named, spend up to `totalBudget`, and stops working at `expiresAt`. + static func sessionIdentityPubkey( + keyId: UInt32, + publicKeyHash160: Data, + appContractId: Data, + totalBudget: UInt64, + expiresAt: UInt64 + ) -> ManagedPlatformWallet.IdentityPubkey { + ManagedPlatformWallet.IdentityPubkey( + keyId: keyId, + keyType: .ecdsaHash160, + purpose: .authentication, + securityLevel: .high, + pubkeyBytes: publicKeyHash160, + contractBounds: .singleContract(id: appContractId), + totalBudget: totalBudget, + expiresAt: expiresAt + ) + } + + /// The three values of a `loginKeyResponse`, as hex. + struct ResponseValues: Codable, Equatable { + let appEphemeralPubKeyHash: String + let walletEphemeralPubKey: String + let encryptedPayload: String + + /// The document's properties in the form `createDocument` and + /// delete-by-values take. + func propertiesJSON() throws -> String { + let data = try JSONSerialization.data( + withJSONObject: [ + "appEphemeralPubKeyHash": appEphemeralPubKeyHash, + "walletEphemeralPubKey": walletEphemeralPubKey, + "encryptedPayload": encryptedPayload, + ], + options: [.sortedKeys]) + return String(decoding: data, as: UTF8.self) + } + } + + /// Encrypts the session private key to the app. `walletEphemeralPrivateKey` + /// is wiped before returning. + static func responseValues( + sessionPrivateKey: Data, + appEphemeralPubKey: Data, + walletEphemeralPrivateKey: inout Data, + encrypt: (Data, Data, Data) throws -> Data = { key, walletPriv, appPub in + try KeyExchangeCrypto.encryptLoginKey( + key, + walletEphemeralPriv: walletPriv, + appEphemeralPub: appPub + ) + } + ) throws -> ResponseValues { + defer { PlatformDashConnectDataSource.zero(&walletEphemeralPrivateKey) } + + let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) + guard appEphemeralPubKeyHash.count == 20 else { + throw DashConnectPlatformError.invalidHash160 + } + let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) + let encryptedPayload = try encrypt(sessionPrivateKey, walletEphemeralPrivateKey, appEphemeralPubKey) + + return ResponseValues( + appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: walletEphemeralPublicKey.toHexString(), + encryptedPayload: encryptedPayload.toHexString() + ) + } +} + +/// A response this wallet published and has not deleted yet, with the key it +/// granted. The type is index-only on Platform: there is no lookup by app and +/// a delete has to carry the original values, so this record is the only way +/// back to the entry. +struct AppConnectPublishedResponse: Codable, Equatable { + /// Base58 ids. + let identityId: String + let appContractId: String + let documentId: String + let values: AppConnect.ResponseValues + let sessionKeyId: UInt32 + /// `nil` when the key was found already registered and its limits were + /// not read back. + let totalBudget: UInt64? + let expiresAt: UInt64? + let publishedAt: Date +} + +protocol AppConnectResponseStore { + func load() -> [AppConnectPublishedResponse] + func save(_ responses: [AppConnectPublishedResponse]) +} + +/// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose +/// scope it borrows. Nothing stored is secret: the values are public on +/// chain and the key ids are visible on the identity. +final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { + private let defaults: UserDefaults + private let scopeKeyProvider: () -> String? + private let encoder: JSONEncoder + private let decoder: JSONDecoder + + private static let logger = Logger( + subsystem: "org.dashfoundation.dash", + category: "dashconnect.app-connect-store") + + init( + defaults: UserDefaults = .standard, + network: DashConnectNetwork, + scopeKeyProvider: (() -> String?)? = nil + ) { + self.defaults = defaults + if let scopeKeyProvider { + self.scopeKeyProvider = scopeKeyProvider + } else { + let connections = UserDefaultsDashConnectStore(defaults: defaults, network: network) + self.scopeKeyProvider = { connections.storageKey } + } + + let encoder = JSONEncoder() + encoder.dateEncodingStrategy = .millisecondsSince1970 + self.encoder = encoder + + let decoder = JSONDecoder() + decoder.dateDecodingStrategy = .millisecondsSince1970 + self.decoder = decoder + } + + private var storageKey: String? { + scopeKeyProvider().map { "\($0).app-connect-responses.v1" } + } + + func load() -> [AppConnectPublishedResponse] { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } + do { + return try decoder.decode([AppConnectPublishedResponse].self, from: data) + } catch { + // Losing the records is survivable: the next login still creates a + // fresh response, and the old entries stay until deleted by value. + Self.logger.warning( + "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") + return [] + } + } + + func save(_ responses: [AppConnectPublishedResponse]) { + guard let storageKey else { return } + guard !responses.isEmpty else { + defaults.removeObject(forKey: storageKey) + return + } + do { + defaults.set(try encoder.encode(responses), forKey: storageKey) + } catch { + Self.logger.error( + "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") + } + } +} diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 54b48d4883..8f3c70d3e2 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -70,6 +70,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case keyRegistrationMismatchedDerivedKey(KeyPurpose) case tokenPurchaseWrongIdentity case tokenPurchaseTokenIdMismatch + case unsupportedStateTransition(String) + case sessionKeyUnusable case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -117,6 +119,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .sessionKeyUnusable: + return NSLocalizedString( + "This sign-in request can no longer be approved. Ask the app for a new code.", + comment: "DashConnect") + case .unsupportedStateTransition(let kindName): + return "This wallet cannot approve the scanned request (\(kindName))." case .devnetLoginContractNotConfigured: return NSLocalizedString( "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings.", @@ -230,7 +238,8 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio } func parse(_ transitionBytes: Data) throws -> DashConnectParsedStateTransition { - switch try parseTransition(transitionBytes) { + let transition = try parseTransition(transitionBytes) + switch transition.kind { case .identityUpdate(let parsed): return .keyRegistration( DashConnectKeyRegistrationTransition( @@ -270,19 +279,40 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio disablePublicKeyIds: parsed.disablePublicKeyIds ) ) - case .tokenPurchase(let parsed): + case .batch(let batch): + // The SDK now describes every batch, where it used to refuse all + // but a lone token direct purchase. The approval sheet and the + // rebuild in `approveTokenPurchase` still cover exactly that one + // case, so everything else is refused here: more than one row + // would be signed without being shown, and an incomplete summary + // (a note, group-action info) carries fields the rebuild drops. + guard transition.complete, + batch.transitions.count == 1, + case .token(let row) = batch.transitions[0], + row.action == Self.tokenDirectPurchaseAction, + row.complete, + let tokenCount = row.tokenCount, + let totalAgreedPrice = row.amount else { + throw DashConnectPlatformError.unsupportedStateTransition(transition.kindName) + } return .tokenPurchase( DashConnectTokenPurchaseTransition( - ownerId: parsed.ownerId, - dataContractId: parsed.dataContractId, - tokenId: parsed.tokenId, - tokenContractPosition: parsed.tokenContractPosition, - tokenCount: parsed.tokenCount, - totalAgreedPrice: parsed.totalAgreedPrice + ownerId: batch.ownerId, + dataContractId: row.dataContractId, + tokenId: row.tokenId, + tokenContractPosition: row.tokenContractPosition, + tokenCount: tokenCount, + totalAgreedPrice: totalAgreedPrice ) ) + case .creditTransfer, .dataContractCreate, .dataContractUpdate, .other: + throw DashConnectPlatformError.unsupportedStateTransition(transition.kindName) } } + + /// rs-dpp's action name for a token direct purchase, as the SDK reports + /// it on a batch row. + private static let tokenDirectPurchaseAction = "DirectPurchase" } final class PlatformDashConnectDataSource: DashConnectDataSource { @@ -321,6 +351,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let supportedNetwork: DashConnectNetwork private let store: any DashConnectStore + private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing @@ -341,6 +372,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { init( supportedNetwork: DashConnectNetwork = PlatformDashConnectDataSource.currentEnvironmentNetwork(), store: (any DashConnectStore)? = nil, + responseStore: (any AppConnectResponseStore)? = nil, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), now: @escaping () -> Date = Date.init @@ -350,6 +382,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { "DashConnect Platform publish runs on testnet and devnet only.") self.supportedNetwork = supportedNetwork self.store = store ?? UserDefaultsDashConnectStore(network: supportedNetwork) + self.responseStore = responseStore ?? UserDefaultsAppConnectResponseStore(network: supportedNetwork) self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now @@ -417,12 +450,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: no context — \(error.localizedDescription, privacy: .public)") throw error } + // Which login this network can answer is decided before the PIN + // prompt: from protocol version 14 the response goes to the App + // Connect system contract and the wallet registers the key itself; + // below it that contract does not exist and the two-QR flow runs. + // A pinned SDK reports its pin (testnet is pinned to 13 in + // `SwiftDashSDKHost.platformVersion(for:)`), so testnet stays on the + // two-QR flow until that pin moves. + let protocolVersion: UInt32 + do { + protocolVersion = try context.sdk.refreshProtocolVersion() + } catch { + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") + throw error + } do { try await authorize() } catch { Self.logger.error("🔗 DASHCONNECT :: authorization failed — \(error.localizedDescription, privacy: .public)") throw error } + if AppConnect.isAvailable(protocolVersion: protocolVersion) { + Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") + return try await approveAppConnectLogin(request, context: context) + } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. @@ -516,6 +567,175 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } + /// The one-QR login: derive the request's session key, register it on the + /// identity with its bounds and limits, and only then publish the + /// encrypted key, so the app finds a live key on its first check. + /// + /// Safe to repeat for the same QR: the key is derived from the request, + /// so a second approval finds it registered and goes straight to + /// publishing. A registration that succeeded before a failed publish is + /// therefore finished by scanning the same QR again. + private func approveAppConnectLogin( + _ request: DashKeyRequest, + context: Context + ) async throws -> DAppConnection { + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { + throw DashConnectPlatformError.loginContractUnavailable + } + + let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) + // `deriveConnectKey` is main-actor isolated in the SDK. + let sessionKey = try await MainActor.run { + try context.wallet.deriveConnectKey( + subFeature: .sessionAuthentication, + identityId: context.identityId, + leaf: requestId, + network: context.network + ) + } + var sessionPrivateKey = sessionKey.privateKeyData + defer { Self.zero(&sessionPrivateKey) } + let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionKey.publicKeyData) + + let signer = KeychainSigner(modelContainer: context.modelContainer) + let currentPublicKeys = try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + + let sessionKeyId: UInt32 + let totalBudget: UInt64? + let expiresAt: UInt64? + switch AppConnect.sessionKeyState( + publicKeyHash160: sessionKeyHash160, + currentIdentityPublicKeys: currentPublicKeys, + now: now() + ) { + case .unusable: + throw DashConnectPlatformError.sessionKeyUnusable + case .usable(let keyId): + Self.logger.info("🔗 DASHCONNECT :: session key already registered") + sessionKeyId = keyId + totalBudget = nil + expiresAt = nil + case .absent: + let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) + let budget = AppConnect.sessionKeyBudgetCredits + let expiry = AppConnect.expiresAt(from: now()) + let key = AppConnect.sessionIdentityPubkey( + keyId: keyId, + publicKeyHash160: sessionKeyHash160, + appContractId: request.contractId, + totalBudget: budget, + expiresAt: expiry + ) + Self.logger.info("🔗 DASHCONNECT :: registering session key") + try await signer.withAdditionalSigningKeys([ + (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), + ]) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: [key], + signer: signer + ) + } + Self.logger.info("🔗 DASHCONNECT :: session key registered") + sessionKeyId = keyId + totalBudget = budget + expiresAt = expiry + } + + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + let values = try AppConnect.responseValues( + sessionPrivateKey: sessionPrivateKey, + appEphemeralPubKey: request.appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey + ) + + let identityId = context.identityId.toBase58String() + let appContractId = request.contractId.toBase58String() + await deletePublishedAppConnectResponses( + identityId: identityId, + appContractId: appContractId, + responseContractId: responseContractId, + context: context, + signer: signer + ) + + Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") + let (documentId, _) = try await context.wallet.createDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + propertiesJSON: try values.propertiesJSON(), + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + + responseStore.save(responseStore.load() + [ + AppConnectPublishedResponse( + identityId: identityId, + appContractId: appContractId, + documentId: documentId.toBase58String(), + values: values, + sessionKeyId: sessionKeyId, + totalBudget: totalBudget, + expiresAt: expiresAt, + publishedAt: now() + ), + ]) + + let preview = await makeConnectionRequest(from: request) + let connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) + var current = subject.value.filter { $0.id != connection.id } + current.append(connection) + persistAndSend(current) + return connection + } + + /// Deletes the responses this identity published earlier for an app, by + /// their original values. Best effort: a response that cannot be deleted + /// now stays recorded and is tried again at the next login, and it does + /// not hold the new login back — the entry it leaves is the encrypted key + /// of a request the app has already finished with. + private func deletePublishedAppConnectResponses( + identityId: String, + appContractId: String, + responseContractId: Data, + context: Context, + signer: KeychainSigner + ) async { + let recorded = responseStore.load() + let previous = recorded.filter { $0.identityId == identityId && $0.appContractId == appContractId } + guard !previous.isEmpty else { return } + + var deleted: [AppConnectPublishedResponse] = [] + for response in previous { + do { + guard let documentId = Self.decodeIdentifier(response.documentId) else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + let signingKeyId = try selectDocumentSigningKeyId( + wallet: context.wallet, + identityId: context.identityId + ) + _ = try await context.wallet.deleteDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + documentId: documentId, + propertiesJSON: try response.values.propertiesJSON(), + signingKeyId: signingKeyId, + signer: signer + ) + deleted.append(response) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + } + } + responseStore.save(recorded.filter { !deleted.contains($0) }) + } + func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { try validateNetwork(request.network) let context = try await requireContext() diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c0a724bcca..f9f343f773 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -199,7 +199,7 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertEqual(tagless.disablePublicKeyIds, tagged.disablePublicKeyIds) let appParser = PlatformWalletDashConnectStateTransitionParser { bytes in - .identityUpdate(try wallet.parseIdentityUpdateTransition(bytes)) + Self.parsed(.identityUpdate(try wallet.parseIdentityUpdateTransition(bytes))) } guard case let .keyRegistration(appTransition) = try appParser.parse(taglessBytes) else { return XCTFail("Expected a key-registration transition") @@ -214,14 +214,9 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let contractId = Data(repeating: 0x22, count: 32) let tokenId = Data(repeating: 0x23, count: 32) let parser = PlatformWalletDashConnectStateTransitionParser { _ in - .tokenPurchase(ManagedPlatformWallet.ParsedTokenPurchaseTransition( - ownerId: ownerId, - dataContractId: contractId, - tokenId: tokenId, - tokenContractPosition: 3, - tokenCount: 100, - totalAgreedPrice: 100_000_000 - )) + Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId) + ]))) } guard case let .tokenPurchase(purchase) = try parser.parse(Data([0x00])) else { @@ -237,19 +232,79 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { func testParserRejectsContractGroupKeysInsteadOfDroppingTheirRestriction() throws { let parser = PlatformWalletDashConnectStateTransitionParser { _ in - .identityUpdate(.init( + Self.parsed(.identityUpdate(.init( identityId: Data(repeating: 0x21, count: 32), addPublicKeys: [.init( keyId: 1, keyType: .ecdsaSecp256k1, purpose: .authentication, securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 33), contractBounds: .contractGroup(id: Data(repeating: 0x23, count: 32)))], - disablePublicKeyIds: [])) + disablePublicKeyIds: []))) } XCTAssertThrowsError(try parser.parse(Data([0]))) { XCTAssertEqual($0 as? DashConnectPlatformError, .keyRegistrationUnexpectedMutation) } } + func testParserRefusesABatchThatIsNotALoneCompleteTokenPurchase() { + let ownerId = Data(repeating: 0x21, count: 32) + let contractId = Data(repeating: 0x22, count: 32) + let tokenId = Data(repeating: 0x23, count: 32) + let purchase = Self.tokenRow(contractId: contractId, tokenId: tokenId) + let refused: [(String, ManagedPlatformWallet.ParsedStateTransition)] = [ + ("two rows", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [purchase, purchase])))), + ("no rows", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [])))), + ("another token action", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, action: "Transfer") + ])))), + ("an incomplete row", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, complete: false) + ])))), + ("an incomplete transition", Self.parsed( + .batch(.init(ownerId: ownerId, transitions: [purchase])), complete: false)), + ("a missing price", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + Self.tokenRow(contractId: contractId, tokenId: tokenId, amount: nil) + ])))), + ("a document row", Self.parsed(.batch(.init(ownerId: ownerId, transitions: [ + .document(.init( + dataContractId: contractId, documentType: "note", + documentId: Data(repeating: 0x24, count: 32), action: "Delete", + amount: nil, recipientId: nil, complete: true, details: nil)) + ])))), + ("another kind", Self.parsed(.other)), + ] + for (name, transition) in refused { + let parser = PlatformWalletDashConnectStateTransitionParser { _ in transition } + XCTAssertThrowsError(try parser.parse(Data([0])), name) { + XCTAssertEqual( + $0 as? DashConnectPlatformError, + .unsupportedStateTransition("TestKind"), + name) + } + } + } + + private static func parsed( + _ kind: ManagedPlatformWallet.ParsedStateTransitionKind, + complete: Bool = true + ) -> ManagedPlatformWallet.ParsedStateTransition { + .init( + kindName: "TestKind", ownerId: nil, isSigned: false, userFeeIncrease: 0, + complete: complete, serialized: Data(), details: nil, kind: kind) + } + + private static func tokenRow( + contractId: Data, + tokenId: Data, + action: String = "DirectPurchase", + amount: UInt64? = 100_000_000, + complete: Bool = true + ) -> ManagedPlatformWallet.ParsedBatchedTransition { + .token(.init( + dataContractId: contractId, tokenId: tokenId, tokenContractPosition: 3, + action: action, amount: amount, recipientId: nil, tokenCount: 100, + complete: complete, details: complete ? nil : "note")) + } + func testTokenPurchasePriceConvertsCreditsToDash() { // 1e11 credits = 1 DASH; 1e3 credits = 1 duff. XCTAssertEqual(Self.purchaseRequest(credits: 0).totalPriceDash, 0) @@ -1338,3 +1393,206 @@ private enum PurchaseSpyError: LocalizedError { } } } + +final class AppConnectLoginTests: XCTestCase { + private var defaults: UserDefaults! + private var suiteName: String! + + override func setUp() { + super.setUp() + suiteName = "AppConnectLoginTests.\(UUID().uuidString)" + defaults = UserDefaults(suiteName: suiteName) + } + + override func tearDown() { + defaults.removePersistentDomain(forName: suiteName) + defaults = nil + suiteName = nil + super.tearDown() + } + + func testOneQrLoginStartsAtProtocolVersion14() { + XCTAssertFalse(AppConnect.isAvailable(protocolVersion: 13)) + XCTAssertTrue(AppConnect.isAvailable(protocolVersion: 14)) + XCTAssertTrue(AppConnect.isAvailable(protocolVersion: 15)) + } + + func testRequestIdIsHash256OfTheAppEphemeralKey() { + // hash256 of the empty string, a published vector. + XCTAssertEqual( + AppConnect.requestId(appEphemeralPubKey: Data()).toHexString(), + "5df6e0e2761359d30a8275058e299fcc0381534545f55cf43e41983f5d4c9456") + XCTAssertEqual(AppConnect.requestId(appEphemeralPubKey: Data(repeating: 0x02, count: 33)).count, 32) + } + + func testSessionKeyIsAbsentUntilItsHashIsOnTheIdentity() { + let hash = Data(repeating: 0x11, count: 20) + let other = Self.key(keyId: 4, data: Data(repeating: 0x22, count: 20)) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [other], now: Self.now), + .absent) + // The same bytes under another key type are a different key. + let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: hash) + XCTAssertEqual( + AppConnect.sessionKeyState( + publicKeyHash160: hash, currentIdentityPublicKeys: [sameBytesOtherType], now: Self.now), + .absent) + } + + func testRegisteredSessionKeyIsUsableWithItsKeyId() { + let hash = Data(repeating: 0x11, count: 20) + let live = Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds + 1) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [live], now: Self.now), + .usable(keyId: 9)) + let unlimited = Self.key(keyId: 9, data: hash) + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [unlimited], now: Self.now), + .usable(keyId: 9)) + } + + func testDisabledExpiredOrMisregisteredSessionKeyIsUnusable() { + let hash = Data(repeating: 0x11, count: 20) + let unusable: [(String, ManagedIdentity.IdentityPublicKeyInfo)] = [ + ("disabled", Self.key(keyId: 9, data: hash, disabledAt: 1)), + ("expired", Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds)), + ("wrong level", Self.key(keyId: 9, securityLevel: .critical, data: hash)), + ("wrong purpose", Self.key(keyId: 9, purpose: .transfer, data: hash)), + ] + for (name, key) in unusable { + XCTAssertEqual( + AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [key], now: Self.now), + .unusable, + name) + } + } + + func testNextKeyIdFollowsTheHighestKeyOnTheIdentity() { + XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: []), 1) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [ + Self.key(keyId: 0, data: Data([1])), + Self.key(keyId: 7, data: Data([2]), disabledAt: 1), + Self.key(keyId: 3, data: Data([3])), + ]), + 8) + } + + func testSessionKeyIsBoundToTheRequestedContractWithBothLimits() { + let hash = Data(repeating: 0x11, count: 20) + let contractId = Data(repeating: 0x33, count: 32) + let key = AppConnect.sessionIdentityPubkey( + keyId: 8, publicKeyHash160: hash, appContractId: contractId, totalBudget: 5, expiresAt: 6) + XCTAssertEqual(key.keyId, 8) + XCTAssertEqual(key.keyType, .ecdsaHash160) + XCTAssertEqual(key.purpose, .authentication) + XCTAssertEqual(key.securityLevel, .high) + XCTAssertEqual(key.pubkeyBytes, hash) + XCTAssertEqual(key.contractBounds, .singleContract(id: contractId)) + XCTAssertEqual(key.totalBudget, 5) + XCTAssertEqual(key.expiresAt, 6) + } + + func testExpiryIsTheLifetimeAfterNowInMilliseconds() { + XCTAssertEqual( + AppConnect.expiresAt(from: Date(timeIntervalSince1970: 1_000)), + UInt64((1_000 + AppConnect.sessionKeyLifetime) * 1000)) + } + + func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { + let sessionPrivateKey = Data(repeating: 0x5a, count: 32) + let appEphemeralPrivateKey = Data(repeating: 0x07, count: 32) + let appEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: appEphemeralPrivateKey) + let walletEphemeralPrivateKeyBytes = Data(repeating: 0x09, count: 32) + var walletEphemeralPrivateKey = walletEphemeralPrivateKeyBytes + + let values = try AppConnect.responseValues( + sessionPrivateKey: sessionPrivateKey, + appEphemeralPubKey: appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey) + + XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0, count: 32), "the ephemeral key is wiped") + XCTAssertEqual( + values.appEphemeralPubKeyHash, + try KeyExchangeCrypto.hash160(appEphemeralPubKey).toHexString()) + let walletEphemeralPubKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKeyBytes) + XCTAssertEqual(values.walletEphemeralPubKey, walletEphemeralPubKey.toHexString()) + // 28-byte envelope plus one 32-byte key: the contract's minimum. + XCTAssertEqual(values.encryptedPayload.count, 60 * 2) + + let payload = try XCTUnwrap(Self.data(hex: values.encryptedPayload)) + // The app's side of the exchange: its private key with the wallet's + // public key. ECDH is symmetric, so the helper's parameters take the + // opposite pair to the one that encrypted. + XCTAssertEqual( + try KeyExchangeCrypto.decryptLoginKey( + payload, + walletEphemeralPriv: appEphemeralPrivateKey, + appEphemeralPub: walletEphemeralPubKey), + sessionPrivateKey) + } + + func testPropertiesJsonHoldsExactlyTheThreeContractFields() throws { + let values = AppConnect.ResponseValues( + appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc") + let object = try XCTUnwrap( + JSONSerialization.jsonObject(with: Data(try values.propertiesJSON().utf8)) as? [String: String]) + XCTAssertEqual(object, [ + "appEphemeralPubKeyHash": "aa", + "walletEphemeralPubKey": "bb", + "encryptedPayload": "cc", + ]) + } + + func testPublishedResponsesSurviveAReloadAndAreScoped() { + let response = AppConnectPublishedResponse( + identityId: "identity", appContractId: "app", documentId: "document", + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 8, totalBudget: 5, expiresAt: 6, + publishedAt: Date(timeIntervalSince1970: 1_000)) + var scope: String? = "scope-a" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } + + store.save([response]) + XCTAssertEqual(store.load(), [response]) + + scope = "scope-b" + XCTAssertEqual(store.load(), [], "another wallet does not see the records") + scope = nil + store.save([response]) + XCTAssertEqual(store.load(), [], "nothing is stored without a wallet scope") + + scope = "scope-a" + store.save([]) + XCTAssertEqual(store.load(), []) + } + + private static let now = Date(timeIntervalSince1970: 1_800_000_000) + private static let nowMilliseconds: Int64 = 1_800_000_000_000 + + private static func key( + keyId: Int32, + purpose: KeyPurpose = .authentication, + securityLevel: SecurityLevel = .high, + keyType: KeyType = .ecdsaHash160, + data: Data, + disabledAt: Int64? = nil, + expiresAt: Int64? = nil + ) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: keyId, purpose: purpose, securityLevel: securityLevel, keyType: keyType, + readOnly: false, disabledAt: disabledAt, data: data, totalBudget: nil, expiresAt: expiresAt) + } + + private static func data(hex: String) -> Data? { + var bytes = [UInt8]() + var index = hex.startIndex + while index < hex.endIndex { + guard let next = hex.index(index, offsetBy: 2, limitedBy: hex.endIndex), + let byte = UInt8(hex[index ..< next], radix: 16) else { return nil } + bytes.append(byte) + index = next + } + return Data(bytes) + } +} From 9552f6ab2a08a8b744c08b3315e689921735e7a3 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 19:41:35 +0300 Subject: [PATCH 02/30] feat(dashpay): disable the app's key when a one-QR connection is turned off Turning a connection off only changed its local status, so the app kept a key that could still sign. For a connection made by the one-QR login the wallet now disables that session key on the identity and deletes the published response by its values before the row is downgraded; a failure leaves the row active and is shown to the user. A two-QR connection stays local-only: that login derives the same key every time and Platform never re-adds a disabled key, so disabling it would lock the app out for good. `disconnect(id:)` now throws, and the view model keeps a second tap and inbound requests out while the identity update is in flight. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 20 ++++++ .../DashConnect/DashConnectDataSource.swift | 10 ++- .../PlatformDashConnectDataSource.swift | 61 ++++++++++++++-- .../Components/ConnectionRow.swift | 8 ++- .../UI/DashConnect/ConnectionsViewModel.swift | 19 ++++- .../DashConnect/DashConnectStoreTests.swift | 2 +- .../PlatformDashConnectDataSourceTests.swift | 69 ++++++++++++++++++- 7 files changed, 175 insertions(+), 14 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 097e916401..030666f52d 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -100,6 +100,26 @@ enum AppConnect { ) } + /// The session keys behind `responses` that can still sign: the ones a + /// disconnect has to disable. A key that is gone, already disabled, or no + /// longer the kind of key this login registers is left alone. + static func sessionKeyIdsToDisable( + for responses: [AppConnectPublishedResponse], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + let granted = Set(responses.map(\.sessionKeyId)) + return currentIdentityPublicKeys + .filter { + granted.contains(UInt32(bitPattern: $0.keyId)) + && $0.keyType == .ecdsaHash160 + && $0.purpose == .authentication + && $0.securityLevel == .high + && $0.disabledAt == nil + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 41ea7e5521..d8c3823225 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -36,7 +36,13 @@ protocol DashConnectDataSource { /// transition could already have reached Platform — the caller must not /// offer a retry when it could have. func approveTokenPurchase(_ request: DashConnectTokenPurchaseRequest) async throws - func disconnect(id: String) async + /// Turns a connection off. For a one-QR connection this disables the key + /// the app was given on the identity and deletes the published response, + /// and throws when the key could not be disabled — the connection then + /// stays as it was. For a two-QR connection it only changes the local + /// status: that login derives the same key every time and Platform never + /// re-adds a disabled key, so disabling it would lock the app out for good. + func disconnect(id: String) async throws func remove(id: String) async } @@ -239,7 +245,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { DashConnectMockError.stateTransitionNotSupported) } - func disconnect(id: String) async { + func disconnect(id: String) async throws { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 8f3c70d3e2..60ff587f2b 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1037,11 +1037,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { persistAndSend(subject.value.filter { $0.id != id }) } - func disconnect(id: String) async { + func disconnect(id: String) async throws { + try await revokeAppConnectGrants(appContractId: id) + let disconnectedAt = now() - // Local-only: keep the published `loginKeyResponse` document intact. - // Re-approving the same `dash-key:` QR is enough to return to `.active` - // once the identity keys are still registered. + // A two-QR connection has nothing recorded to revoke and stops here: + // its `loginKeyResponse` document stays, and re-approving the same + // `dash-key:` QR returns it to `.active` while the identity keys are + // still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1054,6 +1057,56 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) } + /// Ends the access a one-QR login gave an app: disables its session keys + /// on the identity, then deletes the responses that carried them. Does + /// nothing, and needs neither a wallet nor the network, when nothing was + /// published for the app. + /// + /// The key goes first because it is what the app signs with; a response + /// that could not be deleted afterwards stays recorded and is retried by + /// the next disconnect or login. + private func revokeAppConnectGrants(appContractId: String) async throws { + guard responseStore.load().contains(where: { $0.appContractId == appContractId }) else { + return + } + + let context = try await requireContext() + let identityId = context.identityId.toBase58String() + let granted = responseStore.load().filter { + $0.identityId == identityId && $0.appContractId == appContractId + } + guard !granted.isEmpty else { return } + + try await authorize() + + let signer = KeychainSigner(modelContainer: context.modelContainer) + let currentPublicKeys = try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + let keyIds = AppConnect.sessionKeyIdsToDisable( + for: granted, + currentIdentityPublicKeys: currentPublicKeys + ) + if !keyIds.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: keyIds, + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") + } + + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } + await deletePublishedAppConnectResponses( + identityId: identityId, + appContractId: appContractId, + responseContractId: responseContractId, + context: context, + signer: signer + ) + } + static func buildLoginKeyResponseDraft( loginKey: Data, appContractId: Data, diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index e519e95730..eb1903b3dc 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -87,9 +87,11 @@ struct ConnectionRow: View { } /// Always reads as on: the row only shows it for an active connection, and - /// only the off direction is reachable from here. Turning it off locally - /// downgrades the connection back to `.approved`; it does not sign the user - /// out of the app, because the wallet has no channel to end that session. + /// only the off direction is reachable from here. Turning it off + /// downgrades the connection back to `.approved`. For a one-QR connection + /// the data source first disables the app's key on the identity, which is + /// what ends the app's access; for a two-QR connection the change is local + /// and the app keeps its keys (see `DashConnectDataSource.disconnect`). private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index bdf6351e7d..c87d9a7bf1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -281,8 +281,23 @@ final class ConnectionsViewModel: ObservableObject { } func disconnect(_ connection: DAppConnection) { - Task { - await dataSource.disconnect(id: connection.id) + // Disconnecting a one-QR connection signs an identity update, which + // takes seconds; the flag keeps a second tap and an inbound request + // out until it is done. + guard !isProcessingStateTransition else { return } + isProcessingStateTransition = true + Task { [weak self] in + guard let self else { return } + defer { self.isProcessingStateTransition = false } + do { + try await self.dataSource.disconnect(id: connection.id) + } catch { + self.message = ConnectionsScreenMessage( + kind: .error, + text: String( + format: NSLocalizedString("Could not disconnect: %@", comment: "DashConnect"), + error.localizedDescription)) + } } } diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index d0faac2dfb..1418e190f4 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -178,7 +178,7 @@ final class DashConnectStoreTests: XCTestCase { store: store ) - await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot.count, 1) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index f9f343f773..203d6dee43 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1277,6 +1277,37 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { /// /// `approvePendingTokenPurchase` works in an unstructured `Task` and the /// data source runs off the main actor, so there is no handle to await. + func testAFailedDisconnectIsReportedInsteadOfLookingLikeASuccess() async { + let spy = PurchaseApprovalSpy() + spy.disconnectFailure = PurchaseSpyError.refused + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + XCTAssertTrue(viewModel.isProcessingStateTransition) + // A second tap while the first is still out must not start another. + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isProcessingStateTransition } + + XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertEqual(viewModel.message?.kind, .error) + XCTAssertEqual(viewModel.message?.text.contains("spy refused"), true) + } + + func testASuccessfulDisconnectReportsNothing() async { + let spy = PurchaseApprovalSpy() + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.disconnect(Self.connection) + await waitUntil { !viewModel.isProcessingStateTransition } + + XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertNil(viewModel.message) + } + + private static let connection = DAppConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "App", url: "", + status: .active, updatedAt: Date(timeIntervalSince1970: 1_000)) + private func waitUntil(timeout: TimeInterval = 2, _ condition: () -> Bool) async { let deadline = Date().addingTimeInterval(timeout) while !condition(), Date() < deadline { @@ -1371,8 +1402,12 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String) async { - XCTFail("disconnect is not part of the purchase approval flow") + var disconnectFailure: Error? + private(set) var disconnectedIds: [String] = [] + + func disconnect(id: String) async throws { + disconnectedIds.append(id) + if let disconnectFailure { throw disconnectFailure } } func remove(id: String) async { @@ -1478,6 +1513,36 @@ final class AppConnectLoginTests: XCTestCase { 8) } + func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { + let responses = [9, 11, 12, 13].map { Self.response(sessionKeyId: $0) } + let keys = [ + Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), + Self.key(keyId: 9, data: Data([9])), + // Not granted by these responses. + Self.key(keyId: 10, data: Data([10])), + // Already disabled. + Self.key(keyId: 11, data: Data([11]), disabledAt: 1), + // The id now belongs to a key this login would never register. + Self.key(keyId: 12, securityLevel: .critical, data: Data([12])), + // 13 is not on the identity at all. + Self.key(keyId: 14, data: Data([14])), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable(for: responses, currentIdentityPublicKeys: keys), + [9]) + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), + []) + } + + private static func response(sessionKeyId: UInt32) -> AppConnectPublishedResponse { + AppConnectPublishedResponse( + identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_000)) + } + func testSessionKeyIsBoundToTheRequestedContractWithBothLimits() { let hash = Data(repeating: 0x11, count: 20) let contractId = Data(repeating: 0x33, count: 32) From 18d0a04d3e64a2512047b493bf177173110bdd61 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 19:53:15 +0300 Subject: [PATCH 03/30] fix(dashpay): keep every one-QR session key revocable Review pass on the one-QR login and its disconnect: - A later login to the same app deleted the earlier record together with its key id, so that key stayed live and could no longer be found. The record now outlives its response (marked as deleted) until a disconnect disables the key. - The grant and the connection row are recorded once the key is on the identity, before the publish, so a publish with an unknown outcome still leaves a key the user can see and disable. Approving the same QR again reuses the recorded values and does nothing when already published. - A connection remembers which login made it. Turning a one-QR connection off removes the row instead of parking it in the two-QR "approved" state, and refuses, rather than reporting success, when its records are missing. - A scanned `dash-st:` key registration keeps the budget and expiry it carried instead of being rebuilt as an unlimited key. - Disconnect has its own in-flight flag, does not overlap an approval or a resolving request, and re-resolves the wallet context after the PIN prompt. Grant records are read, changed and written in one step. - The protocol-version query runs off the cooperative pool. - The two logins share one `AppConnect.seal` instead of two copies of the encrypt-and-wipe sequence, and the session private key is the sole owner of its buffer so the wipe reaches it. Still open, marked in code: key state is read from the SDK's local view of the identity (TODO(app-connect-stale-keys)); the approval sheet still shows the two-QR text. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 98 ++++-- .../DashConnect/DashConnectModels.swift | 9 + .../Models/DashConnect/DashConnectStore.swift | 9 +- .../PlatformDashConnectDataSource.swift | 314 ++++++++++++------ .../UI/DashConnect/ConnectionsScreen.swift | 2 +- .../UI/DashConnect/ConnectionsViewModel.swift | 18 +- .../DashConnect/DashConnectStoreTests.swift | 15 + .../PlatformDashConnectDataSourceTests.swift | 73 +++- 8 files changed, 385 insertions(+), 153 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 030666f52d..d00c440025 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -19,7 +19,7 @@ enum AppConnect { /// Same id on every network (`docs/protocol/app-connect.md` in /// dashpay/platform). static let contractId = "H8F9mP1BM55TE1ShsxPZHzhyinaMdY9bMmP85mkDhcJJ" - static let documentType = "loginKeyResponse" + static let documentType = PlatformDashConnectDataSource.loginKeyExchangeDocumentType /// Limits put on every session key. /// TODO(app-connect-limits): the protocol leaves both values to the @@ -100,14 +100,14 @@ enum AppConnect { ) } - /// The session keys behind `responses` that can still sign: the ones a + /// The session keys behind `grants` that can still sign: the ones a /// disconnect has to disable. A key that is gone, already disabled, or no /// longer the kind of key this login registers is left alone. static func sessionKeyIdsToDisable( - for responses: [AppConnectPublishedResponse], + for grants: [AppConnectGrant], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> [UInt32] { - let granted = Set(responses.map(\.sessionKeyId)) + let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys .filter { granted.contains(UInt32(bitPattern: $0.keyId)) @@ -126,6 +126,20 @@ enum AppConnect { let walletEphemeralPubKey: String let encryptedPayload: String + init(appEphemeralPubKeyHash: String, walletEphemeralPubKey: String, encryptedPayload: String) { + self.appEphemeralPubKeyHash = appEphemeralPubKeyHash + self.walletEphemeralPubKey = walletEphemeralPubKey + self.encryptedPayload = encryptedPayload + } + + init(_ sealed: SealedKey) { + self.init( + appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: sealed.walletEphemeralPublicKey.toHexString(), + encryptedPayload: sealed.encryptedPayload.toHexString() + ) + } + /// The document's properties in the form `createDocument` and /// delete-by-values take. func propertiesJSON() throws -> String { @@ -140,10 +154,19 @@ enum AppConnect { } } - /// Encrypts the session private key to the app. `walletEphemeralPrivateKey` - /// is wiped before returning. - static func responseValues( - sessionPrivateKey: Data, + /// A 32-byte key encrypted to an app's ephemeral key, with what the app + /// needs to find and open it. Shared by both logins: the two-QR response + /// carries the login key, the one-QR response the session private key. + struct SealedKey: Equatable { + let appEphemeralPubKeyHash: Data + let walletEphemeralPublicKey: Data + let encryptedPayload: Data + } + + /// Encrypts `key` to the app. `walletEphemeralPrivateKey` is wiped before + /// returning. + static func seal( + _ key: Data, appEphemeralPubKey: Data, walletEphemeralPrivateKey: inout Data, encrypt: (Data, Data, Data) throws -> Data = { key, walletPriv, appPub in @@ -153,7 +176,7 @@ enum AppConnect { appEphemeralPub: appPub ) } - ) throws -> ResponseValues { + ) throws -> SealedKey { defer { PlatformDashConnectDataSource.zero(&walletEphemeralPrivateKey) } let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) @@ -161,25 +184,31 @@ enum AppConnect { throw DashConnectPlatformError.invalidHash160 } let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) - let encryptedPayload = try encrypt(sessionPrivateKey, walletEphemeralPrivateKey, appEphemeralPubKey) + let encryptedPayload = try encrypt(key, walletEphemeralPrivateKey, appEphemeralPubKey) - return ResponseValues( - appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), - walletEphemeralPubKey: walletEphemeralPublicKey.toHexString(), - encryptedPayload: encryptedPayload.toHexString() + return SealedKey( + appEphemeralPubKeyHash: appEphemeralPubKeyHash, + walletEphemeralPublicKey: walletEphemeralPublicKey, + encryptedPayload: encryptedPayload ) } } -/// A response this wallet published and has not deleted yet, with the key it -/// granted. The type is index-only on Platform: there is no lookup by app and +/// A session key this wallet registered for an app, and the response that +/// carried it. Kept until the key is disabled and the response is gone. +/// +/// The response type is index-only on Platform: there is no lookup by app and /// a delete has to carry the original values, so this record is the only way -/// back to the entry. -struct AppConnectPublishedResponse: Codable, Equatable { +/// back to the entry — and the only place that knows which key on the +/// identity belongs to which app. +struct AppConnectGrant: Codable, Equatable { /// Base58 ids. let identityId: String let appContractId: String - let documentId: String + /// `nil` until Platform confirmed the response: the grant is recorded + /// before publishing, so a publish whose outcome is unknown still leaves + /// a key that can be disabled. + var documentId: String? let values: AppConnect.ResponseValues let sessionKeyId: UInt32 /// `nil` when the key was found already registered and its limits were @@ -187,11 +216,22 @@ struct AppConnectPublishedResponse: Codable, Equatable { let totalBudget: UInt64? let expiresAt: UInt64? let publishedAt: Date + /// Set once the response was deleted from Platform while the key stays + /// live (a later login to the same app). Absent means not deleted. + var responseDeleted: Bool? + /// Set once a disconnect disabled the key but could not delete the + /// response; the record then only waits for that delete. + var keyDisabled: Bool? + + /// Whether there is a response on Platform this record can still delete. + var hasDeletableResponse: Bool { + documentId != nil && responseDeleted != true + } } protocol AppConnectResponseStore { - func load() -> [AppConnectPublishedResponse] - func save(_ responses: [AppConnectPublishedResponse]) + func load() -> [AppConnectGrant] + func save(_ grants: [AppConnectGrant]) } /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose @@ -233,27 +273,29 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } - func load() -> [AppConnectPublishedResponse] { + func load() -> [AppConnectGrant] { guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } do { - return try decoder.decode([AppConnectPublishedResponse].self, from: data) + return try decoder.decode([AppConnectGrant].self, from: data) } catch { - // Losing the records is survivable: the next login still creates a - // fresh response, and the old entries stay until deleted by value. + // Without the records the keys they named can no longer be told + // apart on the identity. A one-QR row whose records are gone + // refuses to disconnect (`grantRecordsMissing`) instead of + // pretending the key was disabled. Self.logger.warning( "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") return [] } } - func save(_ responses: [AppConnectPublishedResponse]) { + func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } - guard !responses.isEmpty else { + guard !grants.isEmpty else { defaults.removeObject(forKey: storageKey) return } do { - defaults.set(try encoder.encode(responses), forKey: storageKey) + defaults.set(try encoder.encode(grants), forKey: storageKey) } catch { Self.logger.error( "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 0d1e80d4a1..5a94c68a40 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -173,6 +173,14 @@ enum ConnectionStatus: String, Codable, CaseIterable { } } +/// Which login made a connection. It decides what turning it off means: +/// a one-QR connection has a session key on the identity to disable, a +/// two-QR connection does not (see `DashConnectDataSource.disconnect`). +enum DashConnectLoginKind: String, Codable { + case twoQR + case oneQR +} + /// A connected app identified by its stable contract id. struct DAppConnection: Identifiable, Equatable, Hashable { let id: String @@ -180,6 +188,7 @@ struct DAppConnection: Identifiable, Equatable, Hashable { let url: String let status: ConnectionStatus let updatedAt: Date + var loginKind: DashConnectLoginKind = .twoQR } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index faa99db9a1..507ed2d726 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -115,7 +115,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { name: row.label, url: row.url, status: row.status, - updatedAt: row.updatedAt + updatedAt: row.updatedAt, + loginKind: row.loginKind ?? .twoQR ) ) } @@ -140,7 +141,8 @@ final class UserDefaultsDashConnectStore: DashConnectStore { label: $0.name, url: $0.url, status: $0.status, - updatedAt: $0.updatedAt + updatedAt: $0.updatedAt, + loginKind: $0.loginKind == .twoQR ? nil : $0.loginKind ) } @@ -166,6 +168,9 @@ final class UserDefaultsDashConnectStore: DashConnectStore { let url: String let status: ConnectionStatus let updatedAt: Date + /// Absent for a two-QR connection, which is every row written before + /// the one-QR login existed. + let loginKind: DashConnectLoginKind? } private static func base58Decode(_ string: String) -> Data? { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 60ff587f2b..842fae7e04 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -72,6 +72,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case tokenPurchaseTokenIdMismatch case unsupportedStateTransition(String) case sessionKeyUnusable + case grantRecordsMissing case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -119,6 +120,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .grantRecordsMissing: + return NSLocalizedString( + "This wallet has no record of the key it gave this app, so it cannot turn it off here.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -172,6 +177,10 @@ struct DashConnectKeyRegistrationKey: Equatable { let securityLevel: SecurityLevel let publicKeyData: Data let contractBounds: ContractBounds? + /// Protocol 14 limits the scanned transition put on the key. Carried so + /// the rebuilt registration grants exactly what was asked for. + var totalBudget: UInt64? = nil + var expiresAt: UInt64? = nil } struct DashConnectKeyRegistrationTransition: Equatable { @@ -273,7 +282,9 @@ struct PlatformWalletDashConnectStateTransitionParser: DashConnectStateTransitio // this flow derives, so refuse the transition instead. throw DashConnectPlatformError.keyRegistrationUnexpectedMutation } - } + }, + totalBudget: key.totalBudget, + expiresAt: key.expiresAt ) }, disablePublicKeyIds: parsed.disablePublicKeyIds @@ -459,7 +470,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // two-QR flow until that pin moves. let protocolVersion: UInt32 do { - protocolVersion = try context.sdk.refreshProtocolVersion() + protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) } catch { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error @@ -567,14 +578,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } + /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a + /// proven network query. It runs on a plain dispatch queue so it does not + /// hold a cooperative-pool thread for a DAPI round trip. + private static func networkProtocolVersion(sdk: SDK) async throws -> UInt32 { + try await withCheckedThrowingContinuation { continuation in + DispatchQueue.global(qos: .userInitiated).async { + continuation.resume(with: Result { try sdk.refreshProtocolVersion() }) + } + } + } + /// The one-QR login: derive the request's session key, register it on the /// identity with its bounds and limits, and only then publish the /// encrypted key, so the app finds a live key on its first check. /// - /// Safe to repeat for the same QR: the key is derived from the request, - /// so a second approval finds it registered and goes straight to - /// publishing. A registration that succeeded before a failed publish is - /// therefore finished by scanning the same QR again. + /// The grant and the connection row are recorded as soon as the key is + /// known to be on the identity, before the publish: whatever happens to + /// the publish, the key stays visible in Connections and can be disabled. + /// + /// Approving the same QR again finds the key registered and does not + /// register it twice; if the response is already recorded as published it + /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, context: Context @@ -584,27 +609,43 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) - // `deriveConnectKey` is main-actor isolated in the SDK. - let sessionKey = try await MainActor.run { - try context.wallet.deriveConnectKey( + // `deriveConnectKey` is main-actor isolated in the SDK. Only the two + // buffers leave the closure, so the private key below is the sole + // owner of its storage and the deferred wipe reaches the real bytes. + var (sessionPublicKey, sessionPrivateKey) = try await MainActor.run { + let key = try context.wallet.deriveConnectKey( subFeature: .sessionAuthentication, identityId: context.identityId, leaf: requestId, network: context.network ) + return (key.publicKeyData, key.privateKeyData) } - var sessionPrivateKey = sessionKey.privateKeyData defer { Self.zero(&sessionPrivateKey) } - let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionKey.publicKeyData) + let sessionKeyHash160 = try KeyExchangeCrypto.hash160(sessionPublicKey) + + var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() + let sealed = try AppConnect.seal( + sessionPrivateKey, + appEphemeralPubKey: request.appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey + ) + let identityId = context.identityId.toBase58String() + let appContractId = request.contractId.toBase58String() + let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) + // TODO(app-connect-stale-keys): this is the SDK's local view of the + // identity, refreshed only when an identity update returns success. A + // registration that landed but whose wait failed is not in it, and + // approving the same QR then tries to add the key a second time. let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() let sessionKeyId: UInt32 - let totalBudget: UInt64? - let expiresAt: UInt64? + var totalBudget: UInt64? + var expiresAt: UInt64? switch AppConnect.sessionKeyState( publicKeyHash160: sessionKeyHash160, currentIdentityPublicKeys: currentPublicKeys, @@ -615,8 +656,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .usable(let keyId): Self.logger.info("🔗 DASHCONNECT :: session key already registered") sessionKeyId = keyId - totalBudget = nil - expiresAt = nil case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) let budget = AppConnect.sessionKeyBudgetCredits @@ -644,18 +683,48 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = expiry } - var walletEphemeralPrivateKey = try Self.generateEphemeralPrivateKey() - let values = try AppConnect.responseValues( - sessionPrivateKey: sessionPrivateKey, - appEphemeralPubKey: request.appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey - ) + // From here the app-side key exists on the identity. Record it, and + // show the connection, before anything else can fail. A grant already + // recorded for this request keeps its values: if an earlier publish + // landed without confirming, those are the ones on Platform. + let grant = updateGrants { grants -> AppConnectGrant in + if let existing = grants.first(where: { + $0.identityId == identityId && $0.appContractId == appContractId + && $0.sessionKeyId == sessionKeyId && $0.values.appEphemeralPubKeyHash == requestHash + }) { + return existing + } + let new = AppConnectGrant( + identityId: identityId, + appContractId: appContractId, + documentId: nil, + values: AppConnect.ResponseValues(sealed), + sessionKeyId: sessionKeyId, + totalBudget: totalBudget, + expiresAt: expiresAt, + publishedAt: now() + ) + grants.append(new) + return new + } - let identityId = context.identityId.toBase58String() - let appContractId = request.contractId.toBase58String() - await deletePublishedAppConnectResponses( - identityId: identityId, - appContractId: appContractId, + let preview = await makeConnectionRequest(from: request) + let connection = Self.makeConnection( + preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + var current = subject.value.filter { $0.id != connection.id } + current.append(connection) + persistAndSend(current) + + guard grant.documentId == nil else { + Self.logger.info("🔗 DASHCONNECT :: response already published for this request") + return connection + } + + await deleteAppConnectResponses( + where: { + $0.identityId == identityId && $0.appContractId == appContractId + && $0.values.appEphemeralPubKeyHash != requestHash + }, responseContractId: responseContractId, context: context, signer: signer @@ -666,52 +735,50 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ownerIdentityId: context.identityId, contractId: responseContractId, documentType: AppConnect.documentType, - propertiesJSON: try values.propertiesJSON(), + propertiesJSON: try grant.values.propertiesJSON(), signer: signer ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") - responseStore.save(responseStore.load() + [ - AppConnectPublishedResponse( - identityId: identityId, - appContractId: appContractId, - documentId: documentId.toBase58String(), - values: values, - sessionKeyId: sessionKeyId, - totalBudget: totalBudget, - expiresAt: expiresAt, - publishedAt: now() - ), - ]) - - let preview = await makeConnectionRequest(from: request) - let connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + updateGrants { grants in + guard let index = grants.firstIndex(of: grant) else { return } + grants[index].documentId = documentId.toBase58String() + } return connection } - /// Deletes the responses this identity published earlier for an app, by - /// their original values. Best effort: a response that cannot be deleted - /// now stays recorded and is tried again at the next login, and it does - /// not hold the new login back — the entry it leaves is the encrypted key - /// of a request the app has already finished with. - private func deletePublishedAppConnectResponses( - identityId: String, - appContractId: String, + /// Reads, changes and writes the grant records in one step with no + /// suspension point in between, so an approval and a disconnect that + /// overlap cannot write a stale copy over each other's change. + @discardableResult + private func updateGrants(_ change: (inout [AppConnectGrant]) -> T) -> T { + var grants = responseStore.load() + let result = change(&grants) + responseStore.save(grants) + return result + } + + /// Deletes, by their original values, the responses of the matching + /// grants that are still on Platform. Best effort: a response that cannot + /// be deleted now stays recorded and is tried again by the next login or + /// disconnect. It does not hold the caller back — the entry it leaves is + /// the encrypted key of a request the app has already finished with. + /// + /// A grant whose key is still live keeps its record, marked as having no + /// response left, because the record is what lets a later disconnect find + /// and disable that key. A grant whose key is already disabled has no + /// further use and is dropped. + private func deleteAppConnectResponses( + where matches: (AppConnectGrant) -> Bool, responseContractId: Data, context: Context, signer: KeychainSigner ) async { - let recorded = responseStore.load() - let previous = recorded.filter { $0.identityId == identityId && $0.appContractId == appContractId } - guard !previous.isEmpty else { return } - - var deleted: [AppConnectPublishedResponse] = [] - for response in previous { + let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } + for grant in pending { do { - guard let documentId = Self.decodeIdentifier(response.documentId) else { + guard let documentIdText = grant.documentId, + let documentId = Self.decodeIdentifier(documentIdText) else { throw DashConnectPlatformError.existingDocumentLookupFailed } let signingKeyId = try selectDocumentSigningKeyId( @@ -723,17 +790,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { contractId: responseContractId, documentType: AppConnect.documentType, documentId: documentId, - propertiesJSON: try response.values.propertiesJSON(), + propertiesJSON: try grant.values.propertiesJSON(), signingKeyId: signingKeyId, signer: signer ) - deleted.append(response) + updateGrants { grants in + guard let index = grants.firstIndex(of: grant) else { return } + if grants[index].keyDisabled == true { + grants.remove(at: index) + } else { + grants[index].responseDeleted = true + } + } } catch { Self.logger.error( "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") } } - responseStore.save(recorded.filter { !deleted.contains($0) }) } func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { @@ -1038,13 +1111,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func disconnect(id: String) async throws { - try await revokeAppConnectGrants(appContractId: id) + let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR + let hasGrants = responseStore.load().contains { $0.appContractId == id } + if isOneQR || hasGrants { + try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + } + if isOneQR { + // Nothing is left of a one-QR connection once its key is disabled: + // the same QR can no longer be approved and there is no second + // step to wait for, so the row goes instead of sitting in the + // two-QR "approved" state. + persistAndSend(subject.value.filter { $0.id != id }) + return + } let disconnectedAt = now() - // A two-QR connection has nothing recorded to revoke and stops here: - // its `loginKeyResponse` document stays, and re-approving the same - // `dash-key:` QR returns it to `.active` while the identity keys are - // still registered. + // Local-only for a two-QR connection: its `loginKeyResponse` document + // stays, and re-approving the same `dash-key:` QR returns it to + // `.active` while the identity keys are still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1057,34 +1141,44 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { }) } - /// Ends the access a one-QR login gave an app: disables its session keys - /// on the identity, then deletes the responses that carried them. Does - /// nothing, and needs neither a wallet nor the network, when nothing was - /// published for the app. + /// Ends the access one-QR logins gave an app: disables its session keys + /// on the identity, then deletes the responses that carried them. /// - /// The key goes first because it is what the app signs with; a response - /// that could not be deleted afterwards stays recorded and is retried by - /// the next disconnect or login. - private func revokeAppConnectGrants(appContractId: String) async throws { - guard responseStore.load().contains(where: { $0.appContractId == appContractId }) else { - return - } - - let context = try await requireContext() + /// The key goes first because it is what the app signs with. A response + /// that could not be deleted afterwards stays recorded, with its key + /// marked disabled, and is retried by the next login or disconnect. + /// + /// `requiresGrants` is set for a row made by the one-QR login: finding no + /// record for it means the key cannot be identified, and that is an error + /// rather than a silent success. + private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws { + var context = try await requireContext() let identityId = context.identityId.toBase58String() - let granted = responseStore.load().filter { - $0.identityId == identityId && $0.appContractId == appContractId + func isGranted(_ grant: AppConnectGrant) -> Bool { + grant.identityId == identityId && grant.appContractId == appContractId + } + guard responseStore.load().contains(where: isGranted) else { + if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } + return } - guard !granted.isEmpty else { return } try await authorize() + // The PIN prompt can outlast a wallet or network switch; sign with + // what is active now, and only if it is still the same identity. + context = try await requireContext() + guard context.identityId.toBase58String() == identityId else { + throw DashConnectPlatformError.noIdentity + } let signer = KeychainSigner(modelContainer: context.modelContainer) + // TODO(app-connect-stale-keys): the SDK's local view of the identity; + // a disable that landed but whose wait failed is not in it, and the + // retry is then refused by Platform until the view refreshes. let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() let keyIds = AppConnect.sessionKeyIdsToDisable( - for: granted, + for: responseStore.load().filter(isGranted), currentIdentityPublicKeys: currentPublicKeys ) if !keyIds.isEmpty { @@ -1097,10 +1191,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } + // Every key of this app is now off. Records with nothing left to + // delete are done; the rest wait for their response to go. + updateGrants { grants in + grants.removeAll { isGranted($0) && !$0.hasDeletableResponse } + for index in grants.indices where isGranted(grants[index]) { + grants[index].keyDisabled = true + } + } + guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } - await deletePublishedAppConnectResponses( - identityId: identityId, - appContractId: appContractId, + await deleteAppConnectResponses( + where: isGranted, responseContractId: responseContractId, context: context, signer: signer @@ -1120,26 +1222,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } ) throws -> DashConnectLoginKeyResponseDraft { - defer { zero(&walletEphemeralPrivateKey) } - - let appEphemeralPubKeyHash = try KeyExchangeCrypto.hash160(appEphemeralPubKey) - guard appEphemeralPubKeyHash.count == 20 else { - throw DashConnectPlatformError.invalidHash160 - } - - let walletEphemeralPublicKey = try Secp256k1.compressedPublicKey(privateKey: walletEphemeralPrivateKey) - let encryptedPayload = try encryptLoginKey(loginKey, walletEphemeralPrivateKey, appEphemeralPubKey) + let sealed = try AppConnect.seal( + loginKey, + appEphemeralPubKey: appEphemeralPubKey, + walletEphemeralPrivateKey: &walletEphemeralPrivateKey, + encrypt: encryptLoginKey + ) + let values = AppConnect.ResponseValues(sealed) return DashConnectLoginKeyResponseDraft( properties: [ "contractId": appContractId.toBase58String(), - "appEphemeralPubKeyHash": appEphemeralPubKeyHash.toHexString(), - "walletEphemeralPubKey": walletEphemeralPublicKey.toHexString(), - "encryptedPayload": encryptedPayload.toHexString(), + "appEphemeralPubKeyHash": values.appEphemeralPubKeyHash, + "walletEphemeralPubKey": values.walletEphemeralPubKey, + "encryptedPayload": values.encryptedPayload, "keyIndex": LoginKeyDerivation.defaultKeyIndex, ], - walletEphemeralPublicKey: walletEphemeralPublicKey, - encryptedPayload: encryptedPayload + walletEphemeralPublicKey: sealed.walletEphemeralPublicKey, + encryptedPayload: sealed.encryptedPayload ) } @@ -1307,14 +1407,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private static func makeConnection( preview: ConnectionRequest, status: ConnectionStatus, - updatedAt: Date + updatedAt: Date, + loginKind: DashConnectLoginKind = .twoQR ) -> DAppConnection { DAppConnection( id: preview.appContractId, name: preview.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : preview.appLabel, url: preview.appUrl, status: status, - updatedAt: updatedAt + updatedAt: updatedAt, + loginKind: loginKind ) } @@ -1706,7 +1808,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .singleContractDocumentType(let id, let documentTypeName): return .singleContractDocumentType(id: id, documentTypeName: documentTypeName) } - } + }, + totalBudget: key.totalBudget, + expiresAt: key.expiresAt ) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 3ac6074272..a7189422e5 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -51,7 +51,7 @@ struct ConnectionsScreen: View { content } - if viewModel.isProcessingStateTransition { + if viewModel.isProcessingStateTransition || viewModel.isDisconnecting { Color.black.opacity(0.08) .ignoresSafeArea() diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index c87d9a7bf1..22ce543aa8 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -52,6 +52,10 @@ final class ConnectionsViewModel: ObservableObject { @Published var isApproving = false @Published var isApprovingPurchase = false @Published var isProcessingStateTransition = false + /// A disconnect that is signing an identity update. Its own flag, not + /// `isProcessingStateTransition`: a `dash-st:` task clears that one when + /// it finishes, which would lift the guard while a disconnect is still out. + @Published private(set) var isDisconnecting = false @Published var message: ConnectionsScreenMessage? /// Failure of the last approve attempt, rendered **inside** the approve sheet. /// A screen-level `.alert` cannot appear over a presented sheet, so routing this @@ -128,7 +132,7 @@ final class ConnectionsViewModel: ObservableObject { return } - guard !isProcessingStateTransition else { + guard !isProcessingStateTransition, !isDisconnecting else { message = ConnectionsScreenMessage( kind: .error, text: NSLocalizedString("Finish the current DashConnect request first, then try again.", @@ -282,13 +286,15 @@ final class ConnectionsViewModel: ObservableObject { func disconnect(_ connection: DAppConnection) { // Disconnecting a one-QR connection signs an identity update, which - // takes seconds; the flag keeps a second tap and an inbound request - // out until it is done. - guard !isProcessingStateTransition else { return } - isProcessingStateTransition = true + // takes seconds. It must not overlap anything else that signs one or + // touches the same records: a second tap, an approval on screen or in + // flight, a request still resolving, a `dash-st:` in progress. + guard !isDisconnecting, !isProcessingStateTransition, !isApproving, !isApprovingPurchase, + !isResolvingRequest, pendingRequest == nil, pendingTokenPurchase == nil else { return } + isDisconnecting = true Task { [weak self] in guard let self else { return } - defer { self.isProcessingStateTransition = false } + defer { self.isDisconnecting = false } do { try await self.dataSource.disconnect(id: connection.id) } catch { diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 1418e190f4..4761ac5207 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -32,6 +32,21 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertEqual(store.load(), connections) } + func testRoundTripKeepsWhichLoginMadeAConnection() { + let store = makeStore(network: .testnet, walletIdHex: "wallet-a") + var oneQR = sampleConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", status: .active, + updatedAt: Date(timeIntervalSince1970: 10)) + oneQR.loginKind = .oneQR + let twoQR = sampleConnection( + id: "7W6u4NgW63FPUuW8EnTbYzD4KybNQD5n7CUDWydJY234", status: .active, + updatedAt: Date(timeIntervalSince1970: 20)) + + store.save([oneQR, twoQR]) + + XCTAssertEqual(store.load().map(\.loginKind), [.oneQR, .twoQR]) + } + func testUnknownStatusDropsOnlyThatRow() throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let payload: [[String: Any]] = [ diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 203d6dee43..bd2393b1c2 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -245,6 +245,28 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { } } + func testParserKeepsTheLimitsAScannedKeyRegistrationCarries() throws { + let parser = PlatformWalletDashConnectStateTransitionParser { _ in + Self.parsed(.identityUpdate(.init( + identityId: Data(repeating: 0x21, count: 32), + addPublicKeys: [ + .init( + keyId: 1, keyType: .ecdsaHash160, purpose: .authentication, + securityLevel: .high, pubkeyBytes: Data(repeating: 0x22, count: 20), + totalBudget: 7, expiresAt: 9), + .init( + keyId: 2, keyType: .ecdsaSecp256k1, purpose: .encryption, + securityLevel: .medium, pubkeyBytes: Data(repeating: 0x23, count: 33)), + ], + disablePublicKeyIds: []))) + } + guard case let .keyRegistration(transition) = try parser.parse(Data([0])) else { + return XCTFail("Expected a key-registration transition") + } + XCTAssertEqual(transition.addPublicKeys.map(\.totalBudget), [7, nil]) + XCTAssertEqual(transition.addPublicKeys.map(\.expiresAt), [9, nil]) + } + func testParserRefusesABatchThatIsNotALoneCompleteTokenPurchase() { let ownerId = Data(repeating: 0x21, count: 32) let contractId = Data(repeating: 0x22, count: 32) @@ -1283,10 +1305,10 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) - XCTAssertTrue(viewModel.isProcessingStateTransition) + XCTAssertTrue(viewModel.isDisconnecting) // A second tap while the first is still out must not start another. viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isProcessingStateTransition } + await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) XCTAssertEqual(viewModel.message?.kind, .error) @@ -1298,7 +1320,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) viewModel.disconnect(Self.connection) - await waitUntil { !viewModel.isProcessingStateTransition } + await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) XCTAssertNil(viewModel.message) @@ -1514,7 +1536,7 @@ final class AppConnectLoginTests: XCTestCase { } func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { - let responses = [9, 11, 12, 13].map { Self.response(sessionKeyId: $0) } + let grants = [9, 11, 12, 13].map { Self.grant(sessionKeyId: $0) } let keys = [ Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), Self.key(keyId: 9, data: Data([9])), @@ -1528,15 +1550,15 @@ final class AppConnectLoginTests: XCTestCase { Self.key(keyId: 14, data: Data([14])), ] XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: responses, currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable(for: grants, currentIdentityPublicKeys: keys), [9]) XCTAssertEqual( AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), []) } - private static func response(sessionKeyId: UInt32) -> AppConnectPublishedResponse { - AppConnectPublishedResponse( + private static func grant(sessionKeyId: UInt32) -> AppConnectGrant { + AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), sessionKeyId: sessionKeyId, totalBudget: nil, expiresAt: nil, @@ -1571,10 +1593,10 @@ final class AppConnectLoginTests: XCTestCase { let walletEphemeralPrivateKeyBytes = Data(repeating: 0x09, count: 32) var walletEphemeralPrivateKey = walletEphemeralPrivateKeyBytes - let values = try AppConnect.responseValues( - sessionPrivateKey: sessionPrivateKey, + let values = AppConnect.ResponseValues(try AppConnect.seal( + sessionPrivateKey, appEphemeralPubKey: appEphemeralPubKey, - walletEphemeralPrivateKey: &walletEphemeralPrivateKey) + walletEphemeralPrivateKey: &walletEphemeralPrivateKey)) XCTAssertEqual(walletEphemeralPrivateKey, Data(repeating: 0, count: 32), "the ephemeral key is wiped") XCTAssertEqual( @@ -1609,8 +1631,37 @@ final class AppConnectLoginTests: XCTestCase { ]) } + func testAGrantWrittenBeforeTheDeleteFlagsExistedStillLoads() throws { + // The shape the first device run stored: no `responseDeleted`, no + // `keyDisabled`. Losing it would leave that key impossible to find. + let stored = """ + [{"identityId":"identity","appContractId":"app","documentId":"document", + "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, + "sessionKeyId":6,"totalBudget":5000000000,"expiresAt":1799315762000,"publishedAt":1791539765792}] + """ + defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + let grant = try XCTUnwrap(store.load().first) + XCTAssertEqual(grant.sessionKeyId, 6) + XCTAssertEqual(grant.documentId, "document") + XCTAssertNil(grant.responseDeleted) + XCTAssertNil(grant.keyDisabled) + XCTAssertTrue(grant.hasDeletableResponse) + } + + func testAGrantHasNothingToDeleteBeforeItIsPublishedOrAfterItsResponseIsGone() { + var grant = Self.grant(sessionKeyId: 6) + XCTAssertTrue(grant.hasDeletableResponse) + grant.responseDeleted = true + XCTAssertFalse(grant.hasDeletableResponse) + grant.responseDeleted = nil + grant.documentId = nil + XCTAssertFalse(grant.hasDeletableResponse) + } + func testPublishedResponsesSurviveAReloadAndAreScoped() { - let response = AppConnectPublishedResponse( + let response = AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document", values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), sessionKeyId: 8, totalBudget: 5, expiresAt: 6, From c80f5a0c36c15ccc4cb7fa5ff500fc97949b9287 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sat, 10 Oct 2026 20:07:44 +0300 Subject: [PATCH 04/30] fix(dashpay): match grant records by key and fail closed on a stale identity view Second review pass on the one-QR login: - A grant was looked up in the store by whole-value equality, and its date does not survive the store's millisecond round trip bit for bit, so about half of all publishes never recorded their document id. Records are now matched on what identifies a grant: identity, app, key id, request hash. - A granted key id missing from the wallet's local view of the identity was treated as gone, after which the records and the row were dropped as if the key had been disabled. Platform never removes a key, so a missing id now stops the disconnect with an error. - The one-QR approval re-resolves the wallet context after the PIN prompt and refuses to continue for a different identity. - The grant store decodes row by row and writes back rows it cannot read instead of overwriting them. - Two doc comments corrected to say what the code does. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 77 +++++++++++++++---- .../PlatformDashConnectDataSource.swift | 26 ++++++- .../Components/ConnectionRow.swift | 10 +-- .../PlatformDashConnectDataSourceTests.swift | 47 +++++++++++ 4 files changed, 134 insertions(+), 26 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index d00c440025..5996505ba4 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -8,8 +8,9 @@ import SwiftDashSDK /// encrypted key to the App Connect system contract. There is no `dash-st:` /// step. /// -/// Everything here is pure; `PlatformDashConnectDataSource` owns the Platform -/// calls and their order. +/// `AppConnect` holds the rules and is pure; `PlatformDashConnectDataSource` +/// owns the Platform calls and their order. The grant records and their +/// `UserDefaults` store are at the end of the file. enum AppConnect { /// The protocol version that registers the App Connect system contract. /// Below it the contract does not exist and the two-QR login is the only @@ -120,6 +121,18 @@ enum AppConnect { .sorted() } + /// Granted session keys the given view of the identity does not contain. + /// Platform never removes a key, it only disables it, so a missing id + /// means the view is out of date — not that the key is gone. A disconnect + /// must stop on these instead of treating them as dealt with. + static func sessionKeyIdsMissing( + from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + for grants: [AppConnectGrant] + ) -> [UInt32] { + let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String @@ -223,6 +236,14 @@ struct AppConnectGrant: Codable, Equatable { /// response; the record then only waits for that delete. var keyDisabled: Bool? + /// What makes two records the same grant: one session key given for one + /// request. Records are matched on this, never on whole-value equality — + /// `publishedAt` does not survive the store's millisecond round trip bit + /// for bit. + var key: String { + [identityId, appContractId, String(sessionKeyId), values.appEphemeralPubKeyHash].joined(separator: "|") + } + /// Whether there is a response on Platform this record can still delete. var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true @@ -274,31 +295,53 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { } func load() -> [AppConnectGrant] { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return [] } - do { - return try decoder.decode([AppConnectGrant].self, from: data) - } catch { - // Without the records the keys they named can no longer be told - // apart on the identity. A one-QR row whose records are gone - // refuses to disconnect (`grantRecordsMissing`) instead of - // pretending the key was disabled. - Self.logger.warning( - "AppConnectResponseStore: stored responses could not be decoded: \(error.localizedDescription, privacy: .public)") - return [] - } + readRows().grants } func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } - guard !grants.isEmpty else { + // Rows this build cannot read are written back untouched: each one is + // the only record of a key on the identity, and dropping it would + // leave that key impossible to find. + let unreadable = readRows().unreadable + guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) return } do { - defaults.set(try encoder.encode(grants), forKey: storageKey) + let encoded = try grants.map { try JSONSerialization.jsonObject(with: encoder.encode($0)) } + defaults.set( + try JSONSerialization.data(withJSONObject: encoded + unreadable), + forKey: storageKey) } catch { Self.logger.error( - "AppConnectResponseStore: failed to encode responses: \(error.localizedDescription, privacy: .public)") + "AppConnectResponseStore: failed to encode grants: \(error.localizedDescription, privacy: .public)") + } + } + + /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one + /// unreadable row costs one record instead of all of them. + private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any]) { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], []) } + guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { + Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") + return ([], []) + } + var grants: [AppConnectGrant] = [] + var unreadable: [Any] = [] + for row in rows { + if JSONSerialization.isValidJSONObject(row), + let rowData = try? JSONSerialization.data(withJSONObject: row), + let grant = try? decoder.decode(AppConnectGrant.self, from: rowData) { + grants.append(grant) + } else { + unreadable.append(row) + } + } + if !unreadable.isEmpty { + Self.logger.warning( + "AppConnectResponseStore: \(unreadable.count, privacy: .public) stored grant(s) could not be read; kept as stored") } + return (grants, unreadable) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 842fae7e04..da4d28cd83 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -73,6 +73,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case unsupportedStateTransition(String) case sessionKeyUnusable case grantRecordsMissing + case identityKeysOutOfDate case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -120,6 +121,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return "The scanned token purchase targets a different identity." case .tokenPurchaseTokenIdMismatch: return "The scanned token purchase names a token that does not belong to the contract and position it would buy from." + case .identityKeysOutOfDate: + return NSLocalizedString( + "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later.", + comment: "DashConnect") case .grantRecordsMissing: return NSLocalizedString( "This wallet has no record of the key it gave this app, so it cannot turn it off here.", @@ -483,7 +488,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } if AppConnect.isAvailable(protocolVersion: protocolVersion) { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, context: context) + // The PIN prompt can outlast a wallet or identity switch, and this + // path puts a spend-capable key on the identity: sign with what is + // active now, and only if it is still the identity that was shown. + let authorized = try await requireContext() + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.noIdentity + } + return try await approveAppConnectLogin(request, context: authorized) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -741,7 +753,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") updateGrants { grants in - guard let index = grants.firstIndex(of: grant) else { return } + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() } return connection @@ -795,7 +807,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) updateGrants { grants in - guard let index = grants.firstIndex(of: grant) else { return } + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } if grants[index].keyDisabled == true { grants.remove(at: index) } else { @@ -1177,8 +1189,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let currentPublicKeys = try context.wallet .managedIdentity(identityId: context.identityId) .getPublicKeys() + let granted = responseStore.load().filter(isGranted) + guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { + // A granted key the local view does not know cannot be shown to + // be disabled, so nothing is reported as turned off. + throw DashConnectPlatformError.identityKeysOutOfDate + } let keyIds = AppConnect.sessionKeyIdsToDisable( - for: responseStore.load().filter(isGranted), + for: granted, currentIdentityPublicKeys: currentPublicKeys ) if !keyIds.isEmpty { diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index eb1903b3dc..00ac7e770c 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -87,11 +87,11 @@ struct ConnectionRow: View { } /// Always reads as on: the row only shows it for an active connection, and - /// only the off direction is reachable from here. Turning it off - /// downgrades the connection back to `.approved`. For a one-QR connection - /// the data source first disables the app's key on the identity, which is - /// what ends the app's access; for a two-QR connection the change is local - /// and the app keeps its keys (see `DashConnectDataSource.disconnect`). + /// only the off direction is reachable from here. What turning it off does + /// depends on the login that made the connection (see + /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's + /// key disabled on the identity and its row removed; a two-QR connection + /// is downgraded to `.approved` locally and the app keeps its keys. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index bd2393b1c2..c35f037f15 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1650,6 +1650,53 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertTrue(grant.hasDeletableResponse) } + func testAGrantIsFoundAgainAfterTheStoreRoundTrip() { + // A wall-clock date does not survive the millisecond round trip bit + // for bit, so whole-value equality misses the stored record about + // half the time; the grant key does not depend on the date. + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + for offset in 0 ..< 200 { + let grant = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 6, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813 + Double(offset) * 0.000_137)) + store.save([grant]) + XCTAssertEqual(store.load().first?.key, grant.key) + } + } + + func testARowThisBuildCannotReadIsKeptWhenTheStoreIsSaved() throws { + let stored = """ + [{"somethingNewer":true,"sessionKeyId":4}, + {"identityId":"identity","appContractId":"app","documentId":"document", + "values":{"appEphemeralPubKeyHash":"aa","walletEphemeralPubKey":"bb","encryptedPayload":"cc"}, + "sessionKeyId":6,"publishedAt":1791539765792}] + """ + defaults.set(Data(stored.utf8), forKey: "scope.app-connect-responses.v1") + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + XCTAssertEqual(store.load().map(\.sessionKeyId), [6]) + store.save(store.load() + [Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(store.load().map(\.sessionKeyId), [6, 7]) + + let rows = try XCTUnwrap( + JSONSerialization.jsonObject( + with: try XCTUnwrap(defaults.data(forKey: "scope.app-connect-responses.v1"))) as? [[String: Any]]) + XCTAssertEqual(rows.filter { $0["somethingNewer"] as? Bool == true }.count, 1) + + // Clearing the readable grants must not clear the unreadable row. + store.save([]) + XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) + } + + func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { + let grants = [9, 13].map { Self.grant(sessionKeyId: $0) } + let keys = [Self.key(keyId: 9, data: Data([9]), disabledAt: 1)] + XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: grants), [13]) + XCTAssertEqual(AppConnect.sessionKeyIdsMissing(from: keys, for: [grants[0]]), []) + } + func testAGrantHasNothingToDeleteBeforeItIsPublishedOrAfterItsResponseIsGone() { var grant = Self.grant(sessionKeyId: 6) XCTAssertTrue(grant.hasDeletableResponse) From cc1a9701d3e07d1db3b638fc7032eaeb35b52591 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 12 Oct 2026 12:25:47 +0300 Subject: [PATCH 05/30] fix(dashpay): decide one-QR key and response state from Platform The wallet decided whether to add or disable a session key from the SDK's local copy of the identity, which is only replaced when an identity update returns success. It now reloads the identity before both decisions. A publish or a delete of the response can land without confirming. A refused publish is now looked up and adopted with the values that are on Platform, a failed delete is checked against Platform, and a disconnect no longer drops the record of a response whose publish never confirmed. Also: - a response deleted by a later login is published again when its own request comes back, instead of being reported as already published; - a connection stays while the app holds a key on another identity of the wallet, and a disconnect from an identity that gave it none says so; - a login does not start when the grant store cannot save; - records left by a disconnect are retried by the next login with the same identity. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 88 +++++- .../DashConnect/DashConnectDataSource.swift | 3 +- .../PlatformDashConnectDataSource.swift | 253 ++++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 78 +++++- 4 files changed, 354 insertions(+), 68 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 5996505ba4..c3f791bc5f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -133,6 +133,63 @@ enum AppConnect { return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() } + /// The query for one identity's response to one request, in the order of + /// the contract's only index. A byte-array value travels as base64. + static func responseLookupWhereClause(appEphemeralPubKeyHash: Data, ownerIdentityId: Data) -> String { + """ + [["appEphemeralPubKeyHash","==","\(appEphemeralPubKeyHash.base64EncodedString())"],\ + ["$ownerId","==","\(ownerIdentityId.toBase58String())"]] + """ + } + + /// The values of a response read back from Platform, or `nil` when the + /// document is not the response to `appEphemeralPubKeyHash` or cannot be + /// read. A delete has to carry the values that are on Platform, and those + /// are this wallet's own only when it recorded them before publishing. + /// + /// The SDK returns a byte field as base64 text. An array of numbers and + /// hex text are read as well, so a change of that encoding does not turn + /// every lookup into a failure. + static func responseValues( + fromDocument document: [String: Any], + appEphemeralPubKeyHash: Data + ) -> ResponseValues? { + func field(_ name: String) -> Any? { + document[name] ?? (document["properties"] as? [String: Any])?[name] + } + func bytes(_ value: Any?, _ decode: (String) -> Data?) -> Data? { + if let text = value as? String { return decode(text) } + guard let numbers = value as? [Int], numbers.allSatisfy({ (0 ... 255).contains($0) }) else { return nil } + return Data(numbers.map(UInt8.init)) + } + let decoders: [(String) -> Data?] = [{ Data(base64Encoded: $0) }, { data(fromHex: $0) }] + for decode in decoders { + guard bytes(field("appEphemeralPubKeyHash"), decode) == appEphemeralPubKeyHash, + let walletEphemeralPubKey = bytes(field("walletEphemeralPubKey"), decode), + walletEphemeralPubKey.count == 33, + let encryptedPayload = bytes(field("encryptedPayload"), decode), + (60 ... 572).contains(encryptedPayload.count) else { continue } + return ResponseValues( + appEphemeralPubKeyHash: appEphemeralPubKeyHash.toHexString(), + walletEphemeralPubKey: walletEphemeralPubKey.toHexString(), + encryptedPayload: encryptedPayload.toHexString()) + } + return nil + } + + static func data(fromHex hex: String) -> Data? { + guard hex.count.isMultiple(of: 2) else { return nil } + var data = Data(capacity: hex.count / 2) + var index = hex.startIndex + while index < hex.endIndex { + let next = hex.index(index, offsetBy: 2) + guard let byte = UInt8(hex[index ..< next], radix: 16) else { return nil } + data.append(byte) + index = next + } + return data + } + /// The three values of a `loginKeyResponse`, as hex. struct ResponseValues: Codable, Equatable { let appEphemeralPubKeyHash: String @@ -222,18 +279,20 @@ struct AppConnectGrant: Codable, Equatable { /// before publishing, so a publish whose outcome is unknown still leaves /// a key that can be disabled. var documentId: String? - let values: AppConnect.ResponseValues + /// Replaced only by values read back from Platform. + var values: AppConnect.ResponseValues let sessionKeyId: UInt32 - /// `nil` when the key was found already registered and its limits were - /// not read back. + /// The limits the key was registered with; `nil` for one without. let totalBudget: UInt64? let expiresAt: UInt64? let publishedAt: Date - /// Set once the response was deleted from Platform while the key stays - /// live (a later login to the same app). Absent means not deleted. + /// Set once the response is known to be gone from Platform while the key + /// stays live: deleted by a later login to the same app, or never there + /// after a publish that did not land. Absent means not known to be gone. var responseDeleted: Bool? - /// Set once a disconnect disabled the key but could not delete the - /// response; the record then only waits for that delete. + /// Set once a disconnect disabled the key while its response could not + /// be deleted, or could not be shown to be absent; the record then only + /// waits for that. var keyDisabled: Bool? /// What makes two records the same grant: one session key given for one @@ -248,13 +307,26 @@ struct AppConnectGrant: Codable, Equatable { var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true } + + /// A publish was started and never confirmed: the response may be on + /// Platform or not. + var hasUnconfirmedResponse: Bool { + documentId == nil && responseDeleted != true + } } protocol AppConnectResponseStore { + /// Whether `save` keeps anything. A login must not register a key the + /// store cannot record: nothing could find that key again. + var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) } +extension AppConnectResponseStore { + var canPersist: Bool { true } +} + /// Wallet- and network-scoped, like `UserDefaultsDashConnectStore`, whose /// scope it borrows. Nothing stored is secret: the values are public on /// chain and the key ids are visible on the identity. @@ -294,6 +366,8 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } + var canPersist: Bool { storageKey != nil } + func load() -> [AppConnectGrant] { readRows().grants } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index d8c3823225..c60f51236e 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -39,7 +39,8 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. For a two-QR connection it only changes the local + /// stays as it was. The connection also stays, without an error, while + /// the app holds a key on another identity of the wallet. For a two-QR connection it only changes the local /// status: that login derives the same key every time and Platform never /// re-adds a disabled key, so disabling it would lock the app out for good. func disconnect(id: String) async throws diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index da4d28cd83..873afc6486 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -74,6 +74,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case sessionKeyUnusable case grantRecordsMissing case identityKeysOutOfDate + case grantOnAnotherIdentity + case grantStoreUnavailable case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -125,6 +127,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later.", comment: "DashConnect") + case .grantOnAnotherIdentity: + return NSLocalizedString( + "This app has a key on another identity of this wallet. Switch to that identity to turn it off.", + comment: "DashConnect") + case .grantStoreUnavailable: + return "This wallet cannot record the key it would give the app, so the sign-in was not started." case .grantRecordsMissing: return NSLocalizedString( "This wallet has no record of the key it gave this app, so it cannot turn it off here.", @@ -619,6 +627,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { throw DashConnectPlatformError.loginContractUnavailable } + guard responseStore.canPersist else { + throw DashConnectPlatformError.grantStoreUnavailable + } let requestId = AppConnect.requestId(appEphemeralPubKey: request.appEphemeralPubKey) // `deriveConnectKey` is main-actor isolated in the SDK. Only the two @@ -647,13 +658,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let appContractId = request.contractId.toBase58String() let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) - // TODO(app-connect-stale-keys): this is the SDK's local view of the - // identity, refreshed only when an identity update returns success. A - // registration that landed but whose wait failed is not in it, and - // approving the same QR then tries to add the key a second time. - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let sessionKeyId: UInt32 var totalBudget: UInt64? @@ -668,6 +673,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { case .usable(let keyId): Self.logger.info("🔗 DASHCONNECT :: session key already registered") sessionKeyId = keyId + let registered = currentPublicKeys.first { UInt32(bitPattern: $0.keyId) == keyId } + totalBudget = registered?.totalBudget + expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) let budget = AppConnect.sessionKeyBudgetCredits @@ -727,15 +735,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { current.append(connection) persistAndSend(current) - guard grant.documentId == nil else { + // A response deleted by a later login to this app is published again + // when its own request comes back. + guard !grant.hasDeletableResponse else { Self.logger.info("🔗 DASHCONNECT :: response already published for this request") return connection } + // Besides this app's earlier responses, this takes whatever an earlier + // disconnect of any app left behind for this identity: its row is + // gone, so a login is the only moment left to finish that cleanup. await deleteAppConnectResponses( where: { - $0.identityId == identityId && $0.appContractId == appContractId - && $0.values.appEphemeralPubKeyHash != requestHash + guard $0.identityId == identityId else { return false } + return $0.keyDisabled == true + || ($0.appContractId == appContractId && $0.values.appEphemeralPubKeyHash != requestHash) }, responseContractId: responseContractId, context: context, @@ -743,22 +757,75 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") - let (documentId, _) = try await context.wallet.createDocument( - ownerIdentityId: context.identityId, - contractId: responseContractId, - documentType: AppConnect.documentType, - propertiesJSON: try grant.values.propertiesJSON(), - signer: signer - ) - Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + let documentId: Data + var publishedValues = grant.values + do { + (documentId, _) = try await context.wallet.createDocument( + ownerIdentityId: context.identityId, + contractId: responseContractId, + documentType: AppConnect.documentType, + propertiesJSON: try grant.values.propertiesJSON(), + signer: signer + ) + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse published") + } catch { + // A publish can land without confirming, and the response is + // unique per request and identity, so the retry is then refused. + // If the response is there, this login is complete; if it is not, + // or that cannot be told, the failure stands. + guard let published = try? await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: sealed.appEphemeralPubKeyHash, + responseContractId: responseContractId, + sdk: context.sdk + ) else { + throw error + } + Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse was already published") + documentId = published.documentId + publishedValues = published.values + } updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() + grants[index].values = publishedValues + grants[index].responseDeleted = nil } return connection } + /// This identity's response to one request, with the values it has on + /// Platform, or `nil` when there is none; a failed lookup or a response + /// that cannot be read throws. + private func findAppConnectResponse( + ownerIdentityId: Data, + appEphemeralPubKeyHash: Data, + responseContractId: Data, + sdk: SDK + ) async throws -> (documentId: Data, values: AppConnect.ResponseValues)? { + let response = try await sdk.documentList( + dataContractId: responseContractId.toBase58String(), + documentType: AppConnect.documentType, + whereClause: AppConnect.responseLookupWhereClause( + appEphemeralPubKeyHash: appEphemeralPubKeyHash, + ownerIdentityId: ownerIdentityId + ), + limit: 1 + ) + guard let documents = response["documents"] as? [[String: Any]] else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + guard let document = documents.first else { return nil } + guard let id = document["$id"] as? String, + let identifier = Self.decodeIdentifier(id), identifier.count == 32, + let values = AppConnect.responseValues( + fromDocument: document, appEphemeralPubKeyHash: appEphemeralPubKeyHash) else { + throw DashConnectPlatformError.existingDocumentLookupFailed + } + return (identifier, values) + } + /// Reads, changes and writes the grant records in one step with no /// suspension point in between, so an approval and a disconnect that /// overlap cannot write a stale copy over each other's change. @@ -772,8 +839,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Deletes, by their original values, the responses of the matching /// grants that are still on Platform. Best effort: a response that cannot - /// be deleted now stays recorded and is tried again by the next login or - /// disconnect. It does not hold the caller back — the entry it leaves is + /// be deleted now stays recorded and is tried again by the next login + /// with this identity. It does not hold the caller back — the entry it leaves is /// the encrypted key of a request the app has already finished with. /// /// A grant whose key is still live keeps its record, marked as having no @@ -786,6 +853,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context: Context, signer: KeychainSigner ) async { + await resolveUnconfirmedAppConnectResponses( + where: matches, responseContractId: responseContractId, context: context) let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } for grant in pending { do { @@ -806,17 +875,73 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeyId: signingKeyId, signer: signer ) + markAppConnectResponseGone(grant) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + // A delete can land without confirming, and every retry is + // then refused because there is nothing left to delete. Only + // Platform can say which failure this was. + guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } + do { + let remaining = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: hash, + responseContractId: responseContractId, + sdk: context.sdk + ) + if remaining == nil { markAppConnectResponseGone(grant) } + } catch { + continue + } + } + } + } + + /// Records that a grant has no response on Platform any more. The record + /// of a live key stays, because it is what lets a disconnect find that + /// key; the record of a disabled key has no further use. + private func markAppConnectResponseGone(_ grant: AppConnectGrant) { + updateGrants { grants in + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } + if grants[index].keyDisabled == true { + grants.remove(at: index) + } else { + grants[index].responseDeleted = true + } + } + } + + /// Settles the matching grants whose publish never confirmed, by asking + /// Platform. A response that is there gets its id and its values on + /// Platform, so it can be deleted; one that is not there needs nothing + /// more. A lookup that fails leaves the record as it is for the next try. + private func resolveUnconfirmedAppConnectResponses( + where matches: (AppConnectGrant) -> Bool, + responseContractId: Data, + context: Context + ) async { + for grant in responseStore.load() where matches(grant) && grant.hasUnconfirmedResponse { + guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } + do { + let published = try await findAppConnectResponse( + ownerIdentityId: context.identityId, + appEphemeralPubKeyHash: hash, + responseContractId: responseContractId, + sdk: context.sdk + ) + guard let published else { + markAppConnectResponseGone(grant) + continue + } updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } - if grants[index].keyDisabled == true { - grants.remove(at: index) - } else { - grants[index].responseDeleted = true - } + grants[index].documentId = published.documentId.toBase58String() + grants[index].values = published.values } } catch { Self.logger.error( - "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") + "🔗 DASHCONNECT :: unconfirmed loginKeyResponse not resolved — \(error.localizedDescription, privacy: .public)") } } } @@ -1126,7 +1251,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + // The row stands for the app, and the app still holds a key on + // another identity of this wallet. That key can only be disabled + // while its identity is the active one, so the row stays to get + // there; this identity's key is off. + if liveElsewhere { return } } if isOneQR { // Nothing is left of a one-QR connection once its key is disabled: @@ -1158,20 +1288,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// /// The key goes first because it is what the app signs with. A response /// that could not be deleted afterwards stays recorded, with its key - /// marked disabled, and is retried by the next login or disconnect. + /// marked disabled, and is retried by the next login with this identity. + /// + /// Returns whether the app still has a live key on another identity of + /// this wallet. When this identity gave it none, that is thrown instead: + /// nothing was turned off. /// /// `requiresGrants` is set for a row made by the one-QR login: finding no /// record for it means the key cannot be identified, and that is an error /// rather than a silent success. - private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws { + private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } + func hasLiveGrantElsewhere() -> Bool { + responseStore.load().contains { + $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true + } + } guard responseStore.load().contains(where: isGranted) else { + if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } - return + return false } try await authorize() @@ -1183,16 +1323,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } let signer = KeychainSigner(modelContainer: context.modelContainer) - // TODO(app-connect-stale-keys): the SDK's local view of the identity; - // a disable that landed but whose wait failed is not in it, and the - // retry is then refused by Platform until the view refreshes. - let currentPublicKeys = try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) let granted = responseStore.load().filter(isGranted) guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { - // A granted key the local view does not know cannot be shown to - // be disabled, so nothing is reported as turned off. + // Platform never removes a key, so the node that answered is + // behind. A key it does not know cannot be shown to be disabled, + // so nothing is reported as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } let keyIds = AppConnect.sessionKeyIdsToDisable( @@ -1209,22 +1345,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } - // Every key of this app is now off. Records with nothing left to - // delete are done; the rest wait for their response to go. + // Every key this identity gave the app is now off. Records whose + // response is known to be gone are done; the rest wait for their + // response to be deleted, or to be found if its publish never + // confirmed. updateGrants { grants in - grants.removeAll { isGranted($0) && !$0.hasDeletableResponse } + grants.removeAll { isGranted($0) && $0.responseDeleted == true } for index in grants.indices where isGranted(grants[index]) { grants[index].keyDisabled = true } } - guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { return } - await deleteAppConnectResponses( - where: isGranted, - responseContractId: responseContractId, - context: context, - signer: signer - ) + if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { + await deleteAppConnectResponses( + where: isGranted, + responseContractId: responseContractId, + context: context, + signer: signer + ) + } + return hasLiveGrantElsewhere() } static func buildLoginKeyResponseDraft( @@ -1577,6 +1717,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// The identity's keys as Platform has them now. The SDK's own copy is + /// only replaced when an identity update returns success, so a + /// registration or a disable that landed without confirming is missing + /// from it; deciding from that copy would add the key twice or disable it + /// twice. The reload also replaces the copy the SDK signs the next update + /// against. + private func refreshedIdentityPublicKeys( + context: Context + ) async throws -> [ManagedIdentity.IdentityPublicKeyInfo] { + guard try await context.wallet.loadIdentity(atIndex: context.identityIndex) == context.identityId else { + throw DashConnectPlatformError.noIdentity + } + return try context.wallet + .managedIdentity(identityId: context.identityId) + .getPublicKeys() + } + private func requireContext() async throws -> Context { let runtime = await MainActor.run { ( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c35f037f15..e4e0eef42c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1452,6 +1452,20 @@ private enum PurchaseSpyError: LocalizedError { } final class AppConnectLoginTests: XCTestCase { + func testResponseLookupQueriesTheIndexInOrderWithBase64Hash() throws { + let hash = Data(repeating: 0xAB, count: 20) + let owner = Data(repeating: 0x01, count: 32) + + let clause = AppConnect.responseLookupWhereClause(appEphemeralPubKeyHash: hash, ownerIdentityId: owner) + + let parsed = try XCTUnwrap( + JSONSerialization.jsonObject(with: Data(clause.utf8)) as? [[String]]) + XCTAssertEqual(parsed, [ + ["appEphemeralPubKeyHash", "==", hash.base64EncodedString()], + ["$ownerId", "==", owner.toBase58String()], + ]) + } + private var defaults: UserDefaults! private var suiteName: String! @@ -1650,20 +1664,60 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertTrue(grant.hasDeletableResponse) } - func testAGrantIsFoundAgainAfterTheStoreRoundTrip() { - // A wall-clock date does not survive the millisecond round trip bit - // for bit, so whole-value equality misses the stored record about - // half the time; the grant key does not depend on the date. + func testASavedGrantIsLoadedWithTheSameKey() { let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } - for offset in 0 ..< 200 { - let grant = AppConnectGrant( - identityId: "identity", appContractId: "app", documentId: nil, - values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), - sessionKeyId: 6, totalBudget: nil, expiresAt: nil, - publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813 + Double(offset) * 0.000_137)) - store.save([grant]) - XCTAssertEqual(store.load().first?.key, grant.key) + let grant = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, + values: .init(appEphemeralPubKeyHash: "aa", walletEphemeralPubKey: "bb", encryptedPayload: "cc"), + sessionKeyId: 6, totalBudget: nil, expiresAt: nil, + publishedAt: Date(timeIntervalSince1970: 1_791_539_765.792_813)) + store.save([grant]) + + XCTAssertEqual(store.load().first?.key, grant.key) + } + + func testAStoreWithoutAScopeCannotPersist() { + XCTAssertTrue( + UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" }.canPersist) + XCTAssertFalse( + UserDefaultsAppConnectResponseStore(defaults: defaults, network: .devnet) { nil }.canPersist) + } + + func testResponseValuesAreReadBackFromNumbersBase64AndHex() { + let hash = Data(repeating: 0xAB, count: 20) + let walletKey = Data([0x02] + [UInt8](repeating: 0x11, count: 32)) + let payload = Data(repeating: 0x22, count: 60) + let expected = AppConnect.ResponseValues( + appEphemeralPubKeyHash: hash.toHexString(), + walletEphemeralPubKey: walletKey.toHexString(), + encryptedPayload: payload.toHexString()) + let encodings: [(Data) -> Any] = [ + { $0.map(Int.init) }, { $0.base64EncodedString() }, { $0.toHexString() }, + ] + for encode in encodings { + let document: [String: Any] = [ + "$id": "id", + "appEphemeralPubKeyHash": encode(hash), + "walletEphemeralPubKey": encode(walletKey), + "encryptedPayload": encode(payload), + ] + XCTAssertEqual( + AppConnect.responseValues(fromDocument: document, appEphemeralPubKeyHash: hash), expected) + XCTAssertNil( + AppConnect.responseValues( + fromDocument: document, appEphemeralPubKeyHash: Data(repeating: 0xCD, count: 20))) } + XCTAssertNil(AppConnect.responseValues(fromDocument: ["$id": "id"], appEphemeralPubKeyHash: hash)) + } + + func testAnUnconfirmedResponseIsNeitherDeletableNorKnownGone() { + var grant = Self.grant(sessionKeyId: 6) + grant.documentId = nil + XCTAssertTrue(grant.hasUnconfirmedResponse) + XCTAssertFalse(grant.hasDeletableResponse) + + grant.responseDeleted = true + XCTAssertFalse(grant.hasUnconfirmedResponse) } func testARowThisBuildCannotReadIsKeptWhenTheStoreIsSaved() throws { From 09a28c55140ed7acc7e62565a2776721282796f2 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Mon, 12 Oct 2026 21:41:45 +0300 Subject: [PATCH 06/30] fix(dashpay): disconnect also disables one-QR keys the wallet has no record of A reinstalled wallet has no grant records, so disconnect left the app's earlier session keys live. Disconnect now also takes the live keys on the active identity that the wallet's key store shows bound to the app's contract and that are shaped as this login registers them (AUTHENTICATION, HIGH, ECDSA_HASH160, with a budget and an expiry). - Stops with an error when a live session key cannot be placed, or when a stored key of the app's is missing from the fetched key list. - Disables at most 10 keys per identity update, the consensus limit. - A one-QR row with no record no longer fails; the identity is checked. Not covered: the response behind a key with no record stays on Platform, and a key on a non-active identity with no record is not seen. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 121 ++++++++++++++-- .../PlatformDashConnectDataSource.swift | 129 +++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 132 +++++++++++++++++- 3 files changed, 338 insertions(+), 44 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c3f791bc5f..ec273d0c77 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -101,26 +101,119 @@ enum AppConnect { ) } - /// The session keys behind `grants` that can still sign: the ones a - /// disconnect has to disable. A key that is gone, already disabled, or no - /// longer the kind of key this login registers is left alone. + /// What the wallet's store of identity keys says about one key: its + /// payload, whether it is disabled there, and the contract it is bound to + /// when the bound is a whole single contract. The fetched key list + /// carries no bounds, so for a key without a grant record this is where + /// its app is read from. + struct KeyBinding: Equatable { + let keyId: UInt32 + let data: Data + let singleContractId: Data? + var isDisabled = false + /// The stored key has the type, purpose, level and limits of a key + /// this login registers. + var isSessionKeyShaped = false + /// The store has a bound for the key that this build cannot read, so + /// the key's app is unknown rather than "another one". + var hasUnreadableBound = false + } + + /// The most keys one identity update may disable (Platform consensus). + static let maxKeysDisabledPerUpdate = 10 + + /// Whether the store's bound for a key says which contract, if any, the + /// key is bound to: no bound (0), a 32-byte single contract (1), a + /// document type (2) or a contract group (3). + static func isReadableBound(boundsKind: Int, boundIds: [Data]?) -> Bool { + switch boundsKind { + case 0, 2, 3: return true + case 1: return boundIds?.first?.count == 32 + default: return false + } + } + + /// The contract a stored key is bound to as a whole. `boundsKind` is the + /// store's discriminant: 1 is a single contract; a document-type bound + /// (2), a contract group (3) and no bound (0) give nil. + static func singleContractId(boundsKind: Int, boundIds: [Data]?) -> Data? { + guard boundsKind == 1, let id = boundIds?.first, id.count == 32 else { return nil } + return id + } + + private static func isLiveSessionKey(_ key: ManagedIdentity.IdentityPublicKeyInfo) -> Bool { + key.keyType == .ecdsaHash160 + && key.purpose == .authentication + && key.securityLevel == .high + && key.disabledAt == nil + } + + /// The keys a disconnect has to disable: the live ones behind `grants`, + /// plus every live key of the same kind that `bindings` shows bound to + /// `appContractId` and that carries a budget and an expiry, as every key + /// this login registers does. That covers the keys a reinstalled wallet + /// has no grant record for. A key that is gone, already disabled, or of + /// another shape is left alone, including one another wallet gave the + /// app with a document-type bound, a single limit or another key type. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], + appContractId: Data, + bindings: [KeyBinding], currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> [UInt32] { let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys - .filter { - granted.contains(UInt32(bitPattern: $0.keyId)) - && $0.keyType == .ecdsaHash160 - && $0.purpose == .authentication - && $0.securityLevel == .high - && $0.disabledAt == nil + .filter { key in + guard isLiveSessionKey(key) else { return false } + let keyId = UInt32(bitPattern: key.keyId) + if granted.contains(keyId) { return true } + guard key.totalBudget != nil, key.expiresAt != nil else { return false } + return bindings.contains { + $0.keyId == keyId && $0.data == key.data && $0.singleContractId == appContractId + } } .map { UInt32(bitPattern: $0.keyId) } .sorted() } + /// Live session keys whose bound contract is unknown: not behind + /// `grants`, and either absent from `bindings` or stored with a bound + /// that cannot be read. Any of them could belong to the app being + /// disconnected, so a disconnect must stop on these instead of reporting + /// every key as turned off. + static func sessionKeyIdsWithUnknownBinding( + for grants: [AppConnectGrant], + bindings: [KeyBinding], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + let granted = Set(grants.map(\.sessionKeyId)) + return currentIdentityPublicKeys + .filter { key in + guard isLiveSessionKey(key) else { return false } + let keyId = UInt32(bitPattern: key.keyId) + return !granted.contains(keyId) && !bindings.contains { + $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound + } + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() + } + + /// Keys the store holds as live and bound to `appContractId` that the + /// given view of the identity does not contain. As with a missing granted + /// key, the view is out of date and a disconnect must stop. + static func boundKeyIdsMissing( + from currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + appContractId: Data, + bindings: [KeyBinding] + ) -> [UInt32] { + let known = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + return bindings + .filter { $0.singleContractId == appContractId && !$0.isDisabled && !known.contains($0.keyId) } + .map(\.keyId) + .sorted() + } + /// Granted session keys the given view of the identity does not contain. /// Platform never removes a key, it only disables it, so a missing id /// means the view is out of date — not that the key is gone. A disconnect @@ -269,8 +362,8 @@ enum AppConnect { /// /// The response type is index-only on Platform: there is no lookup by app and /// a delete has to carry the original values, so this record is the only way -/// back to the entry — and the only place that knows which key on the -/// identity belongs to which app. +/// back to the entry. It also names the key; without it a disconnect finds +/// the key by its contract bound, and the entry not at all. struct AppConnectGrant: Codable, Equatable { /// Base58 ids. let identityId: String @@ -317,7 +410,7 @@ struct AppConnectGrant: Codable, Equatable { protocol AppConnectResponseStore { /// Whether `save` keeps anything. A login must not register a key the - /// store cannot record: nothing could find that key again. + /// store cannot record: its response could not be found again. var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) @@ -375,8 +468,8 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } // Rows this build cannot read are written back untouched: each one is - // the only record of a key on the identity, and dropping it would - // leave that key impossible to find. + // the only record of a response on Platform, and dropping it would + // leave that response impossible to find. let unreadable = readRows().unreadable guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 873afc6486..afacd706fa 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -72,7 +72,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case tokenPurchaseTokenIdMismatch case unsupportedStateTransition(String) case sessionKeyUnusable - case grantRecordsMissing case identityKeysOutOfDate case grantOnAnotherIdentity case grantStoreUnavailable @@ -133,10 +132,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .grantStoreUnavailable: return "This wallet cannot record the key it would give the app, so the sign-in was not started." - case .grantRecordsMissing: - return NSLocalizedString( - "This wallet has no record of the key it gave this app, so it cannot turn it off here.", - comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -844,9 +839,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// the encrypted key of a request the app has already finished with. /// /// A grant whose key is still live keeps its record, marked as having no - /// response left, because the record is what lets a later disconnect find - /// and disable that key. A grant whose key is already disabled has no - /// further use and is dropped. + /// response left: a later disconnect picks the keys it has records for + /// without looking their app up in the wallet's key store. A grant whose + /// key is already disabled has no further use and is dropped. private func deleteAppConnectResponses( where matches: (AppConnectGrant) -> Bool, responseContractId: Data, @@ -899,8 +894,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Records that a grant has no response on Platform any more. The record - /// of a live key stays, because it is what lets a disconnect find that - /// key; the record of a disabled key has no further use. + /// of a live key stays for a disconnect to disable that key by; the + /// record of a disabled key has no further use. private func markAppConnectResponseGone(_ grant: AppConnectGrant) { updateGrants { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } @@ -1251,7 +1246,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, requiresGrants: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get @@ -1290,14 +1285,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// that could not be deleted afterwards stays recorded, with its key /// marked disabled, and is retried by the next login with this identity. /// - /// Returns whether the app still has a live key on another identity of - /// this wallet. When this identity gave it none, that is thrown instead: - /// nothing was turned off. + /// The keys are the ones recorded here plus the live keys on the identity + /// that are bound to the app's contract and shaped as this login + /// registers them, so the keys a reinstalled wallet kept no record of go + /// too. A key another wallet gave the app in a different shape stays. + /// TODO(app-connect-orphan-responses): the response behind a key with no + /// record stays on Platform. It can only be found by its request hash, + /// which the record held. /// - /// `requiresGrants` is set for a row made by the one-QR login: finding no - /// record for it means the key cannot be identified, and that is an error - /// rather than a silent success. - private func revokeAppConnectGrants(appContractId: String, requiresGrants: Bool) async throws -> Bool { + /// Returns whether a grant record shows the app with a live key on + /// another identity of this wallet. When this identity gave it none, that + /// is thrown instead: nothing was turned off. + /// TODO(app-connect-other-identity-keys): a key on another identity that + /// has no grant record is not seen, so the row can go while that key is + /// live. Only the active identity's keys are looked up. + /// + /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with + /// no record for this identity the keys are still looked for on it. When + /// it holds none bound to the app, there was nothing to turn off here and + /// the call returns without an error. + private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1308,10 +1315,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true } } - guard responseStore.load().contains(where: isGranted) else { - if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if requiresGrants { throw DashConnectPlatformError.grantRecordsMissing } - return false + guard let appContract = Self.decodeIdentifier(appContractId) else { + throw DashConnectPlatformError.loginContractUnavailable + } + if !responseStore.load().contains(where: isGranted) { + // Before the PIN prompt, from the store alone: whether this + // identity holds a key of the app's that has no record. + let holdsUnrecordedKey = try checksUnrecordedKeys && Self + .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } + if !holdsUnrecordedKey { + if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } + if !checksUnrecordedKeys { return false } + } } try await authorize() @@ -1331,17 +1347,43 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // so nothing is reported as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } + let bindings = try Self.storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) + guard AppConnect.sessionKeyIdsWithUnknownBinding( + for: granted, + bindings: bindings, + currentIdentityPublicKeys: currentPublicKeys + ).isEmpty, AppConnect.boundKeyIdsMissing( + from: currentPublicKeys, + appContractId: appContract, + bindings: bindings + ).isEmpty else { + // A live session key the wallet's store cannot place may be this + // app's, and a stored key of the app's that the fetched list + // lacks means the list is behind. Either way nothing is reported + // as turned off. + throw DashConnectPlatformError.identityKeysOutOfDate + } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, + appContractId: appContract, + bindings: bindings, currentIdentityPublicKeys: currentPublicKeys ) + if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { + throw DashConnectPlatformError.grantOnAnotherIdentity + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") - try await context.wallet.updateIdentity( - identityId: context.identityId, - disablePublicKeyIds: keyIds, - signer: signer - ) + // Platform takes a limited number of keys per update. A failure + // part way leaves the rest live and the row in place; the next + // attempt picks up what is still live. + for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), + signer: signer + ) + } Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } @@ -1734,6 +1776,39 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .getPublicKeys() } + /// What the wallet's store holds for each key of the identity. The store + /// is written by the SDK as it loads and updates the identity. + private static func storedKeyBindings( + identityId: String, + modelContainer: ModelContainer + ) throws -> [AppConnect.KeyBinding] { + let descriptor = FetchDescriptor(predicate: #Predicate { $0.identityId == identityId }) + let modelContext = ModelContext(modelContainer) + // The rows are only readable while their context is alive. + return try withExtendedLifetime(modelContext) { + try modelContext.fetch(descriptor).map { + AppConnect.KeyBinding( + keyId: UInt32(bitPattern: $0.keyId), + data: $0.publicKeyData, + singleContractId: AppConnect.singleContractId( + boundsKind: $0.effectiveContractBoundsKind, + boundIds: $0.contractBounds + ), + isDisabled: $0.disabledAt != nil, + isSessionKeyShaped: $0.keyTypeEnum == .ecdsaHash160 + && $0.purposeEnum == .authentication + && $0.securityLevelEnum == .high + && $0.totalBudget != nil + && $0.expiresAt != nil, + hasUnreadableBound: !AppConnect.isReadableBound( + boundsKind: $0.effectiveContractBoundsKind, + boundIds: $0.contractBounds + ) + ) + } + } + } + private func requireContext() async throws -> Context { let runtime = await MainActor.run { ( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index e4e0eef42c..7696a5e56c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1563,14 +1563,139 @@ final class AppConnectLoginTests: XCTestCase { // 13 is not on the identity at all. Self.key(keyId: 14, data: Data([14])), ] + let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: grants, currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable( + for: grants, appContractId: app, bindings: [], currentIdentityPublicKeys: keys), [9]) XCTAssertEqual( - AppConnect.sessionKeyIdsToDisable(for: [], currentIdentityPublicKeys: keys), + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: app, bindings: [], currentIdentityPublicKeys: keys), []) } + func testDisconnectAlsoDisablesLiveKeysBoundToTheAppThatHaveNoGrantRecord() { + let app = Data(repeating: 0xA1, count: 32) + let otherApp = Data(repeating: 0xB2, count: 32) + let keys = [ + Self.key(keyId: 6, data: Data([6]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 7, data: Data([7]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 8, data: Data([8]), disabledAt: 1), + Self.key(keyId: 9, data: Data([9]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 10, data: Data([10]), totalBudget: 5, expiresAt: 9_999), + Self.key(keyId: 11, data: Data([11]), totalBudget: 5, expiresAt: 9_999), + // Bound to the app and of the same kind, but without limits and + // without a grant record: not a key this login registered. + Self.key(keyId: 13, data: Data([13])), + // Bound to the app, but not a key this login registers. + Self.key( + keyId: 12, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, + data: Data([12]), totalBudget: 5, expiresAt: 9_999), + // Bound to the app with one limit only. + Self.key(keyId: 14, data: Data([14]), expiresAt: 9_999), + ] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), + AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), + AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app), + AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: app), + AppConnect.KeyBinding(keyId: 10, data: Data([10]), singleContractId: otherApp), + // The stored row under this id is for a different key. + AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), + AppConnect.KeyBinding(keyId: 12, data: Data([12]), singleContractId: app), + AppConnect.KeyBinding(keyId: 13, data: Data([13]), singleContractId: app), + AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: app), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [Self.grant(sessionKeyId: 9)], + appContractId: app, + bindings: bindings, + currentIdentityPublicKeys: keys), + [6, 7, 9]) + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: otherApp, bindings: bindings, currentIdentityPublicKeys: keys), + [10]) + } + + func testOnlyAWholeSingleContractBoundNamesTheApp() { + let app = Data(repeating: 0xA1, count: 32) + XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 0, boundIds: nil)) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 2, boundIds: [app])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 3, boundIds: [app])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 1, boundIds: [])) + XCTAssertNil(AppConnect.singleContractId(boundsKind: 1, boundIds: [Data([1, 2])])) + + for kind in [0, 2, 3] { + XCTAssertTrue(AppConnect.isReadableBound(boundsKind: kind, boundIds: kind == 0 ? nil : [app])) + } + XCTAssertTrue(AppConnect.isReadableBound(boundsKind: 1, boundIds: [app])) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 1, boundIds: [Data([1, 2])])) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 1, boundIds: nil)) + XCTAssertFalse(AppConnect.isReadableBound(boundsKind: 4, boundIds: [app])) + } + + func testAKeyBoundElsewhereOrNotAtAllIsNeitherDisabledNorUnknown() { + let app = Data(repeating: 0xA1, count: 32) + let keys = [4, 5, 6].map { + Self.key(keyId: Int32($0), data: Data([UInt8($0)]), totalBudget: 5, expiresAt: 9_999) + } + let bindings = [ + // A document-type bound and an unbounded key both store no single contract. + AppConnect.KeyBinding(keyId: 4, data: Data([4]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 5, data: Data([5]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: Data(repeating: 0xB2, count: 32)), + ] + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [], appContractId: app, bindings: bindings, currentIdentityPublicKeys: keys), + []) + XCTAssertEqual( + AppConnect.sessionKeyIdsWithUnknownBinding(for: [], bindings: bindings, currentIdentityPublicKeys: keys), + []) + } + + func testAStoredLiveKeyOfTheAppMissingFromTheIdentityViewIsReported() { + let app = Data(repeating: 0xA1, count: 32) + let otherApp = Data(repeating: 0xB2, count: 32) + let keys = [Self.key(keyId: 6, data: Data([6]))] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: app), + AppConnect.KeyBinding(keyId: 7, data: Data([7]), singleContractId: app), + AppConnect.KeyBinding(keyId: 8, data: Data([8]), singleContractId: app, isDisabled: true), + AppConnect.KeyBinding(keyId: 9, data: Data([9]), singleContractId: otherApp), + ] + XCTAssertEqual(AppConnect.boundKeyIdsMissing(from: keys, appContractId: app, bindings: bindings), [7]) + } + + func testALiveSessionKeyTheStoreCannotPlaceStopsADisconnect() { + let app = Data(repeating: 0xA1, count: 32) + let keys = [ + Self.key(keyId: 0, securityLevel: .master, keyType: .ecdsaSecp256k1, data: Data([0])), + Self.key(keyId: 6, data: Data([6])), + Self.key(keyId: 7, data: Data([7])), + Self.key(keyId: 8, data: Data([8]), disabledAt: 1), + Self.key(keyId: 9, data: Data([9])), + Self.key(keyId: 11, data: Data([11])), + ] + let bindings = [ + AppConnect.KeyBinding(keyId: 6, data: Data([6]), singleContractId: nil), + AppConnect.KeyBinding(keyId: 11, data: Data([0xFF]), singleContractId: app), + AppConnect.KeyBinding(keyId: 14, data: Data([14]), singleContractId: nil, hasUnreadableBound: true), + ] + // 0 and 8 cannot be session keys that sign; 6 is in the store; 9 has + // a grant record. 7 is unknown, so is 11 (its row is another key) and + // 14 (its stored bound cannot be read). + XCTAssertEqual( + AppConnect.sessionKeyIdsWithUnknownBinding( + for: [Self.grant(sessionKeyId: 9)], + bindings: bindings, + currentIdentityPublicKeys: keys + [Self.key(keyId: 14, data: Data([14]))]), + [7, 11, 14]) + } + private static func grant(sessionKeyId: UInt32) -> AppConnectGrant { AppConnectGrant( identityId: "identity", appContractId: "app", documentId: "document-\(sessionKeyId)", @@ -1794,11 +1919,12 @@ final class AppConnectLoginTests: XCTestCase { keyType: KeyType = .ecdsaHash160, data: Data, disabledAt: Int64? = nil, + totalBudget: UInt64? = nil, expiresAt: Int64? = nil ) -> ManagedIdentity.IdentityPublicKeyInfo { ManagedIdentity.IdentityPublicKeyInfo( keyId: keyId, purpose: purpose, securityLevel: securityLevel, keyType: keyType, - readOnly: false, disabledAt: disabledAt, data: data, totalBudget: nil, expiresAt: expiresAt) + readOnly: false, disabledAt: disabledAt, data: data, totalBudget: totalBudget, expiresAt: expiresAt) } private static func data(hex: String) -> Data? { From 7ec86f20fa12781bc77febae6d01f917b1a11bf0 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 12:28:44 +0300 Subject: [PATCH 07/30] fix(dashpay): keep a stored App Connect value that is not a row list Saving grants replaced or removed a stored value that did not parse as a JSON array, although reading it logs that it is left in place. The save is now skipped. The test spy's disconnect state moves behind its lock. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 17 ++++++--- .../PlatformDashConnectDataSourceTests.swift | 37 +++++++++++++++++-- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index ec273d0c77..c8f75bef1f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -467,10 +467,17 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { func save(_ grants: [AppConnectGrant]) { guard let storageKey else { return } + let stored = readRows() + // A value that is not a list of rows is not this build's to replace: + // nothing is written until it is gone. + guard !stored.isNotRowList else { + Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; grants not saved") + return + } // Rows this build cannot read are written back untouched: each one is // the only record of a response on Platform, and dropping it would // leave that response impossible to find. - let unreadable = readRows().unreadable + let unreadable = stored.unreadable guard !grants.isEmpty || !unreadable.isEmpty else { defaults.removeObject(forKey: storageKey) return @@ -488,11 +495,11 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one /// unreadable row costs one record instead of all of them. - private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any]) { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], []) } + private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any], isNotRowList: Bool) { + guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], [], false) } guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") - return ([], []) + return ([], [], true) } var grants: [AppConnectGrant] = [] var unreadable: [Any] = [] @@ -509,6 +516,6 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { Self.logger.warning( "AppConnectResponseStore: \(unreadable.count, privacy: .public) stored grant(s) could not be read; kept as stored") } - return (grants, unreadable) + return (grants, unreadable, false) } } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7696a5e56c..1daf7c54e8 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1424,12 +1424,24 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - var disconnectFailure: Error? - private(set) var disconnectedIds: [String] = [] + private var storedDisconnectFailure: Error? + private var storedDisconnectedIds: [String] = [] + + var disconnectFailure: Error? { + get { lock.withLock { storedDisconnectFailure } } + set { lock.withLock { storedDisconnectFailure = newValue } } + } + + var disconnectedIds: [String] { + lock.withLock { storedDisconnectedIds } + } func disconnect(id: String) async throws { - disconnectedIds.append(id) - if let disconnectFailure { throw disconnectFailure } + let failure = lock.withLock { () -> Error? in + storedDisconnectedIds.append(id) + return storedDisconnectFailure + } + if let failure { throw failure } } func remove(id: String) async { @@ -1869,6 +1881,23 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertNotNil(defaults.data(forKey: "scope.app-connect-responses.v1")) } + func testAStoredValueThatIsNotARowListIsNeverReplaced() { + let suiteName = "AppConnectResponseStoreTests.\(UUID().uuidString)" + let defaults = UserDefaults(suiteName: suiteName)! + defer { defaults.removePersistentDomain(forName: suiteName) } + let key = "scope.app-connect-responses.v1" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + + for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { + defaults.set(stored, forKey: key) + XCTAssertEqual(store.load().count, 0) + store.save([Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(defaults.data(forKey: key), stored) + store.save([]) + XCTAssertEqual(defaults.data(forKey: key), stored) + } + } + func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { let grants = [9, 13].map { Self.grant(sessionKeyId: $0) } let keys = [Self.key(keyId: 9, data: Data([9]), disabledAt: 1)] From d24e54a020d152a5ed1ad22bc13a2362e3503936 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 14:47:10 +0300 Subject: [PATCH 08/30] fix(dashpay): show what a one-QR sign-in gives the app and bind the approval to it The approval sheet now resolves which login the network takes before it is shown. For the one-QR login it names the session key's budget and lifetime, and the key is registered with the terms that were shown. An approval is refused, and the sheet rebuilt, when the active identity or the login is no longer the one on the sheet; with the protocol version unknown there is nothing to approve. - A session key found already registered is reused only when it is bound to the request's contract and carries limits within the approved terms. - A publish is recorded as unconfirmed before it is submitted, so a republished response is not dropped by a later disconnect. - The grant store reports that it cannot persist while its stored value is not a row list, and a grant that did not land stops the login before the response is published. - Disconnecting a one-QR connection that replaced a two-QR one keeps the row in the two-QR "approved" state while that login's keys are live, and never disables them. - The two remaining English-only errors are localized, and the PR's new strings are added to the catalogs. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 100 +++++- .../DashConnect/DashConnectDataSource.swift | 18 +- .../DashConnect/DashConnectModels.swift | 26 +- .../PlatformDashConnectDataSource.swift | 284 ++++++++++++---- .../DashConnect/ApproveConnectionSheet.swift | 106 ++++-- .../Components/ApproveSheetPresentation.swift | 12 +- .../Components/ConnectionRow.swift | 3 +- .../UI/DashConnect/ConnectionsScreen.swift | 4 +- .../UI/DashConnect/ConnectionsViewModel.swift | 11 +- DashWallet/ar.lproj/Localizable.strings | 15 + DashWallet/bg.lproj/Localizable.strings | 15 + DashWallet/ca.lproj/Localizable.strings | 15 + DashWallet/cs.lproj/Localizable.strings | 15 + DashWallet/da.lproj/Localizable.strings | 15 + DashWallet/de.lproj/Localizable.strings | 15 + DashWallet/el.lproj/Localizable.strings | 15 + DashWallet/en.lproj/Localizable.strings | 15 + DashWallet/eo.lproj/Localizable.strings | 15 + DashWallet/es.lproj/Localizable.strings | 15 + DashWallet/et.lproj/Localizable.strings | 15 + DashWallet/fa.lproj/Localizable.strings | 15 + DashWallet/fi.lproj/Localizable.strings | 15 + DashWallet/fil.lproj/Localizable.strings | 15 + DashWallet/fr.lproj/Localizable.strings | 15 + DashWallet/hr.lproj/Localizable.strings | 15 + DashWallet/hu.lproj/Localizable.strings | 15 + DashWallet/id.lproj/Localizable.strings | 15 + DashWallet/it.lproj/Localizable.strings | 15 + DashWallet/ja.lproj/Localizable.strings | 15 + DashWallet/ko.lproj/Localizable.strings | 15 + DashWallet/mk.lproj/Localizable.strings | 15 + DashWallet/ms.lproj/Localizable.strings | 15 + DashWallet/nb.lproj/Localizable.strings | 15 + DashWallet/nl.lproj/Localizable.strings | 15 + DashWallet/pl.lproj/Localizable.strings | 15 + DashWallet/pt.lproj/Localizable.strings | 15 + DashWallet/ro.lproj/Localizable.strings | 15 + DashWallet/ru.lproj/Localizable.strings | 15 + DashWallet/sk.lproj/Localizable.strings | 15 + DashWallet/sl.lproj/Localizable.strings | 15 + DashWallet/sl_SI.lproj/Localizable.strings | 15 + DashWallet/sq.lproj/Localizable.strings | 15 + DashWallet/sr.lproj/Localizable.strings | 15 + DashWallet/sv.lproj/Localizable.strings | 15 + DashWallet/th.lproj/Localizable.strings | 15 + DashWallet/tr.lproj/Localizable.strings | 15 + DashWallet/uk.lproj/Localizable.strings | 15 + DashWallet/vi.lproj/Localizable.strings | 15 + DashWallet/zh-Hans.lproj/Localizable.strings | 15 + .../zh-Hant-TW.lproj/Localizable.strings | 15 + DashWallet/zh.lproj/Localizable.strings | 15 + DashWallet/zh_TW.lproj/Localizable.strings | 15 + .../DashConnectDataSourceTests.swift | 3 +- .../DashConnect/DashConnectStoreTests.swift | 6 +- .../PlatformDashConnectDataSourceTests.swift | 314 ++++++++++++++++-- 55 files changed, 1389 insertions(+), 143 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c8f75bef1f..3fc476f359 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -28,10 +28,32 @@ enum AppConnect { static let sessionKeyBudgetCredits: UInt64 = 5_000_000_000 // 0.05 DASH static let sessionKeyLifetime: TimeInterval = 90 * 24 * 60 * 60 + /// What a one-QR approval gives the app: how many of the identity's + /// credits its key may spend and for how long the key works. The approval + /// sheet shows these values and the key is registered with them. + struct SessionKeyTerms: Equatable { + let budgetCredits: UInt64 + let lifetime: TimeInterval + + static let current = SessionKeyTerms( + budgetCredits: sessionKeyBudgetCredits, + lifetime: sessionKeyLifetime) + + func expiresAt(from now: Date) -> UInt64 { + UInt64((now.addingTimeInterval(lifetime).timeIntervalSince1970 * 1000).rounded()) + } + } + static func isAvailable(protocolVersion: UInt32) -> Bool { protocolVersion >= minimumProtocolVersion } + /// The terms of the login a network at `protocolVersion` gets: the + /// session key's for the one-QR login, none for the two-QR login. + static func sessionKeyTerms(protocolVersion: UInt32) -> SessionKeyTerms? { + isAvailable(protocolVersion: protocolVersion) ? .current : nil + } + /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral /// public key. Not the lookup key of the response, which is `hash160` of /// the same bytes. @@ -39,24 +61,42 @@ enum AppConnect { Data(SHA256.hash(data: Data(SHA256.hash(data: appEphemeralPubKey)))) } - static func expiresAt(from now: Date) -> UInt64 { - UInt64((now.addingTimeInterval(sessionKeyLifetime).timeIntervalSince1970 * 1000).rounded()) - } - /// What the identity already holds for a derived session key. enum SessionKeyState: Equatable { /// Not on the identity: register it. case absent - /// Registered and able to sign: publish without an identity update. + /// Registered, able to sign, and shown to be this app's key within + /// the approved terms: publish without an identity update. case usable(keyId: UInt32) - /// Registered but disabled or expired. Platform never re-adds a key, - /// so this request cannot be answered; the app has to ask again. + /// Registered but disabled or expired, or not shown to be this app's + /// key within the approved terms. Platform never re-adds a key, so + /// this request cannot be answered; the app has to ask again. case unusable } + /// How far the device clock may have moved back since a key was + /// registered before that key's expiry counts as later than the terms + /// allow. Without it a clock correction between two tries of one request + /// would turn the wallet's own key away. + static let clockTolerance: TimeInterval = 60 * 60 + + /// The session key is derived from the identity and the request's + /// ephemeral key, not from the app's contract, so a request that repeats + /// another app's ephemeral key derives that app's key. A registered key + /// is therefore reused only when it is bound to `appContractId` and + /// carries limits no wider than `terms`. + /// + /// The fetched key list carries no bounds. The bound is read from + /// `bindings`; a key the store cannot place counts as this app's only + /// when `grantedKeyIds` holds it — the keys this wallet recorded giving + /// this app for this request. static func sessionKeyState( publicKeyHash160: Data, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + appContractId: Data, + bindings: [KeyBinding], + grantedKeyIds: Set, + terms: SessionKeyTerms, now: Date ) -> SessionKeyState { guard let key = currentIdentityPublicKeys.first(where: { @@ -68,10 +108,19 @@ enum AppConnect { guard key.purpose == .authentication, key.securityLevel == .high, key.disabledAt == nil, - key.expiresAt.map({ $0 > nowMilliseconds }) ?? true else { + let totalBudget = key.totalBudget, + totalBudget <= terms.budgetCredits, + let expiresAt = key.expiresAt, + expiresAt > nowMilliseconds, + UInt64(expiresAt) <= terms.expiresAt(from: now.addingTimeInterval(clockTolerance)) else { return .unusable } - return .usable(keyId: UInt32(bitPattern: key.keyId)) + let keyId = UInt32(bitPattern: key.keyId) + let stored = bindings.first { $0.keyId == keyId && $0.data == key.data && !$0.hasUnreadableBound } + guard stored.map({ $0.singleContractId == appContractId }) ?? grantedKeyIds.contains(keyId) else { + return .unusable + } + return .usable(keyId: keyId) } static func nextKeyId( @@ -155,11 +204,15 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. + /// So is the two-QR login's authentication key, named by + /// `twoQRAuthenticationKeyHash160`: it has the same kind and bound, and a + /// `dash-st:` registration may have put limits on it. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, bindings: [KeyBinding], - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + twoQRAuthenticationKeyHash160: Data? = nil ) -> [UInt32] { let granted = Set(grants.map(\.sessionKeyId)) return currentIdentityPublicKeys @@ -167,7 +220,8 @@ enum AppConnect { guard isLiveSessionKey(key) else { return false } let keyId = UInt32(bitPattern: key.keyId) if granted.contains(keyId) { return true } - guard key.totalBudget != nil, key.expiresAt != nil else { return false } + guard key.totalBudget != nil, key.expiresAt != nil, + key.data != twoQRAuthenticationKeyHash160 else { return false } return bindings.contains { $0.keyId == keyId && $0.data == key.data && $0.singleContractId == appContractId } @@ -226,6 +280,17 @@ enum AppConnect { return Set(grants.map(\.sessionKeyId)).subtracting(known).sorted() } + /// What a disconnect leaves of the matching records once their keys are + /// disabled. A record whose response is known to be gone is done; the + /// rest stay, marked, until their response is deleted, or found if its + /// publish never confirmed. + static func markKeysDisabled(in grants: inout [AppConnectGrant], where matches: (AppConnectGrant) -> Bool) { + grants.removeAll { matches($0) && $0.responseDeleted == true } + for index in grants.indices where matches(grants[index]) { + grants[index].keyDisabled = true + } + } + /// The query for one identity's response to one request, in the order of /// the contract's only index. A byte-array value travels as base64. static func responseLookupWhereClause(appEphemeralPubKeyHash: Data, ownerIdentityId: Data) -> String { @@ -396,6 +461,15 @@ struct AppConnectGrant: Codable, Equatable { [identityId, appContractId, String(sessionKeyId), values.appEphemeralPubKeyHash].joined(separator: "|") } + /// Call before a publish is submitted. Until Platform confirms it, the + /// response may be there or not, whatever the record said before: a + /// response an earlier login deleted is published again when its request + /// comes back. + mutating func markPublishStarted() { + documentId = nil + responseDeleted = nil + } + /// Whether there is a response on Platform this record can still delete. var hasDeletableResponse: Bool { documentId != nil && responseDeleted != true @@ -459,7 +533,9 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { scopeKeyProvider().map { "\($0).app-connect-responses.v1" } } - var canPersist: Bool { storageKey != nil } + /// False as well while the stored value is not a list of rows: `save` + /// leaves such a value alone, so nothing new would be kept. + var canPersist: Bool { storageKey != nil && !readRows().isNotRowList } func load() -> [AppConnectGrant] { readRows().grants diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index c60f51236e..ce3c450fc8 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -25,7 +25,10 @@ protocol DashConnectDataSource { func parseQR(_ content: String) async throws -> DashConnectQr func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection + /// `consent` is the request as the approval sheet showed it. A login + /// that would give the app something else, or act for another identity, + /// is refused. + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection /// Parses a scanned `dash-st:` payload and either completes key /// registration immediately or returns a token purchase that awaits /// explicit user approval via `approveTokenPurchase(_:)`. @@ -40,9 +43,12 @@ protocol DashConnectDataSource { /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then /// stays as it was. The connection also stays, without an error, while - /// the app holds a key on another identity of the wallet. For a two-QR connection it only changes the local - /// status: that login derives the same key every time and Platform never - /// re-adds a disabled key, so disabling it would lock the app out for good. + /// the app holds a key on another identity of the wallet. For a two-QR + /// connection it only changes the local status: that login derives the + /// same key every time and Platform never re-adds a disabled key, so + /// disabling it would lock the app out for good. A one-QR connection that + /// replaced a two-QR one gets both: its session keys are disabled, and it + /// stays, in that local status, while the two-QR keys are on the identity. func disconnect(id: String) async throws func remove(id: String) async } @@ -201,7 +207,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.notDashConnectQrCode } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { try await Task.sleep(nanoseconds: 400_000_000) if shouldFailNextApprove { @@ -209,7 +215,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.approveFailed } - let connectionRequest = await makeConnectionRequest(from: request) + let connectionRequest = consent let connection = DAppConnection( id: connectionRequest.appContractId, name: connectionRequest.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : connectionRequest.appLabel, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 5a94c68a40..0f1546599f 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -199,6 +199,12 @@ struct ConnectionRequest: Equatable { let walletUsername: String? let walletIdentityId: String? let existingConnection: DAppConnection? + /// What the one-QR login gives the app. `nil` for the two-QR login, which + /// registers no key at approval. + var sessionKeyTerms: AppConnect.SessionKeyTerms? = nil + /// The network did not say which login it takes, so what approving would + /// give the app is unknown and there is nothing to approve yet. + var isLoginUnresolved = false } extension ConnectionRequest { @@ -226,7 +232,9 @@ extension ConnectionRequest { appUrl: String, walletUsername: String?, walletIdentityId: String?, - existingConnection: DAppConnection? + existingConnection: DAppConnection?, + sessionKeyTerms: AppConnect.SessionKeyTerms? = nil, + isLoginUnresolved: Bool = false ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -234,7 +242,21 @@ extension ConnectionRequest { appContractId: loginRequest.contractId.toBase58String(), walletUsername: walletUsername, walletIdentityId: walletIdentityId, - existingConnection: existingConnection + existingConnection: existingConnection, + sessionKeyTerms: sessionKeyTerms, + isLoginUnresolved: isLoginUnresolved ) } } + +extension AppConnect.SessionKeyTerms { + /// The budget as DASH at full credit precision, e.g. "0.05 DASH". + var budgetText: String { + PlatformCreditsFormatter.dashString(budgetCredits) + } + + /// The lifetime in whole days. + var lifetimeDays: Int { + Int(lifetime / (24 * 60 * 60)) + } +} diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index afacd706fa..0ebc43e477 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -75,6 +75,9 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case identityKeysOutOfDate case grantOnAnotherIdentity case grantStoreUnavailable + case approvalOutOfDate + case grantNotRecorded + case twoQRKeysNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -131,13 +134,31 @@ enum DashConnectPlatformError: LocalizedError, Equatable { "This app has a key on another identity of this wallet. Switch to that identity to turn it off.", comment: "DashConnect") case .grantStoreUnavailable: - return "This wallet cannot record the key it would give the app, so the sign-in was not started." + return NSLocalizedString( + "This wallet cannot record the key it would give the app, so the sign-in was not started.", + comment: "DashConnect") + case .grantNotRecorded: + return NSLocalizedString( + "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key.", + comment: "DashConnect") + case .twoQRKeysNotChecked: + return NSLocalizedString( + "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again.", + comment: "DashConnect") + case .approvalOutOfDate: + return NSLocalizedString( + "The details of this sign-in changed while it was on screen. Check them and approve again.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", comment: "DashConnect") case .unsupportedStateTransition(let kindName): - return "This wallet cannot approve the scanned request (\(kindName))." + return String( + format: NSLocalizedString( + "This wallet cannot approve the scanned request (%@).", + comment: "DashConnect: the placeholder is the kind of the scanned state transition"), + kindName) case .devnetLoginContractNotConfigured: return NSLocalizedString( "The devnet DashConnect contract id is not set or is not a valid identifier. Enter it in Settings → Devnet Settings.", @@ -172,6 +193,16 @@ enum DashConnectPlatformError: LocalizedError, Equatable { } } +/// What a disconnect found besides the session keys it disabled. +struct AppConnectRevocation: Equatable { + /// A grant record shows the app with a live key on another identity of + /// this wallet. + let liveOnAnotherIdentity: Bool + /// The keys of an earlier two-QR login to the app are still live on this + /// identity. + let twoQRKeysRemain: Bool +} + struct DashConnectLoginKeyResponseDraft: Equatable { let properties: [String: AnyHashable] let walletEphemeralPublicKey: Data @@ -445,8 +476,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + // Which login this network gets is settled here, so the sheet can + // show what the app is given. With the version unknown the request + // says so, and the sheet offers nothing to approve. The lookup runs + // alongside the two below. + async let resolvedProtocolVersion = try? Self.networkProtocolVersion(sdk: context.sdk) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) + let protocolVersion = await resolvedProtocolVersion return ConnectionRequest( loginRequest: loginRequest, @@ -454,15 +491,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { appUrl: metadata.url, walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), - existingConnection: existingConnection + existingConnection: existingConnection, + sessionKeyTerms: protocolVersion.flatMap(AppConnect.sessionKeyTerms(protocolVersion:)), + isLoginUnresolved: protocolVersion == nil ) } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) + guard consent.appContractId == request.contractId.toBase58String(), !consent.isLoginUnresolved else { + throw DashConnectPlatformError.approvalOutOfDate + } - let context: Context + var context: Context do { context = try await requireContext() } catch { @@ -483,22 +525,34 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error } + // The sheet showed the login `makeConnectionRequest` resolved: its + // terms, or none for the two-QR login. If the network now gets the + // other one, what was approved is not what would run. Either login + // acts for the identity that was on the sheet: it has to be the + // active one here, and again after the PIN prompt. + let terms = AppConnect.sessionKeyTerms(protocolVersion: protocolVersion) + guard consent.sessionKeyTerms == terms, + consent.walletIdentityId == context.identityId.toBase58String() else { + Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") + throw DashConnectPlatformError.approvalOutOfDate + } do { try await authorize() } catch { Self.logger.error("🔗 DASHCONNECT :: authorization failed — \(error.localizedDescription, privacy: .public)") throw error } - if AppConnect.isAvailable(protocolVersion: protocolVersion) { + // The PIN prompt can outlast a wallet or identity switch: sign with + // what is active now, and only if it is still the identity that was + // shown. + let authorized = try await requireContext() + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.approvalOutOfDate + } + context = authorized + if let terms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - // The PIN prompt can outlast a wallet or identity switch, and this - // path puts a spend-capable key on the identity: sign with what is - // active now, and only if it is still the identity that was shown. - let authorized = try await requireContext() - guard authorized.identityId == context.identityId else { - throw DashConnectPlatformError.noIdentity - } - return try await approveAppConnectLogin(request, context: authorized) + return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -547,8 +601,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse document written") - let preview = await makeConnectionRequest(from: request) - Self.logger.info("🔗 DASHCONNECT :: connection preview resolved") let connection: DAppConnection do { var derivedMaterial = try Self.deriveKeyRegistrationMaterial( @@ -574,9 +626,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionPublicKey: derivedMaterial.encryptionPublicKey, currentIdentityPublicKeys: currentPublicKeys ) { - connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .active, updatedAt: now()) } else { - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) } } catch { Self.logger.error( @@ -584,7 +636,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) // Conservative fallback: asking for a QR is safer than claiming the // registration is already on the identity when we could not verify it. - connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) } var current = subject.value.filter { $0.id != connection.id } @@ -617,6 +669,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, + consent: ConnectionRequest, + terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { @@ -654,6 +708,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { + grant.identityId == identityId && grant.appContractId == appContractId + && grant.values.appEphemeralPubKeyHash == requestHash + } + + // Read only for a key that is already on the identity. If the store + // cannot be read, such a key needs a grant record instead. + var bindings: [AppConnect.KeyBinding] = [] + var grantedKeyIds: Set = [] + if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { + bindings = (try? Self.storedKeyBindings( + identityId: identityId, modelContainer: context.modelContainer)) ?? [] + grantedKeyIds = Set(responseStore.load().filter(isGrantForRequest).map(\.sessionKeyId)) + } let sessionKeyId: UInt32 var totalBudget: UInt64? @@ -661,6 +729,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch AppConnect.sessionKeyState( publicKeyHash160: sessionKeyHash160, currentIdentityPublicKeys: currentPublicKeys, + appContractId: request.contractId, + bindings: bindings, + grantedKeyIds: grantedKeyIds, + terms: terms, now: now() ) { case .unusable: @@ -673,8 +745,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) - let budget = AppConnect.sessionKeyBudgetCredits - let expiry = AppConnect.expiresAt(from: now()) + let budget = terms.budgetCredits + let expiry = terms.expiresAt(from: now()) let key = AppConnect.sessionIdentityPubkey( keyId: keyId, publicKeyHash160: sessionKeyHash160, @@ -703,10 +775,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // recorded for this request keeps its values: if an earlier publish // landed without confirming, those are the ones on Platform. let grant = updateGrants { grants -> AppConnectGrant in - if let existing = grants.first(where: { - $0.identityId == identityId && $0.appContractId == appContractId - && $0.sessionKeyId == sessionKeyId && $0.values.appEphemeralPubKeyHash == requestHash - }) { + if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { return existing } let new = AppConnectGrant( @@ -723,13 +792,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } - let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) var current = subject.value.filter { $0.id != connection.id } current.append(connection) persistAndSend(current) + // The store was writable when the login started. If the record did + // not land all the same, a response published now could not be found + // again. The key is live, so the row above stays: a disconnect finds + // the key by its contract bound. + guard responseStore.load().contains(where: { $0.key == grant.key }) else { + Self.logger.error("🔗 DASHCONNECT :: the session key was registered but its record could not be saved") + throw DashConnectPlatformError.grantNotRecorded + } + // A response deleted by a later login to this app is published again // when its own request comes back. guard !grant.hasDeletableResponse else { @@ -751,6 +828,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) + // Recorded before the publish is submitted: a response this record + // had as deleted may be back on Platform after a publish that fails + // to confirm, and a disconnect must then look for it. + updateGrants { grants in + guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } + grants[index].markPublishStarted() + } + Self.logger.info("🔗 DASHCONNECT :: publishing loginKeyResponse") let documentId: Data var publishedValues = grant.values @@ -982,21 +1067,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noApprovedConnectionAwaitingKeyRegistration } - // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. - var chainKey = try await MainActor.run { - try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, - keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), - network: context.network - ).privateKeyData - } - defer { Self.zero(&chainKey) } - - var derivedMaterial = try Self.deriveKeyRegistrationMaterial( - chainKeyPrivateBytes: chainKey, - identityId: context.identityId, - appContractId: pendingAppContractId - ) + var derivedMaterial = try await deriveKeyRegistrationMaterial( + appContractId: pendingAppContractId, context: context) defer { Self.zero(&derivedMaterial.loginKey) Self.zero(&derivedMaterial.authenticationPrivateKey) @@ -1245,15 +1317,17 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func disconnect(id: String) async throws { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } + var twoQRKeysRemain = false if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let revocation = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get // there; this identity's key is off. - if liveElsewhere { return } + if revocation.liveOnAnotherIdentity { return } + twoQRKeysRemain = revocation.twoQRKeysRemain } - if isOneQR { + if isOneQR, !twoQRKeysRemain { // Nothing is left of a one-QR connection once its key is disabled: // the same QR can no longer be approved and there is no second // step to wait for, so the row goes instead of sitting in the @@ -1265,7 +1339,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let disconnectedAt = now() // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to - // `.active` while the identity keys are still registered. + // `.active` while the identity keys are still registered. A one-QR + // connection that replaced a two-QR one ends up here as well while + // the two-QR keys are still on the identity: its session keys are + // off, and the row goes back to what a two-QR disconnect leaves. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1293,7 +1370,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// record stays on Platform. It can only be found by its request hash, /// which the record held. /// - /// Returns whether a grant record shows the app with a live key on + /// Reports whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. /// TODO(app-connect-other-identity-keys): a key on another identity that @@ -1303,8 +1380,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. - private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { + /// the call returns without an error. For such a row it also reports + /// whether the keys of an earlier two-QR login to the app are still live + /// on this identity, and throws once the session keys are off when that + /// cannot be told. + private func revokeAppConnectGrants( + appContractId: String, + checksUnrecordedKeys: Bool + ) async throws -> AppConnectRevocation { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1326,7 +1409,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } if !holdsUnrecordedKey { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { return false } + if !checksUnrecordedKeys { + return AppConnectRevocation(liveOnAnotherIdentity: false, twoQRKeysRemain: false) + } } } @@ -1363,11 +1448,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } + // The keys of an earlier two-QR login to the app, for a row made by + // the one-QR login. They are not disabled: that login derives the + // same keys every time, so the app could never be given them again. + // `nil` when they could not be derived. + var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? + if checksUnrecordedKeys { + do { + twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") + } + } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, bindings: bindings, - currentIdentityPublicKeys: currentPublicKeys + currentIdentityPublicKeys: currentPublicKeys, + twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 ) if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity @@ -1387,16 +1486,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") } - // Every key this identity gave the app is now off. Records whose - // response is known to be gone are done; the rest wait for their - // response to be deleted, or to be found if its publish never - // confirmed. - updateGrants { grants in - grants.removeAll { isGranted($0) && $0.responseDeleted == true } - for index in grants.indices where isGranted(grants[index]) { - grants[index].keyDisabled = true - } - } + // Every session key this identity gave the app is now off. + updateGrants { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( @@ -1406,7 +1497,38 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - return hasLiveGrantElsewhere() + // The session keys are off. The two-QR keys were left out of the + // update, so the list fetched before it still tells whether they are + // live. If they could not be derived that is unknown, and the row + // stays as it is with an error rather than go or change on a guess. + var twoQRKeysRemain = false + if checksUnrecordedKeys { + guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } + twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ) + } + return AppConnectRevocation( + liveOnAnotherIdentity: hasLiveGrantElsewhere(), + twoQRKeysRemain: twoQRKeysRemain) + } + + /// The public halves of the keys the two-QR login derives for this + /// identity and app. + private func twoQRLoginPublicKeys( + appContractId: Data, + context: Context + ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { + var derivedMaterial = try await deriveKeyRegistrationMaterial( + appContractId: appContractId, context: context) + defer { + Self.zero(&derivedMaterial.loginKey) + Self.zero(&derivedMaterial.authenticationPrivateKey) + Self.zero(&derivedMaterial.encryptionPrivateKey) + } + return (derivedMaterial.authenticationPublicKeyHash160, derivedMaterial.encryptionPublicKey) } static func buildLoginKeyResponseDraft( @@ -1468,6 +1590,28 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// The two-QR login's keys for the active identity and one app. The + /// caller wipes the returned private keys. + private func deriveKeyRegistrationMaterial( + appContractId: Data, + context: Context + ) async throws -> DashConnectKeyRegistrationDerivedMaterial { + // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. + var chainKey = try await MainActor.run { + try context.wallet.deriveIdentityAuthKeyAtSlot( + identityIndex: context.identityIndex, + keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), + network: context.network + ).privateKeyData + } + defer { Self.zero(&chainKey) } + return try Self.deriveKeyRegistrationMaterial( + chainKeyPrivateBytes: chainKey, + identityId: context.identityId, + appContractId: appContractId + ) + } + private static func deriveKeyRegistrationMaterial( chainKeyPrivateBytes: Data, identityId: Data, @@ -1581,6 +1725,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// Whether either key of the two-QR login is live on the identity: the + /// app can still use whichever one is. + static func hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: Data, + encryptionPublicKey: Data, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + hasRegisteredAuthenticationKey( + authenticationPublicKeyHash160: authenticationPublicKeyHash160, + currentIdentityPublicKeys: currentIdentityPublicKeys + ) || hasRegisteredEncryptionKey( + encryptionPublicKey: encryptionPublicKey, + currentIdentityPublicKeys: currentIdentityPublicKeys + ) + } + static func missingKeyRegistrationKeys( _ validated: DashConnectKeyRegistrationValidationResult, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 6472c0b50b..e070c553c4 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -70,7 +70,18 @@ struct ApproveConnectionSheet: View { reloginNotice(existingConnection) } - if isRelogin { + // The one-QR login gives the app a key with limits of its + // own, so its terms are spelled out on a repeat sign-in + // too, and when it replaces a two-QR connection. + if request.isLoginUnresolved { + Text(NSLocalizedString( + "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again.", + comment: "DashConnect")) + .font(.subhead) + .foregroundColor(.primaryText) + } else if let terms = request.sessionKeyTerms { + sessionKeyPermissions(terms) + } else if isRelogin { reloginPermissionsSummary } else { fullPermissions @@ -120,7 +131,7 @@ struct ApproveConnectionSheet: View { style: .filledBlue, size: .large, stretch: true, - isEnabled: !isLoading, + isEnabled: !isLoading && !request.isLoginUnresolved, isLoading: isLoading, action: onApprove ) @@ -168,20 +179,65 @@ struct ApproveConnectionSheet: View { } private var fullPermissions: some View { + permissions( + granted: [ + NSLocalizedString("See your username", comment: "DashConnect"), + NSLocalizedString("Verify your identity", comment: "DashConnect"), + ], + withheld: [ + NSLocalizedString("Your private keys", comment: "DashConnect"), + NSLocalizedString("Withdraw funds", comment: "DashConnect"), + ] + ) + } + + /// The one-QR login gives the app a key of its own on the identity, so + /// the sheet names what that key can spend and when it stops working. + private func sessionKeyPermissions(_ terms: AppConnect.SessionKeyTerms) -> some View { + VStack(alignment: .leading, spacing: 20) { + permissions( + granted: [ + NSLocalizedString("See your username", comment: "DashConnect"), + NSLocalizedString("Verify your identity", comment: "DashConnect"), + NSLocalizedString("Act as you in this app without asking each time", comment: "DashConnect one-QR login"), + // Per sign-in: an earlier sign-in to the app keeps its + // own key and limit until the app is disconnected. + String( + format: NSLocalizedString( + "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit.", + comment: "DashConnect one-QR login: the placeholder is an amount with its unit, e.g. 0.05 DASH"), + terms.budgetText + ), + ], + withheld: [ + NSLocalizedString("Your recovery phrase or wallet keys", comment: "DashConnect one-QR login"), + NSLocalizedString("Your Dash balance", comment: "DashConnect one-QR login"), + ] + ) + + Text( + String( + format: NSLocalizedString( + "This access ends after %d days, or when you disconnect the app.", + comment: "DashConnect one-QR login"), + terms.lifetimeDays + ) + ) + .font(.footnote) + .foregroundColor(.secondaryText) + } + } + + private func permissions(granted: [String], withheld: [String]) -> some View { VStack(alignment: .leading, spacing: 20) { VStack(alignment: .leading, spacing: 12) { Text(NSLocalizedString("This app will be able to:", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) - PermissionRow( - icon: .custom("dashconnect.check.circle", maxHeight: 18), - text: NSLocalizedString("See your username", comment: "DashConnect") - ) - PermissionRow( - icon: .custom("dashconnect.check.circle", maxHeight: 18), - text: NSLocalizedString("Verify your identity", comment: "DashConnect") - ) + ForEach(granted, id: \.self) { text in + PermissionRow(icon: .custom("dashconnect.check.circle", maxHeight: 18), text: text) + } } VStack(alignment: .leading, spacing: 12) { @@ -189,14 +245,9 @@ struct ApproveConnectionSheet: View { .font(.subhead) .foregroundColor(.primaryText) - PermissionRow( - icon: .custom("dashconnect.xmark.circle", maxHeight: 18), - text: NSLocalizedString("Your private keys", comment: "DashConnect") - ) - PermissionRow( - icon: .custom("dashconnect.xmark.circle", maxHeight: 18), - text: NSLocalizedString("Withdraw funds", comment: "DashConnect") - ) + ForEach(withheld, id: \.self) { text in + PermissionRow(icon: .custom("dashconnect.xmark.circle", maxHeight: 18), text: text) + } } } } @@ -248,13 +299,14 @@ private struct PermissionRow: View { let text: String var body: some View { - HStack(spacing: 6) { + HStack(alignment: .top, spacing: 6) { Icon(name: icon) .frame(width: 18, height: 18) Text(text) .font(.subhead) .foregroundColor(.primaryText) + .fixedSize(horizontal: false, vertical: true) } } } @@ -309,6 +361,22 @@ private let dashConnectTruncateMiddleCheck: Bool = { ) } +#Preview("Approve One-QR") { + ApproveConnectionSheet( + request: ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "Yappr", + appUrl: "yap.pr", + walletUsername: "dashuser", + walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", + existingConnection: nil, + sessionKeyTerms: .current + ), + onApprove: {}, + onDeny: {} + ) +} + #Preview("Approve Re-Login") { ApproveConnectionSheet( request: ConnectionRequest( diff --git a/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift b/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift index 49b2d99318..ef9ec48bf8 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ApproveSheetPresentation.swift @@ -24,19 +24,21 @@ import SwiftUI /// once rather than repeated per availability branch. struct ApproveSheetPresentation: ViewModifier { let isLoading: Bool + /// Full height, for content that does not fit the fixed one. + var isTall = false - private let detentHeight: CGFloat = 620 + private var detent: PresentationDetent { isTall ? .large : .height(620) } private let cornerRadius: CGFloat = 32 func body(content: Content) -> some View { if #available(iOS 16.4, *) { content - .presentationDetents([.height(detentHeight)]) + .presentationDetents([detent]) .presentationCornerRadius(cornerRadius) .interactiveDismissDisabled(isLoading) } else if #available(iOS 16.0, *) { content - .presentationDetents([.height(detentHeight)]) + .presentationDetents([detent]) .interactiveDismissDisabled(isLoading) } else { content @@ -46,7 +48,7 @@ struct ApproveSheetPresentation: ViewModifier { extension View { /// Presents this view as the approve-connection sheet body. - func approveSheetPresentation(isLoading: Bool) -> some View { - modifier(ApproveSheetPresentation(isLoading: isLoading)) + func approveSheetPresentation(isLoading: Bool, isTall: Bool = false) -> some View { + modifier(ApproveSheetPresentation(isLoading: isLoading, isTall: isTall)) } } diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 00ac7e770c..467799815a 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -91,7 +91,8 @@ struct ConnectionRow: View { /// depends on the login that made the connection (see /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's /// key disabled on the identity and its row removed; a two-QR connection - /// is downgraded to `.approved` locally and the app keeps its keys. + /// is downgraded to `.approved` locally and the app keeps its keys. A + /// one-QR connection that replaced a two-QR one gets both. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index a7189422e5..95104f95da 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -113,7 +113,9 @@ struct ConnectionsScreen: View { onApprove: { viewModel.approvePendingRequest() }, onDeny: { viewModel.denyPendingRequest() } ) - .approveSheetPresentation(isLoading: viewModel.isApproving) + // The one-QR terms make the sheet longer than the fixed height + // shows; who pays and when access ends must not sit below the fold. + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.sessionKeyTerms != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 22ce543aa8..c0a3b3ec42 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -200,7 +200,7 @@ final class ConnectionsViewModel: ObservableObject { // `isResolvingRequest` guards the window where a newer request has been // accepted but has not published yet: approving during it would // authorize the request on screen moments before it is replaced. - guard pendingRequest != nil, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + guard let consent = pendingRequest, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } isApproving = true approveError = nil @@ -209,10 +209,17 @@ final class ConnectionsViewModel: ObservableObject { defer { isApproving = false } do { - _ = try await dataSource.approveLogin(pendingLoginRequest) + _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil self.pendingLoginRequest = nil self.approveError = nil + } catch DashConnectPlatformError.approvalOutOfDate { + // Another identity became active, or the network now answers + // with the other login: what the sheet showed is not what + // would run. Nothing was signed. The sheet is rebuilt from + // the same request as it stands now, for a new decision. + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. self.approveError = String( diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index b7e1ba7721..15c06597b2 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "تم تسجيل ”%@“. هل تريد إرسال طلب جهة اتصال إلى الشخص الذي دعاك؟"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 959cbf52f2..fa1acb7632 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ беше регистрирано. Да се изпрати ли заявка за контакт до човека, който ви покани?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index a52361094c..4ded93138f 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» s'ha registrat. Vols enviar una sol·licitud de contacte a la persona que t'ha convidat?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 4ccf33f284..351218530f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bylo zaregistrováno. Poslat žádost o kontakt osobě, která vás pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 24bcc296da..8b88d3bfa6 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” er blevet registreret. Vil du sende en kontaktanmodning til den person, der inviterede dig?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index b68953730a..eeeab92a29 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ wurde registriert. Möchtest du der Person, die dich eingeladen hat, eine Kontaktanfrage senden?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 9cc83637f3..06faac5783 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "Το «%@» καταχωρίστηκε. Να σταλεί αίτημα επαφής στο άτομο που σας προσκάλεσε;"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 7ad66de2d6..f0d23940f6 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6103,9 +6103,24 @@ "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; /* Wallet preparation and support */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; +"Your Dash balance" = "Your Dash balance"; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "Your wallet could not be opened. Do not delete this app. Try again or contact support for help." = "Your wallet could not be opened. Do not delete this app. Try again or contact support for help."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 00b2de2433..d0d282f894 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ estis registrita. Ĉu sendi kontaktpeton al la persono kiu vin invitis?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 063d294700..7046e8d05f 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» se ha registrado. ¿Quieres enviar una solicitud de contacto a la persona que te invitó?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 26f5a7b707..077d46ffbc 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ on registreeritud. Kas saata kontaktitaotlus inimesele, kes sind kutsus?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index d350ebbe05..f16def9aa4 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» ثبت شد. برای کسی که شما را دعوت کرده درخواست تماس فرستاده شود؟"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 873de00936..e8470bc91a 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” on rekisteröity. Lähetetäänkö yhteyspyyntö sinut kutsuneelle henkilölle?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index f587a7f93d..b123af4139 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "Nairehistro na ang “%@”. Magpadala ng kahilingan sa pakikipag-ugnay sa taong nag-imbita sa iyo?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 73a1c57deb..cc4cbde6ea 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "« %@ » a été enregistré. Envoyer une demande de contact à la personne qui vous a invité ?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 3b2706d41c..1998f549c7 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrirano. Poslati zahtjev za kontakt osobi koja vas je pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 57b9f7b9ba..928cac2833 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "A(z) „%@” regisztrálva. Küldesz kapcsolatkérést annak, aki meghívott?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 84c60a462c..d3e3684a34 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah terdaftar. Kirim permintaan kontak ke orang yang mengundang Anda?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 8312cc323b..88d201b142 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» è stato registrato. Vuoi inviare una richiesta di contatto alla persona che ti ha invitato?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index ae09c8757f..85d23f71fc 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」が登録されました。招待してくれた相手に連絡先リクエストを送りますか?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index e897b42ded..343be990d9 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”이(가) 등록되었습니다. 초대해 준 사람에게 연락처 요청을 보낼까요?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 12fc77356f..4d21e14708 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ е регистрирано. Да се испрати барање за контакт до лицето што ве покани?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 0195c80d72..13dfe42586 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” telah didaftarkan. Hantar permintaan kenalan kepada orang yang menjemput anda?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 24f9a41a6a..480430b4e3 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» er registrert. Vil du sende en kontaktforespørsel til personen som inviterte deg?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 5f7bd14a5a..599070868c 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” is geregistreerd. Wil je een contactverzoek sturen naar de persoon die je heeft uitgenodigd?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 7470646aad..15a6014b07 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” zostało zarejestrowane. Wysłać zaproszenie do kontaktów osobie, która Cię zaprosiła?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 6c99082afb..76ea435846 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” foi registrado. Enviar uma solicitação de contato para a pessoa que convidou você?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index d3ee7c149d..3070060e00 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@” a fost înregistrat. Trimiți o cerere de contact persoanei care te-a invitat?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index b046a26ad8..db056772a5 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зарегистрировано. Отправить запрос на добавление в контакты человеку, который вас пригласил?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index cd9ab9aa26..89048c1532 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ bolo zaregistrované. Poslať žiadosť o kontakt osobe, ktorá vás pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e96a78cb79..0536d9733b 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 27684b4bf6..0565c21773 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "»%@« je bilo registrirano. Želite poslati zahtevo za stik osebi, ki vas je povabila?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 90bd026198..a0dc081897 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ u regjistrua. Të dërgohet një kërkesë kontakti te personi që ju ftoi?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index dcf5990d53..92ed7ddce2 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "„%@“ je registrovano. Poslati zahtev za kontakt osobi koja vas je pozvala?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 3e122bf181..8c9554890b 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "”%@” har registrerats. Vill du skicka en kontaktförfrågan till personen som bjöd in dig?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index c072df3895..e92ba31dce 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "ลงทะเบียน “%@” แล้ว ต้องการส่งคำขอการติดต่อไปยังคนที่เชิญคุณไหม"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 67bd2abe5f..d0484e7a61 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” kaydedildi. Sizi davet eden kişiye bir iletişim isteği gönderilsin mi?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 7eed7bc642..13a2bd9202 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "«%@» зареєстровано. Надіслати запит на додавання до контактів людині, яка вас запросила?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 085d905758..1012589365 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@” đã được đăng ký. Gửi yêu cầu liên hệ tới người đã mời bạn chứ?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e394388742..e89822cd0b 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index a1452fd025..1a836cb6d2 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6214,20 +6214,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index aa585bcc34..8e32533dd8 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "“%@”已注册。要向邀请您的人发送联系人请求吗?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 6168a7f66c..7988106954 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6212,20 +6212,35 @@ "“%@” has been registered. Send a contact request to the person who invited you?" = "「%@」已註冊。要向邀請您的人發送聯繫請求嗎?"; /* DashPay username registration recovery */ +"Act as you in this app without asking each time" = "Act as you in this app without asking each time"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; +"Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; "Identity is still loading" = "Identity is still loading"; "Loading identity…" = "Loading identity…"; "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused." = "Not enough identity credits to register this name. Use Top Up in My Profile, then try again. Your existing identity will be reused."; "Retry loading identity" = "Retry loading identity"; +"Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; +"The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; +"This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; +"This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; +"This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; +"This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; +"This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; +"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; +"Your Dash balance" = "Your Dash balance"; "Your identity is ready. Finish registering a username using its existing credits." = "Your identity is ready. Finish registering a username using its existing credits."; "Your identity is ready. Use its existing credits to register a username." = "Your identity is ready. Use its existing credits to register a username."; +"Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again." = "“%@” was purchased successfully. Switch back to the original wallet and network to see it. Do not purchase it again."; "Couldn't move your wallet" = "Couldn't move your wallet"; "Do not delete the app. Try moving your wallet again, or contact support if the problem continues." = "Do not delete the app. Try moving your wallet again, or contact support if the problem continues."; diff --git a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift index 25fee3c446..27f03143ed 100644 --- a/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/DashConnectDataSourceTests.swift @@ -122,7 +122,8 @@ final class DashConnectDataSourceTests: XCTestCase { ) let dataSource = MockDashConnectDataSource(initial: [existing]) - _ = try await dataSource.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await dataSource.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) XCTAssertEqual(dataSource.connectionsSnapshot.count, 1) XCTAssertEqual(dataSource.connectionsSnapshot.first?.id, existing.id) diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 4761ac5207..2d7f0819ee 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -160,7 +160,8 @@ final class DashConnectStoreTests: XCTestCase { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let first = MockDashConnectDataSource(store: store) - _ = try await first.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await first.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) let second = MockDashConnectDataSource(store: store) @@ -172,7 +173,8 @@ final class DashConnectStoreTests: XCTestCase { func testRemovePersistsAcrossFreshMockInstances() async throws { let store = makeStore(network: .testnet, walletIdHex: "wallet-a") let first = MockDashConnectDataSource(store: store) - _ = try await first.approveLogin(MockDashConnectDataSource.sampleLoginRequest) + _ = try await first.approveLogin( + MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 1daf7c54e8..013f63f137 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -919,6 +919,37 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } + /// A disconnect of a one-QR connection keeps the row while either key of + /// an earlier two-QR login is live: the app can still use that one. + func testEitherLiveTwoQrLoginKeyCountsAsRemainingAccess() { + let authentication = Data(repeating: 0x51, count: 20) + let encryption = Data(repeating: 0x52, count: 33) + func remains(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { + PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( + authenticationPublicKeyHash160: authentication, + encryptionPublicKey: encryption, + currentIdentityPublicKeys: keys) + } + let authenticationKey = makeIdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) + let encryptionKey = makeIdentityPublicKeyInfo( + keyId: 101, purpose: .encryption, securityLevel: .medium, keyType: .ecdsaSecp256k1, data: encryption) + let disabledAuthenticationKey = makeIdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + data: authentication, disabledAt: 1) + // A one-QR session key: same kind as the two-QR authentication key, + // another payload. + let sessionKey = makeIdentityPublicKeyInfo( + keyId: 102, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + data: Data(repeating: 0x53, count: 20)) + + XCTAssertTrue(remains([authenticationKey, encryptionKey])) + XCTAssertTrue(remains([authenticationKey])) + XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) + XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) + XCTAssertFalse(remains([])) + } + func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { let chainKey = Data(repeating: 0x22, count: 32) let identityId = Data(repeating: 0x33, count: 32) @@ -1326,6 +1357,56 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } + func testApprovingALoginPassesTheRequestAsTheSheetShowedIt() async { + let shown = Self.consent(identityId: "identity-a", terms: .current) + let spy = LoginApprovalSpy(shown: [shown]) + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { viewModel.pendingRequest == nil } + + XCTAssertEqual(spy.approvedConsents, [shown]) + XCTAssertNil(viewModel.approveError) + } + + /// Another identity became active, or the network answers with the other + /// login, while the sheet was up: nothing is approved on the old sheet, + /// and the user decides again on what is true now. + func testAnApprovalThatIsOutOfDateShowsTheRequestAgainAsItStands() async { + let shown = Self.consent(identityId: "identity-a", terms: nil) + let current = Self.consent(identityId: "identity-b", terms: .current) + let spy = LoginApprovalSpy(shown: [shown, current]) + spy.approveFailures = [DashConnectPlatformError.approvalOutOfDate] + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, current) + XCTAssertEqual(viewModel.approveError, DashConnectPlatformError.approvalOutOfDate.localizedDescription) + + viewModel.approvePendingRequest() + await waitUntil { viewModel.pendingRequest == nil } + + XCTAssertEqual(spy.approvedConsents, [shown, current]) + XCTAssertNil(viewModel.approveError) + } + + private static func consent(identityId: String, terms: AppConnect.SessionKeyTerms?) -> ConnectionRequest { + ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "App", + appUrl: "", + walletUsername: nil, + walletIdentityId: identityId, + existingConnection: nil, + sessionKeyTerms: terms) + } + private static let connection = DAppConnection( id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", name: "App", url: "", status: .active, updatedAt: Date(timeIntervalSince1970: 1_000)) @@ -1416,7 +1497,7 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { return ConnectionRequest(loginRequest: loginRequest) } - func approveLogin(_ request: DashKeyRequest) async throws -> DAppConnection { + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { throw PurchaseSpyError.unsupported } @@ -1449,6 +1530,67 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { } } +/// A `DashConnectDataSource` for the login approval: every QR is the sample +/// login, each resolution of it hands out the next request in `shown` (the +/// last one from then on), and approvals are recorded with what they carried. +private final class LoginApprovalSpy: DashConnectDataSource { + /// Guards every stored property: the protocol's methods are nonisolated, + /// so they run off the main actor the test asserts from. + private let lock = NSLock() + private var shown: [ConnectionRequest] + private var storedApproveFailures: [Error] = [] + private var storedApprovedConsents: [ConnectionRequest] = [] + + init(shown: [ConnectionRequest]) { + self.shown = shown + } + + /// Thrown by the approvals in order, one each; later approvals succeed. + var approveFailures: [Error] { + get { lock.withLock { storedApproveFailures } } + set { lock.withLock { storedApproveFailures = newValue } } + } + + var approvedConsents: [ConnectionRequest] { + lock.withLock { storedApprovedConsents } + } + + var connections: AnyPublisher<[DAppConnection], Never> { + Just([DAppConnection]()).eraseToAnyPublisher() + } + + func parseQR(_ content: String) async throws -> DashConnectQr { + .login(MockDashConnectDataSource.sampleLoginRequest) + } + + func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest { + lock.withLock { shown.count > 1 ? shown.removeFirst() : shown[0] } + } + + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { + let failure = lock.withLock { () -> Error? in + storedApprovedConsents.append(consent) + return storedApproveFailures.isEmpty ? nil : storedApproveFailures.removeFirst() + } + if let failure { throw failure } + return MockDashConnectDataSource.sample(.active) + } + + func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { + throw PurchaseSpyError.unsupported + } + + func approveTokenPurchase(_ request: DashConnectTokenPurchaseRequest) async throws { + throw PurchaseSpyError.unsupported + } + + func disconnect(id: String) async throws { + throw PurchaseSpyError.unsupported + } + + func remove(id: String) async {} +} + private enum PurchaseSpyError: LocalizedError { case refused case unsupported @@ -1509,47 +1651,111 @@ final class AppConnectLoginTests: XCTestCase { } func testSessionKeyIsAbsentUntilItsHashIsOnTheIdentity() { - let hash = Data(repeating: 0x11, count: 20) let other = Self.key(keyId: 4, data: Data(repeating: 0x22, count: 20)) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [other], now: Self.now), - .absent) + XCTAssertEqual(Self.sessionKeyState(keys: [other]), .absent) // The same bytes under another key type are a different key. - let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: hash) - XCTAssertEqual( - AppConnect.sessionKeyState( - publicKeyHash160: hash, currentIdentityPublicKeys: [sameBytesOtherType], now: Self.now), - .absent) + let sameBytesOtherType = Self.key(keyId: 5, keyType: .ecdsaSecp256k1, data: Self.sessionKeyHash) + XCTAssertEqual(Self.sessionKeyState(keys: [sameBytesOtherType]), .absent) } - func testRegisteredSessionKeyIsUsableWithItsKeyId() { - let hash = Data(repeating: 0x11, count: 20) - let live = Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds + 1) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [live], now: Self.now), - .usable(keyId: 9)) - let unlimited = Self.key(keyId: 9, data: hash) - XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [unlimited], now: Self.now), - .usable(keyId: 9)) + func testRegisteredSessionKeyOfTheAppIsUsableWithItsKeyId() { + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()]), .usable(keyId: 9)) + // Registered a moment ago by a clock that has since been set back. + let afterClockCorrection = Self.sessionKey(expiresAt: Self.nowMilliseconds + 3_600_000 + 60_000) + XCTAssertEqual(Self.sessionKeyState(keys: [afterClockCorrection]), .usable(keyId: 9)) + // Limits narrower than the approved terms are within them. + let narrower = Self.sessionKey( + totalBudget: Self.terms.budgetCredits - 1, expiresAt: Self.nowMilliseconds + 1) + XCTAssertEqual(Self.sessionKeyState(keys: [narrower]), .usable(keyId: 9)) } func testDisabledExpiredOrMisregisteredSessionKeyIsUnusable() { - let hash = Data(repeating: 0x11, count: 20) + let latestExpiry = Int64(Self.terms.expiresAt(from: Self.now.addingTimeInterval(AppConnect.clockTolerance))) let unusable: [(String, ManagedIdentity.IdentityPublicKeyInfo)] = [ - ("disabled", Self.key(keyId: 9, data: hash, disabledAt: 1)), - ("expired", Self.key(keyId: 9, data: hash, expiresAt: Self.nowMilliseconds)), - ("wrong level", Self.key(keyId: 9, securityLevel: .critical, data: hash)), - ("wrong purpose", Self.key(keyId: 9, purpose: .transfer, data: hash)), + ("disabled", Self.sessionKey(disabledAt: 1)), + ("expired", Self.sessionKey(expiresAt: Self.nowMilliseconds)), + ("wrong level", Self.sessionKey(securityLevel: .critical)), + ("wrong purpose", Self.sessionKey(purpose: .transfer)), + ("no budget", Self.sessionKey(totalBudget: nil)), + ("no expiry", Self.sessionKey(expiresAt: nil)), + ("budget above the approved one", Self.sessionKey(totalBudget: Self.terms.budgetCredits + 1)), + ("expiry after the approved one", Self.sessionKey(expiresAt: latestExpiry + 1)), ] for (name, key) in unusable { + XCTAssertEqual(Self.sessionKeyState(keys: [key]), .unusable, name) + } + } + + /// The key is derived from the identity and the request's ephemeral key + /// alone, so a request that repeats another app's ephemeral key finds + /// that app's key on the identity. + func testARegisteredSessionKeyBoundToAnotherAppIsUnusable() { + let otherApp = Data(repeating: 0xB2, count: 32) + let boundElsewhere = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: otherApp)] + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere), .unusable) + // A grant record does not outweigh a bound the store can read. + XCTAssertEqual( + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: boundElsewhere, grantedKeyIds: [9]), + .unusable) + let unbound = [AppConnect.KeyBinding(keyId: 9, data: Self.sessionKeyHash, singleContractId: nil)] + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: unbound), .unusable) + } + + func testARegisteredSessionKeyTheStoreCannotPlaceNeedsAGrantRecord() { + let unplaced: [[AppConnect.KeyBinding]] = [ + [], + // The stored row under this id is for a different key. + [AppConnect.KeyBinding(keyId: 9, data: Data([0xFF]), singleContractId: Self.app)], + [AppConnect.KeyBinding( + keyId: 9, data: Self.sessionKeyHash, singleContractId: nil, hasUnreadableBound: true)], + ] + for bindings in unplaced { + XCTAssertEqual(Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings), .unusable) XCTAssertEqual( - AppConnect.sessionKeyState(publicKeyHash160: hash, currentIdentityPublicKeys: [key], now: Self.now), - .unusable, - name) + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [8]), + .unusable) + XCTAssertEqual( + Self.sessionKeyState(keys: [Self.sessionKey()], bindings: bindings, grantedKeyIds: [9]), + .usable(keyId: 9)) } } + func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { + XCTAssertNil(AppConnect.sessionKeyTerms(protocolVersion: 13)) + XCTAssertEqual(AppConnect.sessionKeyTerms(protocolVersion: 14), .current) + XCTAssertEqual(AppConnect.SessionKeyTerms.current.budgetCredits, AppConnect.sessionKeyBudgetCredits) + XCTAssertEqual(AppConnect.SessionKeyTerms.current.lifetime, AppConnect.sessionKeyLifetime) + } + + func testTheApprovalSheetNamesTheBudgetInDashAndTheLifetimeInDays() { + let terms = AppConnect.SessionKeyTerms(budgetCredits: 5_000_000_000, lifetime: 90 * 24 * 60 * 60) + XCTAssertEqual(terms.budgetText.filter { $0.isNumber || $0.isLetter }, "005DASH") + XCTAssertEqual(terms.lifetimeDays, 90) + } + + /// A response an earlier login deleted is published again when its + /// request comes back. If that publish never confirms, the record must + /// not say the response is gone: a disconnect would drop it and leave + /// the response on Platform with nothing pointing at it. + func testARepublishThatNeverConfirmsKeepsItsRecordThroughADisconnect() { + var republished = Self.grant(sessionKeyId: 9) + republished.responseDeleted = true + republished.markPublishStarted() + XCTAssertNil(republished.documentId) + XCTAssertTrue(republished.hasUnconfirmedResponse) + + var knownGone = Self.grant(sessionKeyId: 10) + knownGone.responseDeleted = true + var otherApp = Self.grant(sessionKeyId: 11) + otherApp.responseDeleted = true + var grants = [republished, knownGone, otherApp] + AppConnect.markKeysDisabled(in: &grants) { $0.sessionKeyId != 11 } + + XCTAssertEqual(grants.map(\.sessionKeyId), [9, 11]) + XCTAssertEqual(grants.map(\.keyDisabled), [true, nil]) + XCTAssertTrue(grants[0].hasUnconfirmedResponse, "the disconnect still has a response to look for") + } + func testNextKeyIdFollowsTheHighestKeyOnTheIdentity() { XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: []), 1) XCTAssertEqual( @@ -1629,6 +1835,16 @@ final class AppConnectLoginTests: XCTestCase { AppConnect.sessionKeyIdsToDisable( for: [], appContractId: otherApp, bindings: bindings, currentIdentityPublicKeys: keys), [10]) + // Key 7 is the two-QR login's authentication key, given limits by + // its `dash-st:` registration: it stays unless a grant names it. + XCTAssertEqual( + AppConnect.sessionKeyIdsToDisable( + for: [Self.grant(sessionKeyId: 9)], + appContractId: app, + bindings: bindings, + currentIdentityPublicKeys: keys, + twoQRAuthenticationKeyHash160: Data([7])), + [6, 9]) } func testOnlyAWholeSingleContractBoundNamesTheApp() { @@ -1733,8 +1949,8 @@ final class AppConnectLoginTests: XCTestCase { func testExpiryIsTheLifetimeAfterNowInMilliseconds() { XCTAssertEqual( - AppConnect.expiresAt(from: Date(timeIntervalSince1970: 1_000)), - UInt64((1_000 + AppConnect.sessionKeyLifetime) * 1000)) + AppConnect.SessionKeyTerms(budgetCredits: 1, lifetime: 60).expiresAt(from: Date(timeIntervalSince1970: 1_000)), + 1_060_000) } func testResponseCarriesTheSessionKeyOnlyTheAppCanDecrypt() throws { @@ -1888,8 +2104,11 @@ final class AppConnectLoginTests: XCTestCase { let key = "scope.app-connect-responses.v1" let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { "scope" } + XCTAssertTrue(store.canPersist) for stored in [Data(#"{"rows":[]}"#.utf8), Data([0xFF, 0x00])] { defaults.set(stored, forKey: key) + // Nothing new would be kept, so a login must not start. + XCTAssertFalse(store.canPersist) XCTAssertEqual(store.load().count, 0) store.save([Self.grant(sessionKeyId: 7)]) XCTAssertEqual(defaults.data(forKey: key), stored) @@ -1940,6 +2159,41 @@ final class AppConnectLoginTests: XCTestCase { private static let now = Date(timeIntervalSince1970: 1_800_000_000) private static let nowMilliseconds: Int64 = 1_800_000_000_000 + private static let app = Data(repeating: 0xA1, count: 32) + private static let sessionKeyHash = Data(repeating: 0x11, count: 20) + private static let terms = AppConnect.SessionKeyTerms(budgetCredits: 500, lifetime: 3_600) + + /// Key 9 as the one-QR login registers it, within `terms`. + private static func sessionKey( + purpose: KeyPurpose = .authentication, + securityLevel: SecurityLevel = .high, + disabledAt: Int64? = nil, + totalBudget: UInt64? = terms.budgetCredits, + expiresAt: Int64? = nowMilliseconds + 3_600_000 + ) -> ManagedIdentity.IdentityPublicKeyInfo { + key( + keyId: 9, purpose: purpose, securityLevel: securityLevel, data: sessionKeyHash, + disabledAt: disabledAt, totalBudget: totalBudget, expiresAt: expiresAt) + } + + /// The state of the session key for `app`; by default the store shows + /// key 9 bound to it. + private static func sessionKeyState( + keys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [AppConnect.KeyBinding] = [ + AppConnect.KeyBinding(keyId: 9, data: sessionKeyHash, singleContractId: app), + ], + grantedKeyIds: Set = [] + ) -> AppConnect.SessionKeyState { + AppConnect.sessionKeyState( + publicKeyHash160: sessionKeyHash, + currentIdentityPublicKeys: keys, + appContractId: app, + bindings: bindings, + grantedKeyIds: grantedKeyIds, + terms: terms, + now: now) + } private static func key( keyId: Int32, From 430b3c0d54496712faa5bfe628747b3ec0bb4fa7 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 14:59:05 +0300 Subject: [PATCH 09/30] fix(dashpay): model an unresolved sign-in as its own state and keep two-QR keys out of a disconnect - A connection request says which login it would run: unresolved, two-QR or one-QR with its terms. One built without asking the network is unresolved, and the sheet then offers another try instead of an approval. - A disconnect derives the two-QR keys before it disables anything. When they cannot be derived, only the recorded session keys are disabled and the row stays with an error. - An expired two-QR key no longer keeps the row. - The connection row is named from a lookup made at approval again. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 24 ++++- .../DashConnect/DashConnectDataSource.swift | 11 ++- .../DashConnect/DashConnectModels.swift | 14 +-- .../PlatformDashConnectDataSource.swift | 87 ++++++++++--------- .../DashConnect/ApproveConnectionSheet.swift | 19 ++-- .../UI/DashConnect/ConnectionsScreen.swift | 2 +- .../UI/DashConnect/ConnectionsViewModel.swift | 7 ++ DashWallet/ar.lproj/Localizable.strings | 4 +- DashWallet/bg.lproj/Localizable.strings | 4 +- DashWallet/ca.lproj/Localizable.strings | 4 +- DashWallet/cs.lproj/Localizable.strings | 4 +- DashWallet/da.lproj/Localizable.strings | 4 +- DashWallet/de.lproj/Localizable.strings | 4 +- DashWallet/el.lproj/Localizable.strings | 4 +- DashWallet/en.lproj/Localizable.strings | 4 +- DashWallet/eo.lproj/Localizable.strings | 4 +- DashWallet/es.lproj/Localizable.strings | 4 +- DashWallet/et.lproj/Localizable.strings | 4 +- DashWallet/fa.lproj/Localizable.strings | 4 +- DashWallet/fi.lproj/Localizable.strings | 4 +- DashWallet/fil.lproj/Localizable.strings | 4 +- DashWallet/fr.lproj/Localizable.strings | 4 +- DashWallet/hr.lproj/Localizable.strings | 4 +- DashWallet/hu.lproj/Localizable.strings | 4 +- DashWallet/id.lproj/Localizable.strings | 4 +- DashWallet/it.lproj/Localizable.strings | 4 +- DashWallet/ja.lproj/Localizable.strings | 4 +- DashWallet/ko.lproj/Localizable.strings | 4 +- DashWallet/mk.lproj/Localizable.strings | 4 +- DashWallet/ms.lproj/Localizable.strings | 4 +- DashWallet/nb.lproj/Localizable.strings | 4 +- DashWallet/nl.lproj/Localizable.strings | 4 +- DashWallet/pl.lproj/Localizable.strings | 4 +- DashWallet/pt.lproj/Localizable.strings | 4 +- DashWallet/ro.lproj/Localizable.strings | 4 +- DashWallet/ru.lproj/Localizable.strings | 4 +- DashWallet/sk.lproj/Localizable.strings | 4 +- DashWallet/sl.lproj/Localizable.strings | 4 +- DashWallet/sl_SI.lproj/Localizable.strings | 4 +- DashWallet/sq.lproj/Localizable.strings | 4 +- DashWallet/sr.lproj/Localizable.strings | 4 +- DashWallet/sv.lproj/Localizable.strings | 4 +- DashWallet/th.lproj/Localizable.strings | 4 +- DashWallet/tr.lproj/Localizable.strings | 4 +- DashWallet/uk.lproj/Localizable.strings | 4 +- DashWallet/vi.lproj/Localizable.strings | 4 +- DashWallet/zh-Hans.lproj/Localizable.strings | 4 +- .../zh-Hant-TW.lproj/Localizable.strings | 4 +- DashWallet/zh.lproj/Localizable.strings | 4 +- DashWallet/zh_TW.lproj/Localizable.strings | 4 +- .../PlatformDashConnectDataSourceTests.swift | 41 ++++++++- 51 files changed, 221 insertions(+), 156 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3fc476f359..25a8bd48f7 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -48,10 +48,26 @@ enum AppConnect { protocolVersion >= minimumProtocolVersion } - /// The terms of the login a network at `protocolVersion` gets: the - /// session key's for the one-QR login, none for the two-QR login. - static func sessionKeyTerms(protocolVersion: UInt32) -> SessionKeyTerms? { - isAvailable(protocolVersion: protocolVersion) ? .current : nil + /// Which login an approval would run, as far as the wallet could tell + /// when it built the approval sheet. + enum Login: Equatable { + /// The network did not say which login it takes, so what approving + /// would give the app is unknown and there is nothing to approve. + case unresolved + /// Registers no key at approval. + case twoQR + /// Registers a session key with these terms. + case oneQR(SessionKeyTerms) + + var sessionKeyTerms: SessionKeyTerms? { + if case .oneQR(let terms) = self { return terms } + return nil + } + } + + /// The login a network at `protocolVersion` gets. + static func login(protocolVersion: UInt32) -> Login { + isAvailable(protocolVersion: protocolVersion) ? .oneQR(.current) : .twoQR } /// The DIP-13 leaf of the session key: `hash256` of the app's ephemeral diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index ce3c450fc8..caf926dab4 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -131,7 +131,11 @@ final class MockDashConnectDataSource: DashConnectDataSource { network: .testnet ) static let sampleLoginQRCode = DashConnectSampleQR.keyUri(for: sampleLoginRequest) - static let sampleRequest = ConnectionRequest(loginRequest: sampleLoginRequest) + static let sampleRequest: ConnectionRequest = { + var request = ConnectionRequest(loginRequest: sampleLoginRequest) + request.login = .twoQR + return request + }() static func sample(_ status: ConnectionStatus) -> DAppConnection { DAppConnection( @@ -215,7 +219,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { throw DashConnectMockError.approveFailed } - let connectionRequest = consent + let connectionRequest = await makeConnectionRequest(from: request) let connection = DAppConnection( id: connectionRequest.appContractId, name: connectionRequest.appLabel.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : connectionRequest.appLabel, @@ -238,7 +242,8 @@ final class MockDashConnectDataSource: DashConnectDataSource { appUrl: fallback.appUrl, walletUsername: nil, walletIdentityId: nil, - existingConnection: existingConnection(for: fallback.appContractId) + existingConnection: existingConnection(for: fallback.appContractId), + login: .twoQR ) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 0f1546599f..fb3a3fc0aa 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -199,12 +199,8 @@ struct ConnectionRequest: Equatable { let walletUsername: String? let walletIdentityId: String? let existingConnection: DAppConnection? - /// What the one-QR login gives the app. `nil` for the two-QR login, which - /// registers no key at approval. - var sessionKeyTerms: AppConnect.SessionKeyTerms? = nil - /// The network did not say which login it takes, so what approving would - /// give the app is unknown and there is nothing to approve yet. - var isLoginUnresolved = false + /// The login approving this request would run. + var login: AppConnect.Login = .unresolved } extension ConnectionRequest { @@ -233,8 +229,7 @@ extension ConnectionRequest { walletUsername: String?, walletIdentityId: String?, existingConnection: DAppConnection?, - sessionKeyTerms: AppConnect.SessionKeyTerms? = nil, - isLoginUnresolved: Bool = false + login: AppConnect.Login = .unresolved ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -243,8 +238,7 @@ extension ConnectionRequest { walletUsername: walletUsername, walletIdentityId: walletIdentityId, existingConnection: existingConnection, - sessionKeyTerms: sessionKeyTerms, - isLoginUnresolved: isLoginUnresolved + login: login ) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 0ebc43e477..2a5afc948f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -143,7 +143,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .twoQRKeysNotChecked: return NSLocalizedString( - "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again.", + "This wallet could not check every key the app may hold, so the app may still have access. Try again.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( @@ -492,15 +492,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, - sessionKeyTerms: protocolVersion.flatMap(AppConnect.sessionKeyTerms(protocolVersion:)), - isLoginUnresolved: protocolVersion == nil + login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved ) } func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) - guard consent.appContractId == request.contractId.toBase58String(), !consent.isLoginUnresolved else { + guard consent.appContractId == request.contractId.toBase58String(), consent.login != .unresolved else { throw DashConnectPlatformError.approvalOutOfDate } @@ -525,13 +524,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") throw error } - // The sheet showed the login `makeConnectionRequest` resolved: its - // terms, or none for the two-QR login. If the network now gets the - // other one, what was approved is not what would run. Either login - // acts for the identity that was on the sheet: it has to be the - // active one here, and again after the PIN prompt. - let terms = AppConnect.sessionKeyTerms(protocolVersion: protocolVersion) - guard consent.sessionKeyTerms == terms, + // The sheet showed the login `makeConnectionRequest` resolved, with + // its terms for the one-QR login. If the network now gets the other + // one, what was approved is not what would run. Either login acts + // for the identity that was on the sheet: it has to be the active + // one here, and again after the PIN prompt. + let login = AppConnect.login(protocolVersion: protocolVersion) + guard consent.login == login, consent.walletIdentityId == context.identityId.toBase58String() else { Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") throw DashConnectPlatformError.approvalOutOfDate @@ -550,9 +549,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.approvalOutOfDate } context = authorized - if let terms { + if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) + return try await approveAppConnectLogin(request, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -601,6 +600,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) Self.logger.info("🔗 DASHCONNECT :: loginKeyResponse document written") + let preview = await makeConnectionRequest(from: request) + Self.logger.info("🔗 DASHCONNECT :: connection preview resolved") let connection: DAppConnection do { var derivedMaterial = try Self.deriveKeyRegistrationMaterial( @@ -626,9 +627,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { encryptionPublicKey: derivedMaterial.encryptionPublicKey, currentIdentityPublicKeys: currentPublicKeys ) { - connection = Self.makeConnection(preview: consent, status: .active, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .active, updatedAt: now()) } else { - connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } } catch { Self.logger.error( @@ -636,7 +637,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) // Conservative fallback: asking for a QR is safer than claiming the // registration is already on the identity when we could not verify it. - connection = Self.makeConnection(preview: consent, status: .approved, updatedAt: now()) + connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } var current = subject.value.filter { $0.id != connection.id } @@ -669,7 +670,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, - consent: ConnectionRequest, terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { @@ -792,8 +792,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } + let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) var current = subject.value.filter { $0.id != connection.id } current.append(connection) persistAndSend(current) @@ -1448,23 +1449,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys of an earlier two-QR login to the app, for a row made by - // the one-QR login. They are not disabled: that login derives the - // same keys every time, so the app could never be given them again. - // `nil` when they could not be derived. + // The keys of an earlier two-QR login to the app. They are not + // disabled: that login derives the same keys every time, so the app + // could never be given them again. `nil` when they could not be + // derived; a key without a grant record could then be one of them, + // so only the recorded session keys are disabled. var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? - if checksUnrecordedKeys { - do { - twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") - } + do { + twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") } let keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, - bindings: bindings, + bindings: twoQRKeys == nil ? [] : bindings, currentIdentityPublicKeys: currentPublicKeys, twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 ) @@ -1497,17 +1497,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - // The session keys are off. The two-QR keys were left out of the - // update, so the list fetched before it still tells whether they are - // live. If they could not be derived that is unknown, and the row - // stays as it is with an error rather than go or change on a guess. + // The recorded session keys are off. The two-QR keys were left out + // of the update, so the list fetched before it still tells whether + // they are live. If they could not be derived, that and the keys + // without a record are unknown: the row stays as it is, with an + // error, rather than go or change on a guess. var twoQRKeysRemain = false if checksUnrecordedKeys { guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys + currentIdentityPublicKeys: currentPublicKeys, + now: now() ) } return AppConnectRevocation( @@ -1725,19 +1727,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// Whether either key of the two-QR login is live on the identity: the - /// app can still use whichever one is. + /// Whether either key of the two-QR login is live on the identity, not + /// disabled and not expired: the app can still use whichever one is. static func hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: Data, encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + now: Date ) -> Bool { - hasRegisteredAuthenticationKey( + let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) + let unexpired = currentIdentityPublicKeys.filter { $0.expiresAt.map { $0 > nowMilliseconds } ?? true } + return hasRegisteredAuthenticationKey( authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: currentIdentityPublicKeys + currentIdentityPublicKeys: unexpired ) || hasRegisteredEncryptionKey( encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: currentIdentityPublicKeys + currentIdentityPublicKeys: unexpired ) } diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index e070c553c4..f4a969908b 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -73,13 +73,13 @@ struct ApproveConnectionSheet: View { // The one-QR login gives the app a key with limits of its // own, so its terms are spelled out on a repeat sign-in // too, and when it replaces a two-QR connection. - if request.isLoginUnresolved { + if request.login == .unresolved { Text(NSLocalizedString( - "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again.", + "This wallet could not check with the network what this sign-in would give the app.", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) - } else if let terms = request.sessionKeyTerms { + } else if let terms = request.login.sessionKeyTerms { sessionKeyPermissions(terms) } else if isRelogin { reloginPermissionsSummary @@ -127,11 +127,15 @@ struct ApproveConnectionSheet: View { } DashButton( - text: NSLocalizedString("Approve", comment: "DashConnect"), + // With the login unresolved there is nothing to approve: + // the same action asks the network again instead. + text: request.login == .unresolved + ? NSLocalizedString("Try again", comment: "") + : NSLocalizedString("Approve", comment: "DashConnect"), style: .filledBlue, size: .large, stretch: true, - isEnabled: !isLoading && !request.isLoginUnresolved, + isEnabled: !isLoading, isLoading: isLoading, action: onApprove ) @@ -370,7 +374,7 @@ private let dashConnectTruncateMiddleCheck: Bool = { walletUsername: "dashuser", walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", existingConnection: nil, - sessionKeyTerms: .current + login: .oneQR(.current) ), onApprove: {}, onDeny: {} @@ -385,7 +389,8 @@ private let dashConnectTruncateMiddleCheck: Bool = { appUrl: "yap.pr", walletUsername: "dashuser", walletIdentityId: "5DbLwAxEWR695MsqP4KybNQD5n7CUDWydJYNg63FzUo8", - existingConnection: MockDashConnectDataSource.sample(.active) + existingConnection: MockDashConnectDataSource.sample(.active), + login: .twoQR ), onApprove: {}, onDeny: {} diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index 95104f95da..c15152bf96 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -115,7 +115,7 @@ struct ConnectionsScreen: View { ) // The one-QR terms make the sheet longer than the fixed height // shows; who pays and when access ends must not sit below the fold. - .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.sessionKeyTerms != nil) + .approveSheetPresentation(isLoading: viewModel.isApproving, isTall: request.login.sessionKeyTerms != nil) } private func tokenPurchaseSheet(for purchase: DashConnectTokenPurchaseRequest) -> some View { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index c0a3b3ec42..d4782c1468 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -208,6 +208,13 @@ final class ConnectionsViewModel: ObservableObject { Task { defer { isApproving = false } + // The wallet could not tell which login this would be, so the + // sheet offered no approval, only another try at finding out. + guard consent.login != .unresolved else { + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + return + } + do { _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 15c06597b2..20f81405cc 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index fa1acb7632..4f61d074a9 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 4ded93138f..83cb5d1344 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 351218530f..8950fafe49 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 8b88d3bfa6..0d4759bda4 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index eeeab92a29..10bf0f0461 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 06faac5783..7ef8f0fd22 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index f0d23940f6..8d3332305e 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6109,7 +6109,6 @@ "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6117,7 +6116,8 @@ "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Your Dash balance" = "Your Dash balance"; "Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index d0d282f894..11d261ff45 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 7046e8d05f..a9d017ede0 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 077d46ffbc..b223dd68df 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index f16def9aa4..a042f20618 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index e8470bc91a..23b700021b 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index b123af4139..ed537b06ef 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index cc4cbde6ea..ad33cfad8d 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 1998f549c7..57c05a3738 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 928cac2833..33fad602aa 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index d3e3684a34..2d2a4a1898 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 88d201b142..25b0009349 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 85d23f71fc..bf82ac932d 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 343be990d9..ff2b1ff277 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 4d21e14708..d7b899a326 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 13dfe42586..b53aa5f5ea 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 480430b4e3..ffe6dffbf3 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 599070868c..2e85abf30a 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 15a6014b07..21f02f0511 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 76ea435846..8cb893e980 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 3070060e00..01f7a37e99 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index db056772a5..8cb3689bc5 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 89048c1532..8970835e40 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 0536d9733b..8a10583189 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 0565c21773..65feed6e8a 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index a0dc081897..96a7986447 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 92ed7ddce2..8fba8ab4ca 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 8c9554890b..acd57caa09 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index e92ba31dce..1b5605e51f 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index d0484e7a61..af8f1de081 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 13a2bd9202..ee7f5b88c6 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 1012589365..75169f34c9 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e89822cd0b..8244282b3e 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 1a836cb6d2..2a5f7f7b92 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6225,7 +6225,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6235,7 +6234,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 8e32533dd8..4179fa1428 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 7988106954..5474ffebb7 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6223,7 +6223,6 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; -"The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again." = "The app's sign-in key was turned off, but this wallet could not check for keys from an earlier sign-in. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6233,7 +6232,8 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again." = "This wallet could not check with the network what this sign-in would give the app. Deny it and scan the code again."; +"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; +"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 013f63f137..d19c049910 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -928,7 +928,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, - currentIdentityPublicKeys: keys) + currentIdentityPublicKeys: keys, + now: Date(timeIntervalSince1970: 1_000)) } let authenticationKey = makeIdentityPublicKeyInfo( keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) @@ -948,6 +949,14 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) XCTAssertFalse(remains([])) + // A `dash-st:` registration may have put an expiry on the key. + func expiringAuthenticationKey(expiresAt: Int64) -> ManagedIdentity.IdentityPublicKeyInfo { + ManagedIdentity.IdentityPublicKeyInfo( + keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, + readOnly: false, disabledAt: nil, data: authentication, totalBudget: 5, expiresAt: expiresAt) + } + XCTAssertFalse(remains([expiringAuthenticationKey(expiresAt: 1_000_000)])) + XCTAssertTrue(remains([expiringAuthenticationKey(expiresAt: 1_000_001)])) } func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { @@ -1357,6 +1366,25 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.message) } + /// With the login unresolved the sheet's action asks again and approves + /// nothing. + func testAnUnresolvedLoginIsAskedForAgainInsteadOfApproved() async { + let unresolved = ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest) + let resolved = Self.consent(identityId: "identity-a", terms: .current) + let spy = LoginApprovalSpy(shown: [unresolved, resolved]) + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + XCTAssertEqual(viewModel.pendingRequest?.login, .unresolved) + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, resolved) + XCTAssertEqual(spy.approvedConsents, []) + XCTAssertNil(viewModel.approveError) + } + func testApprovingALoginPassesTheRequestAsTheSheetShowedIt() async { let shown = Self.consent(identityId: "identity-a", terms: .current) let spy = LoginApprovalSpy(shown: [shown]) @@ -1404,7 +1432,7 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { walletUsername: nil, walletIdentityId: identityId, existingConnection: nil, - sessionKeyTerms: terms) + login: terms.map(AppConnect.Login.oneQR) ?? .twoQR) } private static let connection = DAppConnection( @@ -1721,8 +1749,13 @@ final class AppConnectLoginTests: XCTestCase { } func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { - XCTAssertNil(AppConnect.sessionKeyTerms(protocolVersion: 13)) - XCTAssertEqual(AppConnect.sessionKeyTerms(protocolVersion: 14), .current) + XCTAssertEqual(AppConnect.login(protocolVersion: 13), .twoQR) + XCTAssertEqual(AppConnect.login(protocolVersion: 14), .oneQR(.current)) + XCTAssertNil(AppConnect.Login.twoQR.sessionKeyTerms) + XCTAssertNil(AppConnect.Login.unresolved.sessionKeyTerms) + XCTAssertEqual(AppConnect.Login.oneQR(.current).sessionKeyTerms, .current) + // A request built without asking the network is not a two-QR one. + XCTAssertEqual(ConnectionRequest(loginRequest: MockDashConnectDataSource.sampleLoginRequest).login, .unresolved) XCTAssertEqual(AppConnect.SessionKeyTerms.current.budgetCredits, AppConnect.sessionKeyBudgetCredits) XCTAssertEqual(AppConnect.SessionKeyTerms.current.lifetime, AppConnect.sessionKeyLifetime) } From fdc5d4cfb21015f02ba1a410d0d12b2a17d6938c Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 15:37:24 +0300 Subject: [PATCH 10/30] fix(dashpay): turning off a one-QR connection also disables the app's two-QR keys A one-QR connection that replaced a two-QR one left that login's keys live on the identity after a disconnect. The disconnect now derives them first, disables them with the session keys in the same updates, and removes the row; if they cannot be derived nothing is turned off. A two-QR connection stays local-only as before. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 7 +- .../DashConnect/DashConnectDataSource.swift | 6 +- .../PlatformDashConnectDataSource.swift | 153 +++++++----------- .../DashConnect/ApproveConnectionSheet.swift | 2 +- .../Components/ConnectionRow.swift | 3 +- DashWallet/ar.lproj/Localizable.strings | 5 +- DashWallet/bg.lproj/Localizable.strings | 5 +- DashWallet/ca.lproj/Localizable.strings | 5 +- DashWallet/cs.lproj/Localizable.strings | 5 +- DashWallet/da.lproj/Localizable.strings | 5 +- DashWallet/de.lproj/Localizable.strings | 5 +- DashWallet/el.lproj/Localizable.strings | 5 +- DashWallet/en.lproj/Localizable.strings | 5 +- DashWallet/eo.lproj/Localizable.strings | 5 +- DashWallet/es.lproj/Localizable.strings | 5 +- DashWallet/et.lproj/Localizable.strings | 5 +- DashWallet/fa.lproj/Localizable.strings | 5 +- DashWallet/fi.lproj/Localizable.strings | 5 +- DashWallet/fil.lproj/Localizable.strings | 5 +- DashWallet/fr.lproj/Localizable.strings | 5 +- DashWallet/hr.lproj/Localizable.strings | 5 +- DashWallet/hu.lproj/Localizable.strings | 5 +- DashWallet/id.lproj/Localizable.strings | 5 +- DashWallet/it.lproj/Localizable.strings | 5 +- DashWallet/ja.lproj/Localizable.strings | 5 +- DashWallet/ko.lproj/Localizable.strings | 5 +- DashWallet/mk.lproj/Localizable.strings | 5 +- DashWallet/ms.lproj/Localizable.strings | 5 +- DashWallet/nb.lproj/Localizable.strings | 5 +- DashWallet/nl.lproj/Localizable.strings | 5 +- DashWallet/pl.lproj/Localizable.strings | 5 +- DashWallet/pt.lproj/Localizable.strings | 5 +- DashWallet/ro.lproj/Localizable.strings | 5 +- DashWallet/ru.lproj/Localizable.strings | 5 +- DashWallet/sk.lproj/Localizable.strings | 5 +- DashWallet/sl.lproj/Localizable.strings | 5 +- DashWallet/sl_SI.lproj/Localizable.strings | 5 +- DashWallet/sq.lproj/Localizable.strings | 5 +- DashWallet/sr.lproj/Localizable.strings | 5 +- DashWallet/sv.lproj/Localizable.strings | 5 +- DashWallet/th.lproj/Localizable.strings | 5 +- DashWallet/tr.lproj/Localizable.strings | 5 +- DashWallet/uk.lproj/Localizable.strings | 5 +- DashWallet/vi.lproj/Localizable.strings | 5 +- DashWallet/zh-Hans.lproj/Localizable.strings | 5 +- .../zh-Hant-TW.lproj/Localizable.strings | 5 +- DashWallet/zh.lproj/Localizable.strings | 5 +- DashWallet/zh_TW.lproj/Localizable.strings | 5 +- .../PlatformDashConnectDataSourceTests.swift | 30 ++-- 49 files changed, 165 insertions(+), 251 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 25a8bd48f7..1ee7aa77d2 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -220,9 +220,10 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. - /// So is the two-QR login's authentication key, named by - /// `twoQRAuthenticationKeyHash160`: it has the same kind and bound, and a - /// `dash-st:` registration may have put limits on it. + /// The two-QR login's authentication key, named by + /// `twoQRAuthenticationKeyHash160`, is not picked here either: it has the + /// same kind and bound, a `dash-st:` registration may have put limits on + /// it, and whether it goes is the caller's decision. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index caf926dab4..f83976ce2d 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -46,9 +46,9 @@ protocol DashConnectDataSource { /// the app holds a key on another identity of the wallet. For a two-QR /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so - /// disabling it would lock the app out for good. A one-QR connection that - /// replaced a two-QR one gets both: its session keys are disabled, and it - /// stays, in that local status, while the two-QR keys are on the identity. + /// disabling it would lock the app out for good. Turning off a one-QR + /// connection that replaced a two-QR one does disable those keys too: + /// the app is left with no key on the identity. func disconnect(id: String) async throws func remove(id: String) async } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 2a5afc948f..e6e64e7333 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -77,7 +77,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantStoreUnavailable case approvalOutOfDate case grantNotRecorded - case twoQRKeysNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -139,11 +138,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { comment: "DashConnect") case .grantNotRecorded: return NSLocalizedString( - "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key.", - comment: "DashConnect") - case .twoQRKeysNotChecked: - return NSLocalizedString( - "This wallet could not check every key the app may hold, so the app may still have access. Try again.", + "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( @@ -193,16 +188,6 @@ enum DashConnectPlatformError: LocalizedError, Equatable { } } -/// What a disconnect found besides the session keys it disabled. -struct AppConnectRevocation: Equatable { - /// A grant record shows the app with a live key on another identity of - /// this wallet. - let liveOnAnotherIdentity: Bool - /// The keys of an earlier two-QR login to the app are still live on this - /// identity. - let twoQRKeysRemain: Bool -} - struct DashConnectLoginKeyResponseDraft: Equatable { let properties: [String: AnyHashable] let walletEphemeralPublicKey: Data @@ -484,6 +469,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion = await resolvedProtocolVersion + if protocolVersion == nil { + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown; the sign-in is shown as unresolved") + } return ConnectionRequest( loginRequest: loginRequest, @@ -1318,21 +1306,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func disconnect(id: String) async throws { let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR let hasGrants = responseStore.load().contains { $0.appContractId == id } - var twoQRKeysRemain = false if isOneQR || hasGrants { - let revocation = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get - // there; this identity's key is off. - if revocation.liveOnAnotherIdentity { return } - twoQRKeysRemain = revocation.twoQRKeysRemain - } - if isOneQR, !twoQRKeysRemain { - // Nothing is left of a one-QR connection once its key is disabled: - // the same QR can no longer be approved and there is no second - // step to wait for, so the row goes instead of sitting in the - // two-QR "approved" state. + // there; this identity's keys are off. + if liveElsewhere { return } + } + if isOneQR { + // Nothing is left of a one-QR connection once its keys are + // disabled, those of an earlier two-QR login included: the same + // QR can no longer be approved and there is no second step to + // wait for, so the row goes instead of sitting in the two-QR + // "approved" state. persistAndSend(subject.value.filter { $0.id != id }) return } @@ -1340,10 +1327,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let disconnectedAt = now() // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to - // `.active` while the identity keys are still registered. A one-QR - // connection that replaced a two-QR one ends up here as well while - // the two-QR keys are still on the identity: its session keys are - // off, and the row goes back to what a two-QR disconnect leaves. + // `.active` while the identity keys are still registered. persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } return DAppConnection( @@ -1371,7 +1355,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// record stays on Platform. It can only be found by its request hash, /// which the record held. /// - /// Reports whether a grant record shows the app with a live key on + /// For a row made by the one-QR login the keys of an earlier two-QR + /// login to the app are disabled as well, so that turning the app off + /// leaves it no key on this identity. That login derives the same keys + /// every time and Platform never re-adds a key, so the app cannot sign + /// in with two QRs again. A two-QR row keeps them. + /// + /// Returns whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. /// TODO(app-connect-other-identity-keys): a key on another identity that @@ -1381,14 +1371,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. For such a row it also reports - /// whether the keys of an earlier two-QR login to the app are still live - /// on this identity, and throws once the session keys are off when that - /// cannot be told. - private func revokeAppConnectGrants( - appContractId: String, - checksUnrecordedKeys: Bool - ) async throws -> AppConnectRevocation { + /// the call returns without an error. + private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { var context = try await requireContext() let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { @@ -1410,9 +1394,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } if !holdsUnrecordedKey { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { - return AppConnectRevocation(liveOnAnotherIdentity: false, twoQRKeysRemain: false) - } + if !checksUnrecordedKeys { return false } } } @@ -1449,30 +1431,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys of an earlier two-QR login to the app. They are not - // disabled: that login derives the same keys every time, so the app - // could never be given them again. `nil` when they could not be - // derived; a key without a grant record could then be one of them, - // so only the recorded session keys are disabled. - var twoQRKeys: (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data)? - do { - twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: two-QR keys not derived — \(error.localizedDescription, privacy: .public)") - } - let keyIds = AppConnect.sessionKeyIdsToDisable( + // The keys the two-QR login derives for this app, known before + // anything is disabled: its authentication key has the kind and the + // bound of a session key, and which of the two it is decides what + // happens to it. If they cannot be derived, nothing is turned off. + let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, - bindings: twoQRKeys == nil ? [] : bindings, + bindings: bindings, currentIdentityPublicKeys: currentPublicKeys, - twoQRAuthenticationKeyHash160: twoQRKeys?.authenticationPublicKeyHash160 + twoQRAuthenticationKeyHash160: twoQRKeys.authenticationPublicKeyHash160 ) + if checksUnrecordedKeys { + keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ))).sorted() + } if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } if !keyIds.isEmpty { - Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) session key(s)") + Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure // part way leaves the rest live and the row in place; the next // attempt picks up what is still live. @@ -1483,7 +1465,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - Self.logger.info("🔗 DASHCONNECT :: session key(s) disabled") + Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") } // Every session key this identity gave the app is now off. @@ -1497,24 +1479,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - // The recorded session keys are off. The two-QR keys were left out - // of the update, so the list fetched before it still tells whether - // they are live. If they could not be derived, that and the keys - // without a record are unknown: the row stays as it is, with an - // error, rather than go or change on a guess. - var twoQRKeysRemain = false - if checksUnrecordedKeys { - guard let twoQRKeys else { throw DashConnectPlatformError.twoQRKeysNotChecked } - twoQRKeysRemain = Self.hasAnyRegisteredLoginKey( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys, - now: now() - ) - } - return AppConnectRevocation( - liveOnAnotherIdentity: hasLiveGrantElsewhere(), - twoQRKeysRemain: twoQRKeysRemain) + return hasLiveGrantElsewhere() } /// The public halves of the keys the two-QR login derives for this @@ -1727,23 +1692,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - /// Whether either key of the two-QR login is live on the identity, not - /// disabled and not expired: the app can still use whichever one is. - static func hasAnyRegisteredLoginKey( + /// The ids of the two-QR login's keys that are on the identity and not + /// disabled. + static func liveLoginKeyIds( authenticationPublicKeyHash160: Data, encryptionPublicKey: Data, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], - now: Date - ) -> Bool { - let nowMilliseconds = Int64((now.timeIntervalSince1970 * 1000).rounded()) - let unexpired = currentIdentityPublicKeys.filter { $0.expiresAt.map { $0 > nowMilliseconds } ?? true } - return hasRegisteredAuthenticationKey( - authenticationPublicKeyHash160: authenticationPublicKeyHash160, - currentIdentityPublicKeys: unexpired - ) || hasRegisteredEncryptionKey( - encryptionPublicKey: encryptionPublicKey, - currentIdentityPublicKeys: unexpired - ) + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [UInt32] { + currentIdentityPublicKeys + .filter { key in + hasRegisteredAuthenticationKey( + authenticationPublicKeyHash160: authenticationPublicKeyHash160, + currentIdentityPublicKeys: [key] + ) || hasRegisteredEncryptionKey( + encryptionPublicKey: encryptionPublicKey, + currentIdentityPublicKeys: [key] + ) + } + .map { UInt32(bitPattern: $0.keyId) } + .sorted() } static func missingKeyRegistrationKeys( diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index f4a969908b..b377d1d07d 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -75,7 +75,7 @@ struct ApproveConnectionSheet: View { // too, and when it replaces a two-QR connection. if request.login == .unresolved { Text(NSLocalizedString( - "This wallet could not check with the network what this sign-in would give the app.", + "This wallet could not check what this sign-in would give the app.", comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) diff --git a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift index 467799815a..00ac7e770c 100644 --- a/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift +++ b/DashWallet/Sources/UI/DashConnect/Components/ConnectionRow.swift @@ -91,8 +91,7 @@ struct ConnectionRow: View { /// depends on the login that made the connection (see /// `DashConnectDataSource.disconnect`): a one-QR connection has the app's /// key disabled on the identity and its row removed; a two-QR connection - /// is downgraded to `.approved` locally and the app keeps its keys. A - /// one-QR connection that replaced a two-QR one gets both. + /// is downgraded to `.approved` locally and the app keeps its keys. private var activeSwitch: some View { ZStack { SwitchView(isOn: .constant(true)) diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 20f81405cc..5b5520fff8 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 4f61d074a9..ef0b671de4 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 83cb5d1344..9278c79401 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 8950fafe49..ba2ab9b3a4 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 0d4759bda4..b70f0d1c9d 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 10bf0f0461..1bf9aa1c26 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 7ef8f0fd22..9827fd6716 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 8d3332305e..b33f64b90b 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6108,7 +6108,7 @@ "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6116,8 +6116,7 @@ "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Your Dash balance" = "Your Dash balance"; "Your recovery phrase or wallet keys" = "Your recovery phrase or wallet keys"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 11d261ff45..20b4770296 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index a9d017ede0..efa1f15b75 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index b223dd68df..aded8233f8 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index a042f20618..9abbeb402a 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 23b700021b..a1fda04138 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index ed537b06ef..994206e025 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index ad33cfad8d..83aa4d6c70 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 57c05a3738..ab6bb171f6 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 33fad602aa..c7eb3efe62 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2d2a4a1898..2781bfcbce 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 25b0009349..bfcc832d72 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index bf82ac932d..1e58fec0f0 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index ff2b1ff277..9284ecfb23 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index d7b899a326..6181349ac0 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index b53aa5f5ea..65a4e2e7af 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index ffe6dffbf3..07d9424ddb 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 2e85abf30a..8f9511639d 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 21f02f0511..f50bf8eb8e 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 8cb893e980..946957e6d9 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 01f7a37e99..694c36affb 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 8cb3689bc5..6e4bb365a2 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 8970835e40..b37ae4f192 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 8a10583189..a08d0e6aee 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 65feed6e8a..38b2ec3541 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 96a7986447..299dc0aca6 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 8fba8ab4ca..8b54567700 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index acd57caa09..2ad8db7854 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 1b5605e51f..2d9d6cad0d 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index af8f1de081..0e67336cd6 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index ee7f5b88c6..a098598676 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 75169f34c9..2dc524cb5c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 8244282b3e..e28073ed12 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 2a5f7f7b92..18bf7abed9 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6224,7 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6234,8 +6234,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 4179fa1428..cad7e068bf 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 5474ffebb7..bb44239f6c 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6222,7 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; -"The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it, so the sign-in was not completed. Turn the app off in Connections to remove the key."; +"The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; @@ -6232,8 +6232,7 @@ "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; -"This wallet could not check every key the app may hold, so the app may still have access. Try again." = "This wallet could not check every key the app may hold, so the app may still have access. Try again."; -"This wallet could not check with the network what this sign-in would give the app." = "This wallet could not check with the network what this sign-in would give the app."; +"This wallet could not check what this sign-in would give the app." = "This wallet could not check what this sign-in would give the app."; "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later." = "This wallet's copy of your identity is out of date, so it cannot confirm the app's key was turned off. Try again later."; "Username request completed" = "Username request completed"; "Wait for the wallet and network to finish loading, then retry. No registration has been sent." = "Wait for the wallet and network to finish loading, then retry. No registration has been sent."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index d19c049910..8bfb4b9133 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -919,17 +919,16 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { ) } - /// A disconnect of a one-QR connection keeps the row while either key of - /// an earlier two-QR login is live: the app can still use that one. - func testEitherLiveTwoQrLoginKeyCountsAsRemainingAccess() { + /// Turning off a one-QR connection that replaced a two-QR one disables + /// what is left of the two-QR login's keys as well. + func testADisconnectFindsTheLiveTwoQrLoginKeysByTheirDerivedPayload() { let authentication = Data(repeating: 0x51, count: 20) let encryption = Data(repeating: 0x52, count: 33) - func remains(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> Bool { - PlatformDashConnectDataSource.hasAnyRegisteredLoginKey( + func live(_ keys: [ManagedIdentity.IdentityPublicKeyInfo]) -> [UInt32] { + PlatformDashConnectDataSource.liveLoginKeyIds( authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, - currentIdentityPublicKeys: keys, - now: Date(timeIntervalSince1970: 1_000)) + currentIdentityPublicKeys: keys) } let authenticationKey = makeIdentityPublicKeyInfo( keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: authentication) @@ -944,19 +943,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { keyId: 102, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, data: Data(repeating: 0x53, count: 20)) - XCTAssertTrue(remains([authenticationKey, encryptionKey])) - XCTAssertTrue(remains([authenticationKey])) - XCTAssertTrue(remains([disabledAuthenticationKey, encryptionKey])) - XCTAssertFalse(remains([disabledAuthenticationKey, sessionKey])) - XCTAssertFalse(remains([])) - // A `dash-st:` registration may have put an expiry on the key. - func expiringAuthenticationKey(expiresAt: Int64) -> ManagedIdentity.IdentityPublicKeyInfo { - ManagedIdentity.IdentityPublicKeyInfo( - keyId: 100, purpose: .authentication, securityLevel: .high, keyType: .ecdsaHash160, - readOnly: false, disabledAt: nil, data: authentication, totalBudget: 5, expiresAt: expiresAt) - } - XCTAssertFalse(remains([expiringAuthenticationKey(expiresAt: 1_000_000)])) - XCTAssertTrue(remains([expiringAuthenticationKey(expiresAt: 1_000_001)])) + XCTAssertEqual(live([encryptionKey, sessionKey, authenticationKey]), [100, 101]) + XCTAssertEqual(live([disabledAuthenticationKey, encryptionKey]), [101]) + XCTAssertEqual(live([disabledAuthenticationKey, sessionKey]), []) + XCTAssertEqual(live([]), []) } func testMissingKeyRegistrationKeysReturnsOnlyMissingEncryptionKey() throws { From d61a1df5120190483060060c9b71a4fcd007d180 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 15:46:55 +0300 Subject: [PATCH 11/30] fix(dashpay): a one-QR disconnect reaches the two-QR keys with no session key on the identity - A one-QR row goes on to the PIN prompt when the identity holds no session key of the app: its two-QR keys can only be looked for after it. - An unresolved sign-in says why, and the sheet retries through its own action; the approval cannot be reached from that state. - Comments state what a disconnect disables, not more. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 9 ++-- .../DashConnect/DashConnectDataSource.swift | 3 +- .../DashConnect/DashConnectModels.swift | 8 ++- .../PlatformDashConnectDataSource.swift | 52 ++++++++++++------- .../DashConnect/ApproveConnectionSheet.swift | 13 +++-- .../UI/DashConnect/ConnectionsScreen.swift | 1 + .../UI/DashConnect/ConnectionsViewModel.swift | 26 +++++++--- .../PlatformDashConnectDataSourceTests.swift | 2 + 8 files changed, 75 insertions(+), 39 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 1ee7aa77d2..e98805d40e 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -220,10 +220,11 @@ enum AppConnect { /// has no grant record for. A key that is gone, already disabled, or of /// another shape is left alone, including one another wallet gave the /// app with a document-type bound, a single limit or another key type. - /// The two-QR login's authentication key, named by - /// `twoQRAuthenticationKeyHash160`, is not picked here either: it has the - /// same kind and bound, a `dash-st:` registration may have put limits on - /// it, and whether it goes is the caller's decision. + /// A key without a grant record whose payload is + /// `twoQRAuthenticationKeyHash160` is left alone as well: the two-QR + /// login's authentication key has the same kind and bound, and a + /// `dash-st:` registration may have put limits on it. The caller passes + /// it when that key is to stay. static func sessionKeyIdsToDisable( for grants: [AppConnectGrant], appContractId: Data, diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index f83976ce2d..664900989b 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -47,8 +47,7 @@ protocol DashConnectDataSource { /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so /// disabling it would lock the app out for good. Turning off a one-QR - /// connection that replaced a two-QR one does disable those keys too: - /// the app is left with no key on the identity. + /// connection that replaced a two-QR one does disable those keys too. func disconnect(id: String) async throws func remove(id: String) async } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index fb3a3fc0aa..1c26886965 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -201,6 +201,8 @@ struct ConnectionRequest: Equatable { let existingConnection: DAppConnection? /// The login approving this request would run. var login: AppConnect.Login = .unresolved + /// Why the login is unresolved, when the wallet knows. + var unresolvedLoginReason: String? = nil } extension ConnectionRequest { @@ -229,7 +231,8 @@ extension ConnectionRequest { walletUsername: String?, walletIdentityId: String?, existingConnection: DAppConnection?, - login: AppConnect.Login = .unresolved + login: AppConnect.Login = .unresolved, + unresolvedLoginReason: String? = nil ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -238,7 +241,8 @@ extension ConnectionRequest { walletUsername: walletUsername, walletIdentityId: walletIdentityId, existingConnection: existingConnection, - login: login + login: login, + unresolvedLoginReason: unresolvedLoginReason ) } } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index e6e64e7333..9fa938dd8f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -450,14 +450,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let fallback = ConnectionRequest(loginRequest: loginRequest) let existingConnection = existingConnection(for: fallback.appContractId) - guard let context = try? await requireContext() else { + let context: Context + do { + context = try await requireContext() + } catch { return ConnectionRequest( loginRequest: loginRequest, appLabel: fallback.appLabel, appUrl: fallback.appUrl, walletUsername: nil, walletIdentityId: nil, - existingConnection: existingConnection + existingConnection: existingConnection, + unresolvedLoginReason: error.localizedDescription ) } @@ -465,12 +469,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = try? Self.networkProtocolVersion(sdk: context.sdk) + async let resolvedProtocolVersion = Result { try await Self.networkProtocolVersion(sdk: context.sdk) } let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) - let protocolVersion = await resolvedProtocolVersion - if protocolVersion == nil { - Self.logger.error("🔗 DASHCONNECT :: protocol version unknown; the sign-in is shown as unresolved") + let protocolVersion: UInt32? + var unresolvedLoginReason: String? + switch await resolvedProtocolVersion { + case .success(let version): + protocolVersion = version + case .failure(let error): + Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") + protocolVersion = nil + unresolvedLoginReason = error.localizedDescription } return ConnectionRequest( @@ -480,7 +490,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletUsername: walletUsername, walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, - login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved + login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved, + unresolvedLoginReason: unresolvedLoginReason ) } @@ -859,7 +870,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() grants[index].values = publishedValues - grants[index].responseDeleted = nil } return connection } @@ -1315,11 +1325,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if liveElsewhere { return } } if isOneQR { - // Nothing is left of a one-QR connection once its keys are - // disabled, those of an earlier two-QR login included: the same - // QR can no longer be approved and there is no second step to - // wait for, so the row goes instead of sitting in the two-QR - // "approved" state. + // The session keys are disabled, and so are the keys of an + // earlier two-QR login that were found: the same QR can no + // longer be approved and there is no second step to wait for, + // so the row goes instead of sitting in the two-QR "approved" + // state. persistAndSend(subject.value.filter { $0.id != id }) return } @@ -1356,8 +1366,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// which the record held. /// /// For a row made by the one-QR login the keys of an earlier two-QR - /// login to the app are disabled as well, so that turning the app off - /// leaves it no key on this identity. That login derives the same keys + /// login to the app are disabled as well. That login derives the same keys /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// @@ -1392,9 +1401,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let holdsUnrecordedKey = try checksUnrecordedKeys && Self .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } - if !holdsUnrecordedKey { + // A one-QR row goes on to the PIN prompt either way: the keys of + // an earlier two-QR login can only be looked for after it. + if !holdsUnrecordedKey, !checksUnrecordedKeys { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - if !checksUnrecordedKeys { return false } + return false } } @@ -1433,15 +1444,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // The keys the two-QR login derives for this app, known before // anything is disabled: its authentication key has the kind and the - // bound of a session key, and which of the two it is decides what - // happens to it. If they cannot be derived, nothing is turned off. + // bound of a session key. A one-QR row disables both of them; a + // two-QR row keeps them, so there the authentication key is named + // as one to leave. If they cannot be derived, nothing is turned off. let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, bindings: bindings, currentIdentityPublicKeys: currentPublicKeys, - twoQRAuthenticationKeyHash160: twoQRKeys.authenticationPublicKeyHash160 + twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) if checksUnrecordedKeys { keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index b377d1d07d..757125a5b2 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -38,6 +38,9 @@ struct ApproveConnectionSheet: View { /// would otherwise see nothing at all. var errorText: String? var onApprove: () -> Void + /// Asks again which login this would be. The sheet offers it in place of + /// Approve while that is unresolved. + var onRetry: () -> Void = {} var onDeny: () -> Void var body: some View { @@ -79,6 +82,11 @@ struct ApproveConnectionSheet: View { comment: "DashConnect")) .font(.subhead) .foregroundColor(.primaryText) + if let reason = request.unresolvedLoginReason { + Text(reason) + .font(.footnote) + .foregroundColor(.secondaryText) + } } else if let terms = request.login.sessionKeyTerms { sessionKeyPermissions(terms) } else if isRelogin { @@ -127,8 +135,7 @@ struct ApproveConnectionSheet: View { } DashButton( - // With the login unresolved there is nothing to approve: - // the same action asks the network again instead. + // With the login unresolved there is nothing to approve. text: request.login == .unresolved ? NSLocalizedString("Try again", comment: "") : NSLocalizedString("Approve", comment: "DashConnect"), @@ -137,7 +144,7 @@ struct ApproveConnectionSheet: View { stretch: true, isEnabled: !isLoading, isLoading: isLoading, - action: onApprove + action: request.login == .unresolved ? onRetry : onApprove ) DashButton( diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift index c15152bf96..cba07666f1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsScreen.swift @@ -111,6 +111,7 @@ struct ConnectionsScreen: View { isLoading: viewModel.isApproving, errorText: viewModel.approveError, onApprove: { viewModel.approvePendingRequest() }, + onRetry: { viewModel.retryPendingRequest() }, onDeny: { viewModel.denyPendingRequest() } ) // The one-QR terms make the sheet longer than the fixed height diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index d4782c1468..1887b16a5b 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -200,7 +200,10 @@ final class ConnectionsViewModel: ObservableObject { // `isResolvingRequest` guards the window where a newer request has been // accepted but has not published yet: approving during it would // authorize the request on screen moments before it is replaced. - guard let consent = pendingRequest, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + // An unresolved login has nothing to approve; the sheet offers + // `retryPendingRequest` for it instead. + guard let consent = pendingRequest, consent.login != .unresolved, + let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } isApproving = true approveError = nil @@ -208,13 +211,6 @@ final class ConnectionsViewModel: ObservableObject { Task { defer { isApproving = false } - // The wallet could not tell which login this would be, so the - // sheet offered no approval, only another try at finding out. - guard consent.login != .unresolved else { - self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) - return - } - do { _ = try await dataSource.approveLogin(pendingLoginRequest, consent: consent) self.pendingRequest = nil @@ -237,6 +233,20 @@ final class ConnectionsViewModel: ObservableObject { } } + /// Builds the pending request again, for a sheet that could not tell + /// which login it would run. Approves nothing. + func retryPendingRequest() { + guard pendingRequest != nil, let pendingLoginRequest, !isApproving, !isResolvingRequest else { return } + + isApproving = true + approveError = nil + + Task { + defer { isApproving = false } + self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + } + } + func denyPendingRequest() { guard !isApproving else { return } pendingRequest = nil diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 8bfb4b9133..1e93efa220 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1368,6 +1368,8 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { await waitUntil { viewModel.pendingRequest != nil } XCTAssertEqual(viewModel.pendingRequest?.login, .unresolved) viewModel.approvePendingRequest() + XCTAssertFalse(viewModel.isApproving, "an unresolved login cannot be approved") + viewModel.retryPendingRequest() await waitUntil { !viewModel.isApproving } XCTAssertEqual(viewModel.pendingRequest, resolved) From aa8488d944e1066407c884bbde7e5bccb559f889 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:33:49 +0300 Subject: [PATCH 12/30] fix(dashpay): a one-QR disconnect looks for the app's keys on the wallet's other identities - Before a one-QR row is removed, the wallet's store is read for keys of the app on its other identities that no grant record names: a session key bound to the app's contract, or a key the two-QR login derives for it. The row stays while one is found, and stays with an error when that could not be checked. - The id for a new session key no longer overflows after the last key id; the sign-in is refused instead. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 32 +++- .../PlatformDashConnectDataSource.swift | 141 ++++++++++++++++-- DashWallet/ar.lproj/Localizable.strings | 2 + DashWallet/bg.lproj/Localizable.strings | 2 + DashWallet/ca.lproj/Localizable.strings | 2 + DashWallet/cs.lproj/Localizable.strings | 2 + DashWallet/da.lproj/Localizable.strings | 2 + DashWallet/de.lproj/Localizable.strings | 2 + DashWallet/el.lproj/Localizable.strings | 2 + DashWallet/en.lproj/Localizable.strings | 2 + DashWallet/eo.lproj/Localizable.strings | 2 + DashWallet/es.lproj/Localizable.strings | 2 + DashWallet/et.lproj/Localizable.strings | 2 + DashWallet/fa.lproj/Localizable.strings | 2 + DashWallet/fi.lproj/Localizable.strings | 2 + DashWallet/fil.lproj/Localizable.strings | 2 + DashWallet/fr.lproj/Localizable.strings | 2 + DashWallet/hr.lproj/Localizable.strings | 2 + DashWallet/hu.lproj/Localizable.strings | 2 + DashWallet/id.lproj/Localizable.strings | 2 + DashWallet/it.lproj/Localizable.strings | 2 + DashWallet/ja.lproj/Localizable.strings | 2 + DashWallet/ko.lproj/Localizable.strings | 2 + DashWallet/mk.lproj/Localizable.strings | 2 + DashWallet/ms.lproj/Localizable.strings | 2 + DashWallet/nb.lproj/Localizable.strings | 2 + DashWallet/nl.lproj/Localizable.strings | 2 + DashWallet/pl.lproj/Localizable.strings | 2 + DashWallet/pt.lproj/Localizable.strings | 2 + DashWallet/ro.lproj/Localizable.strings | 2 + DashWallet/ru.lproj/Localizable.strings | 2 + DashWallet/sk.lproj/Localizable.strings | 2 + DashWallet/sl.lproj/Localizable.strings | 2 + DashWallet/sl_SI.lproj/Localizable.strings | 2 + DashWallet/sq.lproj/Localizable.strings | 2 + DashWallet/sr.lproj/Localizable.strings | 2 + DashWallet/sv.lproj/Localizable.strings | 2 + DashWallet/th.lproj/Localizable.strings | 2 + DashWallet/tr.lproj/Localizable.strings | 2 + DashWallet/uk.lproj/Localizable.strings | 2 + DashWallet/vi.lproj/Localizable.strings | 2 + DashWallet/zh-Hans.lproj/Localizable.strings | 2 + .../zh-Hant-TW.lproj/Localizable.strings | 2 + DashWallet/zh.lproj/Localizable.strings | 2 + DashWallet/zh_TW.lproj/Localizable.strings | 2 + .../PlatformDashConnectDataSourceTests.swift | 50 +++++++ 46 files changed, 295 insertions(+), 14 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index e98805d40e..2659c8e41f 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -139,10 +139,13 @@ enum AppConnect { return .usable(keyId: keyId) } + /// The id for a new key: one above the highest on the identity, disabled + /// keys included. `nil` when that id is the last one a key can have. static func nextKeyId( currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] - ) -> UInt32 { - (currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0) + 1 + ) -> UInt32? { + let highest = currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0 + return highest == .max ? nil : highest + 1 } /// The key an app is given: it can only sign for the contract the request @@ -182,6 +185,31 @@ enum AppConnect { /// The store has a bound for the key that this build cannot read, so /// the key's app is unknown rather than "another one". var hasUnreadableBound = false + /// The stored key has the type, purpose and level of the two-QR + /// login's authentication key, or of its encryption key. + var isTwoQRAuthenticationKeyShaped = false + var isTwoQREncryptionKeyShaped = false + } + + /// Whether the store shows either key of the two-QR login, not disabled, + /// in the kind that login registers it. A two-QR login leaves no grant + /// record, so on an identity that is not the active one this is how its + /// keys are recognised. + static func holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: Data, + encryptionPublicKey: Data, + bindings: [KeyBinding] + ) -> Bool { + bindings.contains { + !$0.isDisabled + && (($0.isTwoQRAuthenticationKeyShaped && $0.data == authenticationPublicKeyHash160) + || ($0.isTwoQREncryptionKeyShaped && $0.data == encryptionPublicKey)) + } + } + + /// Whether the store shows a live session key bound to `appContractId`. + static func holdsLiveSessionKey(appContractId: Data, bindings: [KeyBinding]) -> Bool { + bindings.contains { $0.singleContractId == appContractId && !$0.isDisabled && $0.isSessionKeyShaped } } /// The most keys one identity update may disable (Platform consensus). diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 9fa938dd8f..c78737f5d3 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -77,6 +77,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantStoreUnavailable case approvalOutOfDate case grantNotRecorded + case noFreeKeyId + case otherIdentitiesNotChecked case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -140,6 +142,12 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key.", comment: "DashConnect") + case .otherIdentitiesNotChecked: + return NSLocalizedString( + "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", + comment: "DashConnect") + case .noFreeKeyId: + return NSLocalizedString("This identity cannot take another key.", comment: "DashConnect") case .approvalOutOfDate: return NSLocalizedString( "The details of this sign-in changed while it was on screen. Check them and approve again.", @@ -743,7 +751,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { totalBudget = registered?.totalBudget expiresAt = registered?.expiresAt.map { UInt64(max(0, $0)) } case .absent: - let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) + guard let keyId = AppConnect.nextKeyId(currentIdentityPublicKeys: currentPublicKeys) else { + throw DashConnectPlatformError.noFreeKeyId + } let budget = terms.budgetCredits let expiry = terms.expiresAt(from: now()) let key = AppConnect.sessionIdentityPubkey( @@ -1373,9 +1383,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Returns whether a grant record shows the app with a live key on /// another identity of this wallet. When this identity gave it none, that /// is thrown instead: nothing was turned off. - /// TODO(app-connect-other-identity-keys): a key on another identity that - /// has no grant record is not seen, so the row can go while that key is - /// live. Only the active identity's keys are looked up. + /// For a row made by the one-QR login that also covers keys on another + /// identity that no grant record names, as far as the wallet's store + /// shows them. /// /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with /// no record for this identity the keys are still looked for on it. When @@ -1462,7 +1472,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { currentIdentityPublicKeys: currentPublicKeys ))).sorted() } - if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() { + // For a one-QR row, the keys on another identity that no grant + // record shows. `nil` when that could not be told. + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys + ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) + : false + if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { throw DashConnectPlatformError.grantOnAnotherIdentity } if !keyIds.isEmpty { @@ -1491,17 +1506,99 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - return hasLiveGrantElsewhere() + if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return true } + // This identity's keys are off. Whether another one holds a key of + // the app could not be read from the store, so the row stays, with + // an error rather than without one. + guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } + return false + } + + /// Whether the wallet's store shows another identity of this wallet with + /// a live key of the app that no grant record names: a session key bound + /// to the app's contract, or a key the two-QR login derives for it. + /// `nil` when the store could not be read or the keys not derived. + /// + /// The store is as fresh as each identity's last load, and an identity + /// it does not hold is not seen. + private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { + do { + let others = try Self.storedWalletIdentities( + walletId: context.wallet.walletId, + network: context.network, + modelContainer: context.modelContainer + ).filter { $0.identityId != context.identityId } + for other in others { + let bindings = try Self.storedKeyBindings( + identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) + if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } + // Derive only for an identity that has a live key of either + // two-QR kind at all. + guard bindings.contains(where: { + !$0.isDisabled && ($0.isTwoQRAuthenticationKeyShaped || $0.isTwoQREncryptionKeyShaped) + }) else { continue } + let twoQRKeys = try await twoQRLoginPublicKeys( + appContractId: appContractId, + identityId: other.identityId, + identityIndex: other.identityIndex, + context: context) + if AppConnect.holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + bindings: bindings + ) { + return true + } + } + return false + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: keys on other identities not checked — \(error.localizedDescription, privacy: .public)") + return nil + } + } + + /// The identities the SDK's store attaches to this wallet on `network`. + private static func storedWalletIdentities( + walletId: Data, + network: Network, + modelContainer: ModelContainer + ) throws -> [(identityId: Data, identityIndex: UInt32)] { + let descriptor = FetchDescriptor(predicate: PersistentIdentity.predicate(network: network)) + let modelContext = ModelContext(modelContainer) + // The rows are only readable while their context is alive. + return try withExtendedLifetime(modelContext) { + try modelContext.fetch(descriptor) + .filter { $0.wallet?.walletId == walletId } + .map { ($0.identityId, $0.identityIndex) } + } } - /// The public halves of the keys the two-QR login derives for this - /// identity and app. + /// The public halves of the keys the two-QR login derives for the active + /// identity and an app. private func twoQRLoginPublicKeys( appContractId: Data, context: Context + ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { + try await twoQRLoginPublicKeys( + appContractId: appContractId, + identityId: context.identityId, + identityIndex: context.identityIndex, + context: context) + } + + /// The same for any identity of the active wallet, by its index. + private func twoQRLoginPublicKeys( + appContractId: Data, + identityId: Data, + identityIndex: UInt32, + context: Context ) async throws -> (authenticationPublicKeyHash160: Data, encryptionPublicKey: Data) { var derivedMaterial = try await deriveKeyRegistrationMaterial( - appContractId: appContractId, context: context) + appContractId: appContractId, + identityId: identityId, + identityIndex: identityIndex, + context: context) defer { Self.zero(&derivedMaterial.loginKey) Self.zero(&derivedMaterial.authenticationPrivateKey) @@ -1574,11 +1671,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func deriveKeyRegistrationMaterial( appContractId: Data, context: Context + ) async throws -> DashConnectKeyRegistrationDerivedMaterial { + try await deriveKeyRegistrationMaterial( + appContractId: appContractId, + identityId: context.identityId, + identityIndex: context.identityIndex, + context: context) + } + + /// The same for any identity of the active wallet, by its index. + private func deriveKeyRegistrationMaterial( + appContractId: Data, + identityId: Data, + identityIndex: UInt32, + context: Context ) async throws -> DashConnectKeyRegistrationDerivedMaterial { // `deriveIdentityAuthKeyAtSlot` is main-actor isolated in the SDK. var chainKey = try await MainActor.run { try context.wallet.deriveIdentityAuthKeyAtSlot( - identityIndex: context.identityIndex, + identityIndex: identityIndex, keyId: UInt32(LoginKeyDerivation.defaultKeyIndex), network: context.network ).privateKeyData @@ -1586,7 +1697,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { defer { Self.zero(&chainKey) } return try Self.deriveKeyRegistrationMaterial( chainKeyPrivateBytes: chainKey, - identityId: context.identityId, + identityId: identityId, appContractId: appContractId ) } @@ -1947,7 +2058,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { hasUnreadableBound: !AppConnect.isReadableBound( boundsKind: $0.effectiveContractBoundsKind, boundIds: $0.contractBounds - ) + ), + isTwoQRAuthenticationKeyShaped: $0.keyTypeEnum == .ecdsaHash160 + && $0.purposeEnum == .authentication + && $0.securityLevelEnum == .high, + isTwoQREncryptionKeyShaped: $0.keyTypeEnum == .ecdsaSecp256k1 + && $0.purposeEnum == .encryption + && $0.securityLevelEnum == .medium ) } } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 5b5520fff8..4ffd8683e4 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index ef0b671de4..a5649d7a5e 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 9278c79401..38b8295a1e 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index ba2ab9b3a4..48e5449609 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index b70f0d1c9d..ad37330aea 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 1bf9aa1c26..19aed04c65 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 9827fd6716..4bb3cf98c5 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index b33f64b90b..099b5eccea 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6109,10 +6109,12 @@ "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app." = "There isn't enough free space to prepare your wallet. Free up storage in iPhone Settings, then try again. Do not delete this app."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This wallet cannot approve the scanned request (%@)." = "This wallet cannot approve the scanned request (%@)."; "This wallet cannot record the key it would give the app, so the sign-in was not started." = "This wallet cannot record the key it would give the app, so the sign-in was not started."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 20b4770296..6b899e96d3 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index efa1f15b75..bb6a482738 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index aded8233f8..c2b852ab98 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 9abbeb402a..21837cfd17 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index a1fda04138..4e32bd4451 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 994206e025..0ce459b834 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 83aa4d6c70..cbc16fef66 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index ab6bb171f6..612a1716d4 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index c7eb3efe62..4c1635791c 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2781bfcbce..2d39f1c572 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index bfcc832d72..1d97b6f1ac 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 1e58fec0f0..d06740fc89 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 9284ecfb23..25fb69f94b 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 6181349ac0..76b985cd4c 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 65a4e2e7af..9ee12ee052 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 07d9424ddb..c7a786a32f 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 8f9511639d..b9a559798f 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index f50bf8eb8e..45b74a8c30 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 946957e6d9..21db751d2e 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 694c36affb..10ecb31aaa 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 6e4bb365a2..61851e35f6 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index b37ae4f192..c160e4f082 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index a08d0e6aee..550121a446 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 38b2ec3541..70459eea3b 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 299dc0aca6..d2bf1a6649 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 8b54567700..b852cb9595 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 2ad8db7854..37cbf74032 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 2d9d6cad0d..2267ccda5f 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 0e67336cd6..34ba75e5b0 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index a098598676..3251357a09 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 2dc524cb5c..9750cfd874 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index e28073ed12..efca41259b 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 18bf7abed9..800a902073 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6225,10 +6225,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index cad7e068bf..480bbb48b5 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index bb44239f6c..9eb440b1a5 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6223,10 +6223,12 @@ "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; +"The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status." = "The name request succeeded for the original identity. Switch back to the original wallet and network to see its status."; "This access ends after %d days, or when you disconnect the app." = "This access ends after %d days, or when you disconnect the app."; "This app has a key on another identity of this wallet. Switch to that identity to turn it off." = "This app has a key on another identity of this wallet. Switch to that identity to turn it off."; +"This identity cannot take another key." = "This identity cannot take another key."; "This identity has no credits. Use Top Up in My Profile, then return to finish registration." = "This identity has no credits. Use Top Up in My Profile, then return to finish registration."; "This sign-in request can no longer be approved. Ask the app for a new code." = "This sign-in request can no longer be approved. Ask the app for a new code."; "This username is no longer available. Please choose another one." = "This username is no longer available. Please choose another one."; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 1e93efa220..7000e2f6c3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1792,6 +1792,17 @@ final class AppConnectLoginTests: XCTestCase { 8) } + func testThereIsNoNextKeyIdAfterTheLastOne() { + // A key id is a UInt32 the SDK carries as an Int32 bit pattern. + let last = Self.key(keyId: -1, data: Data([1])) + XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [last])) + let disabledLast = Self.key(keyId: -1, data: Data([1]), disabledAt: 1) + XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: 3, data: Data([3])), disabledLast])) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: -2, data: Data([2]))]), + .max) + } + func testDisconnectDisablesOnlyTheLiveSessionKeysItGranted() { let grants = [9, 11, 12, 13].map { Self.grant(sessionKeyId: $0) } let keys = [ @@ -1872,6 +1883,45 @@ final class AppConnectLoginTests: XCTestCase { [6, 9]) } + /// Keys of the app on an identity that is not the active one are + /// recognised from the wallet's store: no grant record names them. + func testTheStoreShowsAnAppKeyHeldOnAnotherIdentityWhileItIsLive() { + let app = Data(repeating: 0xA1, count: 32) + let authentication = Data(repeating: 0x51, count: 20) + let encryption = Data(repeating: 0x52, count: 33) + func holdsTwoQR(_ bindings: [AppConnect.KeyBinding]) -> Bool { + AppConnect.holdsLiveTwoQRLoginKey( + authenticationPublicKeyHash160: authentication, encryptionPublicKey: encryption, bindings: bindings) + } + func authenticationKey(data: Data = authentication, isDisabled: Bool = false) -> AppConnect.KeyBinding { + AppConnect.KeyBinding( + keyId: 3, data: data, singleContractId: app, isDisabled: isDisabled, + isTwoQRAuthenticationKeyShaped: true) + } + let encryptionKey = AppConnect.KeyBinding( + keyId: 4, data: encryption, singleContractId: nil, isTwoQREncryptionKeyShaped: true) + + XCTAssertTrue(holdsTwoQR([authenticationKey()])) + XCTAssertTrue(holdsTwoQR([authenticationKey(isDisabled: true), encryptionKey])) + XCTAssertFalse(holdsTwoQR([authenticationKey(isDisabled: true)])) + // Another app's key: same kind, another payload. + XCTAssertFalse(holdsTwoQR([authenticationKey(data: Data(repeating: 0x53, count: 20))])) + // The same bytes under another kind are not that key. + XCTAssertFalse(holdsTwoQR([AppConnect.KeyBinding(keyId: 5, data: authentication, singleContractId: app)])) + XCTAssertFalse(holdsTwoQR([])) + + let sessionKey = AppConnect.KeyBinding( + keyId: 6, data: Data([6]), singleContractId: app, isSessionKeyShaped: true) + var disabledSessionKey = sessionKey + disabledSessionKey.isDisabled = true + XCTAssertTrue(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [sessionKey])) + XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [disabledSessionKey])) + XCTAssertFalse( + AppConnect.holdsLiveSessionKey(appContractId: Data(repeating: 0xB2, count: 32), bindings: [sessionKey])) + // The two-QR authentication key is bound to the app but carries no limits. + XCTAssertFalse(AppConnect.holdsLiveSessionKey(appContractId: app, bindings: [authenticationKey()])) + } + func testOnlyAWholeSingleContractBoundNamesTheApp() { let app = Data(repeating: 0xA1, count: 32) XCTAssertEqual(AppConnect.singleContractId(boundsKind: 1, boundIds: [app]), app) From 957ea9486aeeaaed5e3d4edce8b4d5e29e086a41 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 16:40:55 +0300 Subject: [PATCH 13/30] fix(dashpay): say when an app's key on another identity keeps the connection, and keep unknown apart from none A disconnect that leaves the row because another identity of the wallet holds a key of the app now reports that instead of returning silently. The store check goes through every other identity: one that cannot be told no longer hides a key found on another, and an identity whose keys are not in the store counts as unknown rather than as holding none. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectDataSource.swift | 2 +- .../PlatformDashConnectDataSource.swift | 48 +++++++++++++------ 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 664900989b..09b190c364 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -42,7 +42,7 @@ protocol DashConnectDataSource { /// Turns a connection off. For a one-QR connection this disables the key /// the app was given on the identity and deletes the published response, /// and throws when the key could not be disabled — the connection then - /// stays as it was. The connection also stays, without an error, while + /// stays as it was. The connection also stays, and that is thrown, while /// the app holds a key on another identity of the wallet. For a two-QR /// connection it only changes the local status: that login derives the /// same key every time and Platform never re-adds a disabled key, so diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index c78737f5d3..68ab5acb69 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1331,8 +1331,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get - // there; this identity's keys are off. - if liveElsewhere { return } + // there, and the user is told; this identity's keys are off. + if liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } } if isOneQR { // The session keys are disabled, and so are the keys of an @@ -1474,7 +1474,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // For a one-QR row, the keys on another identity that no grant // record shows. `nil` when that could not be told. - let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) : false if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { @@ -1517,21 +1517,41 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Whether the wallet's store shows another identity of this wallet with /// a live key of the app that no grant record names: a session key bound /// to the app's contract, or a key the two-QR login derives for it. - /// `nil` when the store could not be read or the keys not derived. - /// - /// The store is as fresh as each identity's last load, and an identity - /// it does not hold is not seen. + /// `nil` when no identity shows one and at least one could not be told: + /// its keys are not in the store, a live session-shaped key there has a + /// bound this build cannot read, or its two-QR keys could not be derived. + /// TODO(app-connect-other-identity-keys): the store is as fresh as each + /// identity's last load from Platform, and an identity it does not hold + /// is not seen, so the row can go while such a key is live. private func anotherIdentityHoldsAppKeys(appContractId: Data, context: Context) async -> Bool? { + let others: [(identityId: Data, identityIndex: UInt32)] do { - let others = try Self.storedWalletIdentities( + others = try Self.storedWalletIdentities( walletId: context.wallet.walletId, network: context.network, modelContainer: context.modelContainer ).filter { $0.identityId != context.identityId } - for other in others { + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: other identities not read — \(error.localizedDescription, privacy: .public)") + return nil + } + // One identity that cannot be told does not hide a key found on + // another. + var hasUnknown = false + for other in others { + do { let bindings = try Self.storedKeyBindings( identityId: other.identityId.toBase58String(), modelContainer: context.modelContainer) if AppConnect.holdsLiveSessionKey(appContractId: appContractId, bindings: bindings) { return true } + // An identity always has keys, so none stored means not + // loaded; and a session-shaped key with an unreadable bound + // may be the app's. + if bindings.isEmpty || bindings.contains(where: { + !$0.isDisabled && $0.isSessionKeyShaped && $0.hasUnreadableBound + }) { + hasUnknown = true + } // Derive only for an identity that has a live key of either // two-QR kind at all. guard bindings.contains(where: { @@ -1549,13 +1569,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) { return true } + } catch { + Self.logger.error( + "🔗 DASHCONNECT :: keys of another identity not checked — \(error.localizedDescription, privacy: .public)") + hasUnknown = true } - return false - } catch { - Self.logger.error( - "🔗 DASHCONNECT :: keys on other identities not checked — \(error.localizedDescription, privacy: .public)") - return nil } + return hasUnknown ? nil : false } /// The identities the SDK's store attaches to this wallet on `network`. From c5fdbd314b70a9cf519f030e918c2db471c9aede Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 18:47:53 +0300 Subject: [PATCH 14/30] fix(dashpay): keep DashConnect rows and grant records with the wallet an operation ran for The connection and grant stores follow the active wallet, and an approval or a disconnect waits on the network and on a PIN prompt. Each operation now works through one pair of stores fixed to the wallet of its context, so a wallet switch while it is suspended cannot move its records to the wallet that became active. - requireContext refuses while the SDK wallet is not the active one. - The published list is tracked by wallet and network scope on the main actor, reloaded when the active wallet changes, and a disconnect or a remove picked from another wallet's list is refused. - A dash-st: key registration resolves the context again after the PIN. - The protocol version lookup in the request preview no longer passes an async closure to Result's synchronous initializer. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 49 ++- .../Models/DashConnect/DashConnectStore.swift | 23 ++ .../PlatformDashConnectDataSource.swift | 331 +++++++++++++----- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../DashConnect/DashConnectStoreTests.swift | 35 ++ .../PlatformDashConnectDataSourceTests.swift | 197 ++++++++++- 48 files changed, 571 insertions(+), 107 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 2659c8e41f..dbfac6e2d8 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -534,6 +534,9 @@ protocol AppConnectResponseStore { var canPersist: Bool { get } func load() -> [AppConnectGrant] func save(_ grants: [AppConnectGrant]) + /// This store fixed to one wallet, and to the network scope it has now, + /// like `DashConnectStore.pinned(toWalletIdHex:)`. + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore } extension AppConnectResponseStore { @@ -545,7 +548,7 @@ extension AppConnectResponseStore { /// chain and the key ids are visible on the identity. final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { private let defaults: UserDefaults - private let scopeKeyProvider: () -> String? + private let scope: Scope private let encoder: JSONEncoder private let decoder: JSONDecoder @@ -553,18 +556,28 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { subsystem: "org.dashfoundation.dash", category: "dashconnect.app-connect-store") - init( + /// Where the scope comes from. + enum Scope { + /// Borrowed from a connection store, so both keep one wallet's data. + case connections(UserDefaultsDashConnectStore) + /// Handed in as it is; it names no wallet. + case key(() -> String?) + } + + convenience init( defaults: UserDefaults = .standard, network: DashConnectNetwork, scopeKeyProvider: (() -> String?)? = nil ) { + self.init( + defaults: defaults, + scope: scopeKeyProvider.map(Scope.key) + ?? .connections(UserDefaultsDashConnectStore(defaults: defaults, network: network))) + } + + init(defaults: UserDefaults, scope: Scope) { self.defaults = defaults - if let scopeKeyProvider { - self.scopeKeyProvider = scopeKeyProvider - } else { - let connections = UserDefaultsDashConnectStore(defaults: defaults, network: network) - self.scopeKeyProvider = { connections.storageKey } - } + self.scope = scope let encoder = JSONEncoder() encoder.dateEncodingStrategy = .millisecondsSince1970 @@ -576,7 +589,25 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { } private var storageKey: String? { - scopeKeyProvider().map { "\($0).app-connect-responses.v1" } + let scopeKey: String? + switch scope { + case .connections(let connections): scopeKey = connections.storageKey + case .key(let provider): scopeKey = provider() + } + return scopeKey.map { "\($0).app-connect-responses.v1" } + } + + func pinned(toWalletIdHex walletIdHex: String) -> any AppConnectResponseStore { + switch scope { + case .connections(let connections): + return UserDefaultsAppConnectResponseStore( + defaults: defaults, scope: .connections(connections.pinnedStore(toWalletIdHex: walletIdHex))) + case .key(let provider): + // A handed-in scope names no wallet to replace: it is fixed to + // the value it has now. + let scopeKey = provider() + return UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .key { scopeKey }) + } } /// False as well while the stored value is not a list of rows: `save` diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift index 507ed2d726..0bd2b0cc1a 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectStore.swift @@ -23,6 +23,13 @@ import os protocol DashConnectStore { func load() -> [DAppConnection] func save(_ connections: [DAppConnection]) + /// Names the wallet and network whose rows this store reads and writes + /// right now; `nil` when it has no scope. + var scopeKey: String? { get } + /// This store fixed to one wallet, and to the network scope it has now. + /// An operation that outlasts a wallet switch reads and writes through + /// it, so its rows stay with the wallet it ran for. + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore } final class UserDefaultsDashConnectStore: DashConnectStore { @@ -76,6 +83,22 @@ final class UserDefaultsDashConnectStore: DashConnectStore { return "dashconnect.connections.v1.\(networkScope).\(walletScope)" } + var scopeKey: String? { storageKey } + + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore { + pinnedStore(toWalletIdHex: walletIdHex) + } + + func pinnedStore(toWalletIdHex walletIdHex: String) -> UserDefaultsDashConnectStore { + let devnetName = devnetNameProvider() + return UserDefaultsDashConnectStore( + defaults: defaults, + network: network, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { devnetName } + ) + } + private var networkScope: String? { guard network == .devnet else { return network.rawValue } guard let name = devnetNameProvider()? diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 68ab5acb69..de627b580a 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -79,6 +79,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked + case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection case devnetLoginContractNotConfigured @@ -146,6 +147,8 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", comment: "DashConnect") + case .walletChanged: + return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: return NSLocalizedString("This identity cannot take another key.", comment: "DashConnect") case .approvalOutOfDate: @@ -375,6 +378,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let identityId: Data let identityIndex: UInt32 let storedUsername: String? + /// One pair for the whole operation: a context resolved again after + /// a PIN prompt takes over the pair of the one it replaces. + var stores: Stores + } + + /// The connection rows and grant records of one wallet. A context carries + /// the pair fixed to its own wallet: the stores follow the active wallet, + /// and an operation that waits on the network or a PIN prompt must still + /// write to the wallet whose identity it changed. + private struct Stores { + let walletIdHex: String + let connections: any DashConnectStore + let grants: any AppConnectResponseStore + + /// Names what the rows belong to: the wallet, and the network scope + /// the connection store was fixed to, which tells two devnets of one + /// wallet apart. + var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + } + + /// The scope of the rows `subject` holds. Read and written on the main + /// actor together with every send, so the two cannot come apart. + @MainActor + private final class ShownRows { + var scope: String? + + nonisolated init(scope: String?) { + self.scope = scope + } } private static let logger = Logger( @@ -396,6 +428,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let store: any DashConnectStore private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> + private let shownRows: ShownRows + private let activeWalletIdHex: () -> String? + private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing private let now: () -> Date @@ -416,8 +451,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { supportedNetwork: DashConnectNetwork = PlatformDashConnectDataSource.currentEnvironmentNetwork(), store: (any DashConnectStore)? = nil, responseStore: (any AppConnectResponseStore)? = nil, + activeWalletIdHex: @escaping () -> String? = { WalletEnvironment.activeWalletIdHex as String? }, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), + notificationCenter: NotificationCenter = .default, now: @escaping () -> Date = Date.init ) { assert( @@ -429,7 +466,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.authorizer = authorizer self.stateTransitionParser = stateTransitionParser self.now = now - self.subject = CurrentValueSubject(self.store.load()) + self.activeWalletIdHex = activeWalletIdHex + let active = Self.pinnedStores( + walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) + self.shownRows = ShownRows(scope: active?.scope) + self.subject = CurrentValueSubject(active?.connections.load() ?? []) + // The list is loaded once, and the active wallet can change while + // this data source lives. + self.walletChangeObserver = notificationCenter + .publisher(for: SwiftDashSDKWalletState.activeWalletDidChangeNotification) + .sink { [weak self] _ in + Task { @MainActor in self?.showActiveWalletRows() } + } } var connections: AnyPublisher<[DAppConnection], Never> { @@ -456,12 +504,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest { let fallback = ConnectionRequest(loginRequest: loginRequest) - let existingConnection = existingConnection(for: fallback.appContractId) + await showActiveWalletRows() let context: Context do { context = try await requireContext() } catch { + let existingConnection = await shownRow(id: fallback.appContractId) return ConnectionRequest( loginRequest: loginRequest, appLabel: fallback.appLabel, @@ -473,19 +522,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + let existingConnection = await rows(in: context.stores).first { $0.id == fallback.appContractId } + // Which login this network gets is settled here, so the sheet can // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = Result { try await Self.networkProtocolVersion(sdk: context.sdk) } + async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion: UInt32? var unresolvedLoginReason: String? - switch await resolvedProtocolVersion { - case .success(let version): - protocolVersion = version - case .failure(let error): + do { + protocolVersion = try await resolvedProtocolVersion + } catch { Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") protocolVersion = nil unresolvedLoginReason = error.localizedDescription @@ -506,6 +556,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) + await showActiveWalletRows() guard consent.appContractId == request.contractId.toBase58String(), consent.login != .unresolved else { throw DashConnectPlatformError.approvalOutOfDate } @@ -551,11 +602,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // The PIN prompt can outlast a wallet or identity switch: sign with // what is active now, and only if it is still the identity that was // shown. - let authorized = try await requireContext() - guard authorized.identityId == context.identityId else { + do { + context = try await contextAfterAuthorization(matching: context) + } catch DashConnectPlatformError.walletChanged { throw DashConnectPlatformError.approvalOutOfDate } - context = authorized if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") return try await approveAppConnectLogin(request, terms: terms, context: context) @@ -647,9 +698,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { connection = Self.makeConnection(preview: preview, status: .approved, updatedAt: now()) } - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + await updateRows(in: context.stores) { rows in + rows.filter { $0.id != connection.id } + [connection] + } return connection } @@ -683,7 +734,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let responseContractId = Self.decodeIdentifier(AppConnect.contractId) else { throw DashConnectPlatformError.loginContractUnavailable } - guard responseStore.canPersist else { + let stores = context.stores + guard stores.grants.canPersist else { throw DashConnectPlatformError.grantStoreUnavailable } @@ -727,7 +779,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { bindings = (try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer)) ?? [] - grantedKeyIds = Set(responseStore.load().filter(isGrantForRequest).map(\.sessionKeyId)) + grantedKeyIds = Set(stores.grants.load().filter(isGrantForRequest).map(\.sessionKeyId)) } let sessionKeyId: UInt32 @@ -783,7 +835,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show the connection, before anything else can fail. A grant already // recorded for this request keeps its values: if an earlier publish // landed without confirming, those are the ones on Platform. - let grant = updateGrants { grants -> AppConnectGrant in + let grant = updateGrants(in: stores) { grants -> AppConnectGrant in if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { return existing } @@ -804,15 +856,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) - var current = subject.value.filter { $0.id != connection.id } - current.append(connection) - persistAndSend(current) + await updateRows(in: stores) { rows in + rows.filter { $0.id != connection.id } + [connection] + } // The store was writable when the login started. If the record did // not land all the same, a response published now could not be found // again. The key is live, so the row above stays: a disconnect finds // the key by its contract bound. - guard responseStore.load().contains(where: { $0.key == grant.key }) else { + guard stores.grants.load().contains(where: { $0.key == grant.key }) else { Self.logger.error("🔗 DASHCONNECT :: the session key was registered but its record could not be saved") throw DashConnectPlatformError.grantNotRecorded } @@ -841,7 +893,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Recorded before the publish is submitted: a response this record // had as deleted may be back on Platform after a publish that fails // to confirm, and a disconnect must then look for it. - updateGrants { grants in + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].markPublishStarted() } @@ -876,7 +928,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { publishedValues = published.values } - updateGrants { grants in + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = documentId.toBase58String() grants[index].values = publishedValues @@ -919,10 +971,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// suspension point in between, so an approval and a disconnect that /// overlap cannot write a stale copy over each other's change. @discardableResult - private func updateGrants(_ change: (inout [AppConnectGrant]) -> T) -> T { - var grants = responseStore.load() + private func updateGrants(in stores: Stores, _ change: (inout [AppConnectGrant]) -> T) -> T { + var grants = stores.grants.load() let result = change(&grants) - responseStore.save(grants) + stores.grants.save(grants) return result } @@ -944,7 +996,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) async { await resolveUnconfirmedAppConnectResponses( where: matches, responseContractId: responseContractId, context: context) - let pending = responseStore.load().filter { matches($0) && $0.hasDeletableResponse } + let pending = context.stores.grants.load().filter { matches($0) && $0.hasDeletableResponse } for grant in pending { do { guard let documentIdText = grant.documentId, @@ -964,7 +1016,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signingKeyId: signingKeyId, signer: signer ) - markAppConnectResponseGone(grant) + markAppConnectResponseGone(grant, in: context.stores) } catch { Self.logger.error( "🔗 DASHCONNECT :: previous loginKeyResponse not deleted — \(error.localizedDescription, privacy: .public)") @@ -979,7 +1031,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: responseContractId, sdk: context.sdk ) - if remaining == nil { markAppConnectResponseGone(grant) } + if remaining == nil { markAppConnectResponseGone(grant, in: context.stores) } } catch { continue } @@ -990,8 +1042,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Records that a grant has no response on Platform any more. The record /// of a live key stays for a disconnect to disable that key by; the /// record of a disabled key has no further use. - private func markAppConnectResponseGone(_ grant: AppConnectGrant) { - updateGrants { grants in + private func markAppConnectResponseGone(_ grant: AppConnectGrant, in stores: Stores) { + updateGrants(in: stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } if grants[index].keyDisabled == true { grants.remove(at: index) @@ -1010,7 +1062,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: Data, context: Context ) async { - for grant in responseStore.load() where matches(grant) && grant.hasUnconfirmedResponse { + for grant in context.stores.grants.load() where matches(grant) && grant.hasUnconfirmedResponse { guard let hash = AppConnect.data(fromHex: grant.values.appEphemeralPubKeyHash) else { continue } do { let published = try await findAppConnectResponse( @@ -1020,10 +1072,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { sdk: context.sdk ) guard let published else { - markAppConnectResponseGone(grant) + markAppConnectResponseGone(grant, in: context.stores) continue } - updateGrants { grants in + updateGrants(in: context.stores) { grants in guard let index = grants.firstIndex(where: { $0.key == grant.key }) else { return } grants[index].documentId = published.documentId.toBase58String() grants[index].values = published.values @@ -1037,6 +1089,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func handleStateTransition(_ request: DashStRequest) async throws -> DashConnectStAction { try validateNetwork(request.network) + await showActiveWalletRows() let context = try await requireContext() // The incoming bytes are parsed only to learn the intent — they are // never signed. Each branch validates the parsed values and rebuilds @@ -1069,7 +1122,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // keys usually do, in their contract bounds. Picking the most // recently approved connection instead would derive app B's keys for // a QR scanned from app A. - let pendingConnection = try pendingApprovedConnectionForKeyRegistration( + let pendingConnection = try Self.pendingApprovedConnectionForKeyRegistration( + in: await rows(in: context.stores), boundContractId: Self.boundAppContractId(in: transition) ) guard let pendingAppContractId = Self.decodeIdentifier(pendingConnection.id) else { @@ -1100,24 +1154,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) guard !missingKeys.isEmpty else { - persistAndSend( - subject.value.map { connection in - guard connection.id == pendingConnection.id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .active, - updatedAt: now() - ) - } - ) + await markActive(pendingConnection, in: context.stores) return } try await authorize() + // The keys were derived and checked for the identity above. + let authorized = try await contextAfterAuthorization(matching: context) - let signer = KeychainSigner(modelContainer: context.modelContainer) + let signer = KeychainSigner(modelContainer: authorized.modelContainer) try await signer.withAdditionalSigningKeys([ ( publicKey: validated.authenticationKey.publicKeyData, @@ -1128,25 +1173,52 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { privateKey: derivedMaterial.encryptionPrivateKey ), ]) { - try await context.wallet.updateIdentity( - identityId: context.identityId, + try await authorized.wallet.updateIdentity( + identityId: authorized.identityId, addPublicKeys: missingKeys.map(Self.makeManagedIdentityPubkey), signer: signer ) } - persistAndSend( - subject.value.map { connection in + await markActive(pendingConnection, in: authorized.stores) + } + + /// The context to sign with after a PIN prompt, which can outlast a + /// wallet or identity switch: what is active now, and only while it is + /// still the identity and the wallet of `context`. + private func contextAfterAuthorization(matching context: Context) async throws -> Context { + let authorized = try await requireContext(pinnedTo: context.stores) + guard authorized.identityId == context.identityId else { + throw DashConnectPlatformError.walletChanged + } + return authorized + } + + /// What is active now, only while it is the wallet `stores` belongs to, + /// and carrying that pair. + private func requireContext(pinnedTo stores: Stores) async throws -> Context { + var context = try await requireContext() + guard context.stores.walletIdHex == stores.walletIdHex else { + throw DashConnectPlatformError.walletChanged + } + context.stores = stores + return context + } + + private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { + let activatedAt = now() + await updateRows(in: stores) { rows in + rows.map { connection in guard connection.id == pendingConnection.id else { return connection } return DAppConnection( id: connection.id, name: connection.name, url: connection.url, status: .active, - updatedAt: now() + updatedAt: activatedAt ) } - ) + } } /// Builds the user-facing approval request for a parsed token purchase, @@ -1195,7 +1267,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return DashConnectTokenPurchaseRequest( // A connection approved earlier for the same contract names the // app; otherwise the sheet falls back to the contract id. - appName: subject.value.first { $0.id == contractIdBase58 }?.name, + appName: await rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, ownerId: purchase.ownerId, dataContractId: purchase.dataContractId, tokenId: purchase.tokenId, @@ -1320,14 +1392,33 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func remove(id: String) async { - persistAndSend(subject.value.filter { $0.id != id }) + // A list that had to change just now was another wallet's: the row + // to remove was not picked from this one. + let (active, changed) = await showActiveWalletRows() + guard let stores = active, !changed else { return } + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } func disconnect(id: String) async throws { - let isOneQR = subject.value.first { $0.id == id }?.loginKind == .oneQR - let hasGrants = responseStore.load().contains { $0.appContractId == id } + let (active, changed) = await showActiveWalletRows() + guard let stores = active else { + throw DashConnectPlatformError.noWallet + } + // The row was picked from the published list. A list that had to + // change just now was another wallet's, and nothing of that wallet + // can be turned off from here, even if this one has a row for the + // same app. + // TODO(dashconnect-row-scope): a list the wallet-change notification + // replaced between the tap and this call is not told apart; the call + // would have to name the wallet the row was shown for. + guard !changed else { + throw DashConnectPlatformError.walletChanged + } + let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + let hasGrants = stores.grants.load().contains { $0.appContractId == id } if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants(appContractId: id, checksUnrecordedKeys: isOneQR) + let liveElsewhere = try await revokeAppConnectGrants( + appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get @@ -1340,7 +1431,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // longer be approved and there is no second step to wait for, // so the row goes instead of sitting in the two-QR "approved" // state. - persistAndSend(subject.value.filter { $0.id != id }) + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } return } @@ -1348,16 +1439,18 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // Local-only for a two-QR connection: its `loginKeyResponse` document // stays, and re-approving the same `dash-key:` QR returns it to // `.active` while the identity keys are still registered. - persistAndSend(subject.value.map { connection in - guard connection.id == id else { return connection } - return DAppConnection( - id: connection.id, - name: connection.name, - url: connection.url, - status: .approved, - updatedAt: disconnectedAt - ) - }) + await updateRows(in: stores) { rows in + rows.map { connection in + guard connection.id == id else { return connection } + return DAppConnection( + id: connection.id, + name: connection.name, + url: connection.url, + status: .approved, + updatedAt: disconnectedAt + ) + } + } } /// Ends the access one-QR logins gave an app: disables its session keys @@ -1391,21 +1484,27 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// no record for this identity the keys are still looked for on it. When /// it holds none bound to the app, there was nothing to turn off here and /// the call returns without an error. - private func revokeAppConnectGrants(appContractId: String, checksUnrecordedKeys: Bool) async throws -> Bool { - var context = try await requireContext() + private func revokeAppConnectGrants( + appContractId: String, + checksUnrecordedKeys: Bool, + stores: Stores + ) async throws -> Bool { + // The row was picked in the wallet `stores` belongs to; another + // wallet's identity is not the one the row belongs to. + var context = try await requireContext(pinnedTo: stores) let identityId = context.identityId.toBase58String() func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } func hasLiveGrantElsewhere() -> Bool { - responseStore.load().contains { + stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true } } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !responseStore.load().contains(where: isGranted) { + if !stores.grants.load().contains(where: isGranted) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. let holdsUnrecordedKey = try checksUnrecordedKeys && Self @@ -1420,16 +1519,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } try await authorize() - // The PIN prompt can outlast a wallet or network switch; sign with - // what is active now, and only if it is still the same identity. - context = try await requireContext() - guard context.identityId.toBase58String() == identityId else { - throw DashConnectPlatformError.noIdentity - } + context = try await contextAfterAuthorization(matching: context) let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - let granted = responseStore.load().filter(isGranted) + let granted = stores.grants.load().filter(isGranted) guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -1496,7 +1590,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // Every session key this identity gave the app is now off. - updateGrants { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } + updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( @@ -1921,23 +2015,58 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - private func persistAndSend(_ connections: [DAppConnection]) { - let sorted = connections.sorted(by: { $0.updatedAt > $1.updatedAt }) - store.save(sorted) - subject.send(sorted) + /// The stores fixed to one wallet; `nil` with no wallet. + private static func pinnedStores( + walletIdHex: String?, + store: any DashConnectStore, + responseStore: any AppConnectResponseStore + ) -> Stores? { + guard let walletIdHex, !walletIdHex.isEmpty else { return nil } + return Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex)) } - private func existingConnection(for contractId: String) -> DAppConnection? { - subject.value.first { $0.id == contractId } + /// The stores fixed to the wallet that is active at this call, read + /// once; `nil` with no wallet. + private func pinnedActiveStores() -> Stores? { + Self.pinnedStores(walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore) } - private func pendingApprovedConnectionForKeyRegistration( - boundContractId: Data? - ) throws -> DAppConnection { - try Self.pendingApprovedConnectionForKeyRegistration( - in: subject.value, - boundContractId: boundContractId - ) + /// Publishes the active wallet's rows when the published list holds + /// another wallet's. Returns the active wallet's stores, read once, and + /// whether the list had to change. + @MainActor + @discardableResult + private func showActiveWalletRows() -> (active: Stores?, changed: Bool) { + let active = pinnedActiveStores() + guard shownRows.scope != active?.scope else { return (active, false) } + shownRows.scope = active?.scope + subject.send(active?.connections.load() ?? []) + return (active, true) + } + + /// The rows of the wallet `stores` belongs to: the published list while + /// it is that wallet's, the stored rows otherwise. + @MainActor + private func rows(in stores: Stores) -> [DAppConnection] { + shownRows.scope == stores.scope ? subject.value : stores.connections.load() + } + + @MainActor + private func shownRow(id: String) -> DAppConnection? { + subject.value.first { $0.id == id } + } + + /// Changes the rows of the wallet `stores` belongs to in one step, saves + /// them there, and publishes them only while the published list is that + /// wallet's. + @MainActor + private func updateRows(in stores: Stores, _ change: ([DAppConnection]) -> [DAppConnection]) { + let sorted = change(rows(in: stores)).sorted(by: { $0.updatedAt > $1.updatedAt }) + stores.connections.save(sorted) + if shownRows.scope == stores.scope { subject.send(sorted) } } /// The contract every bounded key in the transition points at, or `nil` @@ -2128,6 +2257,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.noIdentity } + // The stores below are fixed to this wallet. While a switch is under + // way the SDK can still hold the wallet that is being left. + let walletIdHex = wallet.walletId.hexEncodedString() + guard activeWalletIdHex() == walletIdHex else { + Self.logger.error("🔗 DASHCONNECT :: the SDK wallet is not the active wallet") + throw DashConnectPlatformError.walletChanged + } + let identityIndex = try wallet.managedIdentity(identityId: identityId).getIdentityIndex() ?? 0 return Context( @@ -2137,7 +2274,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { network: network, identityId: identityId, identityIndex: identityIndex, - storedUsername: runtime.storedUsername + storedUsername: runtime.storedUsername, + stores: Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex)) ) } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4ffd8683e4..4a7f4d98fb 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index a5649d7a5e..3782484b0f 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 38b8295a1e..db277f89b1 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 48e5449609..36cb1aea0f 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index ad37330aea..39490b5cbd 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 19aed04c65..81bbf8222d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 4bb3cf98c5..f071296e3c 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 099b5eccea..2347a5978a 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6108,6 +6108,7 @@ "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 6b899e96d3..eb246d451f 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index bb6a482738..58e56d67bd 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index c2b852ab98..7cd6630755 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 21837cfd17..085d0bf9b6 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 4e32bd4451..673ba6f4c2 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 0ce459b834..0474475dbc 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index cbc16fef66..fae9a28e62 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 612a1716d4..0715d27a3b 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 4c1635791c..ae12ecacd2 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 2d39f1c572..4756d0b1fb 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 1d97b6f1ac..049b3838b0 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index d06740fc89..663b24983a 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 25fb69f94b..7b85aec733 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 76b985cd4c..d4fa98c9e3 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 9ee12ee052..352bebfa3f 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index c7a786a32f..7280233df7 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index b9a559798f..88d53dc401 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 45b74a8c30..e8e36401b3 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 21db751d2e..5bd47f0936 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 10ecb31aaa..9d874a3018 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 61851e35f6..371cfac1e4 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index c160e4f082..85309c02be 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 550121a446..445ef45c09 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 70459eea3b..d9b2a3bd54 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d2bf1a6649..d2989f9571 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index b852cb9595..18e28d1e80 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 37cbf74032..b7d0d2be55 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 2267ccda5f..fa22522913 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 34ba75e5b0..bdd8eee0b7 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 3251357a09..5b76b0c8fd 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 9750cfd874..4734b76d7b 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index efca41259b..5a095b99ff 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 800a902073..c1ada09455 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6224,6 +6224,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 480bbb48b5..9b8c0fd216 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 9eb440b1a5..24a2338402 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6222,6 +6222,7 @@ "Retry loading identity" = "Retry loading identity"; "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit." = "Spend up to %@ of your identity's credits on those actions. Each sign-in has its own limit."; "The active wallet or identity changed. Please try again." = "The active wallet or identity changed. Please try again."; +"The active wallet or identity changed. Try again." = "The active wallet or identity changed. Try again."; "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key." = "The app's key was added to your identity, but this wallet could not record it. Turn the app off in Connections to remove the key."; "The app's keys on this identity are off, but this wallet could not check its other identities. Try again." = "The app's keys on this identity are off, but this wallet could not check its other identities. Try again."; "The details of this sign-in changed while it was on screen. Check them and approve again." = "The details of this sign-in changed while it was on screen. Check them and approve again."; diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 2d7f0819ee..25f76858fa 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -225,6 +225,41 @@ final class DashConnectStoreTests: XCTestCase { XCTAssertNotEqual(devnetA.storageKey, devnetB.storageKey) } + func testAPinnedStoreStaysWithItsWalletAndDevnetWhenTheActiveOnesChange() { + var walletIdHex: String? = "wallet-a" + var devnetName: String? = "moutai" + let store = UserDefaultsDashConnectStore( + defaults: defaults, + network: .devnet, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { devnetName } + ) + let connection = sampleConnection( + id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", + status: .active, + updatedAt: Date(timeIntervalSince1970: 10)) + + let pinned = store.pinnedStore(toWalletIdHex: "wallet-a") + XCTAssertEqual(pinned.storageKey, store.storageKey) + + walletIdHex = "wallet-b" + devnetName = "paloma" + pinned.save([connection]) + + XCTAssertNotEqual(pinned.storageKey, store.storageKey) + XCTAssertEqual(pinned.load(), [connection]) + XCTAssertEqual(store.load(), [], "the wallet that became active got none of the rows") + walletIdHex = "wallet-a" + devnetName = "moutai" + XCTAssertEqual(store.load(), [connection]) + } + + func testAPinnedStoreNamesTheWalletItWasGivenNotTheActiveOne() { + let store = makeStore(network: .testnet, walletIdHex: "wallet-b") + + XCTAssertEqual(store.pinnedStore(toWalletIdHex: "wallet-a").storageKey, "dashconnect.connections.v1.t.wallet-a") + } + func testUnnamedDevnetStoresNothing() { let store = makeStore(network: .devnet, walletIdHex: "wallet-a", devnetName: nil) store.save([sampleConnection( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7000e2f6c3..162fa94220 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -84,7 +84,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) @@ -105,7 +106,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) @@ -125,7 +127,8 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { // Explicit: the default follows the app's current network, and on // a fresh install that is mainnet, which the initializer rejects. supportedNetwork: .testnet, - store: TestDashConnectStore(initialConnections: [existing]) + store: TestDashConnectStore(initialConnections: [existing]), + activeWalletIdHex: { "wallet" } ) let request = try makeLoginRequest( contractId: Data(repeating: 0x44, count: 32), @@ -1256,6 +1259,10 @@ private final class TestDashConnectStore: DashConnectStore { func save(_ connections: [DAppConnection]) { self.connections = connections } + + var scopeKey: String? { nil } + + func pinned(toWalletIdHex walletIdHex: String) -> any DashConnectStore { self } } /// What the approval sheet may offer after a failed token purchase. @@ -2232,6 +2239,190 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(store.load(), []) } + func testPinnedGrantRecordsStayWithTheirWalletWhenTheActiveOneChanges() { + var walletIdHex: String? = "wallet-b" + let connections = UserDefaultsDashConnectStore( + defaults: defaults, + network: .testnet, + walletIdHexProvider: { walletIdHex }, + devnetNameProvider: { nil } + ) + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) + let grant = Self.grant(sessionKeyId: 6) + + // Pinned for the wallet the operation runs for, which the active + // one has already stopped being. + let pinned = store.pinned(toWalletIdHex: "wallet-a") + XCTAssertTrue(pinned.canPersist) + pinned.save([grant]) + + XCTAssertEqual(pinned.load(), [grant]) + XCTAssertEqual(store.load(), [], "the active wallet got none of the records") + walletIdHex = "wallet-a" + XCTAssertEqual(store.load(), [grant]) + } + + func testDisconnectOfARowFromAnotherWalletIsRefusedAndTheListMovesToTheActiveWallet() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + active.idHex = "wallet-b" + connections.save([other]) + var published: [DAppConnection] = [] + let subscription = dataSource.connections.sink { published = $0 } + defer { subscription.cancel() } + + do { + try await dataSource.disconnect(id: row.id) + XCTFail("a row of a wallet that is no longer active was disconnected") + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)") + } + } + + XCTAssertEqual(published, [other], "the list shows the wallet that is active") + + XCTAssertEqual(connections.load(), [other]) + active.idHex = "wallet-a" + XCTAssertEqual(connections.load(), [row], "the other wallet's row is untouched") + } + + func testDisconnectIsRefusedWhenTheNewlyActiveWalletHasARowForTheSameApp() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + active.idHex = "wallet-b" + connections.save([row]) + + do { + try await dataSource.disconnect(id: row.id) + XCTFail("the tap on one wallet's row turned off the other wallet's") + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)") + } + } + + XCTAssertEqual(connections.load().map(\.status), [.active]) + } + + func testRemoveDoesNothingWhenTheListWasAnotherWallets() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + active.idHex = "wallet-b" + connections.save([row]) + + await dataSource.remove(id: row.id) + XCTAssertEqual(connections.load(), [row]) + + await dataSource.remove(id: row.id) + XCTAssertEqual(connections.load(), [], "the list is this wallet's now") + } + + func testDisconnectOfATwoQRRowTurnsItOffInTheActiveWallet() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + var published: [DAppConnection] = [] + let subscription = dataSource.connections.sink { published = $0 } + defer { subscription.cancel() } + + try await dataSource.disconnect(id: row.id) + + XCTAssertEqual(connections.load().map(\.status), [.approved]) + XCTAssertEqual(published.map(\.status), [.approved]) + } + + func testTheListMovesToTheActiveWalletWhenTheWalletChangeIsAnnounced() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let center = NotificationCenter() + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center) + let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) + active.idHex = "wallet-b" + connections.save([other]) + let moved = expectation(description: "the active wallet's rows are published") + let subscription = dataSource.connections.sink { rows in + if rows == [other] { moved.fulfill() } + } + defer { subscription.cancel() } + + center.post( + name: SwiftDashSDKWalletState.activeWalletDidChangeNotification, object: nil) + + await fulfillment(of: [moved], timeout: 2) + } + + func testDisconnectWithNoActiveWalletIsRefused() async { + let active = ActiveWallet(nil) + let (dataSource, _) = makeScopedDataSource(active: active) + + do { + try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id) + XCTFail("disconnected with no wallet") + } catch { + guard case DashConnectPlatformError.noWallet = error else { + return XCTFail("unexpected error: \(error)") + } + } + } + + private final class ActiveWallet { + var idHex: String? + init(_ idHex: String?) { self.idHex = idHex } + } + + /// `rows` are the active wallet's, stored before the data source loads + /// its list. + private func makeScopedDataSource( + active: ActiveWallet, + rows: [DAppConnection] = [], + notificationCenter: NotificationCenter = NotificationCenter() + ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { + let connections = UserDefaultsDashConnectStore( + defaults: defaults, + network: .testnet, + walletIdHexProvider: { active.idHex }, + devnetNameProvider: { nil } + ) + connections.save(rows) + let dataSource = PlatformDashConnectDataSource( + supportedNetwork: .testnet, + store: connections, + responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), + activeWalletIdHex: { active.idHex }, + notificationCenter: notificationCenter + ) + return (dataSource, connections) + } + + private static func twoQRRow( + id: String = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", + status: ConnectionStatus + ) -> DAppConnection { + DAppConnection( + id: id, name: "Yappr", url: "yap.pr", status: status, + updatedAt: Date(timeIntervalSince1970: 1_773_132_300)) + } + + func testAPinnedHandedInScopeDoesNotFollowItsProvider() { + var scope: String? = "scope-a" + let store = UserDefaultsAppConnectResponseStore(defaults: defaults, network: .testnet) { scope } + let grant = Self.grant(sessionKeyId: 6) + + let pinned = store.pinned(toWalletIdHex: "wallet-a") + scope = "scope-b" + pinned.save([grant]) + + XCTAssertEqual(store.load(), []) + scope = "scope-a" + XCTAssertEqual(store.load(), [grant]) + } + private static let now = Date(timeIntervalSince1970: 1_800_000_000) private static let nowMilliseconds: Int64 = 1_800_000_000_000 private static let app = Data(repeating: 0xA1, count: 32) From 1633ae0496924f0d661b7844dcbdaf9820d85778 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 21:04:49 +0300 Subject: [PATCH 15/30] fix(dashpay): a DashConnect disconnect acts only on the wallet its row was shown for A published row now names the wallet and network it was published for, and disconnect and remove take that scope back. A row picked from a list that has since moved to another wallet is refused, also when the new wallet has a row for the same app and the list was already replaced by the wallet-change notification before the call arrived. The scope is set where rows are published and cleared before they are stored. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectDataSource.swift | 12 +- .../DashConnect/DashConnectModels.swift | 5 + .../PlatformDashConnectDataSource.swift | 64 ++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 4 +- .../DashConnect/DashConnectStoreTests.swift | 4 +- .../PlatformDashConnectDataSourceTests.swift | 138 +++++++++++++----- 6 files changed, 155 insertions(+), 72 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 09b190c364..70ee6a34ee 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -48,8 +48,12 @@ protocol DashConnectDataSource { /// same key every time and Platform never re-adds a disabled key, so /// disabling it would lock the app out for good. Turning off a one-QR /// connection that replaced a two-QR one does disable those keys too. - func disconnect(id: String) async throws - func remove(id: String) async + /// + /// `scope` is the `DAppConnection.scope` of the row that was picked: + /// both calls act only while it still names the wallet they would act + /// on. + func disconnect(id: String, scope: String?) async throws + func remove(id: String, scope: String?) async } /// Why a token purchase failed, and — the part that decides what the UI may @@ -256,7 +260,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { DashConnectMockError.stateTransitionNotSupported) } - func disconnect(id: String) async throws { + func disconnect(id: String, scope: String?) async throws { let disconnectedAt = Date() persistAndSend(subject.value.map { connection in guard connection.id == id else { return connection } @@ -270,7 +274,7 @@ final class MockDashConnectDataSource: DashConnectDataSource { }) } - func remove(id: String) async { + func remove(id: String, scope: String?) async { persistAndSend(subject.value.filter { $0.id != id }) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 1c26886965..dfb5304aa2 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -189,6 +189,11 @@ struct DAppConnection: Identifiable, Equatable, Hashable { let status: ConnectionStatus let updatedAt: Date var loginKind: DashConnectLoginKind = .twoQR + /// Names the wallet and network a data source published this row for; + /// `nil` on a row that was built or read from a store. Not stored. It + /// goes back with a disconnect or a remove, so a row picked from a list + /// that has since changed wallets is not acted on in the new one. + var scope: String? = nil } /// A pending request derived from a scanned login QR code. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index de627b580a..d17602d43e 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -396,6 +396,25 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// the connection store was fixed to, which tells two devnets of one /// wallet apart. var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + + /// The rows as they are published: each names this scope. + func published(_ rows: [DAppConnection]) -> [DAppConnection] { + Self.rows(rows, scope: scope) + } + + /// The rows as they are stored: without the scope a published row + /// carries. + static func stored(_ rows: [DAppConnection]) -> [DAppConnection] { + Self.rows(rows, scope: nil) + } + + private static func rows(_ rows: [DAppConnection], scope: String?) -> [DAppConnection] { + rows.map { row in + var row = row + row.scope = scope + return row + } + } } /// The scope of the rows `subject` holds. Read and written on the main @@ -470,7 +489,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let active = Self.pinnedStores( walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) self.shownRows = ShownRows(scope: active?.scope) - self.subject = CurrentValueSubject(active?.connections.load() ?? []) + self.subject = CurrentValueSubject(active.map { $0.published($0.connections.load()) } ?? []) // The list is loaded once, and the active wallet can change while // this data source lives. self.walletChangeObserver = notificationCenter @@ -1391,27 +1410,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - func remove(id: String) async { - // A list that had to change just now was another wallet's: the row - // to remove was not picked from this one. - let (active, changed) = await showActiveWalletRows() - guard let stores = active, !changed else { return } + func remove(id: String, scope: String?) async { + // A row published for another wallet was not picked from this one. + guard let stores = await showActiveWalletRows(), scope == stores.scope else { return } await updateRows(in: stores) { rows in rows.filter { $0.id != id } } } - func disconnect(id: String) async throws { - let (active, changed) = await showActiveWalletRows() - guard let stores = active else { + func disconnect(id: String, scope: String?) async throws { + guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } - // The row was picked from the published list. A list that had to - // change just now was another wallet's, and nothing of that wallet - // can be turned off from here, even if this one has a row for the - // same app. - // TODO(dashconnect-row-scope): a list the wallet-change notification - // replaced between the tap and this call is not told apart; the call - // would have to name the wallet the row was shown for. - guard !changed else { + // The row names the wallet it was published for. When that is not + // the wallet that is active now, nothing of the row's wallet can be + // turned off from here, and a row this wallet has for the same app + // is not the one that was picked. + guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR @@ -2035,23 +2048,22 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Publishes the active wallet's rows when the published list holds - /// another wallet's. Returns the active wallet's stores, read once, and - /// whether the list had to change. + /// another wallet's. Returns the active wallet's stores, read once. @MainActor @discardableResult - private func showActiveWalletRows() -> (active: Stores?, changed: Bool) { + private func showActiveWalletRows() -> Stores? { let active = pinnedActiveStores() - guard shownRows.scope != active?.scope else { return (active, false) } + guard shownRows.scope != active?.scope else { return active } shownRows.scope = active?.scope - subject.send(active?.connections.load() ?? []) - return (active, true) + subject.send(active.map { $0.published($0.connections.load()) } ?? []) + return active } /// The rows of the wallet `stores` belongs to: the published list while /// it is that wallet's, the stored rows otherwise. @MainActor private func rows(in stores: Stores) -> [DAppConnection] { - shownRows.scope == stores.scope ? subject.value : stores.connections.load() + shownRows.scope == stores.scope ? Stores.stored(subject.value) : stores.connections.load() } @MainActor @@ -2064,9 +2076,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// wallet's. @MainActor private func updateRows(in stores: Stores, _ change: ([DAppConnection]) -> [DAppConnection]) { - let sorted = change(rows(in: stores)).sorted(by: { $0.updatedAt > $1.updatedAt }) + let sorted = Stores.stored(change(rows(in: stores))).sorted(by: { $0.updatedAt > $1.updatedAt }) stores.connections.save(sorted) - if shownRows.scope == stores.scope { subject.send(sorted) } + if shownRows.scope == stores.scope { subject.send(stores.published(sorted)) } } /// The contract every bounded key in the transition points at, or `nil` diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 1887b16a5b..b526237bc1 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -320,7 +320,7 @@ final class ConnectionsViewModel: ObservableObject { guard let self else { return } defer { self.isDisconnecting = false } do { - try await self.dataSource.disconnect(id: connection.id) + try await self.dataSource.disconnect(id: connection.id, scope: connection.scope) } catch { self.message = ConnectionsScreenMessage( kind: .error, @@ -333,7 +333,7 @@ final class ConnectionsViewModel: ObservableObject { func removeConnection(_ connection: DAppConnection) { Task { - await dataSource.remove(id: connection.id) + await dataSource.remove(id: connection.id, scope: connection.scope) } } diff --git a/DashWalletTests/DashConnect/DashConnectStoreTests.swift b/DashWalletTests/DashConnect/DashConnectStoreTests.swift index 25f76858fa..92b923c2b2 100644 --- a/DashWalletTests/DashConnect/DashConnectStoreTests.swift +++ b/DashWalletTests/DashConnect/DashConnectStoreTests.swift @@ -176,7 +176,7 @@ final class DashConnectStoreTests: XCTestCase { _ = try await first.approveLogin( MockDashConnectDataSource.sampleLoginRequest, consent: MockDashConnectDataSource.sampleRequest) - await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + await first.remove(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil) let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot, []) @@ -195,7 +195,7 @@ final class DashConnectStoreTests: XCTestCase { store: store ) - try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F") + try await first.disconnect(id: "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F", scope: nil) let second = MockDashConnectDataSource(store: store) XCTAssertEqual(second.connectionsSnapshot.count, 1) diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 162fa94220..24c33f281c 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -90,7 +90,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) - XCTAssertEqual(request.existingConnection, existing) + var found = request.existingConnection + XCTAssertNotNil(found?.scope, "a row from the published list names its scope") + found?.scope = nil + XCTAssertEqual(found, existing) XCTAssertEqual(request.appContractId, existing.id) } @@ -112,7 +115,10 @@ final class PlatformDashConnectDataSourceTests: XCTestCase { let request = await dataSource.makeConnectionRequest(from: MockDashConnectDataSource.sampleLoginRequest) - XCTAssertEqual(request.existingConnection, existing) + var found = request.existingConnection + XCTAssertNotNil(found?.scope, "a row from the published list names its scope") + found?.scope = nil + XCTAssertEqual(found, existing) } func testMakeConnectionRequestReturnsNilForUnknownContract() async throws { @@ -1356,10 +1362,13 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { let spy = PurchaseApprovalSpy() let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) - viewModel.disconnect(Self.connection) + var shown = Self.connection + shown.scope = "wallet-a t" + viewModel.disconnect(shown) await waitUntil { !viewModel.isDisconnecting } XCTAssertEqual(spy.disconnectedIds, [Self.connection.id]) + XCTAssertEqual(spy.disconnectedScopes, ["wallet-a t"], "the row goes back with the scope it was shown for") XCTAssertNil(viewModel.message) } @@ -1534,6 +1543,7 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { private var storedDisconnectFailure: Error? private var storedDisconnectedIds: [String] = [] + private var storedDisconnectedScopes: [String?] = [] var disconnectFailure: Error? { get { lock.withLock { storedDisconnectFailure } } @@ -1544,15 +1554,20 @@ private final class PurchaseApprovalSpy: DashConnectDataSource { lock.withLock { storedDisconnectedIds } } - func disconnect(id: String) async throws { + var disconnectedScopes: [String?] { + lock.withLock { storedDisconnectedScopes } + } + + func disconnect(id: String, scope: String?) async throws { let failure = lock.withLock { () -> Error? in storedDisconnectedIds.append(id) + storedDisconnectedScopes.append(scope) return storedDisconnectFailure } if let failure { throw failure } } - func remove(id: String) async { + func remove(id: String, scope: String?) async { XCTFail("remove is not part of the purchase approval flow") } } @@ -1611,11 +1626,11 @@ private final class LoginApprovalSpy: DashConnectDataSource { throw PurchaseSpyError.unsupported } - func disconnect(id: String) async throws { + func disconnect(id: String, scope: String?) async throws { throw PurchaseSpyError.unsupported } - func remove(id: String) async {} + func remove(id: String, scope: String?) async {} } private enum PurchaseSpyError: LocalizedError { @@ -2266,24 +2281,14 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) let other = Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .approved) active.idHex = "wallet-b" connections.save([other]) - var published: [DAppConnection] = [] - let subscription = dataSource.connections.sink { published = $0 } - defer { subscription.cancel() } - do { - try await dataSource.disconnect(id: row.id) - XCTFail("a row of a wallet that is no longer active was disconnected") - } catch { - guard case DashConnectPlatformError.walletChanged = error else { - return XCTFail("unexpected error: \(error)") - } - } - - XCTAssertEqual(published, [other], "the list shows the wallet that is active") + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + XCTAssertEqual(Self.shownRows(dataSource).map(\.id), [other.id], "the list shows the wallet that is active") XCTAssertEqual(connections.load(), [other]) active.idHex = "wallet-a" XCTAssertEqual(connections.load(), [row], "the other wallet's row is untouched") @@ -2293,32 +2298,57 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" connections.save([row]) - do { - try await dataSource.disconnect(id: row.id) - XCTFail("the tap on one wallet's row turned off the other wallet's") - } catch { - guard case DashConnectPlatformError.walletChanged = error else { - return XCTFail("unexpected error: \(error)") - } - } + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } XCTAssertEqual(connections.load().map(\.status), [.active]) } - func testRemoveDoesNothingWhenTheListWasAnotherWallets() async { + func testDisconnectFromAnOldListIsRefusedAfterTheListAlreadyMovedToTheNewWallet() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let center = NotificationCenter() + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center) + // What the screen still holds when the tap lands. + let shown = Self.shownRows(dataSource) + active.idHex = "wallet-b" + connections.save([row]) + let moved = expectation(description: "the active wallet's rows are published") + moved.assertForOverFulfill = false + let subscription = dataSource.connections.sink { rows in + if rows.first?.scope != nil, rows.first?.scope != shown[0].scope { moved.fulfill() } + } + defer { subscription.cancel() } + center.post(name: SwiftDashSDKWalletState.activeWalletDidChangeNotification, object: nil) + await fulfillment(of: [moved], timeout: 2) + + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + await dataSource.remove(id: shown[0].id, scope: shown[0].scope) + + XCTAssertEqual(connections.load(), [row], "the new wallet's row for the same app is untouched") + // The row the new list shows is this wallet's own. + let current = Self.shownRows(dataSource) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + XCTAssertEqual(connections.load().map(\.status), [.approved]) + } + + func testRemoveDoesNothingForARowPublishedForAnotherWallet() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let shown = Self.shownRows(dataSource) active.idHex = "wallet-b" connections.save([row]) - await dataSource.remove(id: row.id) + await dataSource.remove(id: shown[0].id, scope: shown[0].scope) XCTAssertEqual(connections.load(), [row]) - await dataSource.remove(id: row.id) + let current = Self.shownRows(dataSource) + await dataSource.remove(id: current[0].id, scope: current[0].scope) XCTAssertEqual(connections.load(), [], "the list is this wallet's now") } @@ -2326,14 +2356,23 @@ final class AppConnectLoginTests: XCTestCase { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) - var published: [DAppConnection] = [] - let subscription = dataSource.connections.sink { published = $0 } - defer { subscription.cancel() } + let shown = Self.shownRows(dataSource) - try await dataSource.disconnect(id: row.id) + try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) XCTAssertEqual(connections.load().map(\.status), [.approved]) - XCTAssertEqual(published.map(\.status), [.approved]) + XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) + } + + func testARowWithNoScopeIsNotActedOn() async { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + + await Self.expectWalletChanged { try await dataSource.disconnect(id: row.id, scope: nil) } + await dataSource.remove(id: row.id, scope: nil) + + XCTAssertEqual(connections.load(), [row]) } func testTheListMovesToTheActiveWalletWhenTheWalletChangeIsAnnounced() async { @@ -2347,7 +2386,7 @@ final class AppConnectLoginTests: XCTestCase { connections.save([other]) let moved = expectation(description: "the active wallet's rows are published") let subscription = dataSource.connections.sink { rows in - if rows == [other] { moved.fulfill() } + if rows.map(\.id) == [other.id] { moved.fulfill() } } defer { subscription.cancel() } @@ -2362,7 +2401,7 @@ final class AppConnectLoginTests: XCTestCase { let (dataSource, _) = makeScopedDataSource(active: active) do { - try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id) + try await dataSource.disconnect(id: Self.twoQRRow(status: .active).id, scope: nil) XCTFail("disconnected with no wallet") } catch { guard case DashConnectPlatformError.noWallet = error else { @@ -2371,6 +2410,29 @@ final class AppConnectLoginTests: XCTestCase { } } + /// The rows the data source publishes right now. + private static func shownRows(_ dataSource: PlatformDashConnectDataSource) -> [DAppConnection] { + var rows: [DAppConnection] = [] + let subscription = dataSource.connections.sink { rows = $0 } + subscription.cancel() + return rows + } + + private static func expectWalletChanged( + _ action: () async throws -> Void, + file: StaticString = #filePath, + line: UInt = #line + ) async { + do { + try await action() + XCTFail("a row of a wallet that is no longer active was acted on", file: file, line: line) + } catch { + guard case DashConnectPlatformError.walletChanged = error else { + return XCTFail("unexpected error: \(error)", file: file, line: line) + } + } + } + private final class ActiveWallet { var idHex: String? init(_ idHex: String?) { self.idHex = idHex } From 8bfc35b49c55f306aebe74eef1452617a0611c01 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 22:34:13 +0300 Subject: [PATCH 16/30] fix(dashpay): one DashConnect approval, key registration or disconnect at a time per wallet An approval keeps running after its screen is closed, and a screen opened again gets a new data source over the same stores. A disconnect started there could pick the keys to disable before that approval registered one more, and then mark the new grant as disabled too. - A process-wide gate lets one approval, key registration or disconnect run at a time for a wallet, in arrival order, whichever data source it came through. A turn that comes after the active wallet changed does not start. - A disconnect marks disabled, and deletes the responses of, only the grants it read before disabling. - Rows are read from the store for every change instead of from the list a data source loaded earlier, so two data sources do not overwrite each other's rows. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 52 ++++++++ .../PlatformDashConnectDataSource.swift | 65 +++++++--- .../PlatformDashConnectDataSourceTests.swift | 121 +++++++++++++++++- 3 files changed, 221 insertions(+), 17 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index dbfac6e2d8..36c1fe4882 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -528,6 +528,58 @@ struct AppConnectGrant: Codable, Equatable { } } +/// Lets one DashConnect operation at a time run for a wallet, across every +/// data source in the process. A screen that is opened again gets a new data +/// source over the same stores while an approval started on the old one is +/// still running; without this a disconnect could pick the keys to disable +/// before that approval registers one more. +/// +/// Callers wait their turn in the order they arrived. +actor DashConnectOperationGate { + static let shared = DashConnectOperationGate() + + private var held: Set = [] + private var waiting: [String: [CheckedContinuation]] = [:] + + /// `onWait` is called when the operation has to wait for its turn. + func run( + for key: String, + onWait: () -> Void = {}, + _ operation: () async throws -> T + ) async rethrows -> T { + if held.contains(key) { onWait() } + await enter(key) + do { + let result = try await operation() + leave(key) + return result + } catch { + leave(key) + throw error + } + } + + private func enter(_ key: String) async { + guard held.contains(key) else { + held.insert(key) + return + } + // The turn is handed over by `leave`, which keeps `key` held. + await withCheckedContinuation { waiting[key, default: []].append($0) } + } + + private func leave(_ key: String) { + guard var queue = waiting[key], !queue.isEmpty else { + waiting[key] = nil + held.remove(key) + return + } + let next = queue.removeFirst() + waiting[key] = queue + next.resume() + } +} + protocol AppConnectResponseStore { /// Whether `save` keeps anything. A login must not register a key the /// store cannot record: its response could not be found again. diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index d17602d43e..7928db9135 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -448,6 +448,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let responseStore: any AppConnectResponseStore private let subject: CurrentValueSubject<[DAppConnection], Never> private let shownRows: ShownRows + private let operationGate: DashConnectOperationGate private let activeWalletIdHex: () -> String? private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer @@ -474,6 +475,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), notificationCenter: NotificationCenter = .default, + operationGate: DashConnectOperationGate = .shared, now: @escaping () -> Date = Date.init ) { assert( @@ -486,6 +488,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.stateTransitionParser = stateTransitionParser self.now = now self.activeWalletIdHex = activeWalletIdHex + self.operationGate = operationGate let active = Self.pinnedStores( walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) self.shownRows = ShownRows(scope: active?.scope) @@ -541,7 +544,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } - let existingConnection = await rows(in: context.stores).first { $0.id == fallback.appContractId } + let existingConnection = rows(in: context.stores).first { $0.id == fallback.appContractId } // Which login this network gets is settled here, so the sheet can // show what the app is given. With the version unknown the request @@ -572,7 +575,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } + /// One approval, key registration or disconnect at a time for the active + /// wallet, whichever data source it came through. The turn is for the + /// wallet that was active when it was asked for: if another one is + /// active when it comes, the operation does not start. + private func gated(_ operation: () async throws -> T) async throws -> T { + let walletIdHex = activeWalletIdHex() ?? "" + return try await operationGate.run( + for: walletIdHex, + onWait: { Self.logger.info("🔗 DASHCONNECT :: waiting for another DashConnect operation to finish") } + ) { + guard (activeWalletIdHex() ?? "") == walletIdHex else { + throw DashConnectPlatformError.walletChanged + } + return try await operation() + } + } + func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection { + try await gated { try await approveLoginInTurn(request, consent: consent) } + } + + private func approveLoginInTurn( + _ request: DashKeyRequest, + consent: ConnectionRequest + ) async throws -> DAppConnection { Self.logger.info("🔗 DASHCONNECT :: approveLogin started") try validateNetwork(request.network) await showActiveWalletRows() @@ -986,9 +1013,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return (identifier, values) } - /// Reads, changes and writes the grant records in one step with no - /// suspension point in between, so an approval and a disconnect that - /// overlap cannot write a stale copy over each other's change. + /// Reads, changes and writes the grant records in one step, from the + /// store each time. Every caller runs inside `gated`, so no other + /// operation of this wallet writes them in between. @discardableResult private func updateGrants(in stores: Stores, _ change: (inout [AppConnectGrant]) -> T) -> T { var grants = stores.grants.load() @@ -1119,7 +1146,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch parsed { case .keyRegistration(let transition): - try await completeKeyRegistration(transition, context: context) + // Only this branch changes the identity and the rows. + try await gated { try await completeKeyRegistration(transition, context: context) } return .keyRegistrationCompleted case .tokenPurchase(let purchase): return .tokenPurchaseApprovalRequired( @@ -1142,7 +1170,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // recently approved connection instead would derive app B's keys for // a QR scanned from app A. let pendingConnection = try Self.pendingApprovedConnectionForKeyRegistration( - in: await rows(in: context.stores), + in: rows(in: context.stores), boundContractId: Self.boundAppContractId(in: transition) ) guard let pendingAppContractId = Self.decodeIdentifier(pendingConnection.id) else { @@ -1286,7 +1314,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return DashConnectTokenPurchaseRequest( // A connection approved earlier for the same contract names the // app; otherwise the sheet falls back to the contract id. - appName: await rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, + appName: rows(in: context.stores).first { $0.id == contractIdBase58 }?.name, ownerId: purchase.ownerId, dataContractId: purchase.dataContractId, tokenId: purchase.tokenId, @@ -1417,6 +1445,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } func disconnect(id: String, scope: String?) async throws { + try await gated { try await disconnectInTurn(id: id, scope: scope) } + } + + private func disconnectInTurn(id: String, scope: String?) async throws { guard let stores = await showActiveWalletRows() else { throw DashConnectPlatformError.noWallet } @@ -1427,7 +1459,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } - let isOneQR = await rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR let hasGrants = stores.grants.load().contains { $0.appContractId == id } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( @@ -1602,12 +1634,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") } - // Every session key this identity gave the app is now off. - updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isGranted) } + // The session keys of the grants read above are now off, and only + // those are marked. + let revoked = Set(granted.map(\.key)) + func isRevoked(_ grant: AppConnectGrant) -> Bool { revoked.contains(grant.key) } + updateGrants(in: stores) { AppConnect.markKeysDisabled(in: &$0, where: isRevoked) } if let responseContractId = Self.decodeIdentifier(AppConnect.contractId) { await deleteAppConnectResponses( - where: isGranted, + where: isRevoked, responseContractId: responseContractId, context: context, signer: signer @@ -2059,11 +2094,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return active } - /// The rows of the wallet `stores` belongs to: the published list while - /// it is that wallet's, the stored rows otherwise. - @MainActor + /// The rows of the wallet `stores` belongs to, as stored. Not the + /// published list: another data source over the same store may have + /// written since this one loaded it. private func rows(in stores: Stores) -> [DAppConnection] { - shownRows.scope == stores.scope ? Stores.stored(subject.value) : stores.connections.load() + stores.connections.load() } @MainActor diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 24c33f281c..7821928da8 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2396,6 +2396,121 @@ final class AppConnectLoginTests: XCTestCase { await fulfillment(of: [moved], timeout: 2) } + func testOperationsForOneWalletRunOneAtATimeInArrivalOrder() async { + let gate = DashConnectOperationGate() + let log = OperationLog() + let firstStarted = expectation(description: "the first operation is running") + let secondWaits = expectation(description: "the second operation waits") + let thirdWaits = expectation(description: "the third operation waits") + let release = AsyncStream.makeStream() + + let first = Task { + await gate.run(for: "wallet-a") { + await log.add("first starts") + firstStarted.fulfill() + for await _ in release.stream { break } + await log.add("first ends") + } + } + await fulfillment(of: [firstStarted], timeout: 2) + let second = Task { + await gate.run(for: "wallet-a", onWait: { secondWaits.fulfill() }) { await log.add("second runs") } + } + await fulfillment(of: [secondWaits], timeout: 2) + let third = Task { + await gate.run(for: "wallet-a", onWait: { thirdWaits.fulfill() }) { await log.add("third runs") } + } + await fulfillment(of: [thirdWaits], timeout: 2) + // Another wallet does not wait for this one. + await gate.run(for: "wallet-b") { await log.add("other wallet runs") } + release.continuation.yield() + await first.value + await second.value + await third.value + + let entries = await log.entries + XCTAssertEqual( + entries, ["first starts", "other wallet runs", "first ends", "second runs", "third runs"]) + } + + func testADisconnectWaitsForAnOperationAnotherDataSourceIsRunning() async throws { + let gate = DashConnectOperationGate() + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) + let shown = Self.shownRows(dataSource) + let otherStarted = expectation(description: "the other operation is running") + let release = AsyncStream.makeStream() + // What another data source of the same wallet would be doing. + let other = Task { + await gate.run(for: "wallet-a") { + otherStarted.fulfill() + for await _ in release.stream { break } + // It wrote a row of its own meanwhile. + connections.save([row, Self.twoQRRow(id: "7UaqHGBJBbRLJ4fUWS45cnud8PPUugJWoGTt1SKwHJ2P", status: .active)]) + } + } + await fulfillment(of: [otherStarted], timeout: 2) + + let disconnect = Task { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + try await Task.sleep(nanoseconds: 100_000_000) + XCTAssertEqual(connections.load().map(\.status), [.active], "the disconnect has not run yet") + + release.continuation.yield() + await other.value + try await disconnect.value + + let rows = connections.load() + XCTAssertEqual(rows.count, 2, "the row the other operation wrote is kept") + XCTAssertEqual(rows.first { $0.id == row.id }?.status, .approved) + } + + func testAnOperationDoesNotStartForAWalletThatIsNoLongerActiveWhenItsTurnComes() async { + let gate = DashConnectOperationGate() + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row], operationGate: gate) + let shown = Self.shownRows(dataSource) + let otherStarted = expectation(description: "the other operation is running") + let release = AsyncStream.makeStream() + let other = Task { + await gate.run(for: "wallet-a") { + otherStarted.fulfill() + for await _ in release.stream { break } + } + } + await fulfillment(of: [otherStarted], timeout: 2) + + let disconnect = Task { + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + } + try? await Task.sleep(nanoseconds: 100_000_000) + active.idHex = "wallet-b" + release.continuation.yield() + await other.value + await disconnect.value + + active.idHex = "wallet-a" + XCTAssertEqual(connections.load(), [row]) + } + + func testAFailedOperationHandsTheTurnOn() async { + let gate = DashConnectOperationGate() + + do { + try await gate.run(for: "wallet-a") { throw DashConnectPlatformError.noWallet } + XCTFail("the failure was swallowed") + } catch {} + let ran = await gate.run(for: "wallet-a") { true } + + XCTAssertTrue(ran) + } + + private actor OperationLog { + private(set) var entries: [String] = [] + func add(_ entry: String) { entries.append(entry) } + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) @@ -2443,7 +2558,8 @@ final class AppConnectLoginTests: XCTestCase { private func makeScopedDataSource( active: ActiveWallet, rows: [DAppConnection] = [], - notificationCenter: NotificationCenter = NotificationCenter() + notificationCenter: NotificationCenter = NotificationCenter(), + operationGate: DashConnectOperationGate = DashConnectOperationGate() ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { let connections = UserDefaultsDashConnectStore( defaults: defaults, @@ -2457,7 +2573,8 @@ final class AppConnectLoginTests: XCTestCase { store: connections, responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), activeWalletIdHex: { active.idHex }, - notificationCenter: notificationCenter + notificationCenter: notificationCenter, + operationGate: operationGate ) return (dataSource, connections) } From 57b3346b57337d7c7f7f64f3cf6a4ddab650c9f7 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Tue, 13 Oct 2026 23:18:09 +0300 Subject: [PATCH 17/30] fix(dashpay): bind DashConnect operations to the network scope too, and show the app contract on the sheet - A context resolved again after a PIN prompt or a wait at the operation gate must match the whole scope of the stores it carries on with, the wallet and the network scope: the same wallet on another devnet is refused. - A dash-st: key registration takes its turn for the wallet of the context it resolved, and resolves the context again once the turn comes. - The approval sheet shows the app's contract id in full, selectable: the name next to it can be chosen by the code or the contract's owner, and the id is what a one-QR key is bound to. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 35 +++++++++++++------ .../DashConnect/ApproveConnectionSheet.swift | 18 ++++++++++ DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + 45 files changed, 86 insertions(+), 10 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 7928db9135..4fc2e43d7f 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -579,8 +579,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// wallet, whichever data source it came through. The turn is for the /// wallet that was active when it was asked for: if another one is /// active when it comes, the operation does not start. - private func gated(_ operation: () async throws -> T) async throws -> T { - let walletIdHex = activeWalletIdHex() ?? "" + /// + /// An operation that already has a context names that context's wallet, + /// so its turn is that wallet's whichever one is active by now. + private func gated( + walletIdHex: String? = nil, + _ operation: () async throws -> T + ) async throws -> T { + let walletIdHex = walletIdHex ?? activeWalletIdHex() ?? "" return try await operationGate.run( for: walletIdHex, onWait: { Self.logger.info("🔗 DASHCONNECT :: waiting for another DashConnect operation to finish") } @@ -1146,8 +1152,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { switch parsed { case .keyRegistration(let transition): - // Only this branch changes the identity and the rows. - try await gated { try await completeKeyRegistration(transition, context: context) } + // Only this branch changes the identity and the rows. Its turn + // is the wallet of the context read above, and the context is + // resolved again once the turn comes: the wait can outlast a + // wallet, network or identity switch. + try await gated(walletIdHex: context.stores.walletIdHex) { + let current = try await contextAfterAuthorization(matching: context) + try await completeKeyRegistration(transition, context: current) + } return .keyRegistrationCompleted case .tokenPurchase(let purchase): return .tokenPurchaseApprovalRequired( @@ -1230,9 +1242,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { await markActive(pendingConnection, in: authorized.stores) } - /// The context to sign with after a PIN prompt, which can outlast a - /// wallet or identity switch: what is active now, and only while it is - /// still the identity and the wallet of `context`. + /// The context to go on with after a wait — a PIN prompt, a turn at + /// the operation gate — which can outlast a wallet, network or identity + /// switch: what is active now, and only while it is still the identity, + /// the wallet and the network scope of `context`. private func contextAfterAuthorization(matching context: Context) async throws -> Context { let authorized = try await requireContext(pinnedTo: context.stores) guard authorized.identityId == context.identityId else { @@ -1241,11 +1254,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return authorized } - /// What is active now, only while it is the wallet `stores` belongs to, - /// and carrying that pair. + /// What is active now, only while it is the wallet and the network + /// scope `stores` belongs to, and carrying that pair. The same wallet on + /// another devnet is refused: its identity and SDK are that devnet's, + /// and the records would go to this one's. private func requireContext(pinnedTo stores: Stores) async throws -> Context { var context = try await requireContext() - guard context.stores.walletIdHex == stores.walletIdHex else { + guard context.stores.scope == stores.scope else { throw DashConnectPlatformError.walletChanged } context.stores = stores diff --git a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift index 757125a5b2..3419e1d38f 100644 --- a/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift +++ b/DashWallet/Sources/UI/DashConnect/ApproveConnectionSheet.swift @@ -67,6 +67,24 @@ struct ApproveConnectionSheet: View { Text(resolvedSubtitle) .font(.subhead) .foregroundColor(.secondaryText) + + // The name above can be one the code or the + // contract's owner chose. This id is what the + // approval is for: a one-QR key is bound to it. Shown + // in full and selectable, so it can be compared with + // the one the app publishes. + VStack(alignment: .leading, spacing: 2) { + Text(NSLocalizedString("App contract", comment: "DashConnect")) + .font(.footnote) + .foregroundColor(.secondaryText) + Text(request.appContractId) + .font(.footnote.monospaced()) + .foregroundColor(.primaryText) + .textSelection(.enabled) + .fixedSize(horizontal: false, vertical: true) + } + .padding(.top, 6) + .accessibilityElement(children: .combine) } if let existingConnection = request.existingConnection { diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 4a7f4d98fb..d5584d5e61 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 3782484b0f..6513b3f3a2 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index db277f89b1..61c8accaf6 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 36cb1aea0f..2e3871c3fc 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 39490b5cbd..2be25a49a3 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 81bbf8222d..c04bbdef51 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index f071296e3c..ca9a4f2c2f 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 2347a5978a..0a841eced2 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6104,6 +6104,7 @@ /* Wallet preparation and support */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not disconnect: %@" = "Could not disconnect: %@"; "Help" = "Help"; "Couldn't open your wallet data" = "Couldn't open your wallet data"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index eb246d451f..7d7a6c59ad 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 58e56d67bd..f003db3bff 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 7cd6630755..33723de595 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 085d0bf9b6..959d79d3c7 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 673ba6f4c2..0cfe4c369c 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 0474475dbc..aae50ada2e 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fae9a28e62..86b428a091 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 0715d27a3b..dc17aad4bd 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ae12ecacd2..71a486ab7c 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 4756d0b1fb..46ef9edb0b 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 049b3838b0..c511c7a40a 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 663b24983a..ab7432cd4f 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 7b85aec733..9e3d1784b8 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index d4fa98c9e3..eb93acf92f 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 352bebfa3f..8a253e4806 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index 7280233df7..fbebbcd175 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 88d53dc401..425976bdc3 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index e8e36401b3..217733ed48 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 5bd47f0936..b17e728442 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 9d874a3018..cfb663d632 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 371cfac1e4..8014a410b0 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 85309c02be..8a1b4e4fdc 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 445ef45c09..cbb0e002c1 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index d9b2a3bd54..79c4d18d20 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index d2989f9571..7b85f6132b 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 18e28d1e80..47deb31831 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index b7d0d2be55..1d59fbc1ff 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index fa22522913..6c3407daf0 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index bdd8eee0b7..eb3d66858a 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 5b76b0c8fd..9ef5646a8a 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 4734b76d7b..daf0181b9c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 5a095b99ff..60e387599a 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index c1ada09455..52df208568 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6215,6 +6215,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 9b8c0fd216..dcc16565d8 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 24a2338402..88a0bc3ec2 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6213,6 +6213,7 @@ /* DashPay username registration recovery */ "Act as you in this app without asking each time" = "Act as you in this app without asking each time"; +"App contract" = "App contract"; "Could not check username availability. Please try again." = "Could not check username availability. Please try again."; "Could not disconnect: %@" = "Could not disconnect: %@"; "Finish username registration" = "Finish username registration"; From c1d6001828c24addfb8425b66fd821d2dca7151b Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 00:22:04 +0300 Subject: [PATCH 18/30] fix(dashpay): approve a DashConnect sign-in only for the wallet and network its sheet was resolved for The request the approval sheet shows now records the wallet and network scope it was resolved for. An approval is refused, and the sheet rebuilt, when the active wallet or network scope is another one, also when the same wallet and identity exist under another devnet name. The check runs before the protocol version is asked for. The grant store also leaves alone a stored value that is not data at all (a string, a dictionary, a number), like data that is not a list of rows: nothing is written over it and no sign-in starts. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 7 ++-- .../DashConnect/DashConnectDataSource.swift | 2 +- .../DashConnect/DashConnectModels.swift | 16 +++++++-- .../PlatformDashConnectDataSource.swift | 22 ++++++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 6 ++-- .../PlatformDashConnectDataSourceTests.swift | 35 +++++++++++++++++++ 6 files changed, 73 insertions(+), 15 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 36c1fe4882..5174d9fe10 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -701,8 +701,11 @@ final class UserDefaultsAppConnectResponseStore: AppConnectResponseStore { /// Decodes row by row, like `UserDefaultsDashConnectStore`, so one /// unreadable row costs one record instead of all of them. private func readRows() -> (grants: [AppConnectGrant], unreadable: [Any], isNotRowList: Bool) { - guard let storageKey, let data = defaults.data(forKey: storageKey) else { return ([], [], false) } - guard let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { + guard let storageKey, let stored = defaults.object(forKey: storageKey) else { return ([], [], false) } + // A value of another kind is as much not this build's to replace as + // data that is not a list. + guard let data = stored as? Data, + let rows = (try? JSONSerialization.jsonObject(with: data)) as? [Any] else { Self.logger.error("AppConnectResponseStore: stored value is not a JSON array; left in place") return ([], [], true) } diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift index 70ee6a34ee..06083fed35 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDataSource.swift @@ -27,7 +27,7 @@ protocol DashConnectDataSource { func makeConnectionRequest(from loginRequest: DashKeyRequest) async -> ConnectionRequest /// `consent` is the request as the approval sheet showed it. A login /// that would give the app something else, or act for another identity, - /// is refused. + /// wallet or network than it was resolved for, is refused. func approveLogin(_ request: DashKeyRequest, consent: ConnectionRequest) async throws -> DAppConnection /// Parses a scanned `dash-st:` payload and either completes key /// registration immediately or returns a token purchase that awaits diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index dfb5304aa2..308ceb4df7 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -208,6 +208,10 @@ struct ConnectionRequest: Equatable { var login: AppConnect.Login = .unresolved /// Why the login is unresolved, when the wallet knows. var unresolvedLoginReason: String? = nil + /// Names the wallet and network this request was resolved for; `nil` + /// when it was not resolved against one. An approval runs only while it + /// is still the active one. + var scope: String? = nil } extension ConnectionRequest { @@ -237,7 +241,8 @@ extension ConnectionRequest { walletIdentityId: String?, existingConnection: DAppConnection?, login: AppConnect.Login = .unresolved, - unresolvedLoginReason: String? = nil + unresolvedLoginReason: String? = nil, + scope: String? = nil ) { self.init( appLabel: appLabel.trimmingCharacters(in: .whitespacesAndNewlines), @@ -247,9 +252,16 @@ extension ConnectionRequest { walletIdentityId: walletIdentityId, existingConnection: existingConnection, login: login, - unresolvedLoginReason: unresolvedLoginReason + unresolvedLoginReason: unresolvedLoginReason, + scope: scope ) } + + /// Whether this request, as a sheet showed it, was resolved for the + /// identity, wallet and network an approval is about to run for. + func wasResolved(forIdentityId identityId: String, scope: String) -> Bool { + walletIdentityId == identityId && self.scope == scope + } } extension AppConnect.SessionKeyTerms { diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 4fc2e43d7f..17de2ba1cf 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -571,7 +571,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { walletIdentityId: context.identityId.toBase58String(), existingConnection: existingConnection, login: protocolVersion.map(AppConnect.login(protocolVersion:)) ?? .unresolved, - unresolvedLoginReason: unresolvedLoginReason + unresolvedLoginReason: unresolvedLoginReason, + scope: context.stores.scope ) } @@ -620,6 +621,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { Self.logger.error("🔗 DASHCONNECT :: no context — \(error.localizedDescription, privacy: .public)") throw error } + // The sheet was resolved for one identity of one wallet on one + // network, and either login acts for that identity: it has to be + // the active one here, and again after the PIN prompt. The same + // wallet and identity under another devnet name is not what was + // shown. + guard consent.wasResolved( + forIdentityId: context.identityId.toBase58String(), scope: context.stores.scope) else { + Self.logger.error("🔗 DASHCONNECT :: the approved sign-in was resolved for another identity, wallet or network") + throw DashConnectPlatformError.approvalOutOfDate + } // Which login this network can answer is decided before the PIN // prompt: from protocol version 14 the response goes to the App // Connect system contract and the wallet registers the key itself; @@ -636,13 +647,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } // The sheet showed the login `makeConnectionRequest` resolved, with // its terms for the one-QR login. If the network now gets the other - // one, what was approved is not what would run. Either login acts - // for the identity that was on the sheet: it has to be the active - // one here, and again after the PIN prompt. + // one, what was approved is not what would run. let login = AppConnect.login(protocolVersion: protocolVersion) - guard consent.login == login, - consent.walletIdentityId == context.identityId.toBase58String() else { - Self.logger.error("🔗 DASHCONNECT :: the approved sign-in no longer matches the network or the identity") + guard consent.login == login else { + Self.logger.error("🔗 DASHCONNECT :: the network now answers with the other login than the one approved") throw DashConnectPlatformError.approvalOutOfDate } do { diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index b526237bc1..900825eb91 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -217,9 +217,9 @@ final class ConnectionsViewModel: ObservableObject { self.pendingLoginRequest = nil self.approveError = nil } catch DashConnectPlatformError.approvalOutOfDate { - // Another identity became active, or the network now answers - // with the other login: what the sheet showed is not what - // would run. Nothing was signed. The sheet is rebuilt from + // Another identity, wallet or network became active, or the + // network now answers with the other login: what the sheet + // showed is not what would run. Nothing was signed. The sheet is rebuilt from // the same request as it stands now, for a new decision. self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 7821928da8..cc4de723e3 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2212,6 +2212,19 @@ final class AppConnectLoginTests: XCTestCase { store.save([]) XCTAssertEqual(defaults.data(forKey: key), stored) } + // A value that is not data at all is left alone the same way. + let others: [NSObject] = ["rows" as NSString, ["rows": NSArray()] as NSDictionary, 7 as NSNumber] + for stored in others { + defaults.set(stored, forKey: key) + XCTAssertFalse(store.canPersist) + XCTAssertEqual(store.load().count, 0) + store.save([Self.grant(sessionKeyId: 7)]) + XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) + store.save([]) + XCTAssertEqual(defaults.object(forKey: key) as? NSObject, stored) + } + defaults.removeObject(forKey: key) + XCTAssertTrue(store.canPersist) } func testAGrantedKeyMissingFromTheIdentityViewIsReportedNotAssumedGone() { @@ -2511,6 +2524,28 @@ final class AppConnectLoginTests: XCTestCase { func add(_ entry: String) { entries.append(entry) } } + func testAnApprovalIsForTheIdentityWalletAndNetworkItsRequestWasResolvedFor() { + let request = ConnectionRequest( + loginRequest: MockDashConnectDataSource.sampleLoginRequest, + appLabel: "App", + appUrl: "", + walletUsername: nil, + walletIdentityId: "identity-a", + existingConnection: nil, + login: .twoQR, + scope: "wallet-a devnet-one") + + XCTAssertTrue(request.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) + XCTAssertFalse(request.wasResolved(forIdentityId: "identity-b", scope: "wallet-a devnet-one")) + XCTAssertFalse( + request.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-two"), + "the same wallet and identity on another devnet") + // A request that was not resolved against a wallet approves nothing. + var unscoped = request + unscoped.scope = nil + XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From c89def3bf79ddf113036349847349354e2128c5f Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 01:08:43 +0300 Subject: [PATCH 19/30] fix(dashpay): a devnet pointed at other nodes is another scope for a DashConnect approval - The scope an operation runs for now also names where the network is reached (the devnet's quorum URL), so consent given for a devnet is not used after it is pointed at other nodes under the same name. Rows and grant records stay keyed by wallet and devnet name. - When the protocol version cannot be read at approve time the approval fails as an unresolved login and the sheet is rebuilt: it offers "Try again" while it still cannot tell, and otherwise says why nothing was approved. - States what `active` means for a one-QR connection. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectModels.swift | 6 +- .../PlatformDashConnectDataSource.swift | 48 +++++++++++---- .../UI/DashConnect/ConnectionsViewModel.swift | 10 ++++ .../PlatformDashConnectDataSourceTests.swift | 59 ++++++++++++++++++- 4 files changed, 111 insertions(+), 12 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 308ceb4df7..9853e0d85d 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -150,7 +150,11 @@ extension DashConnectTokenPurchaseRequest { /// the user locally turned the connection off from the wallet UI. /// /// `active` means the app's login keys are registered on the identity and the -/// wallet has already published the matching `loginKeyResponse`. +/// wallet has already published the matching `loginKeyResponse`. For a one-QR +/// connection it means the app holds a session key, registered on an +/// identity of this wallet, that this wallet has not disabled: the row is +/// made as soon as the key is registered, whether or not its response was +/// published. enum ConnectionStatus: String, Codable, CaseIterable { case approved case active diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 17de2ba1cf..799637733d 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -76,6 +76,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantOnAnotherIdentity case grantStoreUnavailable case approvalOutOfDate + case loginUnresolved case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked @@ -155,6 +156,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The details of this sign-in changed while it was on screen. Check them and approve again.", comment: "DashConnect") + case .loginUnresolved: + return NSLocalizedString( + "This wallet could not check what this sign-in would give the app.", + comment: "DashConnect") case .sessionKeyUnusable: return NSLocalizedString( "This sign-in request can no longer be approved. Ask the app for a new code.", @@ -391,11 +396,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let walletIdHex: String let connections: any DashConnectStore let grants: any AppConnectResponseStore + /// Where the network is reached, as configured when the pair was + /// made; `nil` on a network with one fixed set of nodes. + let endpoint: String? - /// Names what the rows belong to: the wallet, and the network scope - /// the connection store was fixed to, which tells two devnets of one - /// wallet apart. - var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "")" } + /// Names what an operation runs for: the wallet, the network scope + /// the connection store was fixed to (which tells two devnets of one + /// wallet apart by name), and the endpoint, so a devnet pointed at + /// other nodes under the same name is another scope. The stores + /// themselves are keyed by wallet and name only. + var scope: String { "\(walletIdHex) \(connections.scopeKey ?? "") \(endpoint ?? "")" } /// The rows as they are published: each names this scope. func published(_ rows: [DAppConnection]) -> [DAppConnection] { @@ -450,6 +460,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private let shownRows: ShownRows private let operationGate: DashConnectOperationGate private let activeWalletIdHex: () -> String? + private let networkEndpoint: () -> String? private var walletChangeObserver: AnyCancellable? private let authorizer: DWIdentityAuthorizer private let stateTransitionParser: any DashConnectStateTransitionParsing @@ -474,6 +485,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { activeWalletIdHex: @escaping () -> String? = { WalletEnvironment.activeWalletIdHex as String? }, authorizer: DWIdentityAuthorizer = DWIdentityAuthorizer(), stateTransitionParser: any DashConnectStateTransitionParsing = PlatformWalletDashConnectStateTransitionParser(), + networkEndpoint: (() -> String?)? = nil, notificationCenter: NotificationCenter = .default, operationGate: DashConnectOperationGate = .shared, now: @escaping () -> Date = Date.init @@ -489,8 +501,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { self.now = now self.activeWalletIdHex = activeWalletIdHex self.operationGate = operationGate + // Only a devnet's nodes are configurable. + let networkEndpoint = networkEndpoint + ?? (supportedNetwork == .devnet ? { DevnetConfiguration.quorumURL } : { nil }) + self.networkEndpoint = networkEndpoint let active = Self.pinnedStores( - walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore) + walletIdHex: activeWalletIdHex(), store: self.store, responseStore: self.responseStore, + endpoint: networkEndpoint()) self.shownRows = ShownRows(scope: active?.scope) self.subject = CurrentValueSubject(active.map { $0.published($0.connections.load()) } ?? []) // The list is loaded once, and the active wallet can change while @@ -642,8 +659,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { do { protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) } catch { + // The wallet cannot tell any more whether the login the sheet + // offered is the one this network gets. Nothing was signed. Self.logger.error("🔗 DASHCONNECT :: protocol version unknown — \(error.localizedDescription, privacy: .public)") - throw error + throw DashConnectPlatformError.loginUnresolved } // The sheet showed the login `makeConnectionRequest` resolved, with // its terms for the one-QR login. If the network now gets the other @@ -2090,19 +2109,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private static func pinnedStores( walletIdHex: String?, store: any DashConnectStore, - responseStore: any AppConnectResponseStore + responseStore: any AppConnectResponseStore, + endpoint: String? ) -> Stores? { guard let walletIdHex, !walletIdHex.isEmpty else { return nil } return Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex)) + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + endpoint: endpoint) } /// The stores fixed to the wallet that is active at this call, read /// once; `nil` with no wallet. private func pinnedActiveStores() -> Stores? { - Self.pinnedStores(walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore) + Self.pinnedStores( + walletIdHex: activeWalletIdHex(), store: store, responseStore: responseStore, + endpoint: networkEndpoint()) } /// Publishes the active wallet's rows when the published list holds @@ -2348,7 +2371,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { stores: Stores( walletIdHex: walletIdHex, connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex)) + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + // TODO(dashconnect-endpoint-source): this is the endpoint + // configured now, not the one `sdk` above was built with. + // They agree while the only writer of the setting restarts + // the runtime before it writes. + endpoint: networkEndpoint()) ) } diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 900825eb91..bb55d28b3f 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -223,6 +223,16 @@ final class ConnectionsViewModel: ObservableObject { // the same request as it stands now, for a new decision. self.pendingRequest = await dataSource.makeConnectionRequest(from: pendingLoginRequest) self.approveError = DashConnectPlatformError.approvalOutOfDate.localizedDescription + } catch DashConnectPlatformError.loginUnresolved { + // The wallet could not check which login this network gets. + // Nothing was signed. The sheet is rebuilt: when it still + // cannot tell, it says so itself and offers "Try again" + // instead of Approve; when it can again, the note says why + // the approval did not go through. + let rebuilt = await dataSource.makeConnectionRequest(from: pendingLoginRequest) + self.pendingRequest = rebuilt + self.approveError = rebuilt.login == .unresolved + ? nil : DashConnectPlatformError.loginUnresolved.localizedDescription } catch { // Keep the sheet up so the user can retry without rescanning the QR. self.approveError = String( diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index cc4de723e3..df1244e896 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1432,6 +1432,36 @@ final class ConnectionsViewModelPurchaseTests: XCTestCase { XCTAssertNil(viewModel.approveError) } + /// The wallet could not check which login the network gets at approve + /// time: the sheet is rebuilt. When it still cannot tell, the sheet says + /// so itself and no error is added; when it can again, a note says why + /// nothing was approved. + func testAnApprovalThatCouldNotCheckTheLoginRebuildsTheSheet() async { + let shown = Self.consent(identityId: "identity-a", terms: .current) + var unresolved = shown + unresolved.login = .unresolved + unresolved.unresolvedLoginReason = "no nodes" + let spy = LoginApprovalSpy(shown: [shown, unresolved, shown]) + spy.approveFailures = [DashConnectPlatformError.loginUnresolved, DashConnectPlatformError.loginUnresolved] + let viewModel = ConnectionsViewModel(dataSource: spy, featureUnavailable: false) + + viewModel.onQRScanned("login") + await waitUntil { viewModel.pendingRequest != nil } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, unresolved) + XCTAssertNil(viewModel.approveError, "the sheet states the unresolved login itself") + + viewModel.retryPendingRequest() + await waitUntil { viewModel.pendingRequest == shown } + viewModel.approvePendingRequest() + await waitUntil { !viewModel.isApproving } + + XCTAssertEqual(viewModel.pendingRequest, shown) + XCTAssertEqual(viewModel.approveError, DashConnectPlatformError.loginUnresolved.localizedDescription) + } + private static func consent(identityId: String, terms: AppConnect.SessionKeyTerms?) -> ConnectionRequest { ConnectionRequest( loginRequest: MockDashConnectDataSource.sampleLoginRequest, @@ -2377,6 +2407,26 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(Self.shownRows(dataSource).map(\.status), [.approved]) } + func testARowShownForADevnetAtOtherNodesIsNotActedOnUnderTheSameName() async throws { + let active = ActiveWallet("wallet-a") + let endpoint = Endpoint("https://quorums.one.example") + let center = NotificationCenter() + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource( + active: active, rows: [row], notificationCenter: center, endpoint: endpoint) + let shown = Self.shownRows(dataSource) + + // The same wallet and devnet name, pointed at other nodes. + endpoint.url = "https://quorums.two.example" + + await Self.expectWalletChanged { try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) } + XCTAssertEqual(connections.load().map(\.status), [.active]) + let current = Self.shownRows(dataSource) + XCTAssertNotEqual(current[0].scope, shown[0].scope) + try await dataSource.disconnect(id: current[0].id, scope: current[0].scope) + XCTAssertEqual(connections.load().map(\.status), [.approved]) + } + func testARowWithNoScopeIsNotActedOn() async { let active = ActiveWallet("wallet-a") let row = Self.twoQRRow(status: .active) @@ -2588,13 +2638,19 @@ final class AppConnectLoginTests: XCTestCase { init(_ idHex: String?) { self.idHex = idHex } } + private final class Endpoint { + var url: String? + init(_ url: String?) { self.url = url } + } + /// `rows` are the active wallet's, stored before the data source loads /// its list. private func makeScopedDataSource( active: ActiveWallet, rows: [DAppConnection] = [], notificationCenter: NotificationCenter = NotificationCenter(), - operationGate: DashConnectOperationGate = DashConnectOperationGate() + operationGate: DashConnectOperationGate = DashConnectOperationGate(), + endpoint: Endpoint = Endpoint(nil) ) -> (PlatformDashConnectDataSource, UserDefaultsDashConnectStore) { let connections = UserDefaultsDashConnectStore( defaults: defaults, @@ -2608,6 +2664,7 @@ final class AppConnectLoginTests: XCTestCase { store: connections, responseStore: UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)), activeWalletIdHex: { active.idHex }, + networkEndpoint: { endpoint.url }, notificationCenter: notificationCenter, operationGate: operationGate ) From 41187c99e382e97bc041ea7ab4da8ea953215ab6 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 11:23:01 +0300 Subject: [PATCH 20/30] fix(dashpay): record a one-QR session key before its registration is submitted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An identity update can land on Platform and still report a failure. The grant was recorded only after the update returned, so such a key stayed live with no record and no row to turn it off from. - The grant is recorded unconfirmed (the key's hash) just before the update is submitted. After a reported failure the identity is read again and the login goes on if the key is there; otherwise the failure stands and the record stays unconfirmed. - An unconfirmed record is confirmed, and its app given a row, once its own key (id and hash, live) is seen on the identity — at every one-QR approval and every disconnect. Until then it takes no part in a disconnect, and it is never dropped on the strength of a view that may be behind. - A confirmed record is never replaced by a new unconfirmed one: a retry that does not see its key stops as "identity keys out of date". - The context read for an operation checks that the SDK runtime is still the one it started from after the devnet settings are read. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 40 +++++ .../DashConnect/DashConnectModels.swift | 8 +- .../PlatformDashConnectDataSource.swift | 157 ++++++++++++++---- .../PlatformDashConnectDataSourceTests.swift | 32 ++++ 4 files changed, 204 insertions(+), 33 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 5174d9fe10..c7d8705faa 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -314,6 +314,38 @@ enum AppConnect { .sorted() } + /// Whether the identity holds the key a record names, live: its id, with + /// the key data the record expects while the registration is unconfirmed. + static func holdsRecordedKey( + _ grant: AppConnectGrant, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + currentIdentityPublicKeys.contains { key in + guard UInt32(bitPattern: key.keyId) == grant.sessionKeyId, key.disabledAt == nil else { return false } + guard let hash = grant.unconfirmedKeyHash160 else { return true } + return key.keyType == .ecdsaHash160 && key.data.toHexString() == hash + } + } + + /// Confirms the unconfirmed records of `identityId` whose key the + /// identity now holds, and returns them. A record whose key is not there + /// stays as it is: the update may still land, and nothing is taken from + /// a view that may be behind. + static func confirmRegistrations( + in grants: inout [AppConnectGrant], + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> [AppConnectGrant] { + var confirmed: [AppConnectGrant] = [] + for index in grants.indices + where grants[index].identityId == identityId && grants[index].isUnconfirmed + && holdsRecordedKey(grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys) { + grants[index].unconfirmedKeyHash160 = nil + confirmed.append(grants[index]) + } + return confirmed + } + /// Granted session keys the given view of the identity does not contain. /// Platform never removes a key, it only disables it, so a missing id /// means the view is out of date — not that the key is gone. A disconnect @@ -498,6 +530,14 @@ struct AppConnectGrant: Codable, Equatable { /// be deleted, or could not be shown to be absent; the record then only /// waits for that. var keyDisabled: Bool? + /// The hex hash160 of the session key, set from just before its + /// registration is submitted until the key is seen on the identity. + /// While set, the key may be there or not: an update can land without + /// confirming. Such a record has no row and no response; it is kept so + /// the key, if it lands, is found and confirmed. + var unconfirmedKeyHash160: String? = nil + + var isUnconfirmed: Bool { unconfirmedKeyHash160 != nil } /// What makes two records the same grant: one session key given for one /// request. Records are matched on this, never on whole-value equality — diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift index 9853e0d85d..5a1f083208 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectModels.swift @@ -151,10 +151,10 @@ extension DashConnectTokenPurchaseRequest { /// /// `active` means the app's login keys are registered on the identity and the /// wallet has already published the matching `loginKeyResponse`. For a one-QR -/// connection it means the app holds a session key, registered on an -/// identity of this wallet, that this wallet has not disabled: the row is -/// made as soon as the key is registered, whether or not its response was -/// published. +/// connection it means the app holds a session key on an identity of this +/// wallet that this wallet has not disabled: the row is made once the key is +/// seen on the identity, before its response is published, and stays +/// whether or not the publish is confirmed. enum ConnectionStatus: String, Codable, CaseIterable { case approved case active diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 799637733d..368b0c963c 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -798,9 +798,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// identity with its bounds and limits, and only then publish the /// encrypted key, so the app finds a live key on its first check. /// - /// The grant and the connection row are recorded as soon as the key is - /// known to be on the identity, before the publish: whatever happens to - /// the publish, the key stays visible in Connections and can be disabled. + /// A new key's grant is recorded, unconfirmed, before its registration + /// is submitted, so a key that lands without the update confirming is + /// still found later. Once the key is known to be on the identity the + /// grant is confirmed and the connection row recorded, before the + /// publish: whatever happens to the publish, the key stays visible in + /// Connections and can be disabled. /// /// Approving the same QR again finds the key registered and does not /// register it twice; if the response is already recorded as published it @@ -846,6 +849,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let requestHash = sealed.appEphemeralPubKeyHash.toHexString() let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId && grant.values.appEphemeralPubKeyHash == requestHash @@ -894,15 +899,59 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { totalBudget: budget, expiresAt: expiry ) + // Recorded before the update is submitted: an update can land + // and still report a failure, and a key with no record could not + // be found again. The record stays unconfirmed, with no row, + // until the key is seen on the identity. + var pending = AppConnectGrant( + identityId: identityId, + appContractId: appContractId, + documentId: nil, + values: AppConnect.ResponseValues(sealed), + sessionKeyId: keyId, + totalBudget: budget, + expiresAt: expiry, + publishedAt: now() + ) + pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() + // A confirmed record for this request means its key is on the + // identity, and a view without it is behind: registering again + // would be refused, and the record must keep its values. + guard !stores.grants.load().contains(where: { + isGrantForRequest($0) && !$0.isUnconfirmed && $0.keyDisabled != true + }) else { + throw DashConnectPlatformError.identityKeysOutOfDate + } + updateGrants(in: stores) { grants in + grants.removeAll { $0.key == pending.key } + grants.append(pending) + } + guard stores.grants.load().contains(where: { $0.key == pending.key }) else { + Self.logger.error("🔗 DASHCONNECT :: the session key could not be recorded; not registering it") + throw DashConnectPlatformError.grantStoreUnavailable + } Self.logger.info("🔗 DASHCONNECT :: registering session key") - try await signer.withAdditionalSigningKeys([ - (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), - ]) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - addPublicKeys: [key], - signer: signer - ) + do { + try await signer.withAdditionalSigningKeys([ + (publicKey: sessionKeyHash160, privateKey: sessionPrivateKey), + ]) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + addPublicKeys: [key], + signer: signer + ) + } + } catch { + // The update may have landed all the same. If the key is on + // the identity, the login goes on; otherwise the failure + // stands and the record stays unconfirmed, to be confirmed if + // the key turns up later. + guard let keys = try? await refreshedIdentityPublicKeys(context: context), + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys) else { + Self.logger.error("🔗 DASHCONNECT :: session key registration failed or is unconfirmed — \(error.localizedDescription, privacy: .public)") + throw error + } + Self.logger.info("🔗 DASHCONNECT :: session key is on the identity although the update reported a failure") } Self.logger.info("🔗 DASHCONNECT :: session key registered") sessionKeyId = keyId @@ -910,13 +959,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { expiresAt = expiry } - // From here the app-side key exists on the identity. Record it, and - // show the connection, before anything else can fail. A grant already - // recorded for this request keeps its values: if an earlier publish - // landed without confirming, those are the ones on Platform. + // From here the app-side key exists on the identity. Confirm its + // record, and show the connection, before anything else can fail. A + // grant already recorded for this request keeps its values: if an + // earlier publish landed without confirming, those are the ones on + // Platform. let grant = updateGrants(in: stores) { grants -> AppConnectGrant in - if let existing = grants.first(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { - return existing + if let index = grants.firstIndex(where: { isGrantForRequest($0) && $0.sessionKeyId == sessionKeyId }) { + // The key is on the identity now. + grants[index].unconfirmedKeyHash160 = nil + return grants[index] } let new = AppConnectGrant( identityId: identityId, @@ -1294,6 +1346,35 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return context } + /// Confirms this identity's unconfirmed registrations whose key it now + /// holds, and gives each such app a one-QR row if it has none: the key + /// is live and has to be reachable from Connections. + private func confirmRegistrations( + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + in stores: Stores + ) async { + let confirmed = updateGrants(in: stores) { grants in + AppConnect.confirmRegistrations( + in: &grants, identityId: identityId, currentIdentityPublicKeys: currentIdentityPublicKeys) + } + guard !confirmed.isEmpty else { return } + Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") + let appIds = Set(confirmed.map(\.appContractId)) + let confirmedAt = now() + await updateRows(in: stores) { rows in + let missing = appIds.subtracting(rows.map(\.id)) + return rows + missing.sorted().map { appId in + let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") + return DAppConnection( + id: appId, + name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, + url: branding.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) + } + } + } + private func markActive(_ pendingConnection: DAppConnection, in stores: Stores) async { let activatedAt = now() await updateRows(in: stores) { rows in @@ -1502,7 +1583,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { throw DashConnectPlatformError.walletChanged } let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - let hasGrants = stores.grants.load().contains { $0.appContractId == id } + // A record whose registration is unconfirmed has nothing for a + // disconnect to turn off until its key is seen. + let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) @@ -1586,12 +1669,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func hasLiveGrantElsewhere() -> Bool { stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true + && !$0.isUnconfirmed } } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !stores.grants.load().contains(where: isGranted) { + if !stores.grants.load().contains(where: { isGranted($0) && !$0.isUnconfirmed }) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. let holdsUnrecordedKey = try checksUnrecordedKeys && Self @@ -1610,7 +1694,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - let granted = stores.grants.load().filter(isGranted) + // A registration whose key has turned up is confirmed. One that has + // not stays unconfirmed and takes no part in what follows: its key + // id may belong to another key, and its absence says nothing. + // TODO(dashconnect-unconfirmed-row): if the view stays behind + // through this disconnect too, the app's row goes while that key may + // have landed; the next one-QR approval with this identity confirms + // the key and shows the app again. + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -2360,6 +2453,20 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let identityIndex = try wallet.managedIdentity(identityId: identityId).getIdentityIndex() ?? 0 + // The devnet name and endpoint the stores name are read from the + // settings, after the runtime above. A change to them first stops + // that runtime and builds another, so if it is still the one + // running once they are read, they are the settings it runs on. + let stores = Stores( + walletIdHex: walletIdHex, + connections: store.pinned(toWalletIdHex: walletIdHex), + grants: responseStore.pinned(toWalletIdHex: walletIdHex), + endpoint: networkEndpoint()) + guard await MainActor.run(body: { SwiftDashSDKHost.shared.sdk === sdk }) else { + Self.logger.error("🔗 DASHCONNECT :: the SDK runtime changed while its context was read") + throw DashConnectPlatformError.walletChanged + } + return Context( wallet: wallet, sdk: sdk, @@ -2368,15 +2475,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { identityId: identityId, identityIndex: identityIndex, storedUsername: runtime.storedUsername, - stores: Stores( - walletIdHex: walletIdHex, - connections: store.pinned(toWalletIdHex: walletIdHex), - grants: responseStore.pinned(toWalletIdHex: walletIdHex), - // TODO(dashconnect-endpoint-source): this is the endpoint - // configured now, not the one `sdk` above was built with. - // They agree while the only writer of the setting restarts - // the runtime before it writes. - endpoint: networkEndpoint()) + stores: stores ) } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index df1244e896..a0133adbf4 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2596,6 +2596,38 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) } + func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKey() { + var pending = Self.grant(sessionKeyId: 9) + let hash = Data(repeating: 0x5A, count: 20) + pending.unconfirmedKeyHash160 = hash.toHexString() + let landed = [Self.key(keyId: 9, data: hash)] + let other = [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))] + + XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: landed)) + XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: other), + "another key under the same id is not the one submitted") + XCTAssertFalse( + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), + "a disabled key is not a live registration") + + var grants = [pending] + XCTAssertEqual( + AppConnect.confirmRegistrations( + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: other), []) + XCTAssertEqual( + AppConnect.confirmRegistrations(in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: []), + [], "a key not in the view is not taken as never registered") + XCTAssertTrue(grants[0].isUnconfirmed) + XCTAssertEqual( + AppConnect.confirmRegistrations( + in: &grants, identityId: "another identity", currentIdentityPublicKeys: landed), []) + + let confirmed = AppConnect.confirmRegistrations( + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: landed) + XCTAssertEqual(confirmed.map(\.key), [pending.key]) + XCTAssertFalse(grants[0].isUnconfirmed) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 5868ac123a79af52e729d51f55854f43c9fa68fd Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 12:28:36 +0300 Subject: [PATCH 21/30] fix(dashpay): confirm a recovered one-QR key only with its bound and limits; read Platform off the main actor - A key found after a reported failure, or later, confirms its record only if it is the key that was submitted with everything it was given: the data, AUTH/HIGH/HASH160, live, the recorded budget and expiry, and a stored bound to the record's app. A bound the store does not show is not taken on trust, and an unconfirmed record no longer counts as proof of a key's bound when the same request is approved again. - The App Connect response lookup and the protocol-version read run on their own queues instead of through the SDK's main-actor queries, so a network round trip no longer holds the UI. - The protocol version a login is chosen by comes from a proved read of the current epoch, which fails instead of falling back; an SDK pinned to a version (testnet) keeps deciding by its pin, with no network read. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 24 ++- .../PlatformDashConnectDataSource.swift | 142 ++++++++++++++++-- .../PlatformDashConnectDataSourceTests.swift | 52 +++++-- 3 files changed, 184 insertions(+), 34 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c7d8705faa..3c59e777fe 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -314,16 +314,28 @@ enum AppConnect { .sorted() } - /// Whether the identity holds the key a record names, live: its id, with - /// the key data the record expects while the registration is unconfirmed. + /// Whether the identity holds, live, the key a record names. For an + /// unconfirmed record that is the key it was going to register, with + /// everything that key was given: the data, the kind, the limits, and the + /// bound to the record's app as the wallet's store reads it. A bound the + /// store does not show is not taken on trust. static func holdsRecordedKey( _ grant: AppConnectGrant, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [KeyBinding] ) -> Bool { currentIdentityPublicKeys.contains { key in guard UInt32(bitPattern: key.keyId) == grant.sessionKeyId, key.disabledAt == nil else { return false } guard let hash = grant.unconfirmedKeyHash160 else { return true } + guard let appContractId = Data.identifier(fromBase58: grant.appContractId) else { return false } return key.keyType == .ecdsaHash160 && key.data.toHexString() == hash + && key.purpose == .authentication && key.securityLevel == .high + && key.totalBudget == grant.totalBudget + && key.expiresAt.map({ UInt64(max(0, $0)) }) == grant.expiresAt + && bindings.contains { + $0.keyId == grant.sessionKeyId && $0.data == key.data && !$0.hasUnreadableBound + && $0.singleContractId == appContractId + } } } @@ -334,12 +346,14 @@ enum AppConnect { static func confirmRegistrations( in grants: inout [AppConnectGrant], identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [KeyBinding] ) -> [AppConnectGrant] { var confirmed: [AppConnectGrant] = [] for index in grants.indices where grants[index].identityId == identityId && grants[index].isUnconfirmed - && holdsRecordedKey(grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys) { + && holdsRecordedKey( + grants[index], currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) { grants[index].unconfirmedKeyHash160 = nil confirmed.append(grants[index]) } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 368b0c963c..afb64a98eb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -567,7 +567,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // show what the app is given. With the version unknown the request // says so, and the sheet offers nothing to approve. The lookup runs // alongside the two below. - async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk) + async let resolvedProtocolVersion = Self.networkProtocolVersion(sdk: context.sdk, network: context.network) let metadata = await resolveAppMetadata(for: loginRequest, sdk: context.sdk) let walletUsername = await resolveWalletUsername(context: context) let protocolVersion: UInt32? @@ -657,7 +657,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // two-QR flow until that pin moves. let protocolVersion: UInt32 do { - protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk) + protocolVersion = try await Self.networkProtocolVersion(sdk: context.sdk, network: context.network) } catch { // The wallet cannot tell any more whether the login the sheet // offered is the one this network gets. Nothing was signed. @@ -786,12 +786,17 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a /// proven network query. It runs on a plain dispatch queue so it does not /// hold a cooperative-pool thread for a DAPI round trip. - private static func networkProtocolVersion(sdk: SDK) async throws -> UInt32 { - try await withCheckedThrowingContinuation { continuation in - DispatchQueue.global(qos: .userInitiated).async { - continuation.resume(with: Result { try sdk.refreshProtocolVersion() }) - } - } + /// The protocol version a login is chosen by. An SDK pinned to a + /// version (`SwiftDashSDKHost.platformVersion(for:)`) builds only that + /// version's transitions, so its pin decides, with no network read. An + /// unpinned one gets the network's version from a proved read of the + /// current epoch, which throws when the read fails: the SDK's own + /// refreshed number is not used, since a failed refresh leaves its + /// starting value in place without an error. + private static func networkProtocolVersion(sdk: SDK, network: Network) async throws -> UInt32 { + let pin = await MainActor.run { SwiftDashSDKHost.platformVersion(for: network) } + guard pin == 0 else { return pin } + return try await DashConnectPlatformQueries.currentEpochProtocolVersion(sdk: sdk) } /// The one-QR login: derive the request's session key, register it on the @@ -850,7 +855,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let signer = KeychainSigner(modelContainer: context.modelContainer) let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) func isGrantForRequest(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId && grant.values.appEphemeralPubKeyHash == requestHash @@ -863,7 +869,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if currentPublicKeys.contains(where: { $0.keyType == .ecdsaHash160 && $0.data == sessionKeyHash160 }) { bindings = (try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer)) ?? [] - grantedKeyIds = Set(stores.grants.load().filter(isGrantForRequest).map(\.sessionKeyId)) + // An unconfirmed record is not evidence of the key's bound: it + // only says what was submitted. + grantedKeyIds = Set(stores.grants.load() + .filter { isGrantForRequest($0) && !$0.isUnconfirmed }.map(\.sessionKeyId)) } let sessionKeyId: UInt32 @@ -947,7 +956,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // stands and the record stays unconfirmed, to be confirmed if // the key turns up later. guard let keys = try? await refreshedIdentityPublicKeys(context: context), - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys) else { + let bindings = try? Self.storedKeyBindings( + identityId: identityId, modelContainer: context.modelContainer), + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bindings) else { Self.logger.error("🔗 DASHCONNECT :: session key registration failed or is unconfirmed — \(error.localizedDescription, privacy: .public)") throw error } @@ -1076,7 +1087,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { responseContractId: Data, sdk: SDK ) async throws -> (documentId: Data, values: AppConnect.ResponseValues)? { - let response = try await sdk.documentList( + let response = try await DashConnectPlatformQueries.documentList( + sdk: sdk, dataContractId: responseContractId.toBase58String(), documentType: AppConnect.documentType, whereClause: AppConnect.responseLookupWhereClause( @@ -1352,11 +1364,16 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + modelContainer: ModelContainer, in stores: Stores ) async { + guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }), + let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer) + else { return } let confirmed = updateGrants(in: stores) { grants in AppConnect.confirmRegistrations( - in: &grants, identityId: identityId, currentIdentityPublicKeys: currentIdentityPublicKeys) + in: &grants, identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) } guard !confirmed.isEmpty else { return } Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") @@ -1702,7 +1719,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // have landed; the next one-QR approval with this identity confirms // the key and shows the app again. await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, in: stores) + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is @@ -2751,3 +2769,99 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } } + +/// Platform reads the Swift SDK offers only on the main actor, where their +/// blocking FFI calls would hold the UI for a network round trip. They run +/// here on one serial queue instead, with the SDK kept alive for the call; +/// each copies the native result and releases it before returning. +/// TODO(dashconnect-off-main-queries): use the SDK's own off-main reads once +/// it has them for these two, as it has `dataContractGetOffMain`. +enum DashConnectPlatformQueries { + /// One queue per kind of read, so a slow document search does not hold + /// back the protocol-version read a sheet waits for. + private static let epochQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.epoch-query") + private static let documentQueue = DispatchQueue(label: "org.dashfoundation.dash.dashconnect.document-query") + + /// The protocol version the network runs, from a proved read of the + /// current epoch. It throws when that read fails: there is no fallback + /// value. + static func currentEpochProtocolVersion(sdk: SDK) async throws -> UInt32 { + let epoch = try await run(sdk, on: epochQueue) { handle in + try json(from: dash_sdk_system_get_current_epoch(handle)) + } + guard let version = (epoch["protocol_version"] as? NSNumber)?.uint32Value else { + throw SDKError.serializationError("The current epoch carries no protocol version") + } + return version + } + + /// `SDK.documentList(dataContractId:documentType:whereClause:limit:)` + /// off the main actor: the contract is fetched, searched and released + /// on the query queue. + static func documentList( + sdk: SDK, + dataContractId: String, + documentType: String, + whereClause: String, + limit: UInt32 + ) async throws -> [String: Any] { + try await run(sdk, on: documentQueue) { handle in + let contract = dash_sdk_data_contract_fetch(handle, dataContractId) + if let error = contract.error { + defer { dash_sdk_error_free(error) } + throw SDKError.fromDashSDKError(error.pointee) + } + guard let contractHandle = contract.data else { + throw SDKError.notFound("Data contract not found") + } + defer { dash_sdk_data_contract_destroy(OpaquePointer(contractHandle)) } + return try documentType.withCString { typePointer in + try whereClause.withCString { wherePointer in + var parameters = DashSDKDocumentSearchParams() + parameters.data_contract_handle = OpaquePointer(contractHandle) + parameters.document_type = typePointer + parameters.where_json = wherePointer + parameters.order_by_json = nil + parameters.limit = limit + parameters.start_at = 0 + return try json(from: dash_sdk_document_search(handle, ¶meters)) + } + } + } + } + + private static func run( + _ sdk: SDK, + on queue: DispatchQueue, + _ body: @escaping (OpaquePointer) throws -> [String: Any] + ) async throws -> [String: Any] { + try await withCheckedThrowingContinuation { continuation in + queue.async { + // The SDK owns the handle and releases it when it goes, so + // it is held until the call is done. + withExtendedLifetime(sdk) { + guard let handle = sdk.handle else { + continuation.resume(throwing: SDKError.invalidState("SDK not initialized")) + return + } + continuation.resume(with: Result { try body(handle) }) + } + } + } + } + + /// The JSON object a result carries, with the result released. + private static func json(from result: DashSDKResult) throws -> [String: Any] { + if let error = result.error { + defer { dash_sdk_error_free(error) } + throw SDKError.fromDashSDKError(error.pointee) + } + guard let data = result.data else { throw SDKError.notFound("No data returned") } + let text = String(cString: data.assumingMemoryBound(to: CChar.self)) + dash_sdk_string_free(data) + guard let object = try? JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any] else { + throw SDKError.serializationError("The result is not a JSON object") + } + return object + } +} diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index a0133adbf4..048e00877d 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2596,34 +2596,56 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(unscoped.wasResolved(forIdentityId: "identity-a", scope: "wallet-a devnet-one")) } - func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKey() { - var pending = Self.grant(sessionKeyId: 9) + func testAnUnconfirmedRegistrationIsConfirmedOnlyByItsOwnKeyWithWhatItWasGiven() throws { + let appContractId = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appContract = try XCTUnwrap(Data.identifier(fromBase58: appContractId)) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: template.identityId, appContractId: appContractId, documentId: nil, + values: template.values, sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, + publishedAt: template.publishedAt) let hash = Data(repeating: 0x5A, count: 20) pending.unconfirmedKeyHash160 = hash.toHexString() - let landed = [Self.key(keyId: 9, data: hash)] - let other = [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))] + let bound = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: appContract)] + func key( + data: Data = hash, level: SecurityLevel = .high, budget: UInt64? = 5_000, + expiry: Int64? = 6_000, disabledAt: Int64? = nil + ) -> [ManagedIdentity.IdentityPublicKeyInfo] { + [Self.key(keyId: 9, securityLevel: level, data: data, disabledAt: disabledAt, + totalBudget: budget, expiresAt: expiry)] + } - XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: landed)) - XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: other), - "another key under the same id is not the one submitted") + XCTAssertTrue(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: bound)) + for (keys, why) in [ + (key(data: Data(repeating: 0x01, count: 20)), "another key under the same id"), + (key(disabledAt: 1), "a disabled key"), + (key(level: .critical), "another security level"), + (key(budget: nil), "no budget"), + (key(budget: 9_000), "another budget"), + (key(expiry: nil), "no expiry"), + ([], "no key at all"), + ] { + XCTAssertFalse(AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: keys, bindings: bound), why) + } + XCTAssertFalse( + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: []), + "a bound the store does not show is not taken on trust") + let otherApp = [AppConnect.KeyBinding(keyId: 9, data: hash, singleContractId: Data(repeating: 0x77, count: 32))] XCTAssertFalse( - AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), - "a disabled key is not a live registration") + AppConnect.holdsRecordedKey(pending, currentIdentityPublicKeys: key(), bindings: otherApp), + "bound to another app") var grants = [pending] XCTAssertEqual( AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: other), []) - XCTAssertEqual( - AppConnect.confirmRegistrations(in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: []), + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: [], bindings: bound), [], "a key not in the view is not taken as never registered") XCTAssertTrue(grants[0].isUnconfirmed) XCTAssertEqual( AppConnect.confirmRegistrations( - in: &grants, identityId: "another identity", currentIdentityPublicKeys: landed), []) - + in: &grants, identityId: "another identity", currentIdentityPublicKeys: key(), bindings: bound), []) let confirmed = AppConnect.confirmRegistrations( - in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: landed) + in: &grants, identityId: pending.identityId, currentIdentityPublicKeys: key(), bindings: bound) XCTAssertEqual(confirmed.map(\.key), [pending.key]) XCTAssertFalse(grants[0].isUnconfirmed) } From b41bc1cd13d7c2194df7f71469c97c4cf0c16865 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Wed, 14 Oct 2026 13:31:58 +0300 Subject: [PATCH 22/30] fix(dashpay): free a native result string through a typed C pointer `dash_sdk_string_free` takes a `char *`; the adapter passed the raw result pointer, which only compiled against a header that declares it `void *`. Also drops a doc comment left over from the previous protocol-version lookup. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/PlatformDashConnectDataSource.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index afb64a98eb..653c3280b5 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -783,9 +783,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return connection } - /// `SDK.refreshProtocolVersion()` is a synchronous FFI call that makes a - /// proven network query. It runs on a plain dispatch queue so it does not - /// hold a cooperative-pool thread for a DAPI round trip. /// The protocol version a login is chosen by. An SDK pinned to a /// version (`SwiftDashSDKHost.platformVersion(for:)`) builds only that /// version's transitions, so its pin decides, with no network read. An @@ -2857,8 +2854,9 @@ enum DashConnectPlatformQueries { throw SDKError.fromDashSDKError(error.pointee) } guard let data = result.data else { throw SDKError.notFound("No data returned") } - let text = String(cString: data.assumingMemoryBound(to: CChar.self)) - dash_sdk_string_free(data) + let string = data.assumingMemoryBound(to: CChar.self) + let text = String(cString: string) + dash_sdk_string_free(string) guard let object = try? JSONSerialization.jsonObject(with: Data(text.utf8)) as? [String: Any] else { throw SDKError.serializationError("The result is not a JSON object") } From 06e0d2c06aa9e55b393527a0b7f37459c2f2ab7e Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 15 Oct 2026 13:51:39 +0300 Subject: [PATCH 23/30] fix(dashpay): activate an app's existing row when its one-QR key is confirmed Recovering an unconfirmed one-QR registration only added rows for apps that had none, so a two-QR row still waiting for its second scan kept that banner over a live session key, and a later pass could not repair it once the grant was confirmed. The row now becomes active and one-QR, keeping its branding and scope. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 41 +++++++++++----- .../PlatformDashConnectDataSourceTests.swift | 47 +++++++++++++++++++ 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 653c3280b5..bab7486589 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1356,8 +1356,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Confirms this identity's unconfirmed registrations whose key it now - /// holds, and gives each such app a one-QR row if it has none: the key - /// is live and has to be reachable from Connections. + /// holds, and makes each such app's row active and one-QR, adding one if + /// it has none: the key is live and has to be reachable from Connections. private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], @@ -1377,15 +1377,34 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let appIds = Set(confirmed.map(\.appContractId)) let confirmedAt = now() await updateRows(in: stores) { rows in - let missing = appIds.subtracting(rows.map(\.id)) - return rows + missing.sorted().map { appId in - let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") - return DAppConnection( - id: appId, - name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, - url: branding.url, - status: .active, updatedAt: confirmedAt, loginKind: .oneQR) - } + Self.rowsAfterConfirming(appIds: appIds, in: rows, at: confirmedAt) + } + } + + /// `rows` once the apps in `appIds` hold a live one-QR key: each app's + /// row becomes active and one-QR, keeping its branding and scope (a + /// two-QR row waiting for its second scan would otherwise keep showing + /// that banner instead of the disconnect switch), and an app with no row + /// gets one. + static func rowsAfterConfirming(appIds: Set, in rows: [DAppConnection], at confirmedAt: Date) -> [DAppConnection] { + let reconciled = rows.map { connection in + guard appIds.contains(connection.id) else { return connection } + var updated = DAppConnection( + id: connection.id, + name: connection.name, + url: connection.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) + updated.scope = connection.scope + return updated + } + let missing = appIds.subtracting(rows.map(\.id)) + return reconciled + missing.sorted().map { appId in + let branding = DashConnectFallbackAppMetadata.resolve(contractId: appId, unauthenticatedLabel: "") + return DAppConnection( + id: appId, + name: branding.name.isEmpty ? NSLocalizedString("Unknown app", comment: "DashConnect") : branding.name, + url: branding.url, + status: .active, updatedAt: confirmedAt, loginKind: .oneQR) } } diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 048e00877d..b36eb43e4d 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2650,6 +2650,53 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertFalse(grants[0].isUnconfirmed) } + /// A recovered one-QR registration turns the app's existing row into an + /// active one-QR row: a two-QR row still waiting for its second scan + /// would otherwise keep that banner over a live session key. + func testConfirmingARegistrationActivatesTheAppsExistingRow() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" + let earlier = Date(timeIntervalSince1970: 1_000) + let confirmedAt = Date(timeIntervalSince1970: 2_000) + var waiting = DAppConnection( + id: appA, name: "App A", url: "https://a.example", + status: .approved, updatedAt: earlier, loginKind: .twoQR) + waiting.scope = "wallet-a devnet-one" + let other = DAppConnection( + id: appB, name: "App B", url: "https://b.example", + status: .approved, updatedAt: earlier, loginKind: .twoQR) + + let rows = PlatformDashConnectDataSource.rowsAfterConfirming( + appIds: [appA], in: [waiting, other], at: confirmedAt) + + XCTAssertEqual(rows.count, 2) + let a = rows[0] + XCTAssertEqual(a.id, appA) + XCTAssertEqual(a.status, .active) + XCTAssertEqual(a.loginKind, .oneQR) + XCTAssertEqual(a.updatedAt, confirmedAt) + XCTAssertEqual(a.name, "App A") + XCTAssertEqual(a.url, "https://a.example") + XCTAssertEqual(a.scope, "wallet-a devnet-one") + let b = rows[1] + XCTAssertEqual(b.status, .approved, "an app whose key was not confirmed keeps its row") + XCTAssertEqual(b.loginKind, .twoQR) + XCTAssertEqual(b.updatedAt, earlier) + } + + /// An app with a confirmed key but no row gets an active one-QR row. + func testConfirmingARegistrationAddsARowForAnAppWithout() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let confirmedAt = Date(timeIntervalSince1970: 2_000) + + let rows = PlatformDashConnectDataSource.rowsAfterConfirming(appIds: [appA], in: [], at: confirmedAt) + + XCTAssertEqual(rows.map(\.id), [appA]) + XCTAssertEqual(rows.first?.status, .active) + XCTAssertEqual(rows.first?.loginKind, .oneQR) + XCTAssertEqual(rows.first?.updatedAt, confirmedAt) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 5c2f19dab49d57afa1fad335ce8604dda7c388c6 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Thu, 15 Oct 2026 23:06:58 +0300 Subject: [PATCH 24/30] fix(dashpay): give a confirmed one-QR key its row back if the row was never saved The one-QR login confirmed the grant and then resolved the connection preview again (protocol version, contract metadata, username) before saving the row. An app terminated during those reads left a live key with a confirmed grant and no row, or an approved two-QR row without a disconnect switch, and nothing repaired it: recovery looked only at unconfirmed grants. The row is now built from the approved sheet's request, so no network read sits between the two writes. Recovery also reconciles every app this identity holds a live key of by a confirmed grant: a missing or two-QR row becomes an active one-QR row on the next one-QR approval or disconnect. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 73 ++++++++++++++----- .../PlatformDashConnectDataSourceTests.swift | 61 ++++++++++++++++ 2 files changed, 116 insertions(+), 18 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index bab7486589..e293e81ccf 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -688,7 +688,7 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } if let terms = login.sessionKeyTerms { Self.logger.info("🔗 DASHCONNECT :: authorized; protocol \(protocolVersion, privacy: .public), one-QR login") - return try await approveAppConnectLogin(request, terms: terms, context: context) + return try await approveAppConnectLogin(request, consent: consent, terms: terms, context: context) } Self.logger.info("🔗 DASHCONNECT :: authorized; deriving login key") @@ -803,15 +803,21 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// A new key's grant is recorded, unconfirmed, before its registration /// is submitted, so a key that lands without the update confirming is /// still found later. Once the key is known to be on the identity the - /// grant is confirmed and the connection row recorded, before the - /// publish: whatever happens to the publish, the key stays visible in - /// Connections and can be disabled. + /// grant is confirmed and the connection row recorded, from what the + /// approved sheet showed and with no network read between the two, before + /// the publish: whatever happens to the publish, the key stays visible in + /// Connections and can be disabled. A row lost between the two writes is + /// put back by the next one-QR approval with this identity, or by a + /// disconnect of one of its apps once the PIN is entered. + /// TODO(dashconnect-lost-row): nothing puts it back at launch or when + /// Connections opens, so until then the key is live with no row. /// /// Approving the same QR again finds the key registered and does not /// register it twice; if the response is already recorded as published it /// does nothing more. private func approveAppConnectLogin( _ request: DashKeyRequest, + consent: ConnectionRequest, terms: AppConnect.SessionKeyTerms, context: Context ) async throws -> DAppConnection { @@ -992,9 +998,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return new } - let preview = await makeConnectionRequest(from: request) let connection = Self.makeConnection( - preview: preview, status: .active, updatedAt: now(), loginKind: .oneQR) + preview: consent, status: .active, updatedAt: now(), loginKind: .oneQR) await updateRows(in: stores) { rows in rows.filter { $0.id != connection.id } + [connection] } @@ -1356,31 +1361,63 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } /// Confirms this identity's unconfirmed registrations whose key it now - /// holds, and makes each such app's row active and one-QR, adding one if - /// it has none: the key is live and has to be reachable from Connections. + /// holds, and makes the row of each app this identity holds a recorded + /// live key of active and one-QR, adding one if it has none: the key is + /// live and has to be reachable from Connections. That also covers a + /// grant confirmed earlier whose row was never saved, or was saved by a + /// two-QR login. private func confirmRegistrations( identityId: String, currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], modelContainer: ModelContainer, in stores: Stores ) async { - guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }), - let bindings = try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer) + guard stores.grants.load().contains(where: { $0.identityId == identityId && $0.keyDisabled != true }) else { return } - let confirmed = updateGrants(in: stores) { grants in - AppConnect.confirmRegistrations( - in: &grants, identityId: identityId, - currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) - } - guard !confirmed.isEmpty else { return } - Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") - let appIds = Set(confirmed.map(\.appContractId)) + // Without the store's bindings no unconfirmed record is confirmed, + // and a confirmed one does not need them. + let bindings = (try? Self.storedKeyBindings(identityId: identityId, modelContainer: modelContainer)) ?? [] + if stores.grants.load().contains(where: { $0.identityId == identityId && $0.isUnconfirmed }) { + let confirmed = updateGrants(in: stores) { grants in + AppConnect.confirmRegistrations( + in: &grants, identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) + } + if !confirmed.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: \(confirmed.count, privacy: .public) unconfirmed session key(s) found on the identity") + } + } + let appIds = Self.appIdsWithoutTheirOneQRRow( + grants: stores.grants.load(), identityId: identityId, + currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings, + rows: rows(in: stores)) + guard !appIds.isEmpty else { return } + Self.logger.info("🔗 DASHCONNECT :: \(appIds.count, privacy: .public) app(s) with a live session key get their row back") let confirmedAt = now() await updateRows(in: stores) { rows in Self.rowsAfterConfirming(appIds: appIds, in: rows, at: confirmedAt) } } + /// The apps `identityId` holds a live key of by a confirmed grant record + /// whose row is missing from `rows` or is not an active one-QR row. + static func appIdsWithoutTheirOneQRRow( + grants: [AppConnectGrant], + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + bindings: [AppConnect.KeyBinding], + rows: [DAppConnection] + ) -> Set { + let live = grants.filter { + $0.identityId == identityId && !$0.isUnconfirmed && $0.keyDisabled != true + && AppConnect.holdsRecordedKey( + $0, currentIdentityPublicKeys: currentIdentityPublicKeys, bindings: bindings) + } + return Set(live.map(\.appContractId)).filter { appId in + !rows.contains { $0.id == appId && $0.status == .active && $0.loginKind == .oneQR } + } + } + /// `rows` once the apps in `appIds` hold a live one-QR key: each app's /// row becomes active and one-QR, keeping its branding and scope (a /// two-QR row waiting for its second scan would otherwise keep showing diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index b36eb43e4d..a505bb4c10 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2697,6 +2697,67 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.first?.updatedAt, confirmedAt) } + /// A grant confirmed with no row saved after it, as an app terminated + /// between the two writes leaves it, gets its app's row back: when the + /// app has none, and when the row it has is a two-QR one. + func testAConfirmedGrantWithoutItsOneQRRowGetsItsRowBack() throws { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let appB = "BbWcUA8Msi7HSgC2hCJsCtDADs2FzQVabRuHvk1tnj4d" + func grant(app: String, keyId: UInt32, identity: String = "identity") -> AppConnectGrant { + let template = Self.grant(sessionKeyId: keyId) + return AppConnectGrant( + identityId: identity, appContractId: app, documentId: nil, values: template.values, + sessionKeyId: keyId, totalBudget: nil, expiresAt: nil, publishedAt: template.publishedAt) + } + let keys = [ + Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20)), + Self.key(keyId: 8, data: Data(repeating: 0x08, count: 20)), + ] + // Key 7 bound to app A as the store shows it, so an unconfirmed + // record of it would hold its key. + let bindings = [AppConnect.KeyBinding( + keyId: 7, data: Data(repeating: 0x07, count: 20), + singleContractId: try XCTUnwrap(Data.identifier(fromBase58: appA)))] + func appIds(_ grants: [AppConnectGrant], rows: [DAppConnection], keys: [ManagedIdentity.IdentityPublicKeyInfo] = keys) + -> Set { + PlatformDashConnectDataSource.appIdsWithoutTheirOneQRRow( + grants: grants, identityId: "identity", currentIdentityPublicKeys: keys, bindings: bindings, rows: rows) + } + let earlier = Date(timeIntervalSince1970: 1_000) + let twoQRRow = DAppConnection( + id: appA, name: "App A", url: "", status: .approved, updatedAt: earlier, loginKind: .twoQR) + let oneQRRow = DAppConnection( + id: appA, name: "App A", url: "", status: .active, updatedAt: earlier, loginKind: .oneQR) + + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: []), [appA], "no row") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), [appA], "a two-QR row") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7)], rows: [oneQRRow]), [], "the row is there") + XCTAssertEqual( + appIds([grant(app: appA, keyId: 7), grant(app: appB, keyId: 8)], rows: [oneQRRow]), [appB], + "a later approval for another app finds the row this one lost") + + var disabled = grant(app: appA, keyId: 7) + disabled.keyDisabled = true + XCTAssertEqual(appIds([disabled], rows: []), [], "a disconnected grant") + XCTAssertEqual( + appIds([grant(app: appA, keyId: 7)], rows: [], + keys: [Self.key(keyId: 7, data: Data(repeating: 0x07, count: 20), disabledAt: 1)]), + [], "a key disabled on the identity") + XCTAssertEqual(appIds([grant(app: appA, keyId: 9)], rows: []), [], "a key the identity does not hold") + XCTAssertEqual(appIds([grant(app: appA, keyId: 7, identity: "other")], rows: []), [], "another identity") + var unconfirmed = grant(app: appA, keyId: 7) + unconfirmed.unconfirmedKeyHash160 = Data(repeating: 0x07, count: 20).toHexString() + XCTAssertTrue(AppConnect.holdsRecordedKey(unconfirmed, currentIdentityPublicKeys: keys, bindings: bindings)) + XCTAssertEqual(appIds([unconfirmed], rows: []), [], "an unconfirmed grant is left to its confirmation") + + // What the row becomes. + let rows = PlatformDashConnectDataSource.rowsAfterConfirming( + appIds: appIds([grant(app: appA, keyId: 7)], rows: [twoQRRow]), in: [twoQRRow], + at: Date(timeIntervalSince1970: 2_000)) + XCTAssertEqual(rows.map(\.status), [.active]) + XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 3b753747e4c7f126dee4ad588602e86e3b36d13a Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 21:18:16 +0300 Subject: [PATCH 25/30] build: pin the platform SDK to v5.1-dev with platform#4844 DashConnect v2 needs `deriveConnectKey` and the reshaped `ParsedStateTransition` (platform#4844), the delete-by-values entry point (platform#5419) and the contract-group read (platform#5421), all merged into v5.1-dev at a9336f9486. develop's pin (5.0.0-rc.1) has none of them. Co-Authored-By: Claude Opus 5.5 --- .platform-ref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.platform-ref b/.platform-ref index 56eacde9f4..843357bc60 100644 --- a/.platform-ref +++ b/.platform-ref @@ -1 +1 @@ -2f4d161c89bd1750a5cc2ceef391e1cee192a9a7 +a9336f9486e5f0c79ce0940638037783b883c725 From b9e508914b0ae855094c42bff7d75c6c309a6bc2 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:17:40 +0300 Subject: [PATCH 26/30] fix(dashpay): settle a pending one-QR registration before a disconnect, and find a key id past the last one A one-QR upgrade over a two-QR row whose identity update landed but reported a failure left an unconfirmed record and the two-QR row. A disconnect then took the local two-QR path, downgraded the row and left the session key on with no switch to turn it off. The disconnect now reads the active identity again first when it has such a record of the app: a key confirmed there makes the row one-QR and the full disconnect runs; a failed read, or a key that is live under the record's id but cannot be confirmed, stops it with the row in place. A key on the identity under the last id (an app can register one there through the two-QR flow) made every new one-QR login fail with no free key id. The lowest id no key has is taken instead. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 13 +++- .../PlatformDashConnectDataSource.swift | 67 ++++++++++++++++++- .../PlatformDashConnectDataSourceTests.swift | 48 ++++++++++++- 3 files changed, 120 insertions(+), 8 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3c59e777fe..3cc9d13be1 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -140,12 +140,19 @@ enum AppConnect { } /// The id for a new key: one above the highest on the identity, disabled - /// keys included. `nil` when that id is the last one a key can have. + /// keys included. Platform only refuses an id the identity already has, + /// so when the highest is the last id a key can have (a key an app + /// registered can be given it) the lowest id no key has is taken + /// instead. `nil` only when every id is taken. static func nextKeyId( currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] ) -> UInt32? { - let highest = currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }.max() ?? 0 - return highest == .max ? nil : highest + 1 + let taken = Set(currentIdentityPublicKeys.map { UInt32(bitPattern: $0.keyId) }) + let highest = taken.max() ?? 0 + guard highest == .max else { return highest + 1 } + // The identity holds far fewer keys than there are ids, so this + // stops within a few steps of the lowest gap. + return (0 ... UInt32.max).first { !taken.contains($0) } } /// The key an app is given: it can only sign for the contract the request diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index e293e81ccf..f63ccbc1ef 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -1652,9 +1652,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } + // A one-QR registration whose outcome was never seen may have landed + // over this app's two-QR row. Which disconnect runs is decided by the + // row, so such a record of the active identity is settled against a + // fresh view of it first: a key confirmed there makes the row + // one-QR. If that cannot be done, nothing is turned off and the row + // stays. + try await settleUnconfirmedRegistrations(appContractId: id, stores: stores) let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - // A record whose registration is unconfirmed has nothing for a - // disconnect to turn off until its key is seen. + // A record still unconfirmed takes no part: the fresh view did not + // show its key live, or the record is another identity's. + // TODO(dashconnect-unconfirmed-row): an update still on its way when + // that view was read lands after this disconnect, and its key is + // shown again only by the next one-QR approval with this identity. let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } if isOneQR || hasGrants { let liveElsewhere = try await revokeAppConnectGrants( @@ -1693,6 +1703,59 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } + /// When the active identity has an unconfirmed registration of the app, + /// reads the identity again and runs `confirmRegistrations` with it, + /// which confirms every registration of the identity whose key is there + /// and makes those apps' rows one-QR. Returns without anything else when + /// there is no such record. Throws when the wallet's context cannot be + /// resolved or the identity read, and when the read shows the key of a + /// registration of the app that still could not be confirmed. + private func settleUnconfirmedRegistrations(appContractId: String, stores: Stores) async throws { + let activeIdentityId = await MainActor.run { DWCurrentUserIdentityInfo.shared.identityId } + guard let identityId = activeIdentityId?.toBase58String(), stores.grants.load().contains(where: { + $0.appContractId == appContractId && $0.identityId == identityId && $0.isUnconfirmed + }) else { return } + let context = try await requireContext(pinnedTo: stores) + guard context.identityId.toBase58String() == identityId else { + throw DashConnectPlatformError.walletChanged + } + let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) + await confirmRegistrations( + identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, + modelContainer: context.modelContainer, in: stores) + // The key landed live under the record's id but the record could not + // be confirmed: the key store has no readable bound for it, or the + // key differs from what the record says was submitted. The local + // disconnect would leave that key on with no row to turn it off from. + guard !Self.holdsUnconfirmedKey( + in: stores.grants.load(), appContractId: appContractId, identityId: identityId, + currentIdentityPublicKeys: currentPublicKeys) + else { + Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") + throw DashConnectPlatformError.identityKeysOutOfDate + } + } + + /// Whether the identity holds, live, the key an unconfirmed registration + /// of the app was going to register, under the id it was submitted with. + /// The same key under another id came from another submission of the + /// request, which has its own record. + static func holdsUnconfirmedKey( + in grants: [AppConnectGrant], + appContractId: String, + identityId: String, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + ) -> Bool { + grants.contains { grant in + guard grant.appContractId == appContractId, grant.identityId == identityId, + let hash = grant.unconfirmedKeyHash160 else { return false } + return currentIdentityPublicKeys.contains { + UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil + && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == hash + } + } + } + /// Ends the access one-QR logins gave an app: disables its session keys /// on the identity, then deletes the responses that carried them. /// diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index a505bb4c10..c357d264e2 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1844,12 +1844,20 @@ final class AppConnectLoginTests: XCTestCase { 8) } - func testThereIsNoNextKeyIdAfterTheLastOne() { + /// An app can register a key under the last id there is. The next key + /// then takes the lowest free id, and disabling that key changes nothing: + /// its id stays taken. + func testAKeyOnTheLastIdLeavesTheLowestFreeIdForTheNextKey() { // A key id is a UInt32 the SDK carries as an Int32 bit pattern. let last = Self.key(keyId: -1, data: Data([1])) - XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [last])) + XCTAssertEqual(AppConnect.nextKeyId(currentIdentityPublicKeys: [last]), 0) let disabledLast = Self.key(keyId: -1, data: Data([1]), disabledAt: 1) - XCTAssertNil(AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: 3, data: Data([3])), disabledLast])) + XCTAssertEqual( + AppConnect.nextKeyId(currentIdentityPublicKeys: [ + Self.key(keyId: 0, data: Data([0])), Self.key(keyId: 1, data: Data([2])), + Self.key(keyId: 2, data: Data([3]), disabledAt: 1), disabledLast, + ]), + 3, "a disabled key keeps its id") XCTAssertEqual( AppConnect.nextKeyId(currentIdentityPublicKeys: [Self.key(keyId: -2, data: Data([2]))]), .max) @@ -2758,6 +2766,40 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) } + /// A disconnect stops on an unconfirmed registration of the app whose + /// key is live: the local two-QR disconnect would leave it on. + func testALiveKeyOfAnUnconfirmedRegistrationIsFound() { + let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + let hash = Data(repeating: 0x5A, count: 20) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: appA, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = hash.toHexString() + func holds( + _ grants: [AppConnectGrant], keys: [ManagedIdentity.IdentityPublicKeyInfo], + app: String = appA, identity: String = "identity" + ) -> Bool { + PlatformDashConnectDataSource.holdsUnconfirmedKey( + in: grants, appContractId: app, identityId: identity, currentIdentityPublicKeys: keys) + } + + XCTAssertTrue(holds([pending], keys: [Self.key(keyId: 9, data: hash)])) + // A refused submission under id 9 and a later one of the same request + // that landed under id 12: the record of the first is not that key. + XCTAssertFalse( + holds([pending], keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)]), + "the same key under another id") + XCTAssertFalse(holds([pending], keys: []), "the key is not there") + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), "a disabled key") + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))])) + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], app: "another app")) + XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], identity: "another identity")) + var confirmed = pending + confirmed.unconfirmedKeyHash160 = nil + XCTAssertFalse(holds([confirmed], keys: [Self.key(keyId: 9, data: hash)]), "a confirmed record") + } + func testDisconnectWithNoActiveWalletIsRefused() async { let active = ActiveWallet(nil) let (dataSource, _) = makeScopedDataSource(active: active) From 96bee7c7fcfe83ac37a91280b9c930da28536ddd Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Fri, 16 Oct 2026 22:57:49 +0300 Subject: [PATCH 27/30] fix(dashpay): choose the disconnect from a fresh view, and settle a one-QR registration by its revision A disconnect picked one-QR or two-QR from the row alone. A two-QR row with a one-QR registration whose outcome was not known was turned off locally, and the key could land afterwards with no row; a confirmed grant whose row write was lost had its repaired row overwritten as two-QR again. The registration now notes the identity revision its update was built for. Platform takes an identity update only at one above the identity's revision, so once the identity is there without the key the update can never land. The revocation reads the identity's keys and revision after the PIN and then settles each pending registration of the app: a live key that cannot be confirmed stops the disconnect, one that can never land is dropped, and one that may still land makes the disconnect one-QR, whose disable update leaves it unable to land; with nothing to disable the disconnect stops with a new message. A live key of a confirmed grant also makes it one-QR. The caller removes or downgrades the row by what the revocation returns. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 10 +- .../PlatformDashConnectDataSource.swift | 289 +++++++++++------- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../PlatformDashConnectDataSourceTests.swift | 90 ++++-- 46 files changed, 302 insertions(+), 130 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index 3cc9d13be1..c0ed74f36a 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -555,8 +555,16 @@ struct AppConnectGrant: Codable, Equatable { /// registration is submitted until the key is seen on the identity. /// While set, the key may be there or not: an update can land without /// confirming. Such a record has no row and no response; it is kept so - /// the key, if it lands, is found and confirmed. + /// the key, if it lands, is found and confirmed, until a disconnect + /// finds that the update can no longer land. var unconfirmedKeyHash160: String? = nil + /// The identity revision the registration's update was submitted with, + /// set with `unconfirmedKeyHash160`. Platform takes an identity update + /// only at one above the identity's revision, so once the identity is at + /// this revision or past it without the key live, the update can never + /// land. + /// `nil` on a record from a build that did not note it. + var submittedRevision: UInt64? = nil var isUnconfirmed: Bool { unconfirmedKeyHash160 != nil } diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index f63ccbc1ef..8174a88406 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -80,6 +80,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case grantNotRecorded case noFreeKeyId case otherIdentitiesNotChecked + case registrationPending case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection @@ -148,6 +149,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "The app's keys on this identity are off, but this wallet could not check its other identities. Try again.", comment: "DashConnect") + case .registrationPending: + return NSLocalizedString( + "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again.", + comment: "DashConnect") case .walletChanged: return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: @@ -926,6 +931,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { publishedAt: now() ) pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() + // The update is built at one above the revision the wallet holds + // for the identity, read again from Platform above. + let revisionBefore = try context.wallet.managedIdentity(identityId: context.identityId).getRevision() + pending.submittedRevision = revisionBefore == .max ? nil : revisionBefore + 1 // A confirmed record for this request means its key is on the // identity, and a view without it is behind: registering again // would be refused, and the record must keep its values. @@ -954,10 +963,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } } catch { + // Another update of the identity that landed meanwhile moved + // the wallet's revision, and this one may have been built on + // it: the record names the higher of the two, which only + // makes a disconnect wait longer for the outcome. + if let revisionAfter = try? context.wallet + .managedIdentity(identityId: context.identityId).getRevision(), + revisionAfter > revisionBefore, revisionAfter < .max { + updateGrants(in: stores) { grants in + guard let index = grants.firstIndex(where: { $0.key == pending.key }) else { return } + grants[index].submittedRevision = revisionAfter + 1 + } + pending.submittedRevision = revisionAfter + 1 + } // The update may have landed all the same. If the key is on // the identity, the login goes on; otherwise the failure // stands and the record stays unconfirmed, to be confirmed if - // the key turns up later. + // the key turns up later, or dropped by a disconnect once the + // update can no longer land. guard let keys = try? await refreshedIdentityPublicKeys(context: context), let bindings = try? Self.storedKeyBindings( identityId: identityId, modelContainer: context.modelContainer), @@ -1652,37 +1675,31 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard scope == stores.scope else { throw DashConnectPlatformError.walletChanged } - // A one-QR registration whose outcome was never seen may have landed - // over this app's two-QR row. Which disconnect runs is decided by the - // row, so such a record of the active identity is settled against a - // fresh view of it first: a key confirmed there makes the row - // one-QR. If that cannot be done, nothing is turned off and the row - // stays. - try await settleUnconfirmedRegistrations(appContractId: id, stores: stores) - let isOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR - // A record still unconfirmed takes no part: the fresh view did not - // show its key live, or the record is another identity's. - // TODO(dashconnect-unconfirmed-row): an update still on its way when - // that view was read lands after this disconnect, and its key is - // shown again only by the next one-QR approval with this identity. - let hasGrants = stores.grants.load().contains { $0.appContractId == id && !$0.isUnconfirmed } - if isOneQR || hasGrants { - let liveElsewhere = try await revokeAppConnectGrants( - appContractId: id, checksUnrecordedKeys: isOneQR, stores: stores) + let rowIsOneQR = rows(in: stores).first { $0.id == id }?.loginKind == .oneQR + // What can reach Platform: a confirmed grant of the app, and a + // registration of it whose outcome is not known yet. Which of the + // two disconnects runs is settled by the revocation, from a fresh + // view of the identity, not by the row alone. + let hasGrants = stores.grants.load().contains { + $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) + } + if rowIsOneQR || hasGrants { + let revocation = try await revokeAppConnectGrants( + appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) // The row stands for the app, and the app still holds a key on // another identity of this wallet. That key can only be disabled // while its identity is the active one, so the row stays to get // there, and the user is told; this identity's keys are off. - if liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } - } - if isOneQR { - // The session keys are disabled, and so are the keys of an - // earlier two-QR login that were found: the same QR can no - // longer be approved and there is no second step to wait for, - // so the row goes instead of sitting in the two-QR "approved" - // state. - await updateRows(in: stores) { rows in rows.filter { $0.id != id } } - return + if revocation.liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } + if revocation.asOneQR { + // The session keys are disabled, and so are the keys of an + // earlier two-QR login that were found: the same QR can no + // longer be approved and there is no second step to wait + // for, so the row goes instead of sitting in the two-QR + // "approved" state. + await updateRows(in: stores) { rows in rows.filter { $0.id != id } } + return + } } let disconnectedAt = now() @@ -1703,57 +1720,50 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { } } - /// When the active identity has an unconfirmed registration of the app, - /// reads the identity again and runs `confirmRegistrations` with it, - /// which confirms every registration of the identity whose key is there - /// and makes those apps' rows one-QR. Returns without anything else when - /// there is no such record. Throws when the wallet's context cannot be - /// resolved or the identity read, and when the read shows the key of a - /// registration of the app that still could not be confirmed. - private func settleUnconfirmedRegistrations(appContractId: String, stores: Stores) async throws { - let activeIdentityId = await MainActor.run { DWCurrentUserIdentityInfo.shared.identityId } - guard let identityId = activeIdentityId?.toBase58String(), stores.grants.load().contains(where: { - $0.appContractId == appContractId && $0.identityId == identityId && $0.isUnconfirmed - }) else { return } - let context = try await requireContext(pinnedTo: stores) - guard context.identityId.toBase58String() == identityId else { - throw DashConnectPlatformError.walletChanged - } - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - await confirmRegistrations( - identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, - modelContainer: context.modelContainer, in: stores) - // The key landed live under the record's id but the record could not - // be confirmed: the key store has no readable bound for it, or the - // key differs from what the record says was submitted. The local - // disconnect would leave that key on with no row to turn it off from. - guard !Self.holdsUnconfirmedKey( - in: stores.grants.load(), appContractId: appContractId, identityId: identityId, - currentIdentityPublicKeys: currentPublicKeys) - else { - Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") - throw DashConnectPlatformError.identityKeysOutOfDate - } - } - - /// Whether the identity holds, live, the key an unconfirmed registration - /// of the app was going to register, under the id it was submitted with. - /// The same key under another id came from another submission of the - /// request, which has its own record. - static func holdsUnconfirmedKey( - in grants: [AppConnectGrant], - appContractId: String, - identityId: String, - currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo] + /// Whether a disconnect of the app takes the one-QR path. A live session + /// key of a confirmed grant makes it one-QR however the row reads: a row + /// write lost after the grant was confirmed leaves the app's two-QR row + /// in place. So does a registration that may still land: any disable + /// update the one-QR path then sends lands above the revision that + /// registration was built on, after which it can never land. + static func disconnectsAsOneQR( + rowIsOneQR: Bool, + holdsLiveGrantedKey: Bool, + hasRegistrationThatMayStillLand: Bool ) -> Bool { - grants.contains { grant in - guard grant.appContractId == appContractId, grant.identityId == identityId, - let hash = grant.unconfirmedKeyHash160 else { return false } - return currentIdentityPublicKeys.contains { - UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil - && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == hash - } + rowIsOneQR || holdsLiveGrantedKey || hasRegistrationThatMayStillLand + } + + /// What a view of the identity at `identityRevision` tells of an + /// unconfirmed registration. + enum RegistrationOutcome: Equatable { + /// The key is on the identity, live, under the id the registration + /// was submitted with. The same key under another id came from + /// another submission of the request, which has its own record. + case keyLive + /// The identity is at the update's revision or past it without that + /// key live, so the update can never land. + case cannotLand + /// The identity is below the update's revision: the update may still + /// land. + case mayStillLand + /// The record does not note the revision it was submitted with. + case unknownRevision + } + + static func registrationOutcome( + of grant: AppConnectGrant, + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + identityRevision: UInt64 + ) -> RegistrationOutcome { + let isLive = currentIdentityPublicKeys.contains { + UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil + && $0.keyType == .ecdsaHash160 && $0.data.toHexString() == grant.unconfirmedKeyHash160 } + if isLive { return .keyLive } + guard let submitted = grant.submittedRevision else { return .unknownRevision } + guard identityRevision >= submitted else { return .mayStillLand } + return .cannotLand } /// Ends the access one-QR logins gave an app: disables its session keys @@ -1776,22 +1786,30 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// - /// Returns whether a grant record shows the app with a live key on - /// another identity of this wallet. When this identity gave it none, that - /// is thrown instead: nothing was turned off. - /// For a row made by the one-QR login that also covers keys on another - /// identity that no grant record names, as far as the wallet's store - /// shows them. + /// Returns, as `liveElsewhere`, whether a grant record shows the app with + /// a live key on another identity of this wallet. When this identity gave + /// it none, that is thrown instead: nothing was turned off. For a one-QR + /// disconnect that also covers keys on another identity that no grant + /// record names, as far as the wallet's store shows them. `asOneQR` says + /// which disconnect this was. + /// + /// For a row made by the one-QR login, with no record for this identity, + /// the keys are still looked for on it. When it holds none bound to the + /// app, there was nothing to turn off here and the call returns without + /// an error. /// - /// `checksUnrecordedKeys` is set for a row made by the one-QR login: with - /// no record for this identity the keys are still looked for on it. When - /// it holds none bound to the app, there was nothing to turn off here and - /// the call returns without an error. + /// Which disconnect this is, one-QR or two-QR, is settled after the + /// identity is read again (`disconnectsAsOneQR`) and returned. This + /// identity's registrations of the app whose outcome was not known are + /// settled by that read (`registrationOutcome`): a live key that cannot + /// be confirmed stops the disconnect, one that can never land is + /// dropped, and one that may still land is dropped once a disable update + /// has landed; with no key to disable it stops the disconnect. private func revokeAppConnectGrants( appContractId: String, - checksUnrecordedKeys: Bool, + rowIsOneQR: Bool, stores: Stores - ) async throws -> Bool { + ) async throws -> (liveElsewhere: Bool, asOneQR: Bool) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -1799,6 +1817,10 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { func isGranted(_ grant: AppConnectGrant) -> Bool { grant.identityId == identityId && grant.appContractId == appContractId } + // TODO(dashconnect-unconfirmed-row): a registration of the app on + // another identity whose outcome is not known is not counted here. + // If it lands after this disconnect, its key is shown again only by + // the next one-QR approval with that identity. func hasLiveGrantElsewhere() -> Bool { stores.grants.load().contains { $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true @@ -1808,17 +1830,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable } - if !stores.grants.load().contains(where: { isGranted($0) && !$0.isUnconfirmed }) { + if !stores.grants.load().contains(where: { + isGranted($0) && (!$0.isUnconfirmed || $0.submittedRevision != nil) + }) { // Before the PIN prompt, from the store alone: whether this // identity holds a key of the app's that has no record. - let holdsUnrecordedKey = try checksUnrecordedKeys && Self + let holdsUnrecordedKey = try rowIsOneQR && Self .storedKeyBindings(identityId: identityId, modelContainer: context.modelContainer) .contains { $0.singleContractId == appContract && !$0.isDisabled && $0.isSessionKeyShaped } // A one-QR row goes on to the PIN prompt either way: the keys of // an earlier two-QR login can only be looked for after it. - if !holdsUnrecordedKey, !checksUnrecordedKeys { + if !holdsUnrecordedKey, !rowIsOneQR { if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - return false + return (liveElsewhere: false, asOneQR: false) } } @@ -1826,18 +1850,47 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { context = try await contextAfterAuthorization(matching: context) let signer = KeychainSigner(modelContainer: context.modelContainer) - let currentPublicKeys = try await refreshedIdentityPublicKeys(context: context) - // A registration whose key has turned up is confirmed. One that has - // not stays unconfirmed and takes no part in what follows: its key - // id may belong to another key, and its absence says nothing. - // TODO(dashconnect-unconfirmed-row): if the view stays behind - // through this disconnect too, the app's row goes while that key may - // have landed; the next one-QR approval with this identity confirms - // the key and shows the app again. + let (currentPublicKeys, revision) = try await refreshedIdentityKeysAndRevision(context: context) + // A registration whose key has turned up is confirmed. await confirmRegistrations( identityId: identityId, currentIdentityPublicKeys: currentPublicKeys, modelContainer: context.modelContainer, in: stores) + // One that has not is settled by its revision. One that does not + // note it takes no part: its key id may belong to another key, and + // its absence says nothing. + // TODO(dashconnect-unconfirmed-row): such a record (from a build + // before `submittedRevision`) whose update lands after this + // disconnect is shown again only by the next one-QR approval with + // this identity. + var mayStillLand: Set = [] + var cannotLand: Set = [] + for grant in stores.grants.load() where isGranted(grant) && grant.isUnconfirmed { + switch Self.registrationOutcome( + of: grant, currentIdentityPublicKeys: currentPublicKeys, identityRevision: revision) { + case .keyLive: + // The key landed live under the record's id but the record + // could not be confirmed: the key store has no readable + // bound for it, or the key differs from what the record says + // was submitted. + Self.logger.error("🔗 DASHCONNECT :: an unconfirmed session key of the app is live, but its record could not be confirmed") + throw DashConnectPlatformError.identityKeysOutOfDate + case .cannotLand: cannotLand.insert(grant.key) + case .mayStillLand: mayStillLand.insert(grant.key) + case .unknownRevision: break + } + } + if !cannotLand.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: dropping \(cannotLand.count, privacy: .public) session key registration(s) that can no longer land") + updateGrants(in: stores) { grants in grants.removeAll { cannotLand.contains($0.key) } } + } let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } + let asOneQR = Self.disconnectsAsOneQR( + rowIsOneQR: rowIsOneQR, + holdsLiveGrantedKey: granted.contains { grant in + currentPublicKeys.contains { UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil } + }, + hasRegistrationThatMayStillLand: !mayStillLand.isEmpty) + let checksUnrecordedKeys = asOneQR guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { // Platform never removes a key, so the node that answered is // behind. A key it does not know cannot be shown to be disabled, @@ -1888,6 +1941,15 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { throw DashConnectPlatformError.grantOnAnotherIdentity } + if !mayStillLand.isEmpty, keyIds.isEmpty { + // No update would be sent, so nothing settles the registration. + // TODO(dashconnect-pending-registration): an update that was + // refused, or never sent, cannot be told from one still on its + // way, so this stays until the identity's revision moves or the + // app's code is approved again. + Self.logger.error("🔗 DASHCONNECT :: a session key registration of the app may still land, and there is no key to disable") + throw DashConnectPlatformError.registrationPending + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure @@ -1901,6 +1963,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { ) } Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") + // Each registration that might still land names a revision above + // `revision`, the one below it the identity was already at. The + // update that just landed took one above the identity's revision + // when it was built, at least the revision such a registration + // names, and a revision only grows: none of them can land now. + if !mayStillLand.isEmpty { + updateGrants(in: stores) { grants in grants.removeAll { mayStillLand.contains($0.key) } } + } } // The session keys of the grants read above are now off, and only @@ -1917,12 +1987,12 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return true } + if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return (liveElsewhere: true, asOneQR: asOneQR) } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return false + return (liveElsewhere: false, asOneQR: asOneQR) } /// Whether the wallet's store shows another identity of this wallet with @@ -2492,12 +2562,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { private func refreshedIdentityPublicKeys( context: Context ) async throws -> [ManagedIdentity.IdentityPublicKeyInfo] { + try await refreshedIdentityKeysAndRevision(context: context).keys + } + + /// The identity's keys and revision as Platform has them, both read from + /// one copy of the identity. + private func refreshedIdentityKeysAndRevision( + context: Context + ) async throws -> (keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64) { guard try await context.wallet.loadIdentity(atIndex: context.identityIndex) == context.identityId else { throw DashConnectPlatformError.noIdentity } - return try context.wallet - .managedIdentity(identityId: context.identityId) - .getPublicKeys() + let identity = try context.wallet.managedIdentity(identityId: context.identityId) + return (try identity.getPublicKeys(), try identity.getRevision()) } /// What the wallet's store holds for each key of the identity. The store diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 1b45a8d4e6..877b31a1a9 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 83cb82a924..923a408105 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index d31369052b..fcb9b6c4f3 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 432891cb5c..3e61290826 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index abacd68730..b5b3907fcd 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index 5cf03bc111..d8a4ef434d 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index de47dbd583..3af2216e88 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 00e967a464..b50be6cc38 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6198,6 +6198,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 69c90d37d7..275927f8b4 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 3df8812c48..081003dcc1 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index cd887fca97..2ec63ec681 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 73b8dd5b5a..ee95ca5b77 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index a73ba7af05..5ee92952a8 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bf08c216b5..87bf4f8087 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index fa1fae6961..07c7717a99 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 6f5fe24660..ce79f6ca5e 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index ca5ec716ee..175eb3b350 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index d7933ceee4..8f5353cb39 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 6eb4457447..7d8a21b767 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index fc27f2a562..30985951cc 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 02de3b0edc..0647795e90 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 143fe77df3..dcfb1fd439 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index f416161925..4e980f00ac 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index c8d9c8432d..a402756eb9 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 5732f96f33..b26c76b68f 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 797d0b2b46..e459e3e1ac 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 6cb4d6a3b9..fd85a6ed34 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 6c9394dadf..64484f1ade 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 4a4c254890..0d0e1741e4 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 205d48dd88..7e187ffe4d 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index 9996efb438..e8d1057946 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 9bc4cc80d3..a85b00ccf8 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 4b062f76e5..5b526bca86 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index dc438e947e..ef137f55c1 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 2e907f037d..54e0ccdb2d 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index f0c82511d6..5b63519d87 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 91379c093f..ca390ad3ca 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index 9860f79f9d..ac25212ab8 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index e1fd711f61..b160496fab 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index b17778cdf5..08a819a89c 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 565c8d6237..4d18074a8e 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6298,6 +6298,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 24fef45e09..33a047261c 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 1060a52194..2520d09343 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6296,6 +6296,7 @@ "%u votes per contest — evonodes count as 4, masternodes as 1" = "%u votes per contest — evonodes count as 4, masternodes as 1"; "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; +"A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index c357d264e2..fb0543b59b 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2766,38 +2766,82 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(rows.map(\.loginKind), [.oneQR]) } - /// A disconnect stops on an unconfirmed registration of the app whose - /// key is live: the local two-QR disconnect would leave it on. - func testALiveKeyOfAnUnconfirmedRegistrationIsFound() { - let appA = "EWR695MsqPUuW8EnTbYzD4KybNQD5n7CUDWydJYNg63F" + /// What a fresh view says of an unconfirmed registration: its key live + /// under its id, an update that can never land once the identity is at + /// its revision without the key, or one that may still land. + func testAnUnconfirmedRegistrationIsSettledByItsKeyAndTheIdentityRevision() { let hash = Data(repeating: 0x5A, count: 20) let template = Self.grant(sessionKeyId: 9) var pending = AppConnectGrant( - identityId: "identity", appContractId: appA, documentId: nil, values: template.values, + identityId: "identity", appContractId: "app", documentId: nil, values: template.values, sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) pending.unconfirmedKeyHash160 = hash.toHexString() - func holds( - _ grants: [AppConnectGrant], keys: [ManagedIdentity.IdentityPublicKeyInfo], - app: String = appA, identity: String = "identity" - ) -> Bool { - PlatformDashConnectDataSource.holdsUnconfirmedKey( - in: grants, appContractId: app, identityId: identity, currentIdentityPublicKeys: keys) + pending.submittedRevision = 4 + func outcome( + _ grant: AppConnectGrant, keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64 + ) -> PlatformDashConnectDataSource.RegistrationOutcome { + PlatformDashConnectDataSource.registrationOutcome( + of: grant, currentIdentityPublicKeys: keys, identityRevision: revision) } - XCTAssertTrue(holds([pending], keys: [Self.key(keyId: 9, data: hash)])) + XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash)], revision: 4), .keyLive) + // Still at the revision the update was built on: it may land. + XCTAssertEqual(outcome(pending, keys: [], revision: 3), .mayStillLand) + // Another update took the revision, or this one landed and its key + // was turned off since. + XCTAssertEqual(outcome(pending, keys: [], revision: 4), .cannotLand) + XCTAssertEqual(outcome(pending, keys: [], revision: 7), .cannotLand) + XCTAssertEqual(outcome(pending, keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 4), .cannotLand) // A refused submission under id 9 and a later one of the same request // that landed under id 12: the record of the first is not that key. - XCTAssertFalse( - holds([pending], keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)]), - "the same key under another id") - XCTAssertFalse(holds([pending], keys: []), "the key is not there") - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)]), "a disabled key") - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: Data(repeating: 0x01, count: 20))])) - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], app: "another app")) - XCTAssertFalse(holds([pending], keys: [Self.key(keyId: 9, data: hash)], identity: "another identity")) - var confirmed = pending - confirmed.unconfirmedKeyHash160 = nil - XCTAssertFalse(holds([confirmed], keys: [Self.key(keyId: 9, data: hash)]), "a confirmed record") + XCTAssertEqual( + outcome(pending, keys: [Self.key(keyId: 9, data: Data([9])), Self.key(keyId: 12, data: hash)], revision: 5), + .cannotLand) + var unnoted = pending + unnoted.submittedRevision = nil + XCTAssertEqual(outcome(unnoted, keys: [], revision: 9), .unknownRevision) + XCTAssertEqual(outcome(unnoted, keys: [Self.key(keyId: 9, data: hash)], revision: 9), .keyLive) + } + + /// A live key of a confirmed grant, or a registration that may still + /// land, makes the disconnect one-QR even over a two-QR row. + func testWhatMakesADisconnectOneQR() { + func oneQR(row: Bool = false, live: Bool = false, pending: Bool = false) -> Bool { + PlatformDashConnectDataSource.disconnectsAsOneQR( + rowIsOneQR: row, holdsLiveGrantedKey: live, hasRegistrationThatMayStillLand: pending) + } + + XCTAssertFalse(oneQR(), "a two-QR row and nothing live") + XCTAssertTrue(oneQR(row: true)) + XCTAssertTrue(oneQR(live: true), "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue(oneQR(pending: true), "the one-QR disable update settles the registration") + } + + /// A two-QR row with a registration of the app whose outcome is not + /// known is not turned off locally: the disconnect goes to Platform, and + /// when that cannot be done the row stays as it was. + func testATwoQRRowWithARegistrationThatMayStillLandIsNotTurnedOffLocally() async throws { + let active = ActiveWallet("wallet-a") + let row = Self.twoQRRow(status: .active) + let (dataSource, connections) = makeScopedDataSource(active: active, rows: [row]) + let grants = UserDefaultsAppConnectResponseStore(defaults: defaults, scope: .connections(connections)) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: row.id, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() + pending.submittedRevision = 4 + grants.pinned(toWalletIdHex: "wallet-a").save([pending]) + let shown = Self.shownRows(dataSource) + + do { + try await dataSource.disconnect(id: shown[0].id, scope: shown[0].scope) + XCTFail("turned off locally while the registration may still land") + } catch {} + + XCTAssertEqual(connections.load().map(\.status), [.active]) + XCTAssertEqual(connections.load().map(\.loginKind), [.twoQR]) + XCTAssertEqual(grants.pinned(toWalletIdHex: "wallet-a").load().map(\.key), [pending.key]) } func testDisconnectWithNoActiveWalletIsRefused() async { From bf4e32c2a18b2dc0cf7a96717f057434b8aa76da Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 18 Oct 2026 18:41:04 +0300 Subject: [PATCH 28/30] fix(dashpay): settle a registration that lands during a disconnect, and keep the row for another identity's - A one-QR registration that could still land when the disconnect picked its keys may land before the disable update, which a reload elsewhere can then build on the newer identity. Once a disable update has landed none of them can land any more, so one more read settles each: a key that turned up is disabled too, one that never will is dropped, and a read still below the update keeps the records and the row. - A registration on another identity of the wallet that may still land keeps the row (`registrationPendingOnAnotherIdentity`) instead of a local downgrade on this one; only that identity's own read settles it. This identity's own pending registration is reported first, so the two identities never send the user back and forth. - A confirmed grant not yet recorded as off makes a disconnect one-QR while no two-QR login key is live, so a retry after a one-QR disconnect that stopped after disabling still removes the row. Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 212 +++++++++++++----- DashWallet/ar.lproj/Localizable.strings | 1 + DashWallet/bg.lproj/Localizable.strings | 1 + DashWallet/ca.lproj/Localizable.strings | 1 + DashWallet/cs.lproj/Localizable.strings | 1 + DashWallet/da.lproj/Localizable.strings | 1 + DashWallet/de.lproj/Localizable.strings | 1 + DashWallet/el.lproj/Localizable.strings | 1 + DashWallet/en.lproj/Localizable.strings | 1 + DashWallet/eo.lproj/Localizable.strings | 1 + DashWallet/es.lproj/Localizable.strings | 1 + DashWallet/et.lproj/Localizable.strings | 1 + DashWallet/fa.lproj/Localizable.strings | 1 + DashWallet/fi.lproj/Localizable.strings | 1 + DashWallet/fil.lproj/Localizable.strings | 1 + DashWallet/fr.lproj/Localizable.strings | 1 + DashWallet/hr.lproj/Localizable.strings | 1 + DashWallet/hu.lproj/Localizable.strings | 1 + DashWallet/id.lproj/Localizable.strings | 1 + DashWallet/it.lproj/Localizable.strings | 1 + DashWallet/ja.lproj/Localizable.strings | 1 + DashWallet/ko.lproj/Localizable.strings | 1 + DashWallet/mk.lproj/Localizable.strings | 1 + DashWallet/ms.lproj/Localizable.strings | 1 + DashWallet/nb.lproj/Localizable.strings | 1 + DashWallet/nl.lproj/Localizable.strings | 1 + DashWallet/pl.lproj/Localizable.strings | 1 + DashWallet/pt.lproj/Localizable.strings | 1 + DashWallet/ro.lproj/Localizable.strings | 1 + DashWallet/ru.lproj/Localizable.strings | 1 + DashWallet/sk.lproj/Localizable.strings | 1 + DashWallet/sl.lproj/Localizable.strings | 1 + DashWallet/sl_SI.lproj/Localizable.strings | 1 + DashWallet/sq.lproj/Localizable.strings | 1 + DashWallet/sr.lproj/Localizable.strings | 1 + DashWallet/sv.lproj/Localizable.strings | 1 + DashWallet/th.lproj/Localizable.strings | 1 + DashWallet/tr.lproj/Localizable.strings | 1 + DashWallet/uk.lproj/Localizable.strings | 1 + DashWallet/vi.lproj/Localizable.strings | 1 + DashWallet/zh-Hans.lproj/Localizable.strings | 1 + .../zh-Hant-TW.lproj/Localizable.strings | 1 + DashWallet/zh.lproj/Localizable.strings | 1 + DashWallet/zh_TW.lproj/Localizable.strings | 1 + .../PlatformDashConnectDataSourceTests.swift | 91 +++++++- 45 files changed, 285 insertions(+), 61 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 8174a88406..fbab4f52bd 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -81,6 +81,7 @@ enum DashConnectPlatformError: LocalizedError, Equatable { case noFreeKeyId case otherIdentitiesNotChecked case registrationPending + case registrationPendingOnAnotherIdentity case walletChanged case ephemeralKeyGenerationFailed case ambiguousKeyRegistrationConnection @@ -153,6 +154,10 @@ enum DashConnectPlatformError: LocalizedError, Equatable { return NSLocalizedString( "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again.", comment: "DashConnect") + case .registrationPendingOnAnotherIdentity: + return NSLocalizedString( + "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it.", + comment: "DashConnect") case .walletChanged: return NSLocalizedString("The active wallet or identity changed. Try again.", comment: "DashConnect") case .noFreeKeyId: @@ -1679,7 +1684,9 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // What can reach Platform: a confirmed grant of the app, and a // registration of it whose outcome is not known yet. Which of the // two disconnects runs is settled by the revocation, from a fresh - // view of the identity, not by the row alone. + // view of the identity, not by the row alone. Records of every + // identity of the wallet count: the row is shared, and one held by + // another identity is reported by the revocation. let hasGrants = stores.grants.load().contains { $0.appContractId == id && (!$0.isUnconfirmed || $0.submittedRevision != nil) } @@ -1687,10 +1694,11 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { let revocation = try await revokeAppConnectGrants( appContractId: id, rowIsOneQR: rowIsOneQR, stores: stores) // The row stands for the app, and the app still holds a key on - // another identity of this wallet. That key can only be disabled - // while its identity is the active one, so the row stays to get - // there, and the user is told; this identity's keys are off. - if revocation.liveElsewhere { throw DashConnectPlatformError.grantOnAnotherIdentity } + // another identity of this wallet, or may still be given one + // there. That identity's keys can only be read and disabled + // while it is the active one, so the row stays to get there, and + // the user is told; this identity's keys are off. + if let heldElsewhere = revocation.heldElsewhere { throw heldElsewhere } if revocation.asOneQR { // The session keys are disabled, and so are the keys of an // earlier two-QR login that were found: the same QR can no @@ -1723,15 +1731,23 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// Whether a disconnect of the app takes the one-QR path. A live session /// key of a confirmed grant makes it one-QR however the row reads: a row /// write lost after the grant was confirmed leaves the app's two-QR row - /// in place. So does a registration that may still land: any disable - /// update the one-QR path then sends lands above the revision that - /// registration was built on, after which it can never land. + /// in place. So does a confirmed grant not yet recorded as off while no + /// key of the two-QR login is live: a one-QR disconnect that stopped + /// after disabling its keys, those of the two-QR login among them. With + /// a two-QR login key live, that login came after the grant's key went + /// off, and the row is its. So does a registration that may still land: + /// any disable update the one-QR path then sends lands above the + /// revision that registration was built on, after which it can never + /// land. static func disconnectsAsOneQR( rowIsOneQR: Bool, holdsLiveGrantedKey: Bool, + holdsUnrevokedGrant: Bool, + holdsLiveTwoQRLoginKey: Bool, hasRegistrationThatMayStillLand: Bool ) -> Bool { - rowIsOneQR || holdsLiveGrantedKey || hasRegistrationThatMayStillLand + rowIsOneQR || holdsLiveGrantedKey || (holdsUnrevokedGrant && !holdsLiveTwoQRLoginKey) + || hasRegistrationThatMayStillLand } /// What a view of the identity at `identityRevision` tells of an @@ -1766,6 +1782,51 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { return .cannotLand } + /// The ids of the keys that registrations which might still land put on + /// the identity after all, read once an update of this disconnect has + /// landed: none of them can land any more, so each key is either live + /// now or never will be. Throws when the read still shows one that + /// could land: the node that answered is behind that update. + static func keyIdsOfRegistrationsThatLanded( + _ registrations: [AppConnectGrant], + currentIdentityPublicKeys: [ManagedIdentity.IdentityPublicKeyInfo], + identityRevision: UInt64 + ) throws -> [UInt32] { + try registrations.compactMap { registration in + switch registrationOutcome( + of: registration, + currentIdentityPublicKeys: currentIdentityPublicKeys, + identityRevision: identityRevision + ) { + case .keyLive: return registration.sessionKeyId + case .cannotLand: return nil + case .mayStillLand, .unknownRevision: throw DashConnectPlatformError.identityKeysOutOfDate + } + } + } + + /// Why the app's row has to stay for another identity of this wallet, + /// as the error to show, or `nil` when no identity but `identityId` has + /// part in it. A live key there (`heldOnAnotherIdentity` covers the keys + /// no record names) comes first; a registration there that may still + /// land, one with a noted revision, is settled only by a read of that + /// identity, once it is the active one. + static func reasonHeldElsewhere( + grants: [AppConnectGrant], + appContractId: String, + identityId: String, + heldOnAnotherIdentity: Bool + ) -> DashConnectPlatformError? { + let elsewhere = grants.filter { $0.appContractId == appContractId && $0.identityId != identityId } + if heldOnAnotherIdentity || elsewhere.contains(where: { !$0.isUnconfirmed && $0.keyDisabled != true }) { + return .grantOnAnotherIdentity + } + if elsewhere.contains(where: { $0.isUnconfirmed && $0.submittedRevision != nil }) { + return .registrationPendingOnAnotherIdentity + } + return nil + } + /// Ends the access one-QR logins gave an app: disables its session keys /// on the identity, then deletes the responses that carried them. /// @@ -1786,12 +1847,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// every time and Platform never re-adds a key, so the app cannot sign /// in with two QRs again. A two-QR row keeps them. /// - /// Returns, as `liveElsewhere`, whether a grant record shows the app with - /// a live key on another identity of this wallet. When this identity gave - /// it none, that is thrown instead: nothing was turned off. For a one-QR - /// disconnect that also covers keys on another identity that no grant - /// record names, as far as the wallet's store shows them. `asOneQR` says - /// which disconnect this was. + /// Returns, as `heldElsewhere`, the error to show when a grant record + /// shows the app with a live key on another identity of this wallet, or + /// with a registration there that may still land + /// (`reasonHeldElsewhere`). When this identity gave it none, that is + /// thrown instead: nothing was turned off. For a one-QR disconnect that + /// also covers keys on another identity that no grant record names, as + /// far as the wallet's store shows them. `asOneQR` says which disconnect + /// this was. /// /// For a row made by the one-QR login, with no record for this identity, /// the keys are still looked for on it. When it holds none bound to the @@ -1803,13 +1866,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { /// identity's registrations of the app whose outcome was not known are /// settled by that read (`registrationOutcome`): a live key that cannot /// be confirmed stops the disconnect, one that can never land is - /// dropped, and one that may still land is dropped once a disable update - /// has landed; with no key to disable it stops the disconnect. + /// dropped, and one that may still land is settled by one more read once + /// a disable update has landed, its key disabled if it turned up; with + /// no key to disable it stops the disconnect. private func revokeAppConnectGrants( appContractId: String, rowIsOneQR: Bool, stores: Stores - ) async throws -> (liveElsewhere: Bool, asOneQR: Bool) { + ) async throws -> (heldElsewhere: DashConnectPlatformError?, asOneQR: Bool) { // The row was picked in the wallet `stores` belongs to; another // wallet's identity is not the one the row belongs to. var context = try await requireContext(pinnedTo: stores) @@ -1818,14 +1882,19 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { grant.identityId == identityId && grant.appContractId == appContractId } // TODO(dashconnect-unconfirmed-row): a registration of the app on - // another identity whose outcome is not known is not counted here. - // If it lands after this disconnect, its key is shown again only by - // the next one-QR approval with that identity. + // another identity that does not note its revision (from a build + // before `submittedRevision`) is not counted here. If it lands after + // this disconnect, its key is shown again only by the next one-QR + // approval with that identity. func hasLiveGrantElsewhere() -> Bool { - stores.grants.load().contains { - $0.appContractId == appContractId && $0.identityId != identityId && $0.keyDisabled != true - && !$0.isUnconfirmed - } + Self.reasonHeldElsewhere( + grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, + heldOnAnotherIdentity: false) == .grantOnAnotherIdentity + } + func reasonHeldElsewhere(heldOnAnotherIdentity: Bool = false) -> DashConnectPlatformError? { + Self.reasonHeldElsewhere( + grants: stores.grants.load(), appContractId: appContractId, identityId: identityId, + heldOnAnotherIdentity: heldOnAnotherIdentity) } guard let appContract = Self.decodeIdentifier(appContractId) else { throw DashConnectPlatformError.loginContractUnavailable @@ -1841,8 +1910,8 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // A one-QR row goes on to the PIN prompt either way: the keys of // an earlier two-QR login can only be looked for after it. if !holdsUnrecordedKey, !rowIsOneQR { - if hasLiveGrantElsewhere() { throw DashConnectPlatformError.grantOnAnotherIdentity } - return (liveElsewhere: false, asOneQR: false) + if let heldElsewhere = reasonHeldElsewhere() { throw heldElsewhere } + return (heldElsewhere: nil, asOneQR: false) } } @@ -1884,11 +1953,24 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { updateGrants(in: stores) { grants in grants.removeAll { cannotLand.contains($0.key) } } } let granted = stores.grants.load().filter { isGranted($0) && !$0.isUnconfirmed } + // The keys the two-QR login derives for this app, known before + // anything is disabled: its authentication key has the kind and the + // bound of a session key. A one-QR row disables both of them; a + // two-QR row keeps them, so there the authentication key is named + // as one to leave. If they cannot be derived, nothing is turned off. + let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) + let liveTwoQRLoginKeyIds = Self.liveLoginKeyIds( + authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, + encryptionPublicKey: twoQRKeys.encryptionPublicKey, + currentIdentityPublicKeys: currentPublicKeys + ) let asOneQR = Self.disconnectsAsOneQR( rowIsOneQR: rowIsOneQR, holdsLiveGrantedKey: granted.contains { grant in currentPublicKeys.contains { UInt32(bitPattern: $0.keyId) == grant.sessionKeyId && $0.disabledAt == nil } }, + holdsUnrevokedGrant: granted.contains { $0.keyDisabled != true }, + holdsLiveTwoQRLoginKey: !liveTwoQRLoginKeyIds.isEmpty, hasRegistrationThatMayStillLand: !mayStillLand.isEmpty) let checksUnrecordedKeys = asOneQR guard AppConnect.sessionKeyIdsMissing(from: currentPublicKeys, for: granted).isEmpty else { @@ -1913,12 +1995,6 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { // as turned off. throw DashConnectPlatformError.identityKeysOutOfDate } - // The keys the two-QR login derives for this app, known before - // anything is disabled: its authentication key has the kind and the - // bound of a session key. A one-QR row disables both of them; a - // two-QR row keeps them, so there the authentication key is named - // as one to leave. If they cannot be derived, nothing is turned off. - let twoQRKeys = try await twoQRLoginPublicKeys(appContractId: appContract, context: context) var keyIds = AppConnect.sessionKeyIdsToDisable( for: granted, appContractId: appContract, @@ -1927,48 +2003,58 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { twoQRAuthenticationKeyHash160: checksUnrecordedKeys ? nil : twoQRKeys.authenticationPublicKeyHash160 ) if checksUnrecordedKeys { - keyIds = Array(Set(keyIds).union(Self.liveLoginKeyIds( - authenticationPublicKeyHash160: twoQRKeys.authenticationPublicKeyHash160, - encryptionPublicKey: twoQRKeys.encryptionPublicKey, - currentIdentityPublicKeys: currentPublicKeys - ))).sorted() - } - // For a one-QR row, the keys on another identity that no grant - // record shows. `nil` when that could not be told. - let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() - ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) - : false - if granted.isEmpty, keyIds.isEmpty, hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { - throw DashConnectPlatformError.grantOnAnotherIdentity + keyIds = Array(Set(keyIds).union(liveTwoQRLoginKeyIds)).sorted() } if !mayStillLand.isEmpty, keyIds.isEmpty { // No update would be sent, so nothing settles the registration. + // This identity's own state comes first: whatever another + // identity holds, this one cannot be told to be done. // TODO(dashconnect-pending-registration): an update that was // refused, or never sent, cannot be told from one still on its // way, so this stays until the identity's revision moves or the - // app's code is approved again. + // app's code is approved again. Until then the record also holds + // the row for the wallet's other identities + // (`registrationPendingOnAnotherIdentity`). Self.logger.error("🔗 DASHCONNECT :: a session key registration of the app may still land, and there is no key to disable") throw DashConnectPlatformError.registrationPending } + // For a one-QR row, the keys on another identity that no grant + // record shows. `nil` when that could not be told. + let heldOnAnotherIdentity: Bool? = checksUnrecordedKeys && !hasLiveGrantElsewhere() + ? await anotherIdentityHoldsAppKeys(appContractId: appContract, context: context) + : false + if granted.isEmpty, keyIds.isEmpty, + let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { + throw heldElsewhere + } if !keyIds.isEmpty { Self.logger.info("🔗 DASHCONNECT :: disabling \(keyIds.count, privacy: .public) app key(s)") // Platform takes a limited number of keys per update. A failure // part way leaves the rest live and the row in place; the next // attempt picks up what is still live. - for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { - try await context.wallet.updateIdentity( - identityId: context.identityId, - disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), - signer: signer - ) - } + try await disableKeys(keyIds, context: context, signer: signer) Self.logger.info("🔗 DASHCONNECT :: app key(s) disabled") // Each registration that might still land names a revision above // `revision`, the one below it the identity was already at. The // update that just landed took one above the identity's revision // when it was built, at least the revision such a registration // names, and a revision only grows: none of them can land now. + // One may have landed since `revision` was read, though, and the + // update was built on whatever copy of the identity the SDK held + // by then, which a reload elsewhere may have moved past that + // read: its key is not among `keyIds`. One more read settles + // each of them, and a key that turned up is disabled as well. + // Until then the records and the row stay. if !mayStillLand.isEmpty { + let (keysAfter, revisionAfter) = try await refreshedIdentityKeysAndRevision(context: context) + let landedKeyIds = try Self.keyIdsOfRegistrationsThatLanded( + stores.grants.load().filter { mayStillLand.contains($0.key) }, + currentIdentityPublicKeys: keysAfter, + identityRevision: revisionAfter) + if !landedKeyIds.isEmpty { + Self.logger.info("🔗 DASHCONNECT :: disabling \(landedKeyIds.count, privacy: .public) session key(s) registered after the identity was read") + try await disableKeys(landedKeyIds.sorted(), context: context, signer: signer) + } updateGrants(in: stores) { grants in grants.removeAll { mayStillLand.contains($0.key) } } } } @@ -1987,12 +2073,26 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { signer: signer ) } - if hasLiveGrantElsewhere() || heldOnAnotherIdentity == true { return (liveElsewhere: true, asOneQR: asOneQR) } + if let heldElsewhere = reasonHeldElsewhere(heldOnAnotherIdentity: heldOnAnotherIdentity == true) { + return (heldElsewhere: heldElsewhere, asOneQR: asOneQR) + } // This identity's keys are off. Whether another one holds a key of // the app could not be read from the store, so the row stays, with // an error rather than without one. guard heldOnAnotherIdentity != nil else { throw DashConnectPlatformError.otherIdentitiesNotChecked } - return (liveElsewhere: false, asOneQR: asOneQR) + return (heldElsewhere: nil, asOneQR: asOneQR) + } + + /// Disables `keyIds` on the identity, as many per update as Platform + /// takes. + private func disableKeys(_ keyIds: [UInt32], context: Context, signer: KeychainSigner) async throws { + for start in stride(from: 0, to: keyIds.count, by: AppConnect.maxKeysDisabledPerUpdate) { + try await context.wallet.updateIdentity( + identityId: context.identityId, + disablePublicKeyIds: Array(keyIds[start ..< min(start + AppConnect.maxKeysDisabledPerUpdate, keyIds.count)]), + signer: signer + ) + } } /// Whether the wallet's store shows another identity of this wallet with diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 877b31a1a9..5112f3e33c 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index 923a408105..c50c54d1b3 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index fcb9b6c4f3..1e3f4ec4c0 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 3e61290826..c50dcfd404 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index b5b3907fcd..f6c1d26821 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index d8a4ef434d..48771b41db 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 3af2216e88..af64c887f6 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index b50be6cc38..93378af49a 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6199,6 +6199,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index 275927f8b4..1e58816709 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index 081003dcc1..9968cd6ab0 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 2ec63ec681..5b294faf39 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index ee95ca5b77..f3da95337f 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index 5ee92952a8..3ec9bd13d6 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index 87bf4f8087..6de485a71b 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index 07c7717a99..57f7d07e8a 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index ce79f6ca5e..e0664629f4 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 175eb3b350..d9d9b1769f 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index 8f5353cb39..30534d3256 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index 7d8a21b767..d6352932be 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 30985951cc..7f5e332785 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 0647795e90..bce58c7dfa 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index dcfb1fd439..9fa4d3643a 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 4e980f00ac..4b982b4453 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index a402756eb9..2084691c19 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index b26c76b68f..37dbae433b 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index e459e3e1ac..3812797868 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index fd85a6ed34..08ab577f9a 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 64484f1ade..7b1edd76fb 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 0d0e1741e4..ba3b86c112 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index 7e187ffe4d..4f7f18ebca 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e8d1057946..c88ea3955c 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index a85b00ccf8..f42dbaa289 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 5b526bca86..83793bb712 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index ef137f55c1..f82d5aec6e 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 54e0ccdb2d..466c578317 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index 5b63519d87..9ae6fa5023 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index ca390ad3ca..32d31d4e90 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index ac25212ab8..a7a3bc66c1 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index b160496fab..c213678450 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 08a819a89c..10c8fc2fb3 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 4d18074a8e..e8a60a339e 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6299,6 +6299,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 33a047261c..60c15b6951 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 2520d09343..80747ed2ad 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6297,6 +6297,7 @@ "A masternode vote ended with this username locked, so nobody can register it. Choose a different one." = "A masternode vote ended with this username locked, so nobody can register it. Choose a different one."; "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance." = "A partial withdrawal is limited to %@. Tap Max to withdraw the full balance."; "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again." = "A sign-in to this app may still add a key to your identity, so the app cannot be turned off yet. Try again later, or approve the app's sign-in code again."; +"A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it." = "A sign-in to this app with another identity of this wallet may still add a key to that identity, so the app cannot be turned off here yet. Switch to that identity to check it."; "A vote is cast with %d of these nodes, worth %u votes. Choose which ones under “Voting with”." = "A vote is cast with %1$d of these nodes, worth %2$u votes. Choose which ones under “Voting with”."; "Account" = "Account"; "Account Information" = "Account Information"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index fb0543b59b..9f60b1a678 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -2803,17 +2803,98 @@ final class AppConnectLoginTests: XCTestCase { XCTAssertEqual(outcome(unnoted, keys: [Self.key(keyId: 9, data: hash)], revision: 9), .keyLive) } - /// A live key of a confirmed grant, or a registration that may still - /// land, makes the disconnect one-QR even over a two-QR row. + /// After a disable update of the disconnect has landed, a registration + /// that could still land when its keys were picked has either put its + /// key on the identity, which is then picked for disabling too, or + /// never will. + func testARegistrationThatLandedWhileTheDisconnectRanIsPickedForDisabling() throws { + let hash = Data(repeating: 0x5A, count: 20) + let template = Self.grant(sessionKeyId: 9) + var pending = AppConnectGrant( + identityId: "identity", appContractId: "app", documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + pending.unconfirmedKeyHash160 = hash.toHexString() + pending.submittedRevision = 4 + func landed(keys: [ManagedIdentity.IdentityPublicKeyInfo], revision: UInt64) throws -> [UInt32] { + try PlatformDashConnectDataSource.keyIdsOfRegistrationsThatLanded( + [pending], currentIdentityPublicKeys: keys, identityRevision: revision) + } + + // Landed at 4 before the disable update, which then took 5. + XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash)], revision: 5), [9]) + // The disable update took 4: the registration can never land. + XCTAssertEqual(try landed(keys: [], revision: 4), []) + // It landed and its key is off already. + XCTAssertEqual(try landed(keys: [Self.key(keyId: 9, data: hash, disabledAt: 1)], revision: 6), []) + // A node still below the disable update cannot settle it. + XCTAssertThrowsError(try landed(keys: [], revision: 3)) { error in + guard case DashConnectPlatformError.identityKeysOutOfDate = error else { + return XCTFail("unexpected error: \(error)") + } + } + } + + /// A row stays for another identity of the wallet that holds a key of + /// the app, or may still be given one by a registration with a noted + /// revision. Only that identity's own read settles the registration. + func testAnotherIdentityKeepsTheRowForItsLiveKeyOrPendingRegistration() { + let template = Self.grant(sessionKeyId: 9) + func record(identity: String, app: String = "app", unconfirmed: Bool, revision: UInt64? = 4) -> AppConnectGrant { + var grant = AppConnectGrant( + identityId: identity, appContractId: app, documentId: nil, values: template.values, + sessionKeyId: 9, totalBudget: 5_000, expiresAt: 6_000, publishedAt: template.publishedAt) + if unconfirmed { + grant.unconfirmedKeyHash160 = Data(repeating: 0x5A, count: 20).toHexString() + grant.submittedRevision = revision + } + return grant + } + func reason(_ grants: [AppConnectGrant], heldOnAnotherIdentity: Bool = false) -> String? { + PlatformDashConnectDataSource.reasonHeldElsewhere( + grants: grants, appContractId: "app", identityId: "b", + heldOnAnotherIdentity: heldOnAnotherIdentity + ).map { "\($0)" } + } + var disabled = record(identity: "a", unconfirmed: false) + disabled.keyDisabled = true + + XCTAssertNil(reason([])) + XCTAssertNil(reason([record(identity: "b", unconfirmed: true)]), "this identity's own registration") + XCTAssertNil(reason([record(identity: "a", app: "other", unconfirmed: true)])) + XCTAssertNil(reason([disabled])) + XCTAssertNil( + reason([record(identity: "a", unconfirmed: true, revision: nil)]), + "a record with no revision can never be settled, so it takes no part") + XCTAssertEqual(reason([record(identity: "a", unconfirmed: true)]), "registrationPendingOnAnotherIdentity") + XCTAssertEqual(reason([record(identity: "a", unconfirmed: false)]), "grantOnAnotherIdentity") + XCTAssertEqual(reason([], heldOnAnotherIdentity: true), "grantOnAnotherIdentity") + XCTAssertEqual( + reason([record(identity: "a", unconfirmed: true), record(identity: "c", unconfirmed: false)]), + "grantOnAnotherIdentity", "a live key comes first") + } + + /// A live key of a confirmed grant, a confirmed grant not recorded as + /// off while no two-QR login key is live, or a registration that may + /// still land makes the disconnect one-QR even over a two-QR row. func testWhatMakesADisconnectOneQR() { - func oneQR(row: Bool = false, live: Bool = false, pending: Bool = false) -> Bool { + func oneQR( + row: Bool = false, live: Bool = false, unrevoked: Bool = false, twoQRKeyLive: Bool = false, + pending: Bool = false + ) -> Bool { PlatformDashConnectDataSource.disconnectsAsOneQR( - rowIsOneQR: row, holdsLiveGrantedKey: live, hasRegistrationThatMayStillLand: pending) + rowIsOneQR: row, holdsLiveGrantedKey: live, holdsUnrevokedGrant: unrevoked, + holdsLiveTwoQRLoginKey: twoQRKeyLive, hasRegistrationThatMayStillLand: pending) } XCTAssertFalse(oneQR(), "a two-QR row and nothing live") XCTAssertTrue(oneQR(row: true)) - XCTAssertTrue(oneQR(live: true), "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue( + oneQR(live: true, unrevoked: true, twoQRKeyLive: true), + "a confirmed grant over a two-QR row, its row write lost") + XCTAssertTrue(oneQR(unrevoked: true), "a one-QR disconnect that stopped after disabling every key") + XCTAssertFalse( + oneQR(unrevoked: true, twoQRKeyLive: true), + "a two-QR login came after the grant's key went off: the row is its") XCTAssertTrue(oneQR(pending: true), "the one-QR disable update settles the registration") } From 79996be75bced73140aa3c20a33994c99c2c702a Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 15:19:53 +0200 Subject: [PATCH 29/30] docs(dashpay): note the revision race a one-QR registration record still has The record names the revision the wallet read before the update, while the SDK builds the update from its own cached identity. The revision pin that was to close this was dropped from dashpay/platform#5487 in favour of settling a broadcast's outcome from its signed transition. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/PlatformDashConnectDataSource.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index fbab4f52bd..1147a5a6bb 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -938,6 +938,13 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() // The update is built at one above the revision the wallet holds // for the identity, read again from Platform above. + // TODO(app-connect-broadcast-outcome): the SDK builds the update + // from its own cached identity, and a reload between this read and + // the update can move it, so the update may land at another + // revision than the one recorded here. A disconnect can then take + // a registration that landed for one that never will. Settling the + // outcome from the signed transition (dashpay/platform broadcast + // outbox) closes it. let revisionBefore = try context.wallet.managedIdentity(identityId: context.identityId).getRevision() pending.submittedRevision = revisionBefore == .max ? nil : revisionBefore + 1 // A confirmed record for this request means its key is on the From ff133011d865e4c751b991418145cf36fbfa1216 Mon Sep 17 00:00:00 2001 From: romchornyi Date: Fri, 30 Oct 2026 15:43:50 +0200 Subject: [PATCH 30/30] docs(dashpay): describe the registration revision gap as it stands Co-Authored-By: Claude Opus 5.5 --- .../PlatformDashConnectDataSource.swift | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift index 1147a5a6bb..f74fd756ca 100644 --- a/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift +++ b/DashWallet/Sources/Models/DashConnect/PlatformDashConnectDataSource.swift @@ -936,15 +936,14 @@ final class PlatformDashConnectDataSource: DashConnectDataSource { publishedAt: now() ) pending.unconfirmedKeyHash160 = sessionKeyHash160.toHexString() - // The update is built at one above the revision the wallet holds - // for the identity, read again from Platform above. + // The record names one above the revision the wallet holds for the + // identity now. // TODO(app-connect-broadcast-outcome): the SDK builds the update - // from its own cached identity, and a reload between this read and - // the update can move it, so the update may land at another - // revision than the one recorded here. A disconnect can then take - // a registration that landed for one that never will. Settling the - // outcome from the signed transition (dashpay/platform broadcast - // outbox) closes it. + // from its own cached identity, which a reload after this read can + // move, and does not report the revision it signed. The update can + // then land above the recorded revision, and a disconnect that + // reads the identity at the recorded revision takes a registration + // still on its way for one that can no longer land. let revisionBefore = try context.wallet.managedIdentity(identityId: context.identityId).getRevision() pending.submittedRevision = revisionBefore == .max ? nil : revisionBefore + 1 // A confirmed record for this request means its key is on the