Quick fix - don't show missing mnemonic at startup (#861)

radixdlt · Oct 23, 2023 · 920e7bf · 920e7bf
1 parent 1c95349
commit 920e7bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/RadixWallet/Clients/DeviceFactorSourceClient/DeviceFactorSourceClient+Live.swift b/RadixWallet/Clients/DeviceFactorSourceClient/DeviceFactorSourceClient+Live.swift
@@ -82,7 +82,8 @@ extension DeviceFactorSourceClient: DependencyKey {
 						let mnemonicWithPassphrase = try await secureStorageClient
 						.loadMnemonicByFactorSourceID(
 							deviceFactorSource.id,
-							.checkingAccounts
+							.checkingAccounts,
+							false
 						)
 					else {
 						// Failed to find mnemonic for factor source

diff --git a/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Interface.swift b/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Interface.swift
@@ -27,7 +27,7 @@ extension SecureStorageClient {
 	public typealias LoadProfileSnapshotData = @Sendable (ProfileSnapshot.Header.ID) async throws -> Data?
 
 	public typealias SaveMnemonicForFactorSource = @Sendable (PrivateHDFactorSource) async throws -> Void
-	public typealias LoadMnemonicByFactorSourceID = @Sendable (FactorSourceID.FromHash, LoadMnemonicPurpose) async throws -> MnemonicWithPassphrase?
+	public typealias LoadMnemonicByFactorSourceID = @Sendable (FactorSourceID.FromHash, LoadMnemonicPurpose, _ notifyIfMissing: Bool) async throws -> MnemonicWithPassphrase?
 	public typealias ContainsMnemonicIdentifiedByFactorSourceID = @Sendable (FactorSourceID.FromHash) async -> Bool
 
 	public typealias DeleteMnemonicByFactorSourceID = @Sendable (FactorSourceID.FromHash) async throws -> Void
@@ -79,6 +79,13 @@ extension SecureStorageClient {
 	}
 }
 
+extension SecureStorageClient {
+	@Sendable
+	public func loadMnemonicByFactorSourceID(_ factorSourceID: FactorSourceID.FromHash, _ purpose: LoadMnemonicPurpose) async throws -> MnemonicWithPassphrase? {
+		try await self.loadMnemonicByFactorSourceID(factorSourceID, purpose, true)
+	}
+}
+
 extension SecureStorageClient {
 	public func saveDeviceIdentifierIfNeeded(
 		_ deviceID: UUID

diff --git a/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Live.swift b/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Live.swift
@@ -203,7 +203,7 @@ extension SecureStorageClient: DependencyKey {
 					)
 				)
 			},
-			loadMnemonicByFactorSourceID: { factorSourceID, purpose in
+			loadMnemonicByFactorSourceID: { factorSourceID, purpose, notifyIfMissing in
 				let key = key(factorSourceID: factorSourceID)
 				let authPromptValue: String = {
 					switch purpose {
@@ -233,7 +233,9 @@ extension SecureStorageClient: DependencyKey {
 					forKey: key,
 					authenticationPrompt: authenticationPrompt
 				) else {
-					_ = await overlayWindowClient.scheduleAlert(.missingMnemonicAlert)
+					if notifyIfMissing {
+						_ = await overlayWindowClient.scheduleAlert(.missingMnemonicAlert)
+					}
 					return nil
 				}
 				return try jsonDecoder().decode(MnemonicWithPassphrase.self, from: data)

diff --git a/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Test.swift b/RadixWallet/Clients/SecureStorageClient/SecureStorageClient+Test.swift
@@ -12,7 +12,7 @@ extension SecureStorageClient: TestDependencyKey {
 		saveProfileSnapshot: { _ in },
 		loadProfileSnapshotData: { _ in nil },
 		saveMnemonicForFactorSource: { _ in },
-		loadMnemonicByFactorSourceID: { _, _ in nil },
+		loadMnemonicByFactorSourceID: { _, _, _ in nil },
 		containsMnemonicIdentifiedByFactorSourceID: { _ in false },
 		deleteMnemonicByFactorSourceID: { _ in },
 		deleteProfileAndMnemonicsByFactorSourceIDs: { _, _ in },