From e77af9777a46a26dd44622b8cd020f60561f39d7 Mon Sep 17 00:00:00 2001
From: Simon McLoughlin <simon.d.mcl@gmail.com>
Date: Sun, 21 Jul 2024 11:41:03 +0100
Subject: [PATCH 1/2] - bug fix for unactivated touchid/faceid - bug fix for
 ungrouped collection mode using small icons

---
 .../CollectiblesCollectionsViewModel.swift    |   2 +-
 .../Base.lproj/Onboarding.storyboard          | 154 +++++++++---------
 .../ConfirmPasscodeViewController.swift       |  23 ++-
 Kukai Mobile/Services/StorageService.swift    |  29 +++-
 4 files changed, 121 insertions(+), 87 deletions(-)

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift
index 7ac5e029..2290f52f 100644
--- a/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift	
+++ b/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift	
@@ -387,7 +387,7 @@ class CollectiblesCollectionsViewModel: ViewModel, UICollectionViewDiffableDataS
 			}
 			
 		} else if let obj = dataSource?.itemIdentifier(for: forIndexPath) as? NFT {
-			urls = [MediaProxyService.smallURL(forNFT: obj)]
+			urls = [MediaProxyService.mediumURL(forNFT: obj)]
 		}
 		
 		Logger.app.info("willDisplayImages: \(urls)")
diff --git a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard
index 75d46219..981fa595 100644
--- a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
+++ b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard	
@@ -47,7 +47,7 @@
                                 </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="em4-VY-ISj">
-                                <rect key="frame" x="16" y="135" width="343" height="48"/>
+                                <rect key="frame" x="16" y="135" width="343" height="47"/>
                                 <string key="text">A Secure Home
 for your Digital Assets</string>
                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
@@ -175,20 +175,20 @@ for your Digital Assets</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Easiest way to get started, sign in with your preferred social account" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40t-0K-fyh">
-                                        <rect key="frame" x="24" y="264" width="327" height="34"/>
+                                        <rect key="frame" x="24" y="264" width="327" height="33"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="use_key_wallet" translatesAutoresizingMaskIntoConstraints="NO" id="kz3-TL-M8X">
-                                        <rect key="frame" x="100.5" y="346" width="174" height="136"/>
+                                        <rect key="frame" x="100.5" y="345" width="174" height="136"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="136" id="kwR-c8-ZyG"/>
                                             <constraint firstAttribute="width" constant="174" id="xl5-ok-sIn"/>
                                         </constraints>
                                     </imageView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y7X-1i-Vte" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="95" y="506" width="185" height="56"/>
+                                        <rect key="frame" x="95" y="505" width="185" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Q0O-u9-vdF"/>
                                         </constraints>
@@ -210,7 +210,7 @@ for your Digital Assets</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Create a standard wallet with a recovery phrase and multi account support" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W4M-lS-U4B">
-                                        <rect key="frame" x="24" y="578" width="327" height="34"/>
+                                        <rect key="frame" x="24" y="577" width="327" height="33"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
@@ -297,16 +297,16 @@ for your Digital Assets</string>
                                 <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hoU-aE-01p">
-                                        <rect key="frame" x="0.0" y="24" width="375" height="303"/>
+                                        <rect key="frame" x="0.0" y="24" width="375" height="302"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Access your Kukai wallet using your preferred social account" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TlV-fF-pfc">
-                                                <rect key="frame" x="32" y="0.0" width="311" height="29"/>
+                                                <rect key="frame" x="32" y="0.0" width="311" height="28"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="12"/>
                                                 <color key="textColor" name="Txt8"/>
                                                 <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="129.5" y="45" width="116.5" height="34"/>
+                                                <rect key="frame" x="129.5" y="44" width="116.5" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="34" id="xJV-2O-fg9"/>
                                                 </constraints>
@@ -330,7 +330,7 @@ for your Digital Assets</string>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5t4-7b-ZSi" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="32" y="103" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="102" width="311" height="56"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="56" id="Z29-7F-jnd"/>
                                                 </constraints>
