feat: ios: banana split recovery update (#2366)

* feat: ios: banana split recovery flow update * feat: ios: remaining changes * feat: ios: pass seed name during recovery flow
novasamatech · Mar 11, 2024 · 941879a · 941879a
1 parent 4533d9e
commit 941879a
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 14 deletions.
diff --git a/ios/PolkadotVault/Components/Buttons/CircleButton.swift b/ios/PolkadotVault/Components/Buttons/CircleButton.swift
@@ -7,12 +7,15 @@
 
 import SwiftUI
 
-struct CloseModalButton: View {
+struct CircleButton: View {
+    private let image: ImageResource
     private let action: () -> Void
 
     init(
+        image: ImageResource = .xmarkButton,
         action: @escaping () -> Void
     ) {
+        self.image = image
         self.action = action
     }
 
@@ -24,7 +27,7 @@ struct CloseModalButton: View {
                     Circle()
                         .frame(width: Sizes.xmarkButtonDiameter, height: Sizes.xmarkButtonDiameter, alignment: .center)
                         .foregroundColor(.fill18)
-                    Image(.xmarkButton)
+                    Image(image)
                         .foregroundColor(.textAndIconsPrimary)
                 }
             }

diff --git a/ios/PolkadotVault/Core/Keychain/BananaSplit/KeychainBananaSplitQueryProvider.swift b/ios/PolkadotVault/Core/Keychain/BananaSplit/KeychainBananaSplitQueryProvider.swift
@@ -50,7 +50,6 @@ final class KeychainBananaSplitQueryProvider: KeychainBananaSplitQueryProviding
         case let .fetch(seedName):
             dictionary[kSecMatchLimit] = kSecMatchLimitOne
             dictionary[kSecAttrAccount] = backupName(seedName)
-            dictionary[kSecReturnAttributes] = false
             dictionary[kSecReturnData] = true
         case let .check(seedName):
             dictionary[kSecMatchLimit] = kSecMatchLimitOne
@@ -76,7 +75,6 @@ final class KeychainBananaSplitQueryProvider: KeychainBananaSplitQueryProviding
         case let .fetch(seedName):
             dictionary[kSecMatchLimit] = kSecMatchLimitOne
             dictionary[kSecAttrAccount] = passphraseName(seedName)
-            dictionary[kSecReturnAttributes] = false
             dictionary[kSecReturnData] = true
         case let .delete(seedName):
             dictionary[kSecAttrAccount] = passphraseName(seedName)

diff --git a/ios/PolkadotVault/Modals/Backup/BackupModal.swift b/ios/PolkadotVault/Modals/Backup/BackupModal.swift
@@ -53,7 +53,7 @@ struct BackupModal: View {
                                 .font(PrimaryFont.bodyM.font)
                         }
                         Spacer()
-                        CloseModalButton(action: animateDismissal)
+                        CircleButton(action: animateDismissal)
                     }
                     .padding(.leading, Spacing.large)
                     .padding(.trailing, Spacing.medium)

diff --git a/ios/PolkadotVault/Modals/ExportPrivateKey/ExportPrivateKeyModal.swift b/ios/PolkadotVault/Modals/ExportPrivateKey/ExportPrivateKeyModal.swift
@@ -34,7 +34,7 @@ struct ExportPrivateKeyModal: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: animateDismissal)
+                        CircleButton(action: animateDismissal)
                     }
                     .padding([.leading], Spacing.large)
                     .padding([.trailing], Spacing.medium)

diff --git a/ios/PolkadotVault/Modals/NetworkSelection/NetworkSelectionModal.swift b/ios/PolkadotVault/Modals/NetworkSelection/NetworkSelectionModal.swift
@@ -29,7 +29,7 @@ struct NetworkSelectionModal: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: viewModel.resetAction)
+                        CircleButton(action: viewModel.resetAction)
                     }
                     .padding(.leading, Spacing.large)
                     .padding(.trailing, Spacing.medium)

diff --git a/ios/PolkadotVault/Resources/Assets.xcassets/qr_code.imageset/Contents.json b/ios/PolkadotVault/Resources/Assets.xcassets/qr_code.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "qr_code.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
diff --git a/ios/PolkadotVault/Resources/Assets.xcassets/qr_code.imageset/qr_code.svg b/ios/PolkadotVault/Resources/Assets.xcassets/qr_code.imageset/qr_code.svg
diff --git a/ios/PolkadotVault/Screens/CreateKey/RecoverKeySet/RecoverKeySetSeedPhraseView.swift b/ios/PolkadotVault/Screens/CreateKey/RecoverKeySet/RecoverKeySetSeedPhraseView.swift
@@ -7,6 +7,11 @@
 
 import SwiftUI
 
