[ABW-3396] Claim Wallet

RadixWallet/Clients/AppPreferencesClient/AppPreferencesClient+Interface.swift

@@ -4,9 +4,6 @@ public struct AppPreferencesClient: Sendable {
 	public var getPreferences: GetPreferences
 	public var updatePreferences: UpdatePreferences
 
-	/// Needs special treatment since this setting involves Keychain and iCloud
-	public var setIsCloudProfileSyncEnabled: SetIsCloudProfileSyncEnabled
-
 	/// Sets the flag on the profile, does not delete old backups
 	public var setIsCloudBackupEnabled: SetIsCloudBackupEnabled
 
@@ -21,23 +18,20 @@ public struct AppPreferencesClient: Sendable {
 		updatePreferences: @escaping UpdatePreferences,
 		extractProfile: @escaping ExtractProfile,
 		deleteProfileAndFactorSources: @escaping DeleteProfile,
-		setIsCloudProfileSyncEnabled: @escaping SetIsCloudProfileSyncEnabled,
 		setIsCloudBackupEnabled: @escaping SetIsCloudBackupEnabled
 	) {
 		self.appPreferenceUpdates = appPreferenceUpdates
 		self.getPreferences = getPreferences
 		self.updatePreferences = updatePreferences
 		self.extractProfile = extractProfile
 		self.deleteProfileAndFactorSources = deleteProfileAndFactorSources
-		self.setIsCloudProfileSyncEnabled = setIsCloudProfileSyncEnabled
 		self.setIsCloudBackupEnabled = setIsCloudBackupEnabled
 	}
 }
 
 // MARK: - Typealias
 extension AppPreferencesClient {
 	public typealias AppPreferenceUpdates = @Sendable () async -> AnyAsyncSequence<AppPreferences>
-	public typealias SetIsCloudProfileSyncEnabled = @Sendable (Bool) async throws -> Void
 	public typealias SetIsCloudBackupEnabled = @Sendable (Bool) async throws -> Void
 	public typealias GetPreferences = @Sendable () async -> AppPreferences
 	public typealias UpdatePreferences = @Sendable (AppPreferences) async throws -> Void

RadixWallet/Clients/AppPreferencesClient/AppPreferencesClient+Live.swift

@@ -20,20 +20,6 @@ extension AppPreferencesClient: DependencyKey {
 			deleteProfileAndFactorSources: { keepInICloudIfPresent in
 				try await profileStore.deleteProfile(keepInICloudIfPresent: keepInICloudIfPresent)
 			},
-			setIsCloudProfileSyncEnabled: { isEnabled in
-				@Dependency(\.secureStorageClient) var secureStorageClient
-				let profile = await profileStore.profile
-				let wasEnabled = profile.appPreferences.security.isCloudProfileSyncEnabled
-				guard wasEnabled != isEnabled else { return }
-
-				try await profileStore.updating { profile in
-					profile.appPreferences.security.isCloudProfileSyncEnabled = isEnabled
-				}
-				try secureStorageClient.updateIsCloudProfileSyncEnabled(
-					profile.id,
-					isEnabled ? .enable : .disable
-				)
-			},
 			setIsCloudBackupEnabled: { isEnabled in
 				let profile = await profileStore.profile
 				let wasEnabled = profile.appPreferences.security.isCloudProfileSyncEnabled
@@ -46,6 +32,5 @@ extension AppPreferencesClient: DependencyKey {
 		)
 	}
 
-	public typealias Value = AppPreferencesClient
 	public static let liveValue: Self = .live()
 }

RadixWallet/Clients/AppPreferencesClient/AppPreferencesClient+Test.swift

@@ -8,7 +8,6 @@ extension AppPreferencesClient: TestDependencyKey {
 		updatePreferences: unimplemented("\(Self.self).updatePreferences"),
 		extractProfile: unimplemented("\(Self.self).extractProfile"),
 		deleteProfileAndFactorSources: unimplemented("\(Self.self).deleteProfileAndFactorSources"),
-		setIsCloudProfileSyncEnabled: unimplemented("\(Self.self).setIsCloudProfileSyncEnabled"),
 		setIsCloudBackupEnabled: unimplemented("\(Self.self).setIsCloudBackupEnabled")
 	)
 }
@@ -20,7 +19,6 @@ extension AppPreferencesClient {
 		updatePreferences: { _ in },
 		extractProfile: { fatalError() },
 		deleteProfileAndFactorSources: { _ in },
-		setIsCloudProfileSyncEnabled: { _ in },
 		setIsCloudBackupEnabled: { _ in }
 	)
 }

RadixWallet/Clients/CloudBackupClient/CloudBackupClient+Interface.swift

@@ -6,44 +6,44 @@ import os
 // MARK: - CloudBackupClient
 public struct CloudBackupClient: DependencyKey, Sendable {
 	public let startAutomaticBackups: StartAutomaticBackups
-	public let loadDeviceID: LoadDeviceID
 	public let migrateProfilesFromKeychain: MigrateProfilesFromKeychain
 	public let deleteProfileBackup: DeleteProfileBackup
 	public let checkAccountStatus: CheckAccountStatus
 	public let lastBackup: LastBackup
 	public let loadProfile: LoadProfile
 	public let loadProfileHeaders: LoadProfileHeaders
+	public let claimProfileOnICloud: ClaimProfileOnICloud
 
 	public init(
 		startAutomaticBackups: @escaping StartAutomaticBackups,
-		loadDeviceID: @escaping LoadDeviceID,
 		migrateProfilesFromKeychain: @escaping MigrateProfilesFromKeychain,
 		deleteProfileBackup: @escaping DeleteProfileBackup,
 		checkAccountStatus: @escaping CheckAccountStatus,
 		lastBackup: @escaping LastBackup,
 		loadProfile: @escaping LoadProfile,
-		loadProfileHeaders: @escaping LoadProfileHeaders
+		loadProfileHeaders: @escaping LoadProfileHeaders,
+		claimProfileOnICloud: @escaping ClaimProfileOnICloud
 	) {
 		self.startAutomaticBackups = startAutomaticBackups
-		self.loadDeviceID = loadDeviceID
 		self.migrateProfilesFromKeychain = migrateProfilesFromKeychain
 		self.deleteProfileBackup = deleteProfileBackup
 		self.checkAccountStatus = checkAccountStatus
 		self.lastBackup = lastBackup
 		self.loadProfile = loadProfile
 		self.loadProfileHeaders = loadProfileHeaders
+		self.claimProfileOnICloud = claimProfileOnICloud
 	}
 }
 
 extension CloudBackupClient {
 	public typealias StartAutomaticBackups = @Sendable () async throws -> Void
-	public typealias LoadDeviceID = @Sendable () async -> UUID?
 	public typealias MigrateProfilesFromKeychain = @Sendable () async throws -> [CKRecord]
 	public typealias DeleteProfileBackup = @Sendable (ProfileID) async throws -> Void
 	public typealias CheckAccountStatus = @Sendable () async throws -> CKAccountStatus
 	public typealias LastBackup = @Sendable (ProfileID) -> AnyAsyncSequence<BackupResult?>
 	public typealias LoadProfile = @Sendable (ProfileID) async throws -> BackedUpProfile
 	public typealias LoadProfileHeaders = @Sendable () async throws -> [Profile.Header]
+	public typealias ClaimProfileOnICloud = @Sendable (Profile) async throws -> Void
 }
 
 // MARK: CloudBackupClient.BackedUpProfile