@@ -362,7 +362,7 @@ for your Digital Assets</string>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Loj-qu-Rs8" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                <rect key="frame" x="32" y="175" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="174" width="311" height="56"/>
                                                 <color key="backgroundColor" name="BtnTer1"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="56" id="2pp-WC-vgi"/>
@@ -395,7 +395,7 @@ for your Digital Assets</string>
                                                 </connections>
                                             </button>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="fDb-HE-FXq">
-                                                <rect key="frame" x="32" y="247" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="246" width="311" height="56"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="24" translatesAutoresizingMaskIntoConstraints="NO" id="Wnt-wg-wax">
                                                         <rect key="frame" x="0.0" y="0.0" width="311" height="56"/>
@@ -534,27 +534,27 @@ for your Digital Assets</string>
                                         </constraints>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="or" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BxG-Iy-CiK">
-                                        <rect key="frame" x="181" y="343" width="13.5" height="17"/>
+                                        <rect key="frame" x="181" y="342" width="13" height="16.5"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9pp-bW-Avf">
-                                        <rect key="frame" x="32" y="351" width="145" height="1"/>
+                                        <rect key="frame" x="32" y="350" width="145" height="1"/>
                                         <color key="backgroundColor" name="BG6"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="66r-Tx-tB3"/>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="in2-jt-O6C">
-                                        <rect key="frame" x="198.5" y="351" width="144.5" height="1"/>
+                                        <rect key="frame" x="198" y="350" width="145" height="1"/>
                                         <color key="backgroundColor" name="BG6"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="eyi-8H-2lv"/>
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bRr-0r-cKe" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="32" y="372" width="311" height="56"/>
+                                        <rect key="frame" x="32" y="370.5" width="311" height="56"/>
                                         <color key="backgroundColor" name="BtnTer1"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="A20-IY-fYK"/>
@@ -645,7 +645,7 @@ for your Digital Assets</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jgW-tR-UsW">
-                                <rect key="frame" x="0.0" y="208.5" width="375" height="159"/>
+                                <rect key="frame" x="0.0" y="209" width="375" height="157"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo_kukai" translatesAutoresizingMaskIntoConstraints="NO" id="0hp-v9-I1J">
                                         <rect key="frame" x="87.5" y="0.0" width="200" height="55"/>
@@ -655,13 +655,13 @@ for your Digital Assets</string>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wallet Created" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hvy-tf-fOy">
-                                        <rect key="frame" x="16" y="89" width="343" height="36"/>
+                                        <rect key="frame" x="16" y="89" width="343" height="35"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="30"/>
                                         <color key="textColor" name="Txt2"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nwi-i3-AuU">
-                                        <rect key="frame" x="16" y="137" width="343" height="22"/>
+                                        <rect key="frame" x="16" y="136" width="343" height="21"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
@@ -925,16 +925,16 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6gY-nR-UMM">
-                                <rect key="frame" x="50" y="115.5" width="275" height="295"/>
+                                <rect key="frame" x="50" y="116" width="275" height="292"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Protect Your Wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ec3-ZW-Tu6">
-                                        <rect key="frame" x="0.0" y="182" width="275" height="36"/>
+                                        <rect key="frame" x="0.0" y="182" width="275" height="35"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="30"/>
                                         <color key="textColor" name="Txt2"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Adding biometric security will ensure that you are the only one that can access your wallet" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Fh-e3-WVY">
-                                        <rect key="frame" x="0.0" y="230" width="275" height="65"/>
+                                        <rect key="frame" x="0.0" y="229" width="275" height="63"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
@@ -962,7 +962,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c6K-wg-8hR">
-                                <rect key="frame" x="24" y="442.5" width="327" height="64"/>
+                                <rect key="frame" x="24" y="440" width="327" height="64"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="faceid" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="YXX-dT-Ad9">
                                         <rect key="frame" x="16" y="16.5" width="32" height="30.5"/>
