From e3bacc928b852ba67f518e705eee65f83d2e986d Mon Sep 17 00:00:00 2001
From: Simon McLoughlin <simon.d.mcl@gmail.com>
Date: Tue, 28 May 2024 15:32:14 +0100
Subject: [PATCH] - wire up new private key import option - add option to
 wallet management flow as well - update images

---
 .../xcshareddata/swiftpm/Package.resolved     |  6 +-
 .../Localization/en.lproj/Localizable.strings |  1 +
 .../Modules/Home/AddWalletViewModel.swift     |  3 +-
 .../Modules/Home/Base.lproj/Home.storyboard   | 33 ++++---
 .../AlreadyHaveWalletViewController.swift     |  2 +-
 .../Base.lproj/Onboarding.storyboard          | 85 +++++--------------
 .../ConfirmPasscodeViewController.swift       |  3 +-
 .../ImportPrivateKeyViewController.swift      | 56 ++++++------
 8 files changed, 77 insertions(+), 112 deletions(-)

diff --git a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 06a202c3..4e5f67a9 100644
--- a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
+++ b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved	
@@ -70,7 +70,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "3f3702ebaf7c3ed07cc1dd89bdc5b4f5450241fc"
+        "revision" : "d4c59332acc9d6d32ae45e5d4cbf441a0e9e1b46"
       }
     },
     {
@@ -78,8 +78,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kukai-wallet/kukai-crypto-swift",
       "state" : {
-        "revision" : "203b66175e233ecd2abb7ddb062a49b0301b5616",
-        "version" : "1.0.22"
+        "revision" : "757c1975adb830d158eb50afa3776cf2c5eb7245",
+        "version" : "1.0.23"
       }
     },
     {
diff --git a/Kukai Mobile/Localization/en.lproj/Localizable.strings b/Kukai Mobile/Localization/en.lproj/Localizable.strings
index 2c80ad88..57d6746b 100644
--- a/Kukai Mobile/Localization/en.lproj/Localizable.strings	
+++ b/Kukai Mobile/Localization/en.lproj/Localizable.strings	
@@ -53,6 +53,7 @@
 "error-fetching-domains"="Encountered an error checking for tezos domains";
 "error-unsupported-wallet-type"="This type of wallet doesn't support this feature";
 "error-invalid-private-key"="Invalid private key. Please check you have the correct details and try again";
+"error-invalid-private-key-password"="This private key is encrypted, you must supply the password you used to encryt it";
 
 "error-funds-body-wc2"="Balance for address %@, is %@ and the required balance to pay for this transaction is %@";
 "error-unknwon-wc2"="Unable to respond to Wallet Connect";
diff --git a/Kukai Mobile/Modules/Home/AddWalletViewModel.swift b/Kukai Mobile/Modules/Home/AddWalletViewModel.swift
index 745474e4..047e3054 100644
--- a/Kukai Mobile/Modules/Home/AddWalletViewModel.swift	
+++ b/Kukai Mobile/Modules/Home/AddWalletViewModel.swift	
@@ -51,7 +51,8 @@ class AddWalletViewModel: ViewModel, UITableViewDiffableDataSourceHandler {
 		],
 		[
 			AddCellData(image: UIImage(named: "WalletSocial"), title: "Use Social", subtitle: "Sign in with your preferred social account", isExpandable: false, isTopLevel: false, option: "social"),
-			AddCellData(image: UIImage(named: "WalletHD"), title: "Restore with Recovery Phrase", subtitle: "Import accounts using your recovery phrase from Kukai or another wallet", isExpandable: false, isTopLevel: false, option: "import"),
+			AddCellData(image: UIImage(named: "WalletRestore"), title: "Restore with Recovery Phrase", subtitle: "Import accounts using your recovery phrase from Kukai or another wallet", isExpandable: false, isTopLevel: false, option: "import"),
+			AddCellData(image: UIImage(named: "WalletHD"), title: "Restore with Private Key", subtitle: "Import a wallet from a private key", isExpandable: false, isTopLevel: false, option: "private-key"),
 			AddCellData(image: UIImage(named: "WalletWatch"), title: "Watch a Tezos Address", subtitle: "Watch a public address or .tez domain", isExpandable: false, isTopLevel: false, option: "watch")
 		]
 	]
