From 8ba6f6b16afa211c607bd907909e392420f1acff Mon Sep 17 00:00:00 2001
From: Krzysztof Rodak <krzysztof@parity.io>
Date: Thu, 1 Feb 2024 16:33:51 +0100
Subject: [PATCH] feat: disable dd keys saving and bump to 6.3.2

---
 ios/PolkadotVault.xcodeproj/project.pbxproj   |  6 +--
 .../AddDerivedKeysView.swift                  | 43 +------------------
 .../RecoverKeySetNameViewModelTests.swift     |  2 +-
 3 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/ios/PolkadotVault.xcodeproj/project.pbxproj b/ios/PolkadotVault.xcodeproj/project.pbxproj
index 39921c3dfd..49696bf43f 100644
--- a/ios/PolkadotVault.xcodeproj/project.pbxproj
+++ b/ios/PolkadotVault.xcodeproj/project.pbxproj
@@ -3027,7 +3027,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PolkadotVault",
 				);
-				MARKETING_VERSION = 6.3.1;
+				MARKETING_VERSION = 6.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.parity.NativeSigner;
 				PRODUCT_MODULE_NAME = PolkadotVault;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3063,7 +3063,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PolkadotVault",
 				);
-				MARKETING_VERSION = 6.3.1;
+				MARKETING_VERSION = 6.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.parity.NativeSigner;
 				PRODUCT_MODULE_NAME = PolkadotVault;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3205,7 +3205,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/PolkadotVault",
 				);
-				MARKETING_VERSION = 6.3.1;
+				MARKETING_VERSION = 6.3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.parity.NativeSigner;
 				PRODUCT_MODULE_NAME = PolkadotVault;
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/ios/PolkadotVault/Screens/Scan/DynamicDerivations/AddDerivedKeysView.swift b/ios/PolkadotVault/Screens/Scan/DynamicDerivations/AddDerivedKeysView.swift
index 0af904319c..f8bfd18fc1 100644
--- a/ios/PolkadotVault/Screens/Scan/DynamicDerivations/AddDerivedKeysView.swift
+++ b/ios/PolkadotVault/Screens/Scan/DynamicDerivations/AddDerivedKeysView.swift
@@ -57,16 +57,6 @@ struct AddDerivedKeysView: View {
             )
             .clearModalBackground()
         }
-        .fullScreenModal(
-            isPresented: $viewModel.isPresentingAddKeysCancelation
-        ) {
-            HorizontalActionsBottomModal(
-                viewModel: .cancelAddingDerivedKeys,
-                mainAction: viewModel.onAddCancelationTap(),
-                isShowingBottomAlert: $viewModel.isPresentingAddKeysCancelation
-            )
-            .clearModalBackground()
-        }
     }
 
     @ViewBuilder
@@ -211,37 +201,28 @@ extension AddDerivedKeysView {
     final class ViewModel: ObservableObject {
         private let onCompletion: (OnCompletionAction) -> Void
         let dynamicDerivationsPreview: DdPreview
-        private let derivedKeysService: CreateDerivedKeyService
         private let seedsMediator: SeedsMediating
         let dataModel: AddDerivedKeysData
         @Binding var isPresented: Bool
-        @Published var isPresentingAddKeysCancelation: Bool = false
-        @Published var isPresentingDerivationPath: Bool = false
         @Published var isPresentingError: Bool = false
         @Published var presentableError: ErrorBottomModalViewModel = .importDynamicDerivedKeys(content: "")
 
         init(
             dataModel: AddDerivedKeysData,
             dynamicDerivationsPreview: DdPreview,
-            derivedKeysService: CreateDerivedKeyService = CreateDerivedKeyService(),
             seedsMediator: SeedsMediating = ServiceLocator.seedsMediator,
             isPresented: Binding<Bool>,
             onCompletion: @escaping (OnCompletionAction) -> Void
         ) {
             self.dataModel = dataModel
             self.dynamicDerivationsPreview = dynamicDerivationsPreview
-            self.derivedKeysService = derivedKeysService
             self.seedsMediator = seedsMediator
             _isPresented = isPresented
             self.onCompletion = onCompletion
         }
 
         func onMainActionTap() {
-            if dynamicDerivationsPreview.keySet.derivations.isEmpty {
-                onSuccess()
-            } else {
-                continueCreation()
-            }
+            onSuccess()
         }
 
         func onAddCancelationTap() {
@@ -249,11 +230,7 @@ extension AddDerivedKeysView {
         }
 
         func onBackTap() {
-            if dynamicDerivationsPreview.keySet.derivations.isEmpty {
-                onCancel()
-            } else {
-                isPresentingAddKeysCancelation = true
-            }
+            onCancel()
         }
 
         private func onSuccess() {
@@ -265,22 +242,6 @@ extension AddDerivedKeysView {
             isPresented = false
             onCompletion(.onCancel)
         }
-
-        private func continueCreation() {
-            derivedKeysService.createDerivedKeys(
-                dynamicDerivationsPreview.keySet.seedName,
-                seedsMediator.getSeed(seedName: dynamicDerivationsPreview.keySet.seedName),
-                keysToImport: dynamicDerivationsPreview.keySet.derivations
-            ) { [weak self] result in
-                switch result {
-                case .success:
-                    self?.onSuccess()
-                case let .failure(error):
-                    self?.presentableError = .importDynamicDerivedKeys(content: error.localizedDescription)
-                    self?.isPresentingError = true
-                }
-            }
-        }
     }
 }
 
diff --git a/ios/PolkadotVaultTests/Screens/CreateKey/RecoverKeySet/RecoverKeySetNameViewModelTests.swift b/ios/PolkadotVaultTests/Screens/CreateKey/RecoverKeySet/RecoverKeySetNameViewModelTests.swift
index 7c36ecd2bc..c05ff1fe6e 100644
--- a/ios/PolkadotVaultTests/Screens/CreateKey/RecoverKeySet/RecoverKeySetNameViewModelTests.swift
+++ b/ios/PolkadotVaultTests/Screens/CreateKey/RecoverKeySet/RecoverKeySetNameViewModelTests.swift
@@ -17,7 +17,7 @@ final class RecoverKeySetNameViewModelTests: XCTestCase {
     private var onCompletionExecuted: Bool = false
 
     override func setUp() {
-        super.setUp()   
+        super.setUp()
         seedsMediatorMock = SeedsMediatingMock()
         isPresented = false
         onCompletionExecuted = false