@@ -973,7 +973,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use Face ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dL1-a7-cL2">
-                                        <rect key="frame" x="64" y="21" width="182" height="22"/>
+                                        <rect key="frame" x="64" y="21.5" width="182" height="21"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1212,16 +1212,16 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </userDefinedRuntimeAttributes>
                                     </textView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="mDs-84-ceh">
-                                        <rect key="frame" x="16" y="178" width="343" height="42"/>
+                                        <rect key="frame" x="16" y="178" width="343" height="41"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This is 12-24 words separated by single spaces." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKL-Hk-QO9">
-                                                <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="16.5"/>
                                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt8"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <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="fbR-uh-yoe">
-                                                <rect key="frame" x="0.0" y="25" width="343" height="17"/>
+                                                <rect key="frame" x="0.0" y="24.5" width="343" height="16.5"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="BGAlert4"/>
                                                 <nil key="highlightedColor"/>
@@ -1229,7 +1229,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </subviews>
                                     </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mM7-0X-VxZ" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="16" y="236" width="343" height="34"/>
+                                        <rect key="frame" x="16" y="235" width="343" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="34" id="ysn-p1-seh"/>
                                         </constraints>
@@ -1256,7 +1256,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </connections>
                                     </button>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="hmv-tG-gdu">
-                                        <rect key="frame" x="16" y="286" width="343" height="315.5"/>
+                                        <rect key="frame" x="16" y="285" width="343" height="313.5"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afp-Os-zD6" userLabel="sizing palceholder">
                                                 <rect key="frame" x="0.0" y="0.0" width="343" height="1"/>
@@ -1300,7 +1300,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="gY4-aG-45T">
-                                                <rect key="frame" x="0.0" y="83.5" width="343" height="116"/>
+                                                <rect key="frame" x="0.0" y="83.5" width="343" height="115"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5lG-7q-0tV">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@@ -1310,13 +1310,13 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                         </constraints>
                                                     </view>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add an extra word to your recovery phrase" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZS2-2t-zA0">
-                                                        <rect key="frame" x="0.0" y="32" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="32" width="343" height="16.5"/>
                                                         <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="Extra word (passphrase)" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="bIm-xp-dm5" customClass="ValidatorTextField" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="57" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="56.5" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="yIs-gG-GgK"/>
@@ -1337,7 +1337,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                         </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="GCL-3n-6ex">
-                                                        <rect key="frame" x="0.0" y="99" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="98.5" width="343" height="16.5"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                         <color key="textColor" name="BGAlert4"/>
                                                         <nil key="highlightedColor"/>
@@ -1345,7 +1345,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="XjI-QQ-MR7">
-                                                <rect key="frame" x="0.0" y="199.5" width="343" height="116"/>
+                                                <rect key="frame" x="0.0" y="198.5" width="343" height="115"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xn4-yb-fch">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@@ -1355,13 +1355,13 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                         </constraints>
                                                     </view>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter the matching wallet address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FCi-Ze-gIe">
-                                                        <rect key="frame" x="0.0" y="32" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="32" width="343" height="16.5"/>
                                                         <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="Wallet Address" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="zN1-he-MJi" customClass="ValidatorTextField" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="57" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="56.5" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="86g-2c-39T"/>
@@ -1382,7 +1382,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                                         </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="FfJ-rw-6OW">
-                                                        <rect key="frame" x="0.0" y="99" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="98.5" width="343" height="16.5"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                         <color key="textColor" name="BGAlert4"/>
                                                         <nil key="highlightedColor"/>
@@ -1392,7 +1392,7 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </subviews>
                                     </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yu1-Z5-sbU" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="57" y="614.5" width="261" height="56"/>
+                                        <rect key="frame" x="57" y="611.5" width="261" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Lhh-uo-GYF"/>
                                         </constraints>
