From 365a209ce61f0cd7e76f83ee59a9d01586028fe6 Mon Sep 17 00:00:00 2001
From: Simon Mcloughlin <simon.d.mcl@gmail.com>
Date: Tue, 8 Oct 2024 14:45:12 +0100
Subject: [PATCH 1/2] add embedded error display for connection errors on
 ledger device connected screen

---
 .../Base.lproj/Onboarding.storyboard          | 234 ++++++++++--------
 .../DeviceConnectedViewController.swift       |  17 +-
 2 files changed, 141 insertions(+), 110 deletions(-)

diff --git a/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard b/Kukai Mobile/Modules/Onboarding/Base.lproj/Onboarding.storyboard
index 099fe87e..f0b76ea1 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="47"/>
+                                <rect key="frame" x="16" y="135" width="343" height="48"/>
                                 <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="33"/>
+                                        <rect key="frame" x="24" y="264" width="327" height="34"/>
                                         <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="345" width="174" height="136"/>
+                                        <rect key="frame" x="100.5" y="346" 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="505" width="185" height="56"/>
+                                        <rect key="frame" x="95" y="506" 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="577" width="327" height="33"/>
+                                        <rect key="frame" x="24" y="578" width="327" height="34"/>
                                         <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="302"/>
+                                        <rect key="frame" x="0.0" y="24" width="375" height="303"/>
                                         <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="28"/>
+                                                <rect key="frame" x="32" y="0.0" width="311" height="29"/>
                                                 <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="44" width="116.5" height="34"/>
+                                                <rect key="frame" x="132.5" y="45" width="110.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="102" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="103" 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="174" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="175" 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="246" width="311" height="56"/>
+                                                <rect key="frame" x="32" y="247" 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="342" width="13" height="16.5"/>
+                                        <rect key="frame" x="181" y="343" width="13.5" height="17"/>
                                         <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="350" width="145" height="1"/>
+                                        <rect key="frame" x="32" y="351" 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" y="350" width="145" height="1"/>
+                                        <rect key="frame" x="198.5" y="351" width="144.5" 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="370.5" width="311" height="56"/>
+                                        <rect key="frame" x="32" y="372" 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="209" width="375" height="157"/>
+                                <rect key="frame" x="0.0" y="208.5" width="375" height="159"/>
                                 <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="35"/>
+                                        <rect key="frame" x="16" y="89" width="343" height="36"/>
                                         <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="136" width="343" height="21"/>
+                                        <rect key="frame" x="16" y="137" width="343" height="22"/>
                                         <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="116" width="275" height="292"/>
+                                <rect key="frame" x="50" y="115.5" width="275" height="295"/>
                                 <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="35"/>
+                                        <rect key="frame" x="0.0" y="182" width="275" height="36"/>
                                         <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="229" width="275" height="63"/>
+                                        <rect key="frame" x="0.0" y="230" width="275" height="65"/>
                                         <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="440" width="327" height="64"/>
+                                <rect key="frame" x="24" y="442.5" 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.5" width="182" height="21"/>
+                                        <rect key="frame" x="64" y="21" width="182" height="22"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -1213,16 +1213,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="41"/>
+                                        <rect key="frame" x="16" y="178" width="343" height="42"/>
                                         <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="16.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
                                                 <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="24.5" width="343" height="16.5"/>
+                                                <rect key="frame" x="0.0" y="25" width="343" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="BGAlert4"/>
                                                 <nil key="highlightedColor"/>
@@ -1230,7 +1230,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="235" width="343" height="34"/>
+                                        <rect key="frame" x="16" y="236" width="343" height="34"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="34" id="ysn-p1-seh"/>
                                         </constraints>
@@ -1257,7 +1257,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="285" width="343" height="313.5"/>
+                                        <rect key="frame" x="16" y="286" width="343" height="315.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"/>
@@ -1301,7 +1301,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="115"/>
+                                                <rect key="frame" x="0.0" y="83.5" width="343" height="116"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5lG-7q-0tV">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@@ -1311,13 +1311,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="16.5"/>
+                                                        <rect key="frame" x="0.0" y="32" 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="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="56.5" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="57" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="yIs-gG-GgK"/>
@@ -1338,7 +1338,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="98.5" width="343" height="16.5"/>
+                                                        <rect key="frame" x="0.0" y="99" width="343" height="17"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                         <color key="textColor" name="BGAlert4"/>
                                                         <nil key="highlightedColor"/>
