From 0d3cb215a47d9abdeb6bf736d523c2ebeef48a95 Mon Sep 17 00:00:00 2001
From: Krzysztof Rodak <krzysztof@parity.io>
Date: Thu, 29 Jun 2023 14:19:52 +0200
Subject: [PATCH] fix: ios: update design details for create derived key
 updated flows (#1915)

---
 ios/PolkadotVault.xcodeproj/project.pbxproj         | 13 +++++++++++--
 .../CreateKeysForNetworksView.swift                 |  2 +-
 .../AddKeysForNetwork/AddKeysForNetworkModal.swift  |  0
 .../SelectKeySetsForNetworkKeyView.swift            |  7 +++----
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename ios/PolkadotVault/{Modals => Screens/Scan}/AddKeysForNetwork/AddKeysForNetworkModal.swift (100%)
 rename ios/PolkadotVault/{Modals => Screens/Scan}/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift (97%)

diff --git a/ios/PolkadotVault.xcodeproj/project.pbxproj b/ios/PolkadotVault.xcodeproj/project.pbxproj
index af11b0ba9f..b6ef9eaf1a 100644
--- a/ios/PolkadotVault.xcodeproj/project.pbxproj
+++ b/ios/PolkadotVault.xcodeproj/project.pbxproj
@@ -727,7 +727,6 @@
 		2D7A7BC726BA97A50053C1E0 /* Modals */ = {
 			isa = PBXGroup;
 			children = (
-				6DED2AB32A405DB800EF1C49 /* AddKeysForNetwork */,
 				6D52E3AD2946FF4900AD72F0 /* NetworkSelection */,
 				6DEFB53028FEE17800762219 /* ExportKeys */,
 				6DBF6E2528E44DBA00CC959F /* Errors */,
@@ -945,6 +944,8 @@
 		6D199C9D292A8CF300E79113 /* Scan */ = {
 			isa = PBXGroup;
 			children = (
+				6DED2AB32A405DB800EF1C49 /* AddKeysForNetwork */,
+				6DB39AA22A4579CF004B8FAA /* DynamicDerivations */,
 				6DF91F3C29C06B17000A6BB2 /* Services */,
 				6D34233829952EB500F3BA27 /* Errors */,
 				6D3423372994F11300F3BA27 /* Password */,
@@ -1516,6 +1517,14 @@
 			path = Data;
 			sourceTree = "<group>";
 		};
+		6DB39AA22A4579CF004B8FAA /* DynamicDerivations */ = {
+			isa = PBXGroup;
+			children = (
+				6DB39AA32A4579E0004B8FAA /* AddDerivedKeysView.swift */,
+			);
+			path = DynamicDerivations;
+			sourceTree = "<group>";
+		};
 		6DB39AA72A45C109004B8FAA /* Services */ = {
 			isa = PBXGroup;
 			children = (
@@ -1790,8 +1799,8 @@
 		6DED2AB32A405DB800EF1C49 /* AddKeysForNetwork */ = {
 			isa = PBXGroup;
 			children = (
-				6D31E7C12A404B4900BF9D9B /* AddKeysForNetworkModal.swift */,
 				6DED2AB42A405DD300EF1C49 /* SelectKeySetsForNetworkKeyView.swift */,
+				6D31E7C12A404B4900BF9D9B /* AddKeysForNetworkModal.swift */,
 			);
 			path = AddKeysForNetwork;
 			sourceTree = "<group>";
diff --git a/ios/PolkadotVault/Screens/CreateKey/CreateKeysForNetworks/CreateKeysForNetworksView.swift b/ios/PolkadotVault/Screens/CreateKey/CreateKeysForNetworks/CreateKeysForNetworksView.swift
index c0436a0b1f..be0c014fb3 100644
--- a/ios/PolkadotVault/Screens/CreateKey/CreateKeysForNetworks/CreateKeysForNetworksView.swift
+++ b/ios/PolkadotVault/Screens/CreateKey/CreateKeysForNetworks/CreateKeysForNetworksView.swift
@@ -84,7 +84,7 @@ struct CreateKeysForNetworksView: View {
 
     @ViewBuilder
     func footer() -> some View {
-        InfoBoxView(text: Localizable.CreateKeysForNetwork.Label.footer.string)
+        TransparentHelpBox(text: Localizable.CreateKeysForNetwork.Label.footer.string)
             .padding(.horizontal, Spacing.medium)
     }
 
diff --git a/ios/PolkadotVault/Modals/AddKeysForNetwork/AddKeysForNetworkModal.swift b/ios/PolkadotVault/Screens/Scan/AddKeysForNetwork/AddKeysForNetworkModal.swift
similarity index 100%
rename from ios/PolkadotVault/Modals/AddKeysForNetwork/AddKeysForNetworkModal.swift
rename to ios/PolkadotVault/Screens/Scan/AddKeysForNetwork/AddKeysForNetworkModal.swift
diff --git a/ios/PolkadotVault/Modals/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift b/ios/PolkadotVault/Screens/Scan/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift
similarity index 97%
rename from ios/PolkadotVault/Modals/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift
rename to ios/PolkadotVault/Screens/Scan/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift
index 2425420e31..b390a311bf 100644
--- a/ios/PolkadotVault/Modals/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift
+++ b/ios/PolkadotVault/Screens/Scan/AddKeysForNetwork/SelectKeySetsForNetworkKeyView.swift
@@ -42,6 +42,7 @@ struct SelectKeySetsForNetworkKeyView: View {
                     }
                     .padding(.horizontal, Spacing.large)
                     .padding(.bottom, Spacing.small)
+                    .padding(.top, Spacing.medium)
                 }
             }
         )
@@ -59,18 +60,16 @@ struct SelectKeySetsForNetworkKeyView: View {
 
     @ViewBuilder
     func mainContent() -> some View {
-        VStack(alignment: .leading, spacing: Spacing.extraLarge) {
+        VStack(alignment: .leading, spacing: Spacing.medium) {
             Text(Localizable.SelectKeySetsForNetworkKey.Label.title(viewModel.networkName))
                 .foregroundColor(Asset.textAndIconsPrimary.swiftUIColor)
                 .font(PrimaryFont.titleL.font)
-                .padding(.top, Spacing.extraSmall)
             Localizable.SelectKeySetsForNetworkKey.Label.content.text
                 .foregroundColor(Asset.textAndIconsPrimary.swiftUIColor)
                 .font(PrimaryFont.bodyL.font)
         }
         .padding(.horizontal, Spacing.large)
-        .padding(.bottom, Spacing.medium)
-        .padding(.top, Spacing.extraSmall)
+        .padding(.vertical, Spacing.medium)
     }
 
     @ViewBuilder