@@ -1414,13 +1414,13 @@ Passcode must have at least 3 unique digits, and no more than 3 sequential digit
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Import as Legacy Wallet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HJs-lP-kck">
-                                        <rect key="frame" x="32" y="694.5" width="230" height="17"/>
+                                        <rect key="frame" x="32" y="691.5" width="230" height="16.5"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt6"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="fMd-6F-U16">
-                                        <rect key="frame" x="294" y="687.5" width="51" height="31"/>
+                                        <rect key="frame" x="294" y="684.5" width="51" height="31"/>
                                     </switch>
                                 </subviews>
                                 <constraints>
@@ -1559,16 +1559,16 @@ 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="134" width="343" height="42"/>
+                                        <rect key="frame" x="16" y="134" width="343" height="41"/>
                                         <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"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="16.5"/>
                                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt8"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <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="isZ-rq-Vae">
-                                                <rect key="frame" x="0.0" y="25" width="343" height="17"/>
+                                                <rect key="frame" x="0.0" y="24.5" width="343" height="16.5"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="BGAlert4"/>
                                                 <nil key="highlightedColor"/>
@@ -1576,19 +1576,19 @@ 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="200" width="343" height="84"/>
+                                        <rect key="frame" x="16" y="199" width="343" height="83"/>
                                         <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"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="83"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Encrypted password (optional)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JVj-uF-RmS">
-                                                        <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="343" height="16.5"/>
                                                         <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="password" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="0W5-Sj-9Bh" customClass="ValidatorTextField" customModule="Kukai_Mobile" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="25" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="24.5" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="INR-W2-uNM"/>
@@ -1609,7 +1609,7 @@ You will not be able to transact in this wallet.</string>
                                                         </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="Mog-7K-ySg">
-                                                        <rect key="frame" x="0.0" y="67" width="343" height="17"/>
+                                                        <rect key="frame" x="0.0" y="66.5" width="343" height="16.5"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                         <color key="textColor" name="BGAlert4"/>
                                                         <nil key="highlightedColor"/>
@@ -1619,7 +1619,7 @@ You will not be able to transact in this wallet.</string>
                                         </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="308" width="261" height="56"/>
+                                        <rect key="frame" x="57" y="306" width="261" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Frm-hc-Bch"/>
                                         </constraints>
@@ -1879,7 +1879,7 @@ You will not be able to transact in this wallet.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                             </textField>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Incorrect passcode try again" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mRz-Mx-H8d">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Incorrect passcode try again" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mRz-Mx-H8d">
                                 <rect key="frame" x="76" y="270" width="223" height="17"/>
                                 <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="BGAlert4"/>
@@ -1933,16 +1933,16 @@ You will not be able to transact in this wallet.</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g6s-4i-43F">
-                                <rect key="frame" x="50" y="115.5" width="275" height="273.5"/>
+                                <rect key="frame" x="50" y="116" width="275" height="271"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back up Your Wallet" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sqa-zR-1Np">
-                                        <rect key="frame" x="-34" y="182" width="343" height="36"/>
+                                        <rect key="frame" x="-34" y="182" width="343" height="35"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="30"/>
                                         <color key="textColor" name="Txt2"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back up your wallet so you can recover it if you lose this device!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lR7-9j-Pin">
-                                        <rect key="frame" x="0.0" y="230" width="275" height="43.5"/>
+                                        <rect key="frame" x="0.0" y="229" width="275" height="42"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
@@ -1968,7 +1968,7 @@ You will not be able to transact in this wallet.</string>
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EIg-ad-QmA" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="45" y="443" width="285" height="56"/>
+                                <rect key="frame" x="45" y="441" width="285" height="56"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="56" id="3tn-0b-V3t"/>
                                 </constraints>
@@ -1991,7 +1991,7 @@ You will not be able to transact in this wallet.</string>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c29-Q0-bhN" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                <rect key="frame" x="45" y="523" width="285" height="56"/>
+                                <rect key="frame" x="45" y="521" width="285" height="56"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="56" id="jri-Gb-JOC"/>
                                 </constraints>
