Improve PIN handling

Author: ben-kaufman

Bitkit/AppScene.swift

@@ -74,7 +74,12 @@ struct AppScene: View {
             .onChange(of: wallet.nodeLifecycleState, perform: handleNodeLifecycleChange)
             .onChange(of: scenePhase, perform: handleScenePhaseChange)
             .onChange(of: migrations.isShowingMigrationLoading) { isLoading in
-                if !isLoading { widgets.loadSavedWidgets() }
+                if !isLoading {
+                    widgets.loadSavedWidgets()
+                    if UserDefaults.standard.bool(forKey: "pinOnLaunch") && settings.pinEnabled {
+                        isPinVerified = false
+                    }
+                }
             }
             .environmentObject(app)
             .environmentObject(navigation)

Bitkit/Services/MigrationsService.swift

@@ -476,6 +476,17 @@ extension MigrationsService {
         try Keychain.saveString(key: .securityPin, str: pin)
     }
 
+    private func clearPinSettings() {
+        try? Keychain.delete(key: .securityPin)
+
+        UserDefaults.standard.removeObject(forKey: "requirePinForPayments")
+        UserDefaults.standard.removeObject(forKey: "useBiometrics")
+        UserDefaults.standard.removeObject(forKey: "pinFailedAttempts")
+        UserDefaults.standard.removeObject(forKey: "pinOnLaunch")
+        UserDefaults.standard.removeObject(forKey: "pinOnIdle")
+        UserDefaults.standard.removeObject(forKey: "pin")
+    }
+
     private func migrateLdkData() async throws {
         let accountPath = rnLdkAccountPath
         let managerPath = accountPath.appendingPathComponent("channel_manager.bin")
@@ -757,6 +768,12 @@ extension MigrationsService {
         if let useBiometrics = settings.biometrics {
             defaults.set(useBiometrics, forKey: "useBiometrics")
         }
+        if let pinOnLaunch = settings.pinOnLaunch {
+            defaults.set(pinOnLaunch, forKey: "pinOnLaunch")
+        }
+        if let pinOnIdle = settings.pinOnIdle {
+            defaults.set(pinOnIdle, forKey: "pinOnIdle")
+        }
         if let seen = settings.quickpayIntroSeen {
             defaults.set(seen, forKey: "hasSeenQuickpayIntro")
         }
@@ -1228,6 +1245,8 @@ extension MigrationsService {
         isRestoringFromRNRemoteBackup = true
         Logger.info("Starting RN remote backup restore", context: "Migration")
 
+        clearPinSettings()
+
         // Fetch LDK data (channel_manager and channel_monitors)
         await fetchRNRemoteLdkData()
 
@@ -1324,7 +1343,12 @@ extension MigrationsService {
             return
         }
 
-        applyRNSettings(json.data)
+        var settings = json.data
+        settings.pinForPayments = nil
+        settings.biometrics = nil
+        settings.pinOnLaunch = nil
+        settings.pinOnIdle = nil
+        applyRNSettings(settings)
     }
 
     private func applyRNRemoteWidgets(_ data: Data) async throws {

Bitkit/ViewModels/AppViewModel.swift

@@ -556,6 +556,8 @@ extension AppViewModel {
                     await MigrationsService.shared.reapplyMetadataAfterSync()
                     try? await LightningService.shared.restart()
 
+                    SettingsViewModel.shared.updatePinEnabledState()
+
                     MigrationsService.shared.isShowingMigrationLoading = false
                     self.toast(type: .success, title: "Migration Complete", description: "Your wallet has been successfully migrated")
                 }