diff --git a/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard b/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard
index 45c87599..4979a6c8 100644
--- a/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard	
+++ b/Kukai Mobile/Modules/Home/Base.lproj/Home.storyboard	
@@ -212,13 +212,13 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;heading&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fxm-nU-LyP">
-                                                    <rect key="frame" x="39.999999999999993" y="12.666666666666664" width="79.333333333333314" height="30"/>
+                                                    <rect key="frame" x="39.999999999999993" y="18" width="79.333333333333314" height="19.333333333333329"/>
                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                     <color key="textColor" name="Txt10"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEg-Fn-9q8" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                    <rect key="frame" x="119.33333333333331" y="12.666666666666664" width="50" height="30"/>
+                                                    <rect key="frame" x="119.33333333333331" y="18" width="50" height="19.333333333333329"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="50" id="NPg-Hh-oA7"/>
                                                     </constraints>
@@ -693,6 +693,7 @@
                         <segue destination="W3e-f8-FhA" kind="show" identifier="import" id="KEe-L6-pl8"/>
                         <segue destination="T7z-fZ-ccj" kind="show" identifier="watch" id="9cC-hn-Wwj"/>
                         <segue destination="jRe-if-wgj" kind="show" identifier="account" id="awb-FO-i1F"/>
+                        <segue destination="a3y-gG-3LD" kind="show" identifier="private-key" id="RS4-PO-Dx0"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="oXg-M0-eCg" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
@@ -788,7 +789,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="Hym-l7-6bO">
-                                <rect key="frame" x="16" y="127" width="358" height="455"/>
+                                <rect key="frame" x="16" y="127" width="358" height="443"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="kci-rX-izT">
                                         <rect key="frame" x="0.0" y="0.0" width="358" height="54"/>
@@ -847,7 +848,7 @@
                                         </constraints>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="dIF-1f-QDL">
-                                        <rect key="frame" x="0.0" y="70" width="358" height="110.66666666666669"/>
+                                        <rect key="frame" x="0.0" y="70" width="358" height="98.666666666666686"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TZZ-Gt-iwb" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="105" height="32"/>
@@ -865,7 +866,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XV7-87-nVU" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="81.666666666666686" width="73" height="29"/>
+                                                <rect key="frame" x="0.0" y="81.666666666666686" width="79" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                 <color key="tintColor" name="Txt10"/>
                                                 <inset key="imageEdgeInsets" minX="17" minY="0.0" maxX="4" maxY="0.0"/>
@@ -891,7 +892,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Nxk-cJ-RaT">
-                                        <rect key="frame" x="0.0" y="196.66666666666669" width="358" height="61"/>
+                                        <rect key="frame" x="0.0" y="184.66666666666669" width="358" height="61"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="abB-kP-P9Y" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="105" height="32"/>
@@ -923,7 +924,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="dfs-AO-LMR">
-                                        <rect key="frame" x="0.0" y="273.66666666666669" width="358" height="181.33333333333331"/>
+                                        <rect key="frame" x="0.0" y="261.66666666666669" width="358" height="181.33333333333331"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lJP-hM-7yn">
                                                 <rect key="frame" x="0.0" y="0.0" width="358" height="24"/>
@@ -1578,6 +1579,16 @@
             </objects>
             <point key="canvasLocation" x="2904" y="-2932"/>
         </scene>
+        <!--private-key-->
+        <scene sceneID="XR6-03-ZOZ">
+            <objects>
+                <viewControllerPlaceholder storyboardName="Onboarding" referencedIdentifier="private-key" id="a3y-gG-3LD" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="dR3-rb-bEw"/>
+                </viewControllerPlaceholder>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="qO4-Xp-r6A" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2928" y="-2881"/>
+        </scene>
         <!--Add Account-->
         <scene sceneID="NfW-9Z-Rut">
             <objects>