@@ -1346,7 +1346,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="198.5" width="343" height="115"/>
+                                                <rect key="frame" x="0.0" y="199.5" width="343" height="116"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xn4-yb-fch">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="24"/>
@@ -1356,13 +1356,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="16.5"/>
+                                                        <rect key="frame" x="0.0" y="32" 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="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="56.5" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="57" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="86g-2c-39T"/>
@@ -1383,7 +1383,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="98.5" width="343" height="16.5"/>
+                                                        <rect key="frame" x="0.0" y="99" width="343" height="17"/>
                                                         <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                         <color key="textColor" name="BGAlert4"/>
                                                         <nil key="highlightedColor"/>
@@ -1393,7 +1393,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="611.5" width="261" height="56"/>
+                                        <rect key="frame" x="57" y="614.5" width="261" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="Lhh-uo-GYF"/>
                                         </constraints>
@@ -1415,13 +1415,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="691.5" width="230" height="16.5"/>
+                                        <rect key="frame" x="32" y="694.5" width="230" height="17"/>
                                         <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="684.5" width="51" height="31"/>
+                                        <rect key="frame" x="294" y="687.5" width="51" height="31"/>
                                     </switch>
                                 </subviews>
                                 <constraints>
@@ -1560,16 +1560,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="41"/>
+                                        <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="16.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
                                                 <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="24.5" width="343" height="16.5"/>
+                                                <rect key="frame" x="0.0" y="25" width="343" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Regular" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="BGAlert4"/>
                                                 <nil key="highlightedColor"/>
@@ -1577,19 +1577,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="199" width="343" height="83"/>
+                                        <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="83"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="343" height="84"/>
                                                 <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="16.5"/>
+                                                        <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="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="24.5" width="343" height="34"/>
+                                                        <rect key="frame" x="0.0" y="25" width="343" height="34"/>
                                                         <color key="backgroundColor" name="BG4"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="34" id="INR-W2-uNM"/>
@@ -1610,7 +1610,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="66.5" width="343" height="16.5"/>
+                                                        <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"/>
@@ -1620,7 +1620,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="306" 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>
@@ -1775,7 +1775,7 @@ You will not be able to transact in this wallet.</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make sure you have Bluetooth enabled and your Ledger Nano X is unlocked" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="crb-15-1PS">
-                                <rect key="frame" x="16" y="72" width="343" height="33"/>
+                                <rect key="frame" x="16" y="72" width="343" height="34"/>
                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
@@ -1879,7 +1879,7 @@ You will not be able to transact in this wallet.</string>
                                 </constraints>
                             </view>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Spinner" translatesAutoresizingMaskIntoConstraints="NO" id="U2k-Nc-Xad">
-                                <rect key="frame" x="165" y="129" width="45" height="45"/>
+                                <rect key="frame" x="165" y="130" width="45" height="45"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="45" id="8Ya-xb-fCd"/>
                                     <constraint firstAttribute="width" constant="45" id="r3r-39-RAz"/>
@@ -1908,7 +1908,7 @@ You will not be able to transact in this wallet.</string>
                                 </connections>
                             </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="r4H-ZR-0Ux">
-                                <rect key="frame" x="16" y="190" width="343" height="373"/>
+                                <rect key="frame" x="16" y="191" width="343" height="372"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="LedgerDeviceCell" rowHeight="65" id="hQV-ze-uKD" customClass="LedgerDeviceCell" customModule="Kukai_Mobile" customModuleProvider="target">
@@ -1922,16 +1922,16 @@ You will not be able to transact in this wallet.</string>
                                                     <rect key="frame" x="16" y="2" width="311" height="61"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="x9X-Lr-Ybp">
-                                                            <rect key="frame" x="8" y="11" width="235" height="39.5"/>
+                                                            <rect key="frame" x="8" y="10.5" width="235" height="40.5"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;title&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qyp-dG-jbM">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="235" height="19"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="&lt;title&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qyp-dG-jbM">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="235" height="19.5"/>
                                                                     <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="16"/>
                                                                     <color key="textColor" name="Txt2"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="&lt;subtitle&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u64-RF-MtO">
-                                                                    <rect key="frame" x="0.0" y="23" width="235" height="16.5"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" ambiguous="YES" text="&lt;subtitle&gt;" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u64-RF-MtO">
+                                                                    <rect key="frame" x="0.0" y="23.5" width="235" height="17"/>
                                                                     <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="14"/>
                                                                     <color key="textColor" name="Txt10"/>
                                                                     <nil key="highlightedColor"/>
