From 204214ab71822f27944f9aef1e0fd0ac323ab45f Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Wed, 21 Oct 2026 15:23:07 +0200 Subject: [PATCH 1/2] fix(dashconnect): open DashConnect codes from the Home scanner The Scan shortcut's scanner only understood payment codes, so a dash-key: / dash-st: QR was rejected as "Not a Dash QR code". The scan model now hands a DashConnect URI to a delegate that implements the new optional qrScanModel:didScanDashConnectURI:, before the payment parse. Only Home implements it, and routes the code to the Connections screen the same way a tapped DashConnect link does. The Send and lock-screen scanners are unchanged. Co-Authored-By: Claude Opus 5.5 --- .../DashConnect/DashConnectDeepLink.swift | 11 ++++++++- .../Sources/UI/Home/HomeViewController.swift | 18 +++++++++++++++ .../UI/Payments/ScanQR/DWQRScanModel.h | 8 +++++++ .../UI/Payments/ScanQR/DWQRScanModel.m | 16 +++++++++++++ .../DashConnect/DashConnectUriTests.swift | 23 +++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift b/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift index 6ade248014..041e6c77bb 100644 --- a/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift +++ b/DashWallet/Sources/Models/DashConnect/DashConnectDeepLink.swift @@ -52,7 +52,16 @@ final class DashConnectDeepLink: NSObject { /// `absoluteString` returns what the app emitted. @objc(uriFromURL:) static func uri(from url: URL) -> String? { - let candidate = url.absoluteString.trimmingCharacters(in: .whitespacesAndNewlines) + uri(from: url.absoluteString) + } + + /// The DashConnect URI `string` holds, or `nil` when it is not one. + /// + /// For a carrier that hands over text rather than a `URL`: the Home + /// scanner reads the same payload off a QR code. + @objc(uriFromString:) + static func uri(from string: String) -> String? { + let candidate = string.trimmingCharacters(in: .whitespacesAndNewlines) guard DashConnectUri.isKeyUri(candidate) || DashConnectUri.isStUri(candidate) else { return nil diff --git a/DashWallet/Sources/UI/Home/HomeViewController.swift b/DashWallet/Sources/UI/Home/HomeViewController.swift index 3204cdf7ab..520a005e5f 100644 --- a/DashWallet/Sources/UI/Home/HomeViewController.swift +++ b/DashWallet/Sources/UI/Home/HomeViewController.swift @@ -743,6 +743,24 @@ extension HomeViewController: ShortcutsActionDelegate { } } +// MARK: - DWQRScanModelDelegate + +extension HomeViewController { + /// The Home scanner (the Scan shortcut, `dashwallet://scanqr`) also reads + /// DashConnect codes, and opens the Connections screen with them — the + /// same place a tapped `dash-key:` / `dash-st:` link goes. + /// + /// The scan delegate is `DWBasePayViewController`; only Home answers this + /// optional half, so the lock screen and the Send scanners keep treating + /// these codes as not-a-payment. + @objc(qrScanModel:didScanDashConnectURI:) + func qrScanModel(_ viewModel: DWQRScanModel, didScanDashConnectURI uri: String) { + dismiss(animated: true) { [weak self] in + (self?.tabBarController as? MainTabbarController)?.openDashConnect(uri) + } + } +} + // MARK: - SyncingActivityMonitorObserver extension HomeViewController: SyncingActivityMonitorObserver { diff --git a/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.h b/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.h index 1b34ca4697..0e75de9aa1 100644 --- a/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.h +++ b/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.h @@ -80,6 +80,14 @@ typedef NS_ENUM(NSUInteger, QRCodeObjectType) { - (void)qrScanModel:(DWQRScanModel *)viewModel didScanPaymentInput:(DWPaymentInput *)paymentInput; - (void)qrScanModelDidCancel:(DWQRScanModel *)viewModel; +@optional + +/// A DashConnect request (`dash-key:` / `dash-st:`) was scanned. +/// +/// Only a delegate that implements this is handed one. Every other scanner +/// reads the code as before: not a payment, so "Not a Dash QR code". +- (void)qrScanModel:(DWQRScanModel *)viewModel didScanDashConnectURI:(NSString *)uri; + @end NS_ASSUME_NONNULL_END diff --git a/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.m b/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.m index 07169a2166..8952f81034 100644 --- a/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.m +++ b/DashWallet/Sources/UI/Payments/ScanQR/DWQRScanModel.m @@ -192,6 +192,22 @@ - (void)didOutputMetadataObjects:(NSArray<__kindof AVMetadataObject *> *)metadat NSAssert(![NSThread isMainThread], nil); NSString *addr = [codeObject.stringValue stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; + + // A DashConnect request is not a payment: hand it over whole before the payment parse below + // rejects it. Malformed payloads are reported by the Connections screen, as for a tapped link. + NSString *dashConnectURI = [DWDashConnectDeepLink uriFromString:addr]; + if (dashConnectURI && [self.delegate respondsToSelector:@selector(qrScanModel:didScanDashConnectURI:)]) { + dispatch_async(dispatch_get_main_queue(), ^{ + QRCodeObject *qrCodeObject = [[QRCodeObject alloc] initWithMetadataObject:codeObject]; + [qrCodeObject setValid]; + self.qrCodeObject = qrCodeObject; + + [self.delegate qrScanModel:self didScanDashConnectURI:dashConnectURI]; + }); + + return; + } + DWParsedPaymentURI *parsed = [DWParsedPaymentURI parsePaymentString:addr]; // The URI parse, `pay:` normalization and address validity are app-side now (the box). (Paper-wallet // sweep — the old WIF/BIP38 arm — was dropped in C8 step 5.) diff --git a/DashWalletTests/DashConnect/DashConnectUriTests.swift b/DashWalletTests/DashConnect/DashConnectUriTests.swift index 54fa951fe1..b65bcb7ffa 100644 --- a/DashWalletTests/DashConnect/DashConnectUriTests.swift +++ b/DashWalletTests/DashConnect/DashConnectUriTests.swift @@ -132,6 +132,29 @@ final class DashConnectUriTests: XCTestCase { } } + // MARK: - Scanned codes + + func testScannedStringAcceptsBothDashConnectSchemes() throws { + let keyUri = try validKeyUri() + let stUri = validStUri() + + XCTAssertEqual(DashConnectDeepLink.uri(from: keyUri), keyUri) + XCTAssertEqual(DashConnectDeepLink.uri(from: stUri), stUri) + XCTAssertEqual(DashConnectDeepLink.uri(from: " \(keyUri)\n"), keyUri) + } + + func testScannedStringRejectsPaymentCodes() { + for code in [ + "XnhkeQZLtHqzYqbxLXaAvB9RLnKGrRWKgy", + "dash:XnhkeQZLtHqzYqbxLXaAvB9RLnKGrRWKgy?amount=0.1", + "pay:XnhkeQZLtHqzYqbxLXaAvB9RLnKGrRWKgy", + "https://yap.pr/login", + "", + ] { + XCTAssertNil(DashConnectDeepLink.uri(from: code), code) + } + } + private func assertKeyError(_ uri: String, _ expected: DashConnectUriError) { XCTAssertThrowsError(try DashConnectUri.parseKeyRequest(uri)) { error in From 916956c73a31f7e15017e707aa75279123dac7b6 Mon Sep 17 00:00:00 2001 From: Bartosz Rozwarski Date: Thu, 22 Oct 2026 09:11:57 +0200 Subject: [PATCH 2/2] fix(dashconnect): treat a Home-scanned code as a scan and say where to go next A code from the Home scanner reached the Connections screen through the deep-link path, so App Connect treated it as an on-device link and opened the app's callback in the browser after approval. The hosting controller now remembers that the code was scanned and hands it to onQRScanned; a tapped link still goes through onURIReceived. An approval that finishes the sign-in (the one-QR login or App Connect v2) of a scanned request now ends with "Connected to . Go back to your browser to continue." A link returns through its callback instead, and the two-QR login still waits for the app's key-registration code. Co-Authored-By: Claude Opus 5.5 --- .../Models/DashConnect/AppConnectLogin.swift | 9 ++++++++ .../UI/DashConnect/ConnectionsViewModel.swift | 12 ++++++++++ .../DashConnectHostingController.swift | 23 ++++++++++++++----- .../Sources/UI/Home/HomeViewController.swift | 4 ++-- .../UI/Main/MainTabbarController.swift | 14 +++++++---- 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 | 7 ++++++ 49 files changed, 100 insertions(+), 12 deletions(-) diff --git a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift index c02dcfbccc..480d19c38c 100644 --- a/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift +++ b/DashWallet/Sources/Models/DashConnect/AppConnectLogin.swift @@ -81,6 +81,15 @@ enum AppConnect { case .unresolved, .refused: return false } } + + /// Whether approving finishes the sign-in on the wallet's side. The + /// two-QR login still needs the app's key-registration code scanned. + var signsInAtApproval: Bool { + switch self { + case .oneQR, .appConnect: return true + case .twoQR, .unresolved, .refused: return false + } + } } /// The login a network at `protocolVersion` gets. diff --git a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift index 4c902b1e8f..deeecd18dc 100644 --- a/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift +++ b/DashWallet/Sources/UI/DashConnect/ConnectionsViewModel.swift @@ -237,6 +237,18 @@ final class ConnectionsViewModel: ObservableObject { self.pendingRequest = nil self.pendingLoginRequest = nil self.approveError = nil + // A link goes back through its callback; a scanned code's app + // is on another screen, so the user is told to go back to it. + if consent.login.signsInAtApproval, !pendingRequestArrivedByLink { + message = ConnectionsScreenMessage( + kind: .success, + text: String( + format: NSLocalizedString( + "Connected to %@. Go back to your browser to continue.", + comment: "DashConnect: a sign-in finished at approval; the placeholder is the app's name"), + consent.appLabel) + ) + } } catch DashConnectPlatformError.approvalOutOfDate { // Another identity, wallet or network became active, or the // network now answers with the other login: what the sheet diff --git a/DashWallet/Sources/UI/DashConnect/DashConnectHostingController.swift b/DashWallet/Sources/UI/DashConnect/DashConnectHostingController.swift index 5b25159af0..3abe859033 100644 --- a/DashWallet/Sources/UI/DashConnect/DashConnectHostingController.swift +++ b/DashWallet/Sources/UI/DashConnect/DashConnectHostingController.swift @@ -21,18 +21,23 @@ import SwiftUI import UIKit /// Hosts `ConnectionsScreen` and keeps a handle on its view model, so a -/// `dash-key:` / `dash-st:` link that arrives while the screen is already on -/// the stack is routed into it instead of pushing a second copy. +/// `dash-key:` / `dash-st:` request that arrives while the screen is already +/// on the stack is routed into it instead of pushing a second copy. final class DashConnectHostingController: UIHostingController { private let viewModel: ConnectionsViewModel /// Held until `viewDidAppear`: the approval sheet is presented from the /// screen, which cannot present while it is still being pushed. private var pendingURI: String? + /// Whether `pendingURI` was read off a QR code rather than opened as a + /// link. A scanned code goes in as a scan, the way the screen's own + /// scanner hands one over. + private var pendingURIWasScanned = false - init(navigationController: UINavigationController, uri: String? = nil) { + init(navigationController: UINavigationController, uri: String? = nil, scanned: Bool = false) { let viewModel = ConnectionsViewModel() self.viewModel = viewModel pendingURI = uri + pendingURIWasScanned = scanned super.init(rootView: ConnectionsScreen(vc: navigationController, viewModel: viewModel)) } @@ -46,9 +51,11 @@ final class DashConnectHostingController: UIHostingController consumePendingURI() } - /// Handles a link that arrived for a screen that is already on the stack. - func handle(uri: String) { + /// Handles a request that arrived for a screen that is already on the + /// stack: a link, or with `scanned` a code another screen's scanner read. + func handle(uri: String, scanned: Bool = false) { pendingURI = uri + pendingURIWasScanned = scanned if isViewLoaded, view.window != nil { consumePendingURI() @@ -58,6 +65,10 @@ final class DashConnectHostingController: UIHostingController private func consumePendingURI() { guard let uri = pendingURI else { return } pendingURI = nil - viewModel.onURIReceived(uri) + if pendingURIWasScanned { + viewModel.onQRScanned(uri) + } else { + viewModel.onURIReceived(uri) + } } } diff --git a/DashWallet/Sources/UI/Home/HomeViewController.swift b/DashWallet/Sources/UI/Home/HomeViewController.swift index 520a005e5f..71dd56e187 100644 --- a/DashWallet/Sources/UI/Home/HomeViewController.swift +++ b/DashWallet/Sources/UI/Home/HomeViewController.swift @@ -748,7 +748,7 @@ extension HomeViewController: ShortcutsActionDelegate { extension HomeViewController { /// The Home scanner (the Scan shortcut, `dashwallet://scanqr`) also reads /// DashConnect codes, and opens the Connections screen with them — the - /// same place a tapped `dash-key:` / `dash-st:` link goes. + /// same place a tapped `dash-key:` / `dash-st:` link goes, but as a scan. /// /// The scan delegate is `DWBasePayViewController`; only Home answers this /// optional half, so the lock screen and the Send scanners keep treating @@ -756,7 +756,7 @@ extension HomeViewController { @objc(qrScanModel:didScanDashConnectURI:) func qrScanModel(_ viewModel: DWQRScanModel, didScanDashConnectURI uri: String) { dismiss(animated: true) { [weak self] in - (self?.tabBarController as? MainTabbarController)?.openDashConnect(uri) + (self?.tabBarController as? MainTabbarController)?.openDashConnect(uri, scanned: true) } } } diff --git a/DashWallet/Sources/UI/Main/MainTabbarController.swift b/DashWallet/Sources/UI/Main/MainTabbarController.swift index b7b6729cd2..01fdd239b3 100644 --- a/DashWallet/Sources/UI/Main/MainTabbarController.swift +++ b/DashWallet/Sources/UI/Main/MainTabbarController.swift @@ -545,11 +545,17 @@ extension MainTabbarController { } /// Opens the Connections screen for a `dash-key:` / `dash-st:` link. + @objc + public func openDashConnect(_ uri: String) { + openDashConnect(uri, scanned: false) + } + + /// Opens the Connections screen for a `dash-key:` / `dash-st:` request: + /// a link, or with `scanned` a code the Home scanner read. /// /// The More tab's index moves with the DashPay layout, so it comes from /// `moreTabIndex` rather than from the tab enum. - @objc - public func openDashConnect(_ uri: String) { + func openDashConnect(_ uri: String, scanned: Bool) { dismiss(animated: false, completion: nil) guard let menuNav = menuNavigationController?.navigationController else { return } @@ -559,11 +565,11 @@ extension MainTabbarController { } if let connections = menuNav.topViewController as? DashConnectHostingController { - connections.handle(uri: uri) + connections.handle(uri: uri, scanned: scanned) return } - let controller = DashConnectHostingController(navigationController: menuNav, uri: uri) + let controller = DashConnectHostingController(navigationController: menuNav, uri: uri, scanned: scanned) controller.hidesBottomBarWhenPushed = true menuNav.pushViewController(controller, animated: true) } diff --git a/DashWallet/ar.lproj/Localizable.strings b/DashWallet/ar.lproj/Localizable.strings index 19bc51a6c4..8abfb45400 100644 --- a/DashWallet/ar.lproj/Localizable.strings +++ b/DashWallet/ar.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/bg.lproj/Localizable.strings b/DashWallet/bg.lproj/Localizable.strings index a5823343f2..18e8e67920 100644 --- a/DashWallet/bg.lproj/Localizable.strings +++ b/DashWallet/bg.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ca.lproj/Localizable.strings b/DashWallet/ca.lproj/Localizable.strings index 5ae0fa41bb..7ad152758a 100644 --- a/DashWallet/ca.lproj/Localizable.strings +++ b/DashWallet/ca.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/cs.lproj/Localizable.strings b/DashWallet/cs.lproj/Localizable.strings index 510ce8f44a..5864689960 100644 --- a/DashWallet/cs.lproj/Localizable.strings +++ b/DashWallet/cs.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/da.lproj/Localizable.strings b/DashWallet/da.lproj/Localizable.strings index 2a55b0175d..bf249843a4 100644 --- a/DashWallet/da.lproj/Localizable.strings +++ b/DashWallet/da.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/de.lproj/Localizable.strings b/DashWallet/de.lproj/Localizable.strings index dc4b03379f..10da590b91 100644 --- a/DashWallet/de.lproj/Localizable.strings +++ b/DashWallet/de.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/el.lproj/Localizable.strings b/DashWallet/el.lproj/Localizable.strings index 8862e2bd4e..ed63b59d4c 100644 --- a/DashWallet/el.lproj/Localizable.strings +++ b/DashWallet/el.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/en.lproj/Localizable.strings b/DashWallet/en.lproj/Localizable.strings index 81fb0f09ef..00e14dc0c9 100644 --- a/DashWallet/en.lproj/Localizable.strings +++ b/DashWallet/en.lproj/Localizable.strings @@ -6239,6 +6239,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/eo.lproj/Localizable.strings b/DashWallet/eo.lproj/Localizable.strings index dc1028e20b..81e014f813 100644 --- a/DashWallet/eo.lproj/Localizable.strings +++ b/DashWallet/eo.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/es.lproj/Localizable.strings b/DashWallet/es.lproj/Localizable.strings index a6b9ab4488..2a7c921ac3 100644 --- a/DashWallet/es.lproj/Localizable.strings +++ b/DashWallet/es.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/et.lproj/Localizable.strings b/DashWallet/et.lproj/Localizable.strings index 82f7f2d703..41866c2dab 100644 --- a/DashWallet/et.lproj/Localizable.strings +++ b/DashWallet/et.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/fa.lproj/Localizable.strings b/DashWallet/fa.lproj/Localizable.strings index 4cce5385cb..7c3bbdf6e7 100644 --- a/DashWallet/fa.lproj/Localizable.strings +++ b/DashWallet/fa.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/fi.lproj/Localizable.strings b/DashWallet/fi.lproj/Localizable.strings index bde8da7870..76d6f166ba 100644 --- a/DashWallet/fi.lproj/Localizable.strings +++ b/DashWallet/fi.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/fil.lproj/Localizable.strings b/DashWallet/fil.lproj/Localizable.strings index bd74ff8542..5ba3b0ba22 100644 --- a/DashWallet/fil.lproj/Localizable.strings +++ b/DashWallet/fil.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/fr.lproj/Localizable.strings b/DashWallet/fr.lproj/Localizable.strings index c538ca51bd..0c8d5f1c29 100644 --- a/DashWallet/fr.lproj/Localizable.strings +++ b/DashWallet/fr.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/hr.lproj/Localizable.strings b/DashWallet/hr.lproj/Localizable.strings index 949c2fbd9d..256758eefa 100644 --- a/DashWallet/hr.lproj/Localizable.strings +++ b/DashWallet/hr.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/hu.lproj/Localizable.strings b/DashWallet/hu.lproj/Localizable.strings index 7374a0a178..301286f986 100644 --- a/DashWallet/hu.lproj/Localizable.strings +++ b/DashWallet/hu.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/id.lproj/Localizable.strings b/DashWallet/id.lproj/Localizable.strings index f49c6820ca..8b9ea6cc0d 100644 --- a/DashWallet/id.lproj/Localizable.strings +++ b/DashWallet/id.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/it.lproj/Localizable.strings b/DashWallet/it.lproj/Localizable.strings index ef5fe1d503..ccd7e108b0 100644 --- a/DashWallet/it.lproj/Localizable.strings +++ b/DashWallet/it.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ja.lproj/Localizable.strings b/DashWallet/ja.lproj/Localizable.strings index 43bcf950e3..525a82afff 100644 --- a/DashWallet/ja.lproj/Localizable.strings +++ b/DashWallet/ja.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ko.lproj/Localizable.strings b/DashWallet/ko.lproj/Localizable.strings index 4a616ebeee..deb27f76c3 100644 --- a/DashWallet/ko.lproj/Localizable.strings +++ b/DashWallet/ko.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/mk.lproj/Localizable.strings b/DashWallet/mk.lproj/Localizable.strings index 56a5bf2c1d..26587267e2 100644 --- a/DashWallet/mk.lproj/Localizable.strings +++ b/DashWallet/mk.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ms.lproj/Localizable.strings b/DashWallet/ms.lproj/Localizable.strings index 688408a78a..79fdfa41e0 100644 --- a/DashWallet/ms.lproj/Localizable.strings +++ b/DashWallet/ms.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/nb.lproj/Localizable.strings b/DashWallet/nb.lproj/Localizable.strings index a3cebe7107..629ab358f7 100644 --- a/DashWallet/nb.lproj/Localizable.strings +++ b/DashWallet/nb.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/nl.lproj/Localizable.strings b/DashWallet/nl.lproj/Localizable.strings index 4fd1983762..dc238425c8 100644 --- a/DashWallet/nl.lproj/Localizable.strings +++ b/DashWallet/nl.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/pl.lproj/Localizable.strings b/DashWallet/pl.lproj/Localizable.strings index 57b0d3199f..15f85f5603 100644 --- a/DashWallet/pl.lproj/Localizable.strings +++ b/DashWallet/pl.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/pt.lproj/Localizable.strings b/DashWallet/pt.lproj/Localizable.strings index 8d5717537a..b34d7fdf5f 100644 --- a/DashWallet/pt.lproj/Localizable.strings +++ b/DashWallet/pt.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ro.lproj/Localizable.strings b/DashWallet/ro.lproj/Localizable.strings index 69f08b0e68..f7f6b575ef 100644 --- a/DashWallet/ro.lproj/Localizable.strings +++ b/DashWallet/ro.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/ru.lproj/Localizable.strings b/DashWallet/ru.lproj/Localizable.strings index 6a3b969e84..3b1a3157fa 100644 --- a/DashWallet/ru.lproj/Localizable.strings +++ b/DashWallet/ru.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sk.lproj/Localizable.strings b/DashWallet/sk.lproj/Localizable.strings index e9358ef6c6..287935929e 100644 --- a/DashWallet/sk.lproj/Localizable.strings +++ b/DashWallet/sk.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sl.lproj/Localizable.strings b/DashWallet/sl.lproj/Localizable.strings index e6918973dd..b294c29ab6 100644 --- a/DashWallet/sl.lproj/Localizable.strings +++ b/DashWallet/sl.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sl_SI.lproj/Localizable.strings b/DashWallet/sl_SI.lproj/Localizable.strings index 671dba4d63..ddccc994f9 100644 --- a/DashWallet/sl_SI.lproj/Localizable.strings +++ b/DashWallet/sl_SI.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sq.lproj/Localizable.strings b/DashWallet/sq.lproj/Localizable.strings index 3dcc98c339..5e46c6971a 100644 --- a/DashWallet/sq.lproj/Localizable.strings +++ b/DashWallet/sq.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sr.lproj/Localizable.strings b/DashWallet/sr.lproj/Localizable.strings index 1201ce8c55..838ad1ff66 100644 --- a/DashWallet/sr.lproj/Localizable.strings +++ b/DashWallet/sr.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/sv.lproj/Localizable.strings b/DashWallet/sv.lproj/Localizable.strings index 93d5e0e2ac..7b2b80f6b3 100644 --- a/DashWallet/sv.lproj/Localizable.strings +++ b/DashWallet/sv.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/th.lproj/Localizable.strings b/DashWallet/th.lproj/Localizable.strings index ca7247528d..a9e5311907 100644 --- a/DashWallet/th.lproj/Localizable.strings +++ b/DashWallet/th.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/tr.lproj/Localizable.strings b/DashWallet/tr.lproj/Localizable.strings index 78040f22da..f088e4a5b7 100644 --- a/DashWallet/tr.lproj/Localizable.strings +++ b/DashWallet/tr.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/uk.lproj/Localizable.strings b/DashWallet/uk.lproj/Localizable.strings index be7ae4832b..cba3a3160e 100644 --- a/DashWallet/uk.lproj/Localizable.strings +++ b/DashWallet/uk.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/vi.lproj/Localizable.strings b/DashWallet/vi.lproj/Localizable.strings index 553bbd0eb4..1d641f849c 100644 --- a/DashWallet/vi.lproj/Localizable.strings +++ b/DashWallet/vi.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/zh-Hans.lproj/Localizable.strings b/DashWallet/zh-Hans.lproj/Localizable.strings index 14fe8488d7..442e0bdf47 100644 --- a/DashWallet/zh-Hans.lproj/Localizable.strings +++ b/DashWallet/zh-Hans.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/zh-Hant-TW.lproj/Localizable.strings b/DashWallet/zh-Hant-TW.lproj/Localizable.strings index 833bb6256a..7aa89e6af0 100644 --- a/DashWallet/zh-Hant-TW.lproj/Localizable.strings +++ b/DashWallet/zh-Hant-TW.lproj/Localizable.strings @@ -6359,6 +6359,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/zh.lproj/Localizable.strings b/DashWallet/zh.lproj/Localizable.strings index 6443fc9697..f203157e87 100644 --- a/DashWallet/zh.lproj/Localizable.strings +++ b/DashWallet/zh.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWallet/zh_TW.lproj/Localizable.strings b/DashWallet/zh_TW.lproj/Localizable.strings index 9daeb6fd61..5f3d29c8da 100644 --- a/DashWallet/zh_TW.lproj/Localizable.strings +++ b/DashWallet/zh_TW.lproj/Localizable.strings @@ -6357,6 +6357,7 @@ "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset." = "Confirming saves birth height %u and clears this network's chain data at the next app launch, re-downloading it and rescanning filters from that height. Fully close and relaunch the app to start; the in-app Restart button does not apply this reset."; "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts" = "Connect your DashPay username to apps on the Dash network to sign in without passwords or accounts"; "Connected since %@" = "Connected since %@"; +"Connected to %@. Go back to your browser to continue." = "Connected to %@. Go back to your browser to continue."; "Connections" = "Connections"; "Contact is no longer available" = "Contact is no longer available"; "Contender details" = "Contender details"; diff --git a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift index 20b264d930..50c2cdcfd4 100644 --- a/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift +++ b/DashWalletTests/DashConnect/PlatformDashConnectDataSourceTests.swift @@ -1861,6 +1861,13 @@ final class AppConnectLoginTests: XCTestCase { } } + func testOnlyTheOneQrLoginSignsInAtApproval() { + XCTAssertTrue(AppConnect.Login.oneQR(.current).signsInAtApproval) + // The two-QR login still waits for the app's key-registration code. + XCTAssertFalse(AppConnect.Login.twoQR.signsInAtApproval) + XCTAssertFalse(AppConnect.Login.unresolved.signsInAtApproval) + } + func testTheOneQrLoginHasTermsAndTheTwoQrLoginHasNone() { XCTAssertEqual(AppConnect.login(protocolVersion: 13), .twoQR) XCTAssertEqual(AppConnect.login(protocolVersion: 14), .oneQR(.current))