+struct BananaSplitQRCodeRecovery {
+    let seedName: String
+    let onRecoveryComplete: (CreateKeysForNetworksView.OnCompletionAction) -> Void
+}
+
 struct RecoverKeySetSeedPhraseView: View {
     private enum Constants {
         static let capsuleContainerID = "capsuleContainerID"
@@ -72,6 +77,11 @@ struct RecoverKeySetSeedPhraseView: View {
                         .padding(.top, Spacing.extraSmall)
                         .padding(.bottom, Spacing.extraExtraSmall)
                         Spacer()
+                        HStack(alignment: .center, spacing: 0) {
+                            Spacer()
+                            CircleButton(image: .qrCode, action: viewModel.didTapQRCode)
+                                .padding(Spacing.extraSmall)
+                        }
                     }
                     .frame(minHeight: 156)
                     .containerBackground(CornerRadius.small)
@@ -118,6 +128,23 @@ struct RecoverKeySetSeedPhraseView: View {
                     )
                     .clearModalBackground()
                 }
+                .fullScreenModal(
+                    isPresented: $viewModel.isShowingQRScanner,
+                    onDismiss: {
+                        focus = false
+                        viewModel.onCameraDismiss()
+                    }
+                ) {
+                    CameraView(
+                        viewModel: .init(
+                            isPresented: $viewModel.isShowingQRScanner,
+                            bananaSplitQRCodeRecovery: .init(
+                                seedName: viewModel.seedName,
+                                onRecoveryComplete: viewModel.onCameraComplete(_:)
+                            )
+                        )
+                    )
+                }
             }
         }
     }
@@ -226,9 +253,11 @@ extension RecoverKeySetSeedPhraseView {
         private var shouldSkipUpdate = false
         private let service: RecoverKeySetServicing
         private let onCompletion: (CreateKeysForNetworksView.OnCompletionAction) -> Void
+        private var flowCompleted: (CreateKeysForNetworksView.OnCompletionAction)?
         let seedName: String
         @Binding var isPresented: Bool
         @Published var isPresentingDetails: Bool = false
+        @Published var isShowingQRScanner: Bool = false
         @Published var isValidSeedPhrase: Bool = false
         @Published var seedPhraseGrid: [GridElement] = []
         @Published var userInput: String = Constants.invisibleNonEmptyCharacter
@@ -274,6 +303,25 @@ extension RecoverKeySetSeedPhraseView {
             seedPhraseDraft.append(guess)
         }
 
+        func didTapQRCode() {
+            isShowingQRScanner = true
+        }
+
+        func onCameraComplete(_ onComplete: CreateKeysForNetworksView.OnCompletionAction) {
+            isShowingQRScanner = false
+            flowCompleted = onComplete
+        }
+
+        func onCameraDismiss() {
+            guard let flowCompleted else { return }
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
+                self.isPresented = false
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.4) {
+                    self.onCompletion(flowCompleted)
+                }
+            }
+        }
+
         func onUserInput(_ word: String) {
             guard !shouldSkipUpdate else { return }
             defer { shouldSkipUpdate = false }

diff --git a/ios/PolkadotVault/Screens/DerivedKey/Subviews/DerivationMethodsInfoView.swift b/ios/PolkadotVault/Screens/DerivedKey/Subviews/DerivationMethodsInfoView.swift
@@ -23,7 +23,7 @@ struct DerivationMethodsInfoView: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: viewModel.animateDismissal)
+                        CircleButton(action: viewModel.animateDismissal)
                     }
                     .padding(.leading, Spacing.large)
                     .padding(.trailing, Spacing.medium)

diff --git a/ios/PolkadotVault/Screens/KeyDetails/BananaSplit/BananaSplitPassphraseModal.swift b/ios/PolkadotVault/Screens/KeyDetails/BananaSplit/BananaSplitPassphraseModal.swift
@@ -21,7 +21,7 @@ struct BananaSplitPassphraseModal: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: viewModel.dismissActionSheet)
+                        CircleButton(action: viewModel.dismissActionSheet)
                     }
                     Text(viewModel.passphrase)
                         .multilineTextAlignment(.leading)

diff --git a/ios/PolkadotVault/Screens/KeyDetails/Modals/ExportKeysSelectionModal.swift b/ios/PolkadotVault/Screens/KeyDetails/Modals/ExportKeysSelectionModal.swift
@@ -29,7 +29,7 @@ struct ExportKeysSelectionModal: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: viewModel.cancelAction)
+                        CircleButton(action: viewModel.cancelAction)
                     }
                     .padding(.leading, Spacing.large)
                     .padding(.trailing, Spacing.medium)

diff --git a/ios/PolkadotVault/Screens/KeyDetails/Modals/ExportMultipleKeysModal.swift b/ios/PolkadotVault/Screens/KeyDetails/Modals/ExportMultipleKeysModal.swift
@@ -95,7 +95,7 @@ private extension ExportMultipleKeysModal {
                 .foregroundColor(.textAndIconsPrimary)
                 .font(PrimaryFont.titleS.font)
             Spacer()
-            CloseModalButton(action: animateDismissal)
+            CircleButton(action: animateDismissal)
         }
     }
 }

