Merge pull request #176 from synonymdev/fix/various-fixes

fix: various fixes

Author: pwltr

Bitkit/AppScene.swift

@@ -80,7 +80,7 @@ struct AppScene: View {
             .environmentObject(suggestionsManager)
             .environmentObject(tagManager)
             .onAppear {
-                if !settings.requirePinOnLaunch {
+                if !settings.pinEnabled {
                     isPinVerified = true
                 }
 
@@ -132,7 +132,7 @@ struct AppScene: View {
             // Wallet exists and has been restored from backup. isRestoringWallet is set to false inside below component
             WalletRestoreSuccess()
         } else {
-            if !isPinVerified && settings.pinEnabled && (settings.requirePinOnLaunch || settings.requirePinWhenIdle) {
+            if !isPinVerified && settings.pinEnabled {
                 AuthCheck {
                     isPinVerified = true
                 }
@@ -256,8 +256,8 @@ struct AppScene: View {
     }
 
     private func handleScenePhaseChange(_: ScenePhase) {
-        // If 'pinOnIdle' is enabled, lock the app when the app goes to the background
-        if scenePhase == .background && settings.pinEnabled && settings.requirePinWhenIdle {
+        // If PIN is enabled, lock the app when the app goes to the background
+        if scenePhase == .background && settings.pinEnabled {
             isPinVerified = false
         }
     }

Bitkit/Components/Button/PrimaryButtonView.swift

@@ -33,7 +33,7 @@ struct PrimaryButtonView: View {
         .background(backgroundGradient)
         .cornerRadius(64)
         .shadow(color: shadowColor, radius: 0, x: 0, y: -1)
-        .opacity(isDisabled ? 0.3 : 1.0)
+        .opacity(isDisabled ? 0.32 : 1.0)
         .contentShape(Rectangle())
     }
 
@@ -42,7 +42,7 @@ struct PrimaryButtonView: View {
             return AnyView(Color.gray6)
         }
         if isDisabled {
-            return AnyView(Color.gray4)
+            return AnyView(Color.clear)
         }
 
         return AnyView(ButtonGradient(isPressed: isPressed))

Bitkit/Components/EmptyStateView.swift

@@ -59,8 +59,8 @@ struct EmptyStateView: View {
                                 .aspectRatio(contentMode: .fit)
                                 .foregroundColor(.textSecondary)
                                 .frame(width: 16, height: 16)
+                                .frame(width: 44, height: 44) // Increase hit area
                         }
-                        .frame(width: 44, height: 44)
                         .offset(x: 16, y: -16)
 
                         Spacer()

Bitkit/Components/Header.swift

@@ -43,8 +43,8 @@ struct Header: View {
                         .resizable()
                         .foregroundColor(.textPrimary)
                         .frame(width: 24, height: 24)
+                        .frame(width: 32, height: 32)
                 }
-                .frame(width: 32, height: 32)
             }
         }
         .frame(height: 48)

Bitkit/ViewModels/ActivityListViewModel.swift

@@ -137,6 +137,14 @@ class ActivityListViewModel: ObservableObject {
         selectedTags.removeAll()
     }
 
+    func resetFilters() {
+        searchText = ""
+        startDate = nil
+        endDate = nil
+        selectedTags.removeAll()
+        selectedTab = .all
+    }
+
     private func updateFilteredActivities() async {
         do {
             // Convert dates to timestamps if they exist, ensuring start date is start of day and end date is end of day

Bitkit/ViewModels/Extensions/SettingsViewModel+PIN.swift

@@ -64,8 +64,6 @@ extension SettingsViewModel {
     func resetPinSettings() {
         pinEnabled = false
         pinFailedAttempts = 0
-        requirePinOnLaunch = true
-        requirePinWhenIdle = false
         requirePinForPayments = false
         useBiometrics = false
         Logger.debug("PIN settings reset after app wipe", context: "SettingsViewModel")
@@ -80,8 +78,6 @@ extension SettingsViewModel {
 
         if resetSettings {
             // Reset all PIN-related settings when PIN is disabled
-            requirePinOnLaunch = true
-            requirePinWhenIdle = false
             requirePinForPayments = false
             useBiometrics = false
         }

Bitkit/ViewModels/SettingsViewModel.swift

@@ -58,16 +58,14 @@ class SettingsViewModel: ObservableObject {
     @AppStorage("hideBalanceOnOpen") var hideBalanceOnOpen: Bool = false
     @AppStorage("readClipboard") var readClipboard: Bool = false
     @AppStorage("warnWhenSendingOver100") var warnWhenSendingOver100: Bool = false
-    @AppStorage("requirePinOnLaunch") var requirePinOnLaunch: Bool = true
-    @AppStorage("requirePinWhenIdle") var requirePinWhenIdle: Bool = false
-    @AppStorage("requirePinForPayments") var requirePinForPayments: Bool = false
-    @AppStorage("useBiometrics") var useBiometrics: Bool = false
     @AppStorage("enableQuickpay") var enableQuickpay: Bool = false
     @AppStorage("quickpayAmount") var quickpayAmount: Double = 5
 
     // PIN Management
     @Published internal(set) var pinEnabled: Bool = false
     @AppStorage("pinFailedAttempts") var pinFailedAttempts: Int = 0
+    @AppStorage("requirePinForPayments") var requirePinForPayments: Bool = false
+    @AppStorage("useBiometrics") var useBiometrics: Bool = false
 
     // Electrum Server Settings
     @Published var electrumHost: String = ""

Bitkit/Views/Settings/SecurityPrivacySettingsView.swift

@@ -6,8 +6,6 @@ struct SecurityPrivacySettingsView: View {
     @EnvironmentObject var sheets: SheetViewModel
     @EnvironmentObject var settings: SettingsViewModel
 
-    @State private var showPinCheckForLaunch = false
-    @State private var showPinCheckForIdle = false
     @State private var showPinCheckForPayments = false
     @State private var showingBiometricError = false
     @State private var biometricErrorMessage = ""
@@ -33,6 +31,7 @@ struct SecurityPrivacySettingsView: View {
         VStack(alignment: .leading, spacing: 0) {
             NavigationBar(title: t("settings__security__title"))
                 .padding(.bottom, 16)
+                .padding(.horizontal, 16)
 
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 0) {
@@ -83,32 +82,6 @@ struct SecurityPrivacySettingsView: View {
                             )
                         }
 
-                        Button {
-                            showPinCheckForLaunch = true
-                        } label: {
-                            SettingsListLabel(
-                                title: t("settings__security__pin_launch"),
-                                rightIcon: nil,
-                                toggle: Binding(
-                                    get: { settings.requirePinOnLaunch },
-                                    set: { _ in showPinCheckForLaunch = true }
-                                )
-                            )
-                        }
-
-                        Button {
-                            showPinCheckForIdle = true
-                        } label: {
-                            SettingsListLabel(
-                                title: t("settings__security__pin_idle"),
-                                rightIcon: nil,
-                                toggle: Binding(
-                                    get: { settings.requirePinWhenIdle },
-                                    set: { _ in showPinCheckForIdle = true }
-                                )
-                            )
-                        }
-
                         Button {
                             showPinCheckForPayments = true
                         } label: {
@@ -122,50 +95,29 @@ struct SecurityPrivacySettingsView: View {
                             )
                         }
 
-                        // Biometrics toggle with custom handling
-                        SettingsListLabel(
-                            title: t(
-                                "settings__security__use_bio",
-                                variables: ["biometryTypeName": biometryTypeName]
-                            ),
-                            toggle: Binding(
-                                get: { settings.useBiometrics },
-                                set: { newValue in
-                                    handleBiometricToggle(newValue)
-                                }
+                        if isBiometricAvailable {
+                            // Biometrics toggle with custom handling
+                            SettingsListLabel(
+                                title: t("settings__security__use_bio", variables: ["biometryTypeName": biometryTypeName]),
+                                toggle: Binding(
+                                    get: { settings.useBiometrics },
+                                    set: { newValue in
+                                        handleBiometricToggle(newValue)
+                                    }
+                                )
                             )
-                        )
 
-                        // Footer text for Biometrics
-                        BodySText(t("settings__security__footer", variables: ["biometryTypeName": biometryTypeName]))
-                            .padding(.top, 16)
+                            // Footer text for Biometrics
+                            BodySText(t("settings__security__footer", variables: ["biometryTypeName": biometryTypeName]))
+                                .padding(.top, 16)
+                        }
                     }
                 }
+                .padding(.horizontal, 16)
                 .bottomSafeAreaPadding()
             }
         }
         .navigationBarHidden(true)
-        .padding(.horizontal, 16)
-        .navigationDestination(isPresented: $showPinCheckForLaunch) {
-            PinCheckView(
-                title: t("security__pin_enter"),
-                explanation: "",
-                onCancel: {},
-                onPinVerified: { _ in
-                    settings.requirePinOnLaunch.toggle()
-                }
-            )
-        }
-        .navigationDestination(isPresented: $showPinCheckForIdle) {
-            PinCheckView(
-                title: t("security__pin_enter"),
-                explanation: "",
-                onCancel: {},
-                onPinVerified: { _ in
-                    settings.requirePinWhenIdle.toggle()
-                }
-            )
-        }
         .navigationDestination(isPresented: $showPinCheckForPayments) {
             PinCheckView(
                 title: t("security__pin_enter"),
@@ -189,12 +141,6 @@ struct SecurityPrivacySettingsView: View {
     }
 
     private func handleBiometricToggle(_ newValue: Bool) {
-        if !isBiometricAvailable {
-            // Biometrics not available - show setup sheet
-            sheets.showSheet(.security, data: SecurityConfig(showLaterButton: false))
-            return
-        }
-
         if newValue {
             // User wants to enable biometrics - request authentication
             requestBiometricPermission { success in

Bitkit/Views/SplashView.swift

@@ -1,13 +1,18 @@
 import SwiftUI
 
+// Custom splash screen overlay - provides smooth fade transition from launch screen
+// while wallet data loads. Fades out after 0.2s and removes after 0.4s.
+
 struct SplashView: View {
     var body: some View {
-        Image("Splash")
-            .resizable()
-            .scaledToFill()
-            .offset(x: -4, y: -6)
-            .scaleEffect(0.99)
-            .ignoresSafeArea()
+        GeometryReader { geometry in
+            Image("Splash")
+                .resizable()
+                .scaledToFill()
+                .frame(width: geometry.size.width, height: geometry.size.height)
+                .clipped()
+        }
+        .ignoresSafeArea()
     }
 }
 

Bitkit/Views/Wallets/Activity/AllActivityView.swift

@@ -67,6 +67,7 @@ struct AllActivityView: View {
                             }
                     )
             }
+            .scrollDismissesKeyboard(.interactively)
             .refreshable {
                 do {
                     try await wallet.sync()
@@ -80,6 +81,9 @@ struct AllActivityView: View {
         .navigationBarHidden(true)
         .padding(.horizontal, 16)
         .bottomSafeAreaPadding()
+        .onAppear {
+            activity.resetFilters()
+        }
     }
 }