@@ -2068,7 +2068,7 @@ You will not be able to transact in this wallet.</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ygj-6K-jeD">
-                                <rect key="frame" x="16" y="110.5" width="343" height="446"/>
+                                <rect key="frame" x="16" y="112" width="343" height="443"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AlertKnockout" translatesAutoresizingMaskIntoConstraints="NO" id="AQF-go-UL4">
                                         <rect key="frame" x="132.5" y="50" width="78" height="78"/>
@@ -2085,19 +2085,19 @@ You will not be able to transact in this wallet.</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Putting a large amount of funds into a wallet on this device contains high security risks!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4JD-iI-y4A">
-                                        <rect key="frame" x="16" y="194" width="311" height="34"/>
+                                        <rect key="frame" x="16" y="194" width="311" height="33"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="TxtAlert4"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Install the Kukai Wallet App on a secure device before adding significant value." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RtV-Xp-KZP">
-                                        <rect key="frame" x="16" y="282" width="311" height="34"/>
+                                        <rect key="frame" x="16" y="280" width="311" height="33"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt6"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oOo-v0-m7J" customClass="CustomisableButton" customModule="Kukai_Mobile" customModuleProvider="target">
-                                        <rect key="frame" x="60" y="340" width="223" height="56"/>
+                                        <rect key="frame" x="60" y="337" width="223" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="vnJ-LK-ZRa"/>
                                         </constraints>
@@ -2111,7 +2111,7 @@ You will not be able to transact in this wallet.</string>
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RECOMMENDED" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Oq-ez-NIL">
-                                        <rect key="frame" x="16" y="252" width="311" height="22"/>
+                                        <rect key="frame" x="16" y="251" width="311" height="21"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="BGB-alt4"/>
                                         <nil key="highlightedColor"/>
@@ -2282,16 +2282,16 @@ 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="87" height="23.5"/>
+            <size key="intrinsicContentSize" width="87" height="22.5"/>
         </designable>
         <designable name="1VJ-Ye-1zl">
             <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="5t4-7b-ZSi">
-            <size key="intrinsicContentSize" width="211.5" height="38"/>
+            <size key="intrinsicContentSize" width="205.5" height="37.5"/>
         </designable>
         <designable name="EIg-ad-QmA">
-            <size key="intrinsicContentSize" width="141" height="38"/>
+            <size key="intrinsicContentSize" width="141.5" height="37.5"/>
         </designable>
         <designable name="EX4-MC-WXt">
             <size key="intrinsicContentSize" width="116.5" height="34.5"/>
@@ -2303,55 +2303,55 @@ HD Wallets allow you to create many accounts within the same wallet, all of them
             <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="Loj-qu-Rs8">
-            <size key="intrinsicContentSize" width="223.5" height="38"/>
+            <size key="intrinsicContentSize" width="218.5" height="37.5"/>
         </designable>
         <designable name="UlV-Fl-sF1">
-            <size key="intrinsicContentSize" width="119" height="38"/>
+            <size key="intrinsicContentSize" width="120" height="37.5"/>
         </designable>
         <designable name="XYC-YP-h5d">
-            <size key="intrinsicContentSize" width="227" height="38"/>
+            <size key="intrinsicContentSize" width="219" height="37.5"/>
         </designable>
         <designable name="ZcX-hG-7A3">
             <size key="intrinsicContentSize" width="44" height="34"/>
         </designable>
         <designable name="bIm-xp-dm5">
-            <size key="intrinsicContentSize" width="207" height="23.5"/>
+            <size key="intrinsicContentSize" width="203" height="22.5"/>
         </designable>
         <designable name="bRr-0r-cKe">
-            <size key="intrinsicContentSize" width="210.5" height="38"/>
+            <size key="intrinsicContentSize" width="202" height="37.5"/>
         </designable>
         <designable name="c29-Q0-bhN">
-            <size key="intrinsicContentSize" width="144" height="38"/>
+            <size key="intrinsicContentSize" width="143" height="37.5"/>
         </designable>
         <designable name="c2S-hk-v1m">
             <size key="intrinsicContentSize" width="24" height="24"/>
         </designable>
         <designable name="fpw-5A-t7A">