@@ -2017,13 +2017,13 @@ You will not be able to transact in this wallet.</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make sure your Ledger is unlocked and the Tezos app is installed and open" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0c3-xC-QSP">
-                                <rect key="frame" x="16" y="88" width="343" height="33"/>
+                                <rect key="frame" x="16" y="88" width="343" height="34"/>
                                 <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                 <color key="textColor" name="Txt6"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gp8-Mj-qGa">
-                                <rect key="frame" x="77.5" y="157" width="220" height="76"/>
+                                <rect key="frame" x="77.5" y="158" width="220" height="76"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vBM-De-pMx">
                                         <rect key="frame" x="0.0" y="0.0" width="76" height="76"/>
@@ -2121,14 +2121,14 @@ You will not be able to transact in this wallet.</string>
                                 </constraints>
                             </view>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Spinner" translatesAutoresizingMaskIntoConstraints="NO" id="Rgy-WU-V4j">
-                                <rect key="frame" x="165" y="281" width="45" height="45"/>
+                                <rect key="frame" x="165" y="282" width="45" height="45"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="45" id="APs-Gm-zax"/>
                                     <constraint firstAttribute="width" constant="45" id="GWc-7J-LRo"/>
                                 </constraints>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="KukaiWheel" translatesAutoresizingMaskIntoConstraints="NO" id="8Fg-Sd-sxA">
-                                <rect key="frame" x="177.5" y="293.5" width="20" height="20"/>
+                                <rect key="frame" x="177.5" y="294.5" width="20" height="20"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="YDa-fi-s8u"/>
@@ -2158,49 +2158,74 @@ You will not be able to transact in this wallet.</string>
                                 </connections>
                             </button>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Kbv-U5-ljA">
-                                <rect key="frame" x="16" y="350" width="343" height="174.5"/>
+                                <rect key="frame" x="16" y="351" width="343" height="316.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Checking device ..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="q7E-Ta-CHG">
-                                        <rect key="frame" x="0.0" y="0.0" width="343" height="16.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="343" height="17"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="14"/>
                                         <color key="textColor" name="Txt6"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="&lt;address&gt;" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xey-KN-Z2e">
-                                        <rect key="frame" x="0.0" y="24.5" width="343" height="19"/>
+                                        <rect key="frame" x="0.0" y="25" width="343" height="19.5"/>
                                         <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="16"/>
                                         <color key="textColor" name="Txt10"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Rb1-Z8-u5g">
-                                        <rect key="frame" x="0.0" y="51.5" width="343" height="123"/>
+                                        <rect key="frame" x="0.0" y="52.5" width="343" height="125.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Importing Wallet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4cy-zG-2MQ">
-                                                <rect key="frame" x="98.5" y="0.0" width="146" height="23.5"/>
+                                                <rect key="frame" x="94" y="0.0" width="155" height="24"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="20"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scanning for accounts:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zEL-Xx-bx7">
-                                                <rect key="frame" x="89" y="31.5" width="165.5" height="19"/>
+                                                <rect key="frame" x="87.5" y="32" width="168" height="19.5"/>
                                                 <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="16"/>
                                                 <color key="textColor" name="Txt12"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&lt;number&gt;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ht1-5K-bzW">
-                                                <rect key="frame" x="93" y="58.5" width="157.5" height="40"/>
+                                                <rect key="frame" x="89.5" y="59.5" width="164.5" height="41"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="34"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="found" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2kv-0p-NZA">
-                                                <rect key="frame" x="153.5" y="106.5" width="36.5" height="16.5"/>
+                                                <rect key="frame" x="152.5" y="108.5" width="38" height="17"/>
                                                 <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="14"/>
                                                 <color key="textColor" name="Txt12"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
                                     </stackView>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Fti-TE-AJe">