@@ -1758,7 +1769,7 @@
     </scenes>
     <designables>
         <designable name="0Rb-3x-STy">
-            <size key="intrinsicContentSize" width="24" height="14"/>
+            <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="1un-2s-Olb">
             <size key="intrinsicContentSize" width="76" height="36"/>
@@ -1770,7 +1781,7 @@
             <size key="intrinsicContentSize" width="159" height="34"/>
         </designable>
         <designable name="BXZ-at-zJb">
-            <size key="intrinsicContentSize" width="24" height="14"/>
+            <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="TQh-in-HjU">
             <size key="intrinsicContentSize" width="143.33333333333334" height="34"/>
@@ -1782,10 +1793,10 @@
             <size key="intrinsicContentSize" width="64" height="36"/>
         </designable>
         <designable name="XEg-Fn-9q8">
-            <size key="intrinsicContentSize" width="30" height="30"/>
+            <size key="intrinsicContentSize" width="16" height="18"/>
         </designable>
         <designable name="XV7-87-nVU">
-            <size key="intrinsicContentSize" width="73" height="29"/>
+            <size key="intrinsicContentSize" width="79" height="17"/>
         </designable>
         <designable name="abB-kP-P9Y">
             <size key="intrinsicContentSize" width="105" height="32"/>
diff --git a/Kukai Mobile/Modules/Onboarding/AlreadyHaveWalletViewController.swift b/Kukai Mobile/Modules/Onboarding/AlreadyHaveWalletViewController.swift
index 5fa52750..991d2ead 100644
--- a/Kukai Mobile/Modules/Onboarding/AlreadyHaveWalletViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/AlreadyHaveWalletViewController.swift	
@@ -44,7 +44,7 @@ class AlreadyHaveWalletViewController: UIViewController, UITableViewDelegate, UI
 				cell.descriptionLabel.text = "Import accounts using your recovery phrase from Kukai or another wallet"
 				
 			case 2:
-				cell.iconView.image = UIImage(named: "WalletRestore")
+				cell.iconView.image = UIImage(named: "WalletHD")
 				cell.titleLabel.text = "Import a Private Key"
 				cell.descriptionLabel.text = "Import a wallet from a private key"
 				
diff --git a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard
index 765d1f06..75d46219 100644
--- a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
+++ b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
@@ -306,7 +306,7 @@ for your Digital Assets</string>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EX4-MC-WXt" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="132.5" y="45" width="110.5" height="34"/>
+                                                <rect key="frame" x="129.5" y="45" width="116.5" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="34" id="xJV-2O-fg9"/>
                                                 </constraints>
@@ -1534,7 +1534,7 @@ You will not be able to transact in this wallet.</string>
         <!--Import Private Key-->
         <scene sceneID="XIH-Vs-Hlx">
             <objects>
-                <viewController id="vGy-Xg-zLb" customClass="ImportPrivateKeyViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="private-key" id="vGy-Xg-zLb" customClass="ImportPrivateKeyViewController" customModule="Kukai_Mobile" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="dV0-Bt-SXs">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1543,10 +1543,10 @@ You will not be able to transact in this wallet.</string>
                                 <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="4JQ-2X-hOh">
-                                        <rect key="frame" x="16" y="16" width="343" height="75"/>
+                                        <rect key="frame" x="16" y="16" width="343" height="110"/>
                                         <color key="backgroundColor" name="BG4"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="75" id="Wmq-iv-Aje"/>
+                                            <constraint firstAttribute="height" constant="110" id="Wmq-iv-Aje"/>
                                         </constraints>
                                         <color key="textColor" systemColor="labelColor"/>
                                         <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="18"/>
@@ -1559,7 +1559,7 @@ You will not be able to transact in this wallet.</string>
                                         </userDefinedRuntimeAttributes>
                                     </textView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="J7R-8W-zfd">
