Fixes

Author: ben-kaufman

Bitkit/Services/MigrationsService.swift

@@ -1199,9 +1199,13 @@ extension MigrationsService {
 // MARK: - RN Remote Backup Restore
 
 extension MigrationsService {
+    private func normalizePassphrase(_ passphrase: String?) -> String? {
+        passphrase?.isEmpty == true ? nil : passphrase
+    }
+
     func hasRNRemoteBackup(mnemonic: String, passphrase: String?) async -> Bool {
         do {
-            let effectivePassphrase = passphrase?.isEmpty == true ? nil : passphrase
+            let effectivePassphrase = normalizePassphrase(passphrase)
             RNBackupClient.shared.reset()
             try await RNBackupClient.shared.setup(mnemonic: mnemonic, passphrase: effectivePassphrase)
             return try await RNBackupClient.shared.hasBackup()
@@ -1212,7 +1216,7 @@ extension MigrationsService {
     }
 
     func restoreFromRNRemoteBackup(mnemonic: String, passphrase: String?) async throws {
-        let effectivePassphrase = passphrase?.isEmpty == true ? nil : passphrase
+        let effectivePassphrase = normalizePassphrase(passphrase)
         try await RNBackupClient.shared.setup(mnemonic: mnemonic, passphrase: effectivePassphrase)
 
         isRestoringFromRNRemoteBackup = true

Bitkit/Services/RNBackupClient.swift

@@ -220,7 +220,11 @@ class RNBackupClient {
             else { continue }
 
             let ts = UInt64(timestamp / 1000) // Convert ms to seconds
-            if latestTimestamp == nil || ts > latestTimestamp! {
+            if let latest = latestTimestamp {
+                if ts > latest {
+                    latestTimestamp = ts
+                }
+            } else {
                 latestTimestamp = ts
             }
         }