+                                        <rect key="frame" x="0.0" y="186" width="343" height="130.5"/>
+                                        <subviews>
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AlertKnockout" translatesAutoresizingMaskIntoConstraints="NO" id="dbZ-Bc-bkX">
+                                                <rect key="frame" x="144.5" y="0.0" width="54" height="54"/>
+                                                <color key="tintColor" name="TxtAlert4"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="54" id="ZZh-cJ-DAP"/>
+                                                    <constraint firstAttribute="width" constant="54" id="joB-Lf-YLW"/>
+                                                </constraints>
+                                            </imageView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CONNECTION FAILED" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Im-zt-kUM">
+                                                <rect key="frame" x="77.5" y="62" width="188" height="22"/>
+                                                <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
+                                                <color key="textColor" name="TxtAlert4"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Make sure device is unlocked and Tezos app open." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZ3-eR-mre">
+                                                <rect key="frame" x="26" y="92" width="291" height="38.5"/>
+                                                <fontDescription key="fontDescription" name="Figtree-SemiBold" family="Figtree" pointSize="16"/>
+                                                <color key="textColor" name="TxtBtnSec1"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                    </stackView>
                                 </subviews>
                             </stackView>
                         </subviews>
@@ -2229,6 +2254,7 @@ You will not be able to transact in this wallet.</string>
                         <outlet property="accountScanStackView" destination="Rb1-Z8-u5g" id="hXG-av-Eg2"/>
                         <outlet property="actionButton" destination="gnB-P3-R0z" id="dbr-bn-mLo"/>
                         <outlet property="addressVerificationLabel" destination="Xey-KN-Z2e" id="dd1-rr-ZVM"/>
+                        <outlet property="errorStackView" destination="Fti-TE-AJe" id="a9o-i5-eBL"/>
                         <outlet property="instructionLabel" destination="q7E-Ta-CHG" id="m8u-qF-Mwy"/>
                         <outlet property="numberLabel" destination="ht1-5K-bzW" id="N8G-in-fSa"/>
                         <outlet property="spinnerImage" destination="Rgy-WU-V4j" id="H5n-ks-SFj"/>
@@ -2407,16 +2433,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="116" width="275" height="271"/>
+                                <rect key="frame" x="50" y="115.5" width="275" height="273.5"/>
                                 <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="35"/>
+                                        <rect key="frame" x="-34" y="182" width="343" height="36"/>
                                         <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="229" width="275" height="42"/>
+                                        <rect key="frame" x="0.0" y="230" width="275" height="43.5"/>
                                         <fontDescription key="fontDescription" name="Figtree-Medium" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="Txt8"/>
                                         <nil key="highlightedColor"/>
@@ -2442,7 +2468,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="441" width="285" height="56"/>
+                                <rect key="frame" x="45" y="443" width="285" height="56"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="56" id="3tn-0b-V3t"/>
                                 </constraints>
@@ -2465,7 +2491,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="521" width="285" height="56"/>
+                                <rect key="frame" x="45" y="523" width="285" height="56"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="56" id="jri-Gb-JOC"/>
                                 </constraints>
@@ -2542,7 +2568,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="112" width="343" height="443"/>
+                                <rect key="frame" x="16" y="110.5" width="343" height="446"/>
                                 <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"/>
@@ -2559,19 +2585,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="33"/>
+                                        <rect key="frame" x="16" y="194" width="311" height="34"/>
                                         <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="280" width="311" height="33"/>
+                                        <rect key="frame" x="16" y="282" width="311" height="34"/>
                                         <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="337" width="223" height="56"/>
+                                        <rect key="frame" x="60" y="340" width="223" height="56"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="56" id="vnJ-LK-ZRa"/>
                                         </constraints>
@@ -2585,7 +2611,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="251" width="311" height="21"/>
+                                        <rect key="frame" x="16" y="252" width="311" height="22"/>
                                         <fontDescription key="fontDescription" name="Figtree-Bold" family="Figtree" pointSize="18"/>
                                         <color key="textColor" name="BGB-alt4"/>
                                         <nil key="highlightedColor"/>
@@ -2756,82 +2782,82 @@ 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="22.5"/>
+            <size key="intrinsicContentSize" width="79" height="23.5"/>
         </designable>
         <designable name="1VJ-Ye-1zl">
-            <size key="intrinsicContentSize" width="44" height="34"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="1zn-2G-xlf">
-            <size key="intrinsicContentSize" width="168" height="37.5"/>
+            <size key="intrinsicContentSize" width="173.5" height="38"/>
         </designable>
         <designable name="5t4-7b-ZSi">
-            <size key="intrinsicContentSize" width="205.5" height="37.5"/>
+            <size key="intrinsicContentSize" width="191.5" height="38"/>
         </designable>
         <designable name="EIg-ad-QmA">
-            <size key="intrinsicContentSize" width="141.5" height="37.5"/>
+            <size key="intrinsicContentSize" width="141" height="38"/>
         </designable>
         <designable name="EX4-MC-WXt">