-                                        <rect key="frame" x="16" y="99" width="343" height="42"/>
+                                        <rect key="frame" x="16" y="134" width="343" height="42"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="e.g. edskAbc123..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T01-6s-OSN">
                                                 <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
@@ -1576,7 +1576,7 @@ You will not be able to transact in this wallet.</string>
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="MQX-uY-9rv">
-                                        <rect key="frame" x="16" y="157" width="343" height="184"/>
+                                        <rect key="frame" x="16" y="200" width="343" height="84"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Adf-Ve-u15">
                                                 <rect key="frame" x="0.0" y="0.0" width="343" height="84"/>
@@ -1616,48 +1616,10 @@ You will not be able to transact in this wallet.</string>
                                                     </label>
                                                 </subviews>
                                             </stackView>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="XFl-E6-rB5">
-                                                <rect key="frame" x="0.0" y="100" width="343" height="84"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Confirm wallet address (optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TLd-Sn-dLo">
-                                                        <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
-                                                        <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
-                                                        <color key="textColor" name="Txt8"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="e.g. tz1abc123" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="aSa-Wn-1rX" customClass="ValidatorTextField" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="25" width="343" height="34"/>
-                                                        <color key="backgroundColor" name="BG4"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="34" id="fLk-xe-HfI"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="18"/>
-                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="done" smartDashesType="no" smartInsertDeleteType="no" smartQuotesType="no"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="textPadding">
-                                                                <real key="value" value="8"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                            <userDefinedRuntimeAttribute type="color" keyPath="placeholderColor">
-                                                                <color key="value" name="Txt10"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                            <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="customCornerRadius">
-                                                                <real key="value" value="8"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </textField>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Error message" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7rD-J5-a6a">
-                                                        <rect key="frame" x="0.0" y="67" width="343" height="17"/>
-                                                        <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
-                                                        <color key="textColor" name="BGAlert4"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                            </stackView>
                                         </subviews>
                                     </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oaz-ev-CPh" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="57" y="354" width="261" height="56"/>
+                                        <rect key="frame" x="57" y="308" width="261" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Frm-hc-Bch"/>
                                         </constraints>
@@ -1684,14 +1646,14 @@ You will not be able to transact in this wallet.</string>
                                     <constraint firstItem="4JQ-2X-hOh" firstAttribute="leading" secondItem="Rf3-RX-8Xn" secondAttribute="leading" constant="16" id="36a-ol-bJo"/>
                                     <constraint firstItem="J7R-8W-zfd" firstAttribute="trailing" secondItem="4JQ-2X-hOh" secondAttribute="trailing" id="7XC-Cn-qoE"/>
                                     <constraint firstItem="Rf3-RX-8Xn" firstAttribute="trailing" secondItem="4JQ-2X-hOh" secondAttribute="trailing" constant="16" id="Coa-E1-6Uk"/>
-                                    <constraint firstItem="MQX-uY-9rv" firstAttribute="top" secondItem="J7R-8W-zfd" secondAttribute="bottom" constant="16" id="DOg-OX-7WC"/>
+                                    <constraint firstItem="MQX-uY-9rv" firstAttribute="top" secondItem="J7R-8W-zfd" secondAttribute="bottom" constant="24" id="DOg-OX-7WC"/>
                                     <constraint firstItem="Rf3-RX-8Xn" firstAttribute="bottom" secondItem="oaz-ev-CPh" secondAttribute="bottom" constant="24" id="Enk-tT-86Y"/>
                                     <constraint firstItem="oaz-ev-CPh" firstAttribute="leading" secondItem="mAb-Kh-hB7" secondAttribute="leading" constant="57" id="ITX-7R-K47"/>
                                     <constraint firstItem="4JQ-2X-hOh" firstAttribute="leading" secondItem="mAb-Kh-hB7" secondAttribute="leading" constant="16" id="KgC-Ql-Mn5"/>
                                     <constraint firstItem="mAb-Kh-hB7" firstAttribute="trailing" secondItem="4JQ-2X-hOh" secondAttribute="trailing" constant="16" id="NIU-Mp-76a"/>
                                     <constraint firstItem="J7R-8W-zfd" firstAttribute="top" secondItem="4JQ-2X-hOh" secondAttribute="bottom" constant="8" id="OJH-qy-UTR"/>
+                                    <constraint firstItem="oaz-ev-CPh" firstAttribute="top" secondItem="MQX-uY-9rv" secondAttribute="bottom" constant="24" id="QOU-xF-ynr"/>
                                     <constraint firstItem="4JQ-2X-hOh" firstAttribute="top" secondItem="Rf3-RX-8Xn" secondAttribute="top" constant="16" id="SyI-8c-cF7"/>
-                                    <constraint firstItem="oaz-ev-CPh" firstAttribute="top" secondItem="MQX-uY-9rv" secondAttribute="bottom" constant="13" id="XFS-1j-GpF"/>
                                     <constraint firstItem="mAb-Kh-hB7" firstAttribute="trailing" secondItem="oaz-ev-CPh" secondAttribute="trailing" constant="57" id="ZSv-Vc-k0F"/>
                                     <constraint firstItem="J7R-8W-zfd" firstAttribute="leading" secondItem="4JQ-2X-hOh" secondAttribute="leading" id="gdw-zd-0tR"/>
                                     <constraint firstAttribute="trailing" secondItem="MQX-uY-9rv" secondAttribute="trailing" constant="16" id="i5T-Qc-J8C"/>
@@ -1712,8 +1674,6 @@ You will not be able to transact in this wallet.</string>
                     </view>
                     <navigationItem key="navigationItem" title="Import Private Key" id="iLd-4e-28W"/>
                     <connections>
-                        <outlet property="addressErrorLabel" destination="7rD-J5-a6a" id="JDc-4h-ZPh"/>
-                        <outlet property="addressTextField" destination="aSa-Wn-1rX" id="6Lm-c2-TPZ"/>
                         <outlet property="importButton" destination="oaz-ev-CPh" id="iTI-kE-bJM"/>
                         <outlet property="passwordErrorLabel" destination="Mog-7K-ySg" id="6o8-Aq-Mzn"/>
                         <outlet property="passwordTextField" destination="0W5-Sj-9Bh" id="SXH-fc-FIq"/>
@@ -2322,28 +2282,28 @@ HD Wallets allow you to create many accounts within the same wallet, all of them
     </scenes>
     <designables>
         <designable name="0W5-Sj-9Bh">
-            <size key="intrinsicContentSize" width="79" height="23.5"/>
+            <size key="intrinsicContentSize" width="87" height="23.5"/>
         </designable>
         <designable name="1VJ-Ye-1zl">
-            <size key="intrinsicContentSize" width="24" height="14"/>
+            <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="5t4-7b-ZSi">
-            <size key="intrinsicContentSize" width="191.5" height="38"/>
+            <size key="intrinsicContentSize" width="211.5" height="38"/>
         </designable>
         <designable name="EIg-ad-QmA">
             <size key="intrinsicContentSize" width="141" height="38"/>
         </designable>
         <designable name="EX4-MC-WXt">
-            <size key="intrinsicContentSize" width="110.5" height="34.5"/>
+            <size key="intrinsicContentSize" width="116.5" height="34.5"/>
         </designable>
         <designable name="FWv-hS-Trj">
-            <size key="intrinsicContentSize" width="24" height="14"/>
+            <size key="intrinsicContentSize" width="46" height="36"/>
         </designable>
         <designable name="J2v-BG-JDc">
-            <size key="intrinsicContentSize" width="24" height="14"/>
+            <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="Loj-qu-Rs8">
-            <size key="intrinsicContentSize" width="203.5" height="38"/>
+            <size key="intrinsicContentSize" width="223.5" height="38"/>
         </designable>
         <designable name="UlV-Fl-sF1">
             <size key="intrinsicContentSize" width="119" height="38"/>
@@ -2352,13 +2312,10 @@ HD Wallets allow you to create many accounts within the same wallet, all of them
             <size key="intrinsicContentSize" width="227" height="38"/>
         </designable>
         <designable name="ZcX-hG-7A3">
-            <size key="intrinsicContentSize" width="24" height="14"/>
-        </designable>
-        <designable name="aSa-Wn-1rX">
-            <size key="intrinsicContentSize" width="114.5" height="23.5"/>
+            <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="bIm-xp-dm5">
-            <size key="intrinsicContentSize" width="199" height="23.5"/>
+            <size key="intrinsicContentSize" width="207" height="23.5"/>
         </designable>
         <designable name="bRr-0r-cKe">
             <size key="intrinsicContentSize" width="210.5" height="38"/>
@@ -2367,13 +2324,13 @@ HD Wallets allow you to create many accounts within the same wallet, all of them
             <size key="intrinsicContentSize" width="144" height="38"/>
         </designable>
         <designable name="c2S-hk-v1m">
-            <size key="intrinsicContentSize" width="30" height="34"/>
+            <size key="intrinsicContentSize" width="24" height="24"/>
         </designable>
         <designable name="fpw-5A-t7A">
             <size key="intrinsicContentSize" width="165.5" height="38"/>
         </designable>
         <designable name="mM7-0X-VxZ">
-            <size key="intrinsicContentSize" width="106" height="36"/>
+            <size key="intrinsicContentSize" width="124" height="36"/>
         </designable>
         <designable name="oOo-v0-m7J">
             <size key="intrinsicContentSize" width="109" height="38"/>
@@ -2394,7 +2351,7 @@ HD Wallets allow you to create many accounts within the same wallet, all of them
             <size key="intrinsicContentSize" width="87.5" height="38"/>
         </designable>
         <designable name="zN1-he-MJi">
-            <size key="intrinsicContentSize" width="123" height="23.5"/>
+            <size key="intrinsicContentSize" width="131" height="23.5"/>
         </designable>
         <designable name="zTe-bp-NGr">
             <size key="intrinsicContentSize" width="32" height="34"/>
diff --git a/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift b/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift
index 076b2555..2b0f6523 100644
--- a/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift	
@@ -60,10 +60,11 @@ class ConfirmPasscodeViewController: UIViewController {
 	
 	func navigateNonBiometric() {
 		let importVc = self.navigationController?.viewControllers.filter({ $0 is ImportWalletViewController }).first
+		let importPrivateVc = self.navigationController?.viewControllers.filter({ $0 is ImportPrivateKeyViewController }).first
 		let socialVc = self.navigationController?.viewControllers.filter({ $0 is CreateWithSocialViewController }).first
 		let watchVc = self.navigationController?.viewControllers.filter({ $0 is WatchWalletViewController }).first
 		
-		if importVc != nil || socialVc != nil || watchVc != nil {
+		if importVc != nil || importPrivateVc != nil || socialVc != nil || watchVc != nil {
 			self.performSegue(withIdentifier: "home", sender: self)
 		} else {
 			self.performSegue(withIdentifier: "next", sender: nil)
diff --git a/Kukai Mobile/Modules/Onboarding/ImportPrivateKeyViewController.swift b/Kukai Mobile/Modules/Onboarding/ImportPrivateKeyViewController.swift
index bf11b2d6..e3d46949 100644
--- a/Kukai Mobile/Modules/Onboarding/ImportPrivateKeyViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/ImportPrivateKeyViewController.swift	
@@ -17,8 +17,6 @@ class ImportPrivateKeyViewController: UIViewController {
 	@IBOutlet weak var textViewErrorLabel: UILabel!
 	@IBOutlet weak var passwordTextField: ValidatorTextField!
 	@IBOutlet weak var passwordErrorLabel: UILabel!
-	@IBOutlet weak var addressTextField: ValidatorTextField!
-	@IBOutlet weak var addressErrorLabel: UILabel!
 	@IBOutlet weak var importButton: CustomisableButton!
 	
     override func viewDidLoad() {
@@ -28,7 +26,6 @@ class ImportPrivateKeyViewController: UIViewController {
 		
 		textViewErrorLabel.isHidden = true
 		passwordErrorLabel.isHidden = true
-		addressErrorLabel.isHidden = true
 		
 		textView.delegate = self
 		textView.text = "Enter Private Key"
@@ -38,9 +35,6 @@ class ImportPrivateKeyViewController: UIViewController {
 		passwordTextField.validatorTextFieldDelegate = self
 		passwordTextField.validator = NoWhiteSpaceStringValidator()
 		
-		addressTextField.validatorTextFieldDelegate = self
-		addressTextField.validator = TezosAddressValidator(ownAddress: "")
-		
 		let tap = UITapGestureRecognizer(target: self, action: #selector(ImportPrivateKeyViewController.resignAll))
 		view.addGestureRecognizer(tap)
     }
@@ -80,36 +74,39 @@ class ImportPrivateKeyViewController: UIViewController {
 	@objc private func resignAll() {
 		textView.resignFirstResponder()
 		passwordTextField.resignFirstResponder()
-		addressTextField.resignFirstResponder()
 	}
 	
 	@IBAction func importTapped(_ sender: Any) {
-		guard let inputText = textView.text else {
-			self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key".localized())
+		guard let inputText = textView.text, let wallet = RegularWallet(fromSecretKey: inputText, passphrase: passwordTextField.text) else {
+			
+			if textView.text != nil, (passwordTextField.text == nil || passwordTextField.text == ""), KeyPair.isSecretKeyEncrypted(textView.text) {
+				self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key-password".localized())
+			} else {
+				self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key".localized())
+			}
 			return
 		}
 		
-		let first4 = inputText.prefix(4)
-		if first4 == "edsk" {
-			guard let decoded = Base58Check.decode(string: inputText, prefix: Prefix.Keys.Ed25519.secret), let keyPair = Sodium.shared.sign.keyPair(seed: Array(decoded.prefix(32))) else {
-				self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key".localized())
-				return
+		// Cache and move on
+		self.showLoadingView()
+		WalletManagementService.cacheNew(wallet: wallet, forChildOfIndex: nil, backedUp: true, markSelected: true) { [weak self] errorString in
+			self?.hideLoadingView()
+			if let eString = errorString {
+				self?.windowError(withTitle: "error".localized(), description: eString)
+			} else {
+				self?.navigate()
 			}
-			
-			let privateKey = PrivateKey(keyPair.secretKey)
-			let publicKey = PublicKey(keyPair.publicKey)
-			
-		} else if first4 == "spsk" {
-			guard let decoded = Base58Check.decode(string: inputText, prefix: Prefix.Keys.Secp256k1.secret) else {
-				self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key".localized())
-				return
-			}
-			
-			let privateKey = PrivateKey(decoded, signingCurve: .secp256k1)
-			let publicKey = KeyPair.secp256k1PublicKey(fromPrivateKeyBytes: privateKey.bytes)
+		}
+	}
+	
+	private func navigate() {
+		let viewController = self.navigationController?.viewControllers.filter({ $0 is AccountsViewController }).first
+		if let vc = viewController {
+			self.navigationController?.popToViewController(vc, animated: true)
+			AccountViewModel.setupAccountActivityListener() // Add new wallet(s) to listener
 			
 		} else {
-			self.windowError(withTitle: "error".localized(), description: "error-invalid-private-key".localized())
+			self.performSegue(withIdentifier: "done", sender: nil)
 		}
 	}
 }
@@ -179,10 +176,7 @@ extension ImportPrivateKeyViewController: ValidatorTextFieldDelegate {
 	}
 	
 	private func isEverythingValid() -> Bool {
-		return (doesTextViewPassValidation() &&
-				((passwordTextField.text ?? "").isEmpty || passwordTextField.isValid) &&
-				((addressTextField.text ?? "").isEmpty || addressTextField.isValid)
-				)
+		return ( doesTextViewPassValidation() && ((passwordTextField.text ?? "").isEmpty || passwordTextField.isValid) )
 	}
 }