-            <size key="intrinsicContentSize" width="165.5" height="38"/>
+            <size key="intrinsicContentSize" width="160" height="37.5"/>
         </designable>
         <designable name="mM7-0X-VxZ">
-            <size key="intrinsicContentSize" width="124" height="36"/>
+            <size key="intrinsicContentSize" width="123.5" height="35"/>
         </designable>
         <designable name="oOo-v0-m7J">
-            <size key="intrinsicContentSize" width="109" height="38"/>
+            <size key="intrinsicContentSize" width="105" height="37.5"/>
         </designable>
         <designable name="oaz-ev-CPh">
-            <size key="intrinsicContentSize" width="87.5" height="38"/>
+            <size key="intrinsicContentSize" width="83" height="37.5"/>
         </designable>
         <designable name="rXX-Jd-YOc">
-            <size key="intrinsicContentSize" width="69" height="38"/>
+            <size key="intrinsicContentSize" width="66" height="37.5"/>
         </designable>
         <designable name="t5e-gN-uNl">
-            <size key="intrinsicContentSize" width="132" height="38"/>
+            <size key="intrinsicContentSize" width="127.5" height="37.5"/>
         </designable>
         <designable name="y7X-1i-Vte">
-            <size key="intrinsicContentSize" width="116.5" height="38"/>
+            <size key="intrinsicContentSize" width="113" height="37.5"/>
         </designable>
         <designable name="yu1-Z5-sbU">
-            <size key="intrinsicContentSize" width="87.5" height="38"/>
+            <size key="intrinsicContentSize" width="83" height="37.5"/>
         </designable>
         <designable name="zN1-he-MJi">