-            <size key="intrinsicContentSize" width="116.5" height="34.5"/>
+            <size key="intrinsicContentSize" width="110.5" height="34.5"/>
         </designable>
         <designable name="FWv-hS-Trj">
-            <size key="intrinsicContentSize" width="46" height="36"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="J2v-BG-JDc">
-            <size key="intrinsicContentSize" width="44" height="34"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="Loj-qu-Rs8">
-            <size key="intrinsicContentSize" width="218.5" height="37.5"/>
+            <size key="intrinsicContentSize" width="203.5" height="38"/>
         </designable>
         <designable name="UlV-Fl-sF1">
-            <size key="intrinsicContentSize" width="120" height="37.5"/>
+            <size key="intrinsicContentSize" width="119" height="38"/>
         </designable>
         <designable name="XYC-YP-h5d">
-            <size key="intrinsicContentSize" width="219" height="37.5"/>
+            <size key="intrinsicContentSize" width="227" height="38"/>
         </designable>
         <designable name="ZcX-hG-7A3">
-            <size key="intrinsicContentSize" width="44" height="34"/>
+            <size key="intrinsicContentSize" width="24" height="14"/>
         </designable>
         <designable name="bIm-xp-dm5">
-            <size key="intrinsicContentSize" width="203" height="22.5"/>
+            <size key="intrinsicContentSize" width="199" height="23.5"/>
         </designable>
         <designable name="bRr-0r-cKe">
-            <size key="intrinsicContentSize" width="202" height="37.5"/>
+            <size key="intrinsicContentSize" width="210.5" height="38"/>
         </designable>
         <designable name="c29-Q0-bhN">
-            <size key="intrinsicContentSize" width="143" height="37.5"/>
+            <size key="intrinsicContentSize" width="144" height="38"/>
         </designable>
         <designable name="c2S-hk-v1m">
-            <size key="intrinsicContentSize" width="24" height="24"/>
+            <size key="intrinsicContentSize" width="30" height="34"/>
         </designable>
         <designable name="fpw-5A-t7A">
-            <size key="intrinsicContentSize" width="160" height="37.5"/>
+            <size key="intrinsicContentSize" width="165.5" height="38"/>
         </designable>
         <designable name="gnB-P3-R0z">
-            <size key="intrinsicContentSize" width="163" height="37.5"/>
+            <size key="intrinsicContentSize" width="170" height="38"/>
         </designable>
         <designable name="mM7-0X-VxZ">
-            <size key="intrinsicContentSize" width="123.5" height="35"/>
+            <size key="intrinsicContentSize" width="106" height="36"/>
         </designable>
         <designable name="oOo-v0-m7J">
-            <size key="intrinsicContentSize" width="105" height="37.5"/>
+            <size key="intrinsicContentSize" width="109" height="38"/>
         </designable>
         <designable name="oaz-ev-CPh">
-            <size key="intrinsicContentSize" width="83" height="37.5"/>
+            <size key="intrinsicContentSize" width="87.5" height="38"/>
         </designable>
         <designable name="rXX-Jd-YOc">
-            <size key="intrinsicContentSize" width="66" height="37.5"/>
+            <size key="intrinsicContentSize" width="69" height="38"/>
         </designable>
         <designable name="t5e-gN-uNl">
-            <size key="intrinsicContentSize" width="127.5" height="37.5"/>
+            <size key="intrinsicContentSize" width="132" height="38"/>
         </designable>
         <designable name="y7X-1i-Vte">
-            <size key="intrinsicContentSize" width="113" height="37.5"/>
+            <size key="intrinsicContentSize" width="116.5" height="38"/>
         </designable>
         <designable name="yu1-Z5-sbU">
-            <size key="intrinsicContentSize" width="83" height="37.5"/>
+            <size key="intrinsicContentSize" width="87.5" height="38"/>
         </designable>
         <designable name="zN1-he-MJi">
-            <size key="intrinsicContentSize" width="128.5" height="22.5"/>
+            <size key="intrinsicContentSize" width="123" height="23.5"/>
         </designable>
         <designable name="zTe-bp-NGr">
             <size key="intrinsicContentSize" width="32" height="34"/>