diff --git a/ios/PolkadotVault/Screens/KeyDetails/Views/ManageKeySetsView.swift b/ios/PolkadotVault/Screens/KeyDetails/Views/ManageKeySetsView.swift
@@ -28,7 +28,7 @@ struct ManageKeySetsView: View {
                             .foregroundColor(.textAndIconsPrimary)
                             .font(PrimaryFont.titleS.font)
                         Spacer()
-                        CloseModalButton(action: viewModel.onClose)
+                        CircleButton(action: viewModel.onClose)
                     }
                     .padding(.bottom, Spacing.small)
                     // Spacer

diff --git a/ios/PolkadotVault/Screens/Scan/BananaSplit/EnterBananaSplitPasswordModal.swift b/ios/PolkadotVault/Screens/Scan/BananaSplit/EnterBananaSplitPasswordModal.swift
@@ -115,7 +115,7 @@ struct EnterBananaSplitPasswordView: View {
 extension EnterBananaSplitPasswordView {
     final class ViewModel: ObservableObject {
         @Binding var isPresented: Bool
-        @Published var seedName: String = ""
+        @Published var seedName: String
         @Published var password: String = ""
         @Published var isNameValid: Bool = true
         @Published var isPasswordValid: Bool = true
@@ -133,11 +133,13 @@ extension EnterBananaSplitPasswordView {
 
         init(
             seedsMediator: SeedsMediating = ServiceLocator.seedsMediator,
+            seedName: String = "",
             isPresented: Binding<Bool>,
             qrCodeData: [String],
             onCompletion: @escaping (CreateKeysForNetworksView.OnCompletionAction) -> Void
         ) {
             self.seedsMediator = seedsMediator
+            _seedName = .init(initialValue: seedName)
             self.onCompletion = onCompletion
             self.qrCodeData = qrCodeData
             _isPresented = isPresented

diff --git a/ios/PolkadotVault/Screens/Scan/CameraView.swift b/ios/PolkadotVault/Screens/Scan/CameraView.swift
@@ -128,6 +128,7 @@ struct CameraView: View {
         ) {
             EnterBananaSplitPasswordView(
                 viewModel: .init(
+                    seedName: viewModel.bananaSplitQRCodeRecovery?.seedName ?? "",
                     isPresented: $viewModel.isPresentingEnterBananaSplitPassword,
                     qrCodeData: model.bucket,
                     onCompletion: viewModel.onKeySetAddCompletion(_:)
@@ -262,16 +263,19 @@ extension CameraView {
         private let dynamicDerivationsService: DynamicDerivationsService
         private let seedsMediator: SeedsMediating
         private let runtimePropertiesProvider: RuntimePropertiesProviding
+        let bananaSplitQRCodeRecovery: BananaSplitQRCodeRecovery?
         private weak var cameraModel: CameraService?
 
         init(
             isPresented: Binding<Bool>,
+            bananaSplitQRCodeRecovery: BananaSplitQRCodeRecovery? = nil,
             seedsMediator: SeedsMediating = ServiceLocator.seedsMediator,
             scanService: ScanTabService = ScanTabService(),
             dynamicDerivationsService: DynamicDerivationsService = DynamicDerivationsService(),
             runtimePropertiesProvider: RuntimePropertiesProviding = RuntimePropertiesProvider()
         ) {
             _isPresented = isPresented
+            self.bananaSplitQRCodeRecovery = bananaSplitQRCodeRecovery
             self.seedsMediator = seedsMediator
             self.scanService = scanService
             self.dynamicDerivationsService = dynamicDerivationsService
@@ -372,6 +376,13 @@ extension CameraView {
         }
 
         func onKeySetAddCompletion(_ completionAction: CreateKeysForNetworksView.OnCompletionAction) {
+            if let onRecoveryComplete = bananaSplitQRCodeRecovery?.onRecoveryComplete {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    onRecoveryComplete(completionAction)
+                    self.dismissView()
+                }
+                return
+            }
             let message: String =
                 switch completionAction {
                 case let .createKeySet(seedName):
@@ -384,6 +395,7 @@ extension CameraView {
                 style: .info
             )
             isSnackbarPresented = true
+            resumeCamera()
         }
 
         func onEnterPasswordDismissal() {

diff --git a/ios/PolkadotVault/Screens/Settings/Subviews/Backup/SettingsBackupModal.swift b/ios/PolkadotVault/Screens/Settings/Subviews/Backup/SettingsBackupModal.swift
@@ -31,7 +31,7 @@ struct SettingsBackupModal: View {
                                 .font(PrimaryFont.titleS.font)
                         }
                         Spacer()
-                        CloseModalButton(action: viewModel.dismissModal)
+                        CircleButton(action: viewModel.dismissModal)
                     }
                     .padding(.leading, Spacing.large)
                     .padding(.trailing, Spacing.medium)