-            <size key="intrinsicContentSize" width="131" height="23.5"/>
+            <size key="intrinsicContentSize" width="128.5" height="22.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 2b0f6523..12d0091b 100644
--- a/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift	
@@ -131,10 +131,16 @@ extension ConfirmPasscodeViewController: ValidatorTextFieldDelegate {
 		updateDigitViewsWithLength(length: text.count)
 		
 		if validated {
-			if StorageService.validateTempPasscodeAndCommit(text) == true {
+			let storageResult = StorageService.validateTempPasscodeAndCommit(text)
+			
+			if storageResult == .success {
 				navigate()
+				
+			} else if storageResult == .biometricSetupError {
+				displayBiometricErrorAndReset()
+				
 			} else {
-				displayErrorAndReset()
+				displayValidationErrorAndReset()
 			}
 		} else if text == "" {
 			errorLabel.isHidden = true
@@ -145,8 +151,19 @@ extension ConfirmPasscodeViewController: ValidatorTextFieldDelegate {
 		
 	}
 	
-	func displayErrorAndReset() {
+	func displayValidationErrorAndReset() {
 		DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
+			self?.errorLabel.text = "Incorrect passcode try again"
+			self?.errorLabel.isHidden = false
+			self?.hiddenTextfield.text = ""
+			self?.updateDigitViewsWithLength(length: 0)
+		}
+	}
+	
+	func displayBiometricErrorAndReset() {
+		DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
+			let biometricTypeText = (CurrentDevice.biometricTypeSupported() == .touchID ? "Touch ID" : "Face ID")
+			self?.errorLabel.text = "Unknown error occured trying to use \(biometricTypeText). Please check your device settings and ensure its setup correctly"
 			self?.errorLabel.isHidden = false
 			self?.hiddenTextfield.text = ""
 			self?.updateDigitViewsWithLength(length: 0)
diff --git a/Kukai Mobile/Services/StorageService.swift b/Kukai Mobile/Services/StorageService.swift
index c919ef7d..41d2e894 100644
--- a/Kukai Mobile/Services/StorageService.swift	
+++ b/Kukai Mobile/Services/StorageService.swift	
@@ -35,6 +35,12 @@ public class StorageService {
 		public static let collectiblesGroupModeEnabled = "app.kukai.collectibles.group-mode"
 	}
 	
+	public enum PasscodeStoreResult {
+		case success
+		case failure
+		case biometricSetupError
+	}
+	
 	
 	
 	// MARK: - Cleanup
@@ -81,28 +87,39 @@ public class StorageService {
 	}
 	
 	/// Compare temporary passcode with user supplied passcode. If valid, commit passcode to real storage (overwritting if necessary)
-	public static func validateTempPasscodeAndCommit(_ passcode: String) -> Bool {
+	public static func validateTempPasscodeAndCommit(_ passcode: String) -> PasscodeStoreResult {
 		guard let hash = KeychainSwift().get(StorageService.KeychainKeys.tempPasscode) else {
-			return false
+			return .failure
 		}
 		
 		if Sodium.shared.pwHash.strVerify(hash: hash, passwd: passcode.bytes) {
 			return recordPasscode(passcode)
 		}
 		
-		return false
+		return .failure
 	}
 	
 	/// Delete previous record (if present) and create a new one with usePresence set
-	private static func recordPasscode(_ passcode: String) -> Bool {
+	private static func recordPasscode(_ passcode: String) -> PasscodeStoreResult {
 		guard let hash = Sodium.shared.pwHash.str(passwd: passcode.bytes, opsLimit: Sodium.shared.pwHash.OpsLimitInteractive, memLimit: Sodium.shared.pwHash.MemLimitInteractive) else {
-			return false
+			return .failure
 		}
 		
 		// Recording the passcode only once with biometic flag, means when biometric enabled, users are unable to enter the passcode on its own (i.e. tapping cancel to biometric)
 		// Because retrieving the passcode to do the verification requires succesful biometrics
 		// Instead it needs to be stored twice, once where it can be accessed without biometrics and one with to enable both cases
-		return recordPasscodeHash(hash, withUserPresence: true) && recordPasscodeHash(hash, withUserPresence: false)
+		let res1 = recordPasscodeHash(hash, withUserPresence: true)
+		let res2 = recordPasscodeHash(hash, withUserPresence: false)
+		
+		if res1 == false {
+			return .biometricSetupError
+			
+		} else if res1 && res2 {
+			return .success
+			
+		} else {
+			return .failure
+		}
 	}
 	
 	private static func recordPasscodeHash(_ hash: String, withUserPresence: Bool) -> Bool {

From e787c775e852c1971c36722bd6c18d19565a163e Mon Sep 17 00:00:00 2001
From: Anka <runner@Mac-1721556739933.local>
Date: Sun, 21 Jul 2024 10:46:08 +0000
Subject: [PATCH 2/2] bump version

---
 Kukai Mobile.xcodeproj/project.pbxproj | 6 +++---
 Kukai Mobile/Info.plist                | 2 +-
 Kukai MobileTests/Info.plist           | 2 +-
 Kukai MobileUITests/Info.plist         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Kukai Mobile.xcodeproj/project.pbxproj b/Kukai Mobile.xcodeproj/project.pbxproj
index 47c35ae7..344ba527 100644
--- a/Kukai Mobile.xcodeproj/project.pbxproj	
+++ b/Kukai Mobile.xcodeproj/project.pbxproj	
@@ -2430,7 +2430,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Kukai Mobile/Kukai Mobile.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
@@ -2470,7 +2470,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;
@@ -2656,7 +2656,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;
diff --git a/Kukai Mobile/Info.plist b/Kukai Mobile/Info.plist
index 97bdc004..45e8c74c 100644
--- a/Kukai Mobile/Info.plist	
+++ b/Kukai Mobile/Info.plist	
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kukai MobileTests/Info.plist b/Kukai MobileTests/Info.plist
index 7a750113..5206d19e 100644
--- a/Kukai MobileTests/Info.plist	
+++ b/Kukai MobileTests/Info.plist	
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 </dict>
 </plist>
diff --git a/Kukai MobileUITests/Info.plist b/Kukai MobileUITests/Info.plist
index 7a750113..5206d19e 100644
--- a/Kukai MobileUITests/Info.plist	
+++ b/Kukai MobileUITests/Info.plist	
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 </dict>
 </plist>