Require passing in isPinCorrect function

bitcoinppl · Dec 12, 2024 · fa3d24f · fa3d24f
1 parent ce2dcf1
commit fa3d24f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/ios/Cove/SettingsScreen/ChangePinView.swift b/ios/Cove/SettingsScreen/ChangePinView.swift
@@ -26,6 +26,7 @@ struct ChangePinView: View {
             case .current:
                 NumberPadPinView(
                     title: "Enter Current PIN",
+                    isPinCorrect: isPinCorrect,
                     backAction: backAction,
                     onUnlock: { _ in
                         withAnimation {
@@ -37,6 +38,7 @@ struct ChangePinView: View {
             case .new:
                 NumberPadPinView(
                     title: "Enter new PIN",
+                    isPinCorrect: { _ in true },
                     backAction: backAction,
                     onUnlock: { enteredPin in
                         withAnimation {

diff --git a/ios/Cove/Views/NumberPadPinView.swift b/ios/Cove/Views/NumberPadPinView.swift
@@ -30,7 +30,7 @@ struct NumberPadPinView: View {
     public init(
         title: String = "Enter Pin",
         isUnlocked: Binding<Bool> = .constant(false),
-        isPinCorrect: @escaping (String) -> Bool = { _ in true },
+        isPinCorrect: @escaping (String) -> Bool,
         pinLength: Int = 6,
         backAction: (() -> Void)? = nil,
         onUnlock: @escaping (String) -> Void = { _ in },
@@ -143,23 +143,26 @@ struct NumberPadPinView: View {
                         .tint(.white)
                     }
 
-                    /// 0 and Back Button
+                    // take up space
+                    Button(action: {}) {}
+
                     Button(action: {
-                        if !pin.isEmpty { pin.removeLast() }
+                        guard pin.count < pinLength else { return }
+                        pin.append("0")
                     }, label: {
-                        Image(systemName: "delete.backward")
+                        Text("0")
                             .font(.title)
                             .frame(maxWidth: .infinity)
                             .padding(.vertical, 20)
                             .contentShape(.rect)
                     })
                     .tint(.white)
 
+                    /// 0 and Back Button
                     Button(action: {
-                        guard pin.count < pinLength else { return }
-                        pin.append("0")
+                        if !pin.isEmpty { pin.removeLast() }
                     }, label: {
-                        Text("0")
+                        Image(systemName: "delete.backward")
                             .font(.title)
                             .frame(maxWidth: .infinity)
                             .padding(.vertical, 20)