diff --git a/Kukai Mobile/Modules/Onboarding/DeviceConnectedViewController.swift b/Kukai Mobile/Modules/Onboarding/DeviceConnectedViewController.swift
index 5afa25e6..ab57abe9 100644
--- a/Kukai Mobile/Modules/Onboarding/DeviceConnectedViewController.swift	
+++ b/Kukai Mobile/Modules/Onboarding/DeviceConnectedViewController.swift	
@@ -16,6 +16,7 @@ class DeviceConnectedViewController: UIViewController {
 	@IBOutlet weak var instructionLabel: UILabel!
 	@IBOutlet weak var addressVerificationLabel: UILabel!
 	@IBOutlet weak var accountScanStackView: UIStackView!
+	@IBOutlet weak var errorStackView: UIStackView!
 	@IBOutlet weak var numberLabel: UILabel!
 	@IBOutlet weak var actionButton: CustomisableButton!
 	
@@ -32,6 +33,7 @@ class DeviceConnectedViewController: UIViewController {
 		numberLabel.text = "0"
 		actionButton.isHidden = true
 		actionButton.setTitle("Try Again", for: .normal)
+		errorStackView.isHidden = true
     }
 	
 	override func viewWillAppear(_ animated: Bool) {
@@ -57,22 +59,25 @@ class DeviceConnectedViewController: UIViewController {
 		checkConnected()
 	}
 	
-	private func hideAllInstrunctionUI() {
+	private func hideAllInstrunctionUI(showConnectionError: Bool) {
 		instructionLabel.isHidden = true
 		addressVerificationLabel.isHidden = true
 		accountScanStackView.isHidden = true
 		
 		actionButton.setTitle("Try again", for: .normal)
 		actionButton.isHidden = false
+		
+		errorStackView.isHidden = !showConnectionError
 	}
 	
 	private func checkConnected() {
 		self.instructionLabel.text = "Checking device ..."
 		self.instructionLabel.isHidden = false
+		self.errorStackView.isHidden = true
+		self.actionButton.isHidden = true
 		
 		guard let chosenUUID = TransactionService.shared.ledgerSetupData.selectedUUID else {
-			self.windowError(withTitle: "error".localized(), description: "Unable to locate selected device")
-			self.navigationController?.popViewController(animated: true)
+			hideAllInstrunctionUI(showConnectionError: true)
 			return
 		}
 		
@@ -106,7 +111,7 @@ class DeviceConnectedViewController: UIViewController {
 			}
 			.sink(onError: { [weak self] error in
 				self?.windowError(withTitle: "error".localized(), description: "Ledger device returned an error. Please verify that it has been setup with the Ledger Live app, the Tezos app is installed, and setup.\n\n\(error)")
-				self?.hideAllInstrunctionUI()
+				self?.hideAllInstrunctionUI(showConnectionError: true)
 				
 			}, onSuccess: { [weak self] addressObj2 in
 				self?.address = addressObj2.address
@@ -122,7 +127,7 @@ class DeviceConnectedViewController: UIViewController {
 			  let publicKey = self.publicKey,
 			  let wallet = LedgerWallet(address: address, publicKey: publicKey, derivationPath: HD.defaultDerivationPath, curve: .ed25519, ledgerUUID: uuid) else {
 			self.windowError(withTitle: "error".localized(), description: "Unable to create new wallet. Please try again")
-			self.hideAllInstrunctionUI()
+			self.hideAllInstrunctionUI(showConnectionError: false)
 			return
 		}
 		
@@ -139,7 +144,7 @@ class DeviceConnectedViewController: UIViewController {
 			
 			if let eString = errorString {
 				DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
-					self?.hideAllInstrunctionUI()
+					self?.hideAllInstrunctionUI(showConnectionError: false)
 					self?.windowError(withTitle: "error".localized(), description: eString)
 				}
 			} else {

From 3b35e58c2bb8b1618b6fef8be62809465fbba7ae Mon Sep 17 00:00:00 2001
From: Simon Mcloughlin <simon.d.mcl@gmail.com>
Date: Wed, 16 Oct 2024 11:56:07 +0100
Subject: [PATCH 2/2] add associated domain

---
 Kukai Mobile/Kukai Mobile.entitlements | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Kukai Mobile/Kukai Mobile.entitlements b/Kukai Mobile/Kukai Mobile.entitlements
index 91477e97..8ed0fbad 100644
--- a/Kukai Mobile/Kukai Mobile.entitlements	
+++ b/Kukai Mobile/Kukai Mobile.entitlements	
@@ -6,6 +6,10 @@
 	<array>
 		<string>Default</string>
 	</array>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:connect.kukai.app</string>
+	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.app.kukai.mobile</string>