From a865d3b574469dd1d49adebe829bdc53bba04b9a Mon Sep 17 00:00:00 2001
From: macsleven <abubakars29@yahoo.com>
Date: Sun, 31 May 2020 19:15:45 +0100
Subject: [PATCH 1/4] Rename default account to language translation and fix UI
 on wallet migration,delete watch only message and smaller screens

---
 Decred Wallet.xcodeproj/project.pbxproj       |  2 +-
 Decred Wallet/Constants/Constants.swift       |  2 ++
 .../StartScreenViewController.swift           | 11 +++++-
 .../Custom Dialogs/CustomDialogs.storyboard   |  4 +--
 .../More/More Features/About/About.storyboard | 10 +++---
 .../Features/Security/Security.storyboard     | 34 +++++++++----------
 .../RestoreExistingWalletViewController.swift |  4 +++
 .../Wallets/WalletInfoTableViewCell.xib       |  2 +-
 .../WalletSettingsViewController.swift        |  3 +-
 .../Wallets/WalletsViewController.swift       | 16 +++++----
 Decred Wallet/Utils/LocalizedStrings.swift    |  3 ++
 Decred Wallet/Utils/Utils.swift               | 10 ++++++
 Decred Wallet/en.lproj/Localizable.strings    |  3 ++
 Decred Wallet/es.lproj/Localizable.strings    |  3 ++
 Decred Wallet/pl.lproj/Localizable.strings    |  3 ++
 Decred Wallet/pt-BR.lproj/Localizable.strings |  3 ++
 Decred Wallet/ru-RU.lproj/Localizable.strings |  3 ++
 Decred Wallet/vi.lproj/Localizable.strings    |  3 ++
 .../zh-Hans.lproj/Localizable.strings         |  3 ++
 19 files changed, 88 insertions(+), 34 deletions(-)

diff --git a/Decred Wallet.xcodeproj/project.pbxproj b/Decred Wallet.xcodeproj/project.pbxproj
index c1cb85ab8..e322060d2 100644
--- a/Decred Wallet.xcodeproj/project.pbxproj	
+++ b/Decred Wallet.xcodeproj/project.pbxproj	
@@ -834,8 +834,8 @@
 				DD493C01247654BC00C0D772 /* WatchOnlyWalletInfoTableViewCell.swift */,
 				DD493C05247654BC00C0D772 /* WatchOnlyWalletTableViewCell.xib */,
 				DD493BFF247654BC00C0D772 /* WatchOnlyWalletInfoTableViewCell.xib */,
-				B3E727C523DD4ABF003B06B4 /* WalletAccountTableViewCell.xib */,
 				DD493C03247654BC00C0D772 /* WatchOnlyWalletTableViewCell.swift */,
+				B3E727C523DD4ABF003B06B4 /* WalletAccountTableViewCell.xib */,
 				B3E727C923DD4AE7003B06B4 /* WalletAccountTableViewCell.swift */,
 				B3B9432823E4D0B30088EC3E /* WalletSettingsViewController.swift */,
 				B3D474DE23E55B5D00B6E305 /* WalletSettings.swift */,
diff --git a/Decred Wallet/Constants/Constants.swift b/Decred Wallet/Constants/Constants.swift
index c70ad0881..c16bdcec7 100644
--- a/Decred Wallet/Constants/Constants.swift	
+++ b/Decred Wallet/Constants/Constants.swift	
@@ -20,9 +20,11 @@ struct GlobalConstants {
         static let LEGACY_TESTNET_HD_PATH = "m / 44' / 11' /"
         static let MAINNET_HD_PATH = "m / 44' / 42' /"
         static let LEGACY_MAINNET_HD_PATH = "m / 44' / 20' /"
+        static let DEFAULT = "default"
     }
     
     struct Wallet {
         static let defaultRequiredConfirmations: Int32 = 2
+        static let DEFAULT_ACCOUNT_NUMBER = 0
     }
 }
diff --git a/Decred Wallet/Features/App Launch/StartScreenViewController.swift b/Decred Wallet/Features/App Launch/StartScreenViewController.swift
index 614158c99..d6d4fe51e 100644
--- a/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
+++ b/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
@@ -43,7 +43,11 @@ class StartScreenViewController: UIViewController, CAAnimationDelegate {
             print("init multiwallet error: \(initError!.localizedDescription)")
         }
         
-        if WalletLoader.shared.oneOrMoreWalletsExist {
+        if SingleToMultiWalletMigration.migrationNeeded {
+            self.loadingLabel.text = LocalizedStrings.migratingWallet
+            self.animationDurationSeconds = 5
+            
+        } else if WalletLoader.shared.oneOrMoreWalletsExist {
             self.loadingLabel.text = LocalizedStrings.openingWallet
             self.animationDurationSeconds = 5
         }
@@ -143,6 +147,11 @@ class StartScreenViewController: UIViewController, CAAnimationDelegate {
                     if createWalletError != nil {
                         completion?.displayError(errorMessage: createWalletError!.localizedDescription)
                     } else {
+                        
+                        if let wallet = WalletLoader.shared.wallets.filter({ $0.name == LocalizedStrings.myWallet}).first {
+                            Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                        }
+                        
                         completion?.dismissDialog()
                         NavigationMenuTabBarController.setupMenuAndLaunchApp(isNewWallet: true)
                     }
diff --git a/Decred Wallet/Features/Custom Dialogs/CustomDialogs.storyboard b/Decred Wallet/Features/Custom Dialogs/CustomDialogs.storyboard
index dc3c76f59..f4172e5f0 100644
--- a/Decred Wallet/Features/Custom Dialogs/CustomDialogs.storyboard	
+++ b/Decred Wallet/Features/Custom Dialogs/CustomDialogs.storyboard	
@@ -164,7 +164,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PES-gD-iwp" customClass="RoundedView" customModule="Decred_Wallet" customModuleProvider="target">
                                 <rect key="frame" x="40" y="372" width="334" height="162"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remove wallet from device?" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DmN-2k-s0e">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remove wallet from device?" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="DmN-2k-s0e">
                                         <rect key="frame" x="24" y="20" width="286" height="25.5"/>
                                         <fontDescription key="fontDescription" name="SourceSansPro-SemiBold" family="Source Sans Pro" pointSize="20"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -558,7 +558,7 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jix-Yz-rr0">
                                 <rect key="frame" x="0.0" y="606" width="414" height="290"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Create watch only wallet" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CPF-2i-5k9">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Create watch only wallet" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="CPF-2i-5k9">
                                         <rect key="frame" x="24" y="24" width="366" height="25.5"/>
                                         <fontDescription key="fontDescription" name="SourceSansPro-SemiBold" family="Source Sans Pro" pointSize="20"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Decred Wallet/Features/More/More Features/About/About.storyboard b/Decred Wallet/Features/More/More Features/About/About.storyboard
index d6ad0668b..496977ecc 100644
--- a/Decred Wallet/Features/More/More Features/About/About.storyboard	
+++ b/Decred Wallet/Features/More/More Features/About/About.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -155,13 +155,13 @@
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gB-oy-pZx">
                                 <rect key="frame" x="4" y="0.0" width="406" height="896"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <string key="text">ISC License
+                                <mutableString key="text">ISC License
 
-Copyright (c) 2018-2019 The Decred developers
+Copyright (c) 2018-2020 The Decred developers
 
 Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</string>
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</mutableString>
                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
diff --git a/Decred Wallet/Features/Security/Security.storyboard b/Decred Wallet/Features/Security/Security.storyboard
index 12e831774..9c8b41c3d 100644
--- a/Decred Wallet/Features/Security/Security.storyboard	
+++ b/Decred Wallet/Features/Security/Security.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -158,15 +158,15 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VIK-gW-7wr">
-                                <rect key="frame" x="0.0" y="-38" width="414" height="438"/>
+                                <rect key="frame" x="0.0" y="-28" width="414" height="428"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="oLB-RB-SsP">
-                                        <rect key="frame" x="24" y="20" width="366" height="418"/>
+                                        <rect key="frame" x="24" y="0.0" width="366" height="428"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0Ms-qN-4pQ">
                                                 <rect key="frame" x="0.0" y="0.0" width="366" height="73.5"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock with startup password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NoT-EV-WHd">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock with startup password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="13" translatesAutoresizingMaskIntoConstraints="NO" id="NoT-EV-WHd">
                                                         <rect key="frame" x="0.0" y="24" width="366" height="33.5"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-SemiBold" family="Source Sans Pro" pointSize="20"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -192,9 +192,9 @@
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nLe-fV-hfu">
-                                                <rect key="frame" x="0.0" y="73.5" width="366" height="104.5"/>
+                                                <rect key="frame" x="0.0" y="83.5" width="366" height="104.5"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zvo-QN-AT7">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="zvo-QN-AT7">
                                                         <rect key="frame" x="0.0" y="0.0" width="366" height="80.5"/>
                                                         <string key="text">The restoration process to discover your accounts was interrupted in the last sync. 

 Unlock the wallet to resume the process.</string>
@@ -214,8 +214,8 @@ Unlock the wallet to resume the process.</string>
                                                     <constraint firstAttribute="bottom" secondItem="zvo-QN-AT7" secondAttribute="bottom" constant="24" id="oie-JR-9Kq"/>
                                                 </constraints>
                                             </view>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NMs-Wa-sVv" customClass="FloatingPlaceholderTextField" customModule="Decred_Wallet" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="178" width="366" height="48"/>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="NMs-Wa-sVv" customClass="FloatingPlaceholderTextField" customModule="Decred_Wallet" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="188" width="366" height="48"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="48" id="0es-Dm-pTI"/>
                                                 </constraints>
@@ -223,7 +223,7 @@ Unlock the wallet to resume the process.</string>
                                                 <textInputTraits key="textInputTraits" textContentType="password"/>
                                             </textField>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ewR-2e-MEM">
-                                                <rect key="frame" x="0.0" y="226" width="366" height="16"/>
+                                                <rect key="frame" x="0.0" y="236" width="366" height="16"/>
                                                 <subviews>
                                                     <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Wrong startup password. Please try again." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="afa-Zo-Kic">
                                                         <rect key="frame" x="16" y="4" width="250" height="12"/>
@@ -256,7 +256,7 @@ Unlock the wallet to resume the process.</string>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vmK-ZW-8U3">
-                                                <rect key="frame" x="0.0" y="242" width="366" height="40"/>
+                                                <rect key="frame" x="0.0" y="252" width="366" height="40"/>
                                                 <subviews>
                                                     <progressView contentMode="scaleToFill" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f8A-co-8Dp" customClass="ProgressView" customModule="Decred_Wallet" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="8" width="366" height="8"/>
@@ -275,8 +275,8 @@ Unlock the wallet to resume the process.</string>
                                                     <constraint firstAttribute="bottom" secondItem="f8A-co-8Dp" secondAttribute="bottom" constant="24" id="pad-fh-UgV"/>
                                                 </constraints>
                                             </view>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fj4-AU-s5Z" customClass="FloatingPlaceholderTextField" customModule="Decred_Wallet" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="282" width="366" height="48"/>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Placeholder" textAlignment="natural" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="Fj4-AU-s5Z" customClass="FloatingPlaceholderTextField" customModule="Decred_Wallet" customModuleProvider="target">
+                                                <rect key="frame" x="0.0" y="292" width="366" height="48"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="48" id="q5y-pi-MzY"/>
                                                 </constraints>
@@ -287,7 +287,7 @@ Unlock the wallet to resume the process.</string>
                                                 </connections>
                                             </textField>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aZX-ec-zBK">
-                                                <rect key="frame" x="0.0" y="330" width="366" height="16"/>
+                                                <rect key="frame" x="0.0" y="340" width="366" height="16"/>
                                                 <subviews>
                                                     <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Password do not match" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zxu-b3-Pxp">
                                                         <rect key="frame" x="16" y="4" width="250" height="12"/>
@@ -320,7 +320,7 @@ Unlock the wallet to resume the process.</string>
                                                 </constraints>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EdM-JP-adU">
-                                                <rect key="frame" x="0.0" y="346" width="366" height="72"/>
+                                                <rect key="frame" x="0.0" y="356" width="366" height="72"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v6t-Bu-n8H">
                                                         <rect key="frame" x="199" y="8" width="79" height="40"/>
@@ -439,7 +439,7 @@ Unlock the wallet to resume the process.</string>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xsl-Yq-viG">
                                                 <rect key="frame" x="0.0" y="0.0" width="366" height="73.5"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock with startup PIN" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LFW-Ta-LtS">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock with startup PIN" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="LFW-Ta-LtS">
                                                         <rect key="frame" x="0.0" y="24" width="366" height="25.5"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-SemiBold" family="Source Sans Pro" pointSize="20"/>
                                                         <color key="textColor" red="0.035294117647058823" green="0.078431372549019607" blue="0.25098039215686274" alpha="1" colorSpace="calibratedRGB"/>
@@ -516,7 +516,7 @@ Unlock the wallet to resume the process.</string>
                                                             <outlet property="delegate" destination="SKa-iY-3vv" id="kTA-ks-KxE"/>
                                                         </connections>
                                                     </collectionView>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Spending PIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cqy-a9-VLC">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enter Spending PIN" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="Cqy-a9-VLC">
                                                         <rect key="frame" x="118" y="26" width="130" height="20.5"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                         <color key="textColor" red="0.53725490196078429" green="0.59215686274509804" blue="0.6470588235294118" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift b/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift
index 08a18edb7..ec3520288 100644
--- a/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift	
+++ b/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift	
@@ -124,6 +124,10 @@ class RestoreExistingWalletViewController: UIViewController {
                         completion?.displayError(errorMessage: restoreError!.localizedDescription)
                         return
                     }
+                    
+                    if let wallet = WalletLoader.shared.wallets.filter({ $0.name == self.walletName.lowercased()}).first {
+                        Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                    }
 
                     completion?.dismissDialog()
                     
diff --git a/Decred Wallet/Features/Wallets/WalletInfoTableViewCell.xib b/Decred Wallet/Features/Wallets/WalletInfoTableViewCell.xib
index 94f1e6591..4a55331ca 100644
--- a/Decred Wallet/Features/Wallets/WalletInfoTableViewCell.xib	
+++ b/Decred Wallet/Features/Wallets/WalletInfoTableViewCell.xib	
@@ -45,7 +45,7 @@
                                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not backed up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QMr-qk-cAa">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Not backed up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="QMr-qk-cAa">
                                                         <rect key="frame" x="0.0" y="20.5" width="85" height="18"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
                                                         <color key="textColor" red="0.92941176469999998" green="0.42745098040000001" blue="0.2784313725" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift b/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift
index 1b90ad14a..60b488178 100644
--- a/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift	
+++ b/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift	
@@ -150,9 +150,10 @@ class WalletSettingsViewController: UIViewController {
     }
     
     func showRemoveWalletWarning(callback: @escaping (Bool) -> Void) {
+        let message = self.wallet.isWatchingOnlyWallet() ? LocalizedStrings.removeWalletWarning : LocalizedStrings.removeWatchWalletPrompt
         SimpleOkCancelDialog.show(sender: self,
                                   title: LocalizedStrings.removeWalletFromDevice,
-                                  message: LocalizedStrings.removeWalletWarning,
+                                  message: message,
                                   callback: callback)
     }
     
diff --git a/Decred Wallet/Features/Wallets/WalletsViewController.swift b/Decred Wallet/Features/Wallets/WalletsViewController.swift
index bc6c2a958..a4a2c028e 100644
--- a/Decred Wallet/Features/Wallets/WalletsViewController.swift	
+++ b/Decred Wallet/Features/Wallets/WalletsViewController.swift	
@@ -127,13 +127,17 @@ class WalletsViewController: UIViewController {
                     dialogDelegate?.dismissDialog()
                     Security.spending(initialSecurityType: .password).requestNewCode(sender: self, isChangeAttempt: false) { pinOrPassword, type, completion in
                         WalletLoader.shared.createWallet(spendingPinOrPassword: pinOrPassword, securityType: type, walletName: walletName.lowercased()) { error in
+                            
                             if error == nil {
-                                DispatchQueue.main.async {
-                                    completion?.dismissDialog()
-                                    self.loadWallets()
-                                    self.refreshAccountDetails()
-                                    self.customTabBar?.hasUnBackedUpWallets(true)
-                                    Utils.showBanner(in: self.view, type: .success, text: LocalizedStrings.walletCreated)
+                                if let wallet = WalletLoader.shared.wallets.filter({ $0.name == walletName.lowercased()}).first {
+                                    Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                                    DispatchQueue.main.async {
+                                        completion?.dismissDialog()
+                                        self.loadWallets()
+                                        self.refreshAccountDetails()
+                                        self.customTabBar?.hasUnBackedUpWallets(true)
+                                        Utils.showBanner(in: self.view, type: .success, text: LocalizedStrings.walletCreated)
+                                    }
                                 }
                             } else {
                                 DispatchQueue.main.async {
diff --git a/Decred Wallet/Utils/LocalizedStrings.swift b/Decred Wallet/Utils/LocalizedStrings.swift
index f645bc0e4..e50b2fa07 100644
--- a/Decred Wallet/Utils/LocalizedStrings.swift	
+++ b/Decred Wallet/Utils/LocalizedStrings.swift	
@@ -18,6 +18,8 @@ struct LocalizedStrings {
     static let wallet = NSLocalizedString("wallet", comment: "")
     static let introMessage = NSLocalizedString("introMessage", comment: "")
     static let myWallet = NSLocalizedString("myWallet", comment: "")
+    static let default_ = NSLocalizedString("default_", comment: "")
+    static let migratingWallet = NSLocalizedString("migratingWallet", comment: "")
     
     /* Create New Wallet(Seed display view) */
     static let settingUpYourWallet = NSLocalizedString("settingUpYourWallet", comment: "")
@@ -288,6 +290,7 @@ struct LocalizedStrings {
     static let confirmToRemove = NSLocalizedString("confirmToRemove", comment: "")
     static let walletRemoved = NSLocalizedString("walletRemoved", comment: "")
     static let disconnectDeleteWallet = NSLocalizedString("disconnectDeleteWallet", comment: "")
+    static let removeWatchWalletPrompt = NSLocalizedString("removeWatchWalletPrompt", comment: "")
     
      /* Wallets -> Account */
     static let spendable = NSLocalizedString("spendable", comment: "")
diff --git a/Decred Wallet/Utils/Utils.swift b/Decred Wallet/Utils/Utils.swift
index a24fd6e34..96aa45fe4 100644
--- a/Decred Wallet/Utils/Utils.swift	
+++ b/Decred Wallet/Utils/Utils.swift	
@@ -162,6 +162,16 @@ struct Utils {
         return NSMutableAttributedString(string: tmpString.appending(" DCR") as String)
     }
     
+    static func renameDefaultAccountToLocalLanguage(wallet: DcrlibwalletWallet) {
+        if LocalizedStrings.default_ != GlobalConstants.Strings.DEFAULT {
+            do {
+                try wallet.renameAccount(Int32(GlobalConstants.Wallet.DEFAULT_ACCOUNT_NUMBER), newName: LocalizedStrings.default_)
+            } catch {
+                DcrlibwalletLog(error.localizedDescription)
+            }
+        }
+    }
+    
     static func formatDateTime(timestamp: Int64) -> String {
         let formatter = DateFormatter()
         formatter.amSymbol = "am"
diff --git a/Decred Wallet/en.lproj/Localizable.strings b/Decred Wallet/en.lproj/Localizable.strings
index 885c7e1b2..01316bf26 100644
--- a/Decred Wallet/en.lproj/Localizable.strings	
+++ b/Decred Wallet/en.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Wallet";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "Setting Up Decred Wallet";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Spendable";
diff --git a/Decred Wallet/es.lproj/Localizable.strings b/Decred Wallet/es.lproj/Localizable.strings
index af263885a..94ae23717 100644
--- a/Decred Wallet/es.lproj/Localizable.strings	
+++ b/Decred Wallet/es.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Cartera";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "Configurando Cartera Decred";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Disponível para gasto";
diff --git a/Decred Wallet/pl.lproj/Localizable.strings b/Decred Wallet/pl.lproj/Localizable.strings
index 7ff015033..4029d4d5c 100644
--- a/Decred Wallet/pl.lproj/Localizable.strings	
+++ b/Decred Wallet/pl.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Portfel";
 "introMessage" = "Witaj w portfelu Decred,\n bezpiecznym oraz mobilnym portfelu typu open-source.";
 "myWallet" = "mójportfel";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "Setting Up Decred Wallet";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Upewnij się, że posiadasz kopię zapasową frazy bazowej (seed phrase) zanim usuniesz portfel.";
 "confirmToRemove" = "Potwierdź, aby usunąć";
 "walletRemoved" = "Portfel został usunięty";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Dostępne do wydania";
diff --git a/Decred Wallet/pt-BR.lproj/Localizable.strings b/Decred Wallet/pt-BR.lproj/Localizable.strings
index f4245041c..e1eae6d4f 100644
--- a/Decred Wallet/pt-BR.lproj/Localizable.strings	
+++ b/Decred Wallet/pt-BR.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Carteira";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "Preparando Carteira Decred";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Disponível para gasto";
diff --git a/Decred Wallet/ru-RU.lproj/Localizable.strings b/Decred Wallet/ru-RU.lproj/Localizable.strings
index 48fbf508d..178074f1b 100644
--- a/Decred Wallet/ru-RU.lproj/Localizable.strings	
+++ b/Decred Wallet/ru-RU.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Кошелёк";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "НАСТРОЙКА КОШЕЛЬКА DECRED";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Disponível para gasto";
diff --git a/Decred Wallet/vi.lproj/Localizable.strings b/Decred Wallet/vi.lproj/Localizable.strings
index 34f0f8a3e..1fc28e8a1 100644
--- a/Decred Wallet/vi.lproj/Localizable.strings	
+++ b/Decred Wallet/vi.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "Ví";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "Thiết lập Ví Decred";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Disponível para gasto";
diff --git a/Decred Wallet/zh-Hans.lproj/Localizable.strings b/Decred Wallet/zh-Hans.lproj/Localizable.strings
index d844ea339..49af1f42a 100644
--- a/Decred Wallet/zh-Hans.lproj/Localizable.strings	
+++ b/Decred Wallet/zh-Hans.lproj/Localizable.strings	
@@ -15,6 +15,8 @@
 "wallet" = "钱包";
 "introMessage" = "Welcome to Decred Wallet,\n a secure & open-source mobile wallet.";
 "myWallet" = "mywallet";
+"default_" = "default";
+"migratingWallet" = "Migrating wallet";
 
 /* Create New Wallet(Seed display view) */
 "settingUpYourWallet" = "设置Decred钱包";
@@ -302,6 +304,7 @@
 "removeWalletWarning" = "Make sure to have the seed phrase backed up before removing the wallet.";
 "confirmToRemove" = "Confirm to remove";
 "walletRemoved" = "Wallet removed";
+"removeWatchWalletPrompt" = "Remove watch-only wallet from device?";
 
 /* Wallets -> Account */
 "spendable" = "Disponível para gasto";

From ca9c02ac7802db2025c26f98ab15b036a4150e7f Mon Sep 17 00:00:00 2001
From: macsleven <abubakars29@yahoo.com>
Date: Mon, 1 Jun 2020 20:20:54 +0100
Subject: [PATCH 2/4] Fix overlapping UI on sync details screen

---
 .../Features/Overview/Overview.storyboard     | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/Decred Wallet/Features/Overview/Overview.storyboard b/Decred Wallet/Features/Overview/Overview.storyboard
index 84e871a1d..d0646912a 100644
--- a/Decred Wallet/Features/Overview/Overview.storyboard	
+++ b/Decred Wallet/Features/Overview/Overview.storyboard	
@@ -432,7 +432,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="IqX-eD-if8">
                                                                         <rect key="frame" x="0.0" y="108" width="398" height="64"/>
                                                                         <subviews>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Synced to block 320505 * 2 mins ago" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DFV-Mc-l57">
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Synced to block 320505 * 2 mins ago" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="DFV-Mc-l57">
                                                                                 <rect key="frame" x="56" y="0.0" width="326" height="18"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="18" id="KyY-7S-VZp"/>
@@ -499,7 +499,7 @@
                                                                                         <color key="textColor" cyan="0.60999999999999999" magenta="0.38574564456939697" yellow="0.23122884333133698" black="0.032802663743495941" alpha="1" colorSpace="custom" customColorSpace="genericCMYKColorSpace"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fetching block headers．89%" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GNq-Av-T55">
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fetching block headers．89%" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="GNq-Av-T55">
                                                                                         <rect key="frame" x="166.5" y="16" width="199.5" height="18"/>
                                                                                         <constraints>
                                                                                             <constraint firstAttribute="height" constant="18" id="uUh-CY-myz"/>
@@ -552,14 +552,14 @@
                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l3a-sZ-C7r" customClass="RoundedView" customModule="Decred_Wallet" customModuleProvider="target">
                                                                                 <rect key="frame" x="16" y="45" width="366" height="125"/>
                                                                                 <subviews>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block header fetched" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dIS-OX-dOK">
-                                                                                        <rect key="frame" x="16" y="17.5" width="123.5" height="18"/>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block header fetched" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dIS-OX-dOK">
+                                                                                        <rect key="frame" x="16" y="17.5" width="197.5" height="18"/>
                                                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
                                                                                         <color key="textColor" red="0.34901960784313724" green="0.42745098039215684" blue="0.50588235294117645" alpha="1" colorSpace="calibratedRGB"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6000 of 164864" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gzk-Ij-ojO">
-                                                                                        <rect key="frame" x="250.5" y="16" width="99.5" height="20.5"/>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4426000 of 164864" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="Gzk-Ij-ojO">
+                                                                                        <rect key="frame" x="216" y="16" width="134" height="20.5"/>
                                                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                         <nil key="highlightedColor"/>
@@ -573,8 +573,8 @@
                                                                                             <userDefinedRuntimeAttribute type="string" keyPath="xibLocalizedStringKey" value="syncingProgress"/>
                                                                                         </userDefinedRuntimeAttributes>
                                                                                     </label>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="220 days behind" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KCD-nY-LrI">
-                                                                                        <rect key="frame" x="241.5" y="51.5" width="108.5" height="20.5"/>
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="220 days behind" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="KCD-nY-LrI">
+                                                                                        <rect key="frame" x="203.5" y="51.5" width="146.5" height="20.5"/>
                                                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                         <nil key="highlightedColor"/>
@@ -588,7 +588,7 @@
                                                                                             <userDefinedRuntimeAttribute type="string" keyPath="xibLocalizedStringKey" value="connectedPeersCount"/>
                                                                                         </userDefinedRuntimeAttributes>
                                                                                     </label>
-                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t0k-Xs-Zyp">
+                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t0k-Xs-Zyp">
                                                                                         <rect key="frame" x="342" y="86.5" width="8" height="20.5"/>
                                                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                                                         <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -598,17 +598,20 @@
                                                                                 <color key="backgroundColor" red="0.95294117647058818" green="0.96078431372549022" blue="0.96470588235294119" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                 <constraints>
                                                                                     <constraint firstItem="Yk9-Pc-MEr" firstAttribute="centerY" secondItem="KCD-nY-LrI" secondAttribute="centerY" id="0Hh-7n-RwV"/>
+                                                                                    <constraint firstItem="dIS-OX-dOK" firstAttribute="width" secondItem="l3a-sZ-C7r" secondAttribute="width" multiplier="0.54" id="4Do-BR-d7j"/>
                                                                                     <constraint firstItem="kyJ-LW-AiI" firstAttribute="leading" secondItem="l3a-sZ-C7r" secondAttribute="leading" constant="16" id="A6q-GH-j34"/>
                                                                                     <constraint firstItem="dIS-OX-dOK" firstAttribute="leading" secondItem="l3a-sZ-C7r" secondAttribute="leading" constant="16" id="D0Q-D2-UNx"/>
                                                                                     <constraint firstAttribute="trailing" secondItem="Gzk-Ij-ojO" secondAttribute="trailing" constant="16" id="GET-wd-a6i"/>
                                                                                     <constraint firstItem="Yk9-Pc-MEr" firstAttribute="leading" secondItem="l3a-sZ-C7r" secondAttribute="leading" constant="16" id="Hm3-TS-ldv"/>
                                                                                     <constraint firstItem="KCD-nY-LrI" firstAttribute="top" secondItem="dIS-OX-dOK" secondAttribute="bottom" constant="16" id="IJ1-b4-86F"/>
                                                                                     <constraint firstAttribute="height" constant="125" id="LNe-Gg-OUa"/>
+                                                                                    <constraint firstItem="KCD-nY-LrI" firstAttribute="width" secondItem="l3a-sZ-C7r" secondAttribute="width" multiplier="0.4" id="PqP-2t-0ON"/>
                                                                                     <constraint firstItem="dIS-OX-dOK" firstAttribute="centerY" secondItem="Gzk-Ij-ojO" secondAttribute="centerY" id="TU9-5A-COE"/>
                                                                                     <constraint firstItem="Gzk-Ij-ojO" firstAttribute="top" secondItem="l3a-sZ-C7r" secondAttribute="top" constant="16" id="a0f-aZ-4js"/>
                                                                                     <constraint firstItem="t0k-Xs-Zyp" firstAttribute="top" secondItem="Yk9-Pc-MEr" secondAttribute="bottom" constant="16" id="cdv-1F-6xI"/>
                                                                                     <constraint firstAttribute="trailing" secondItem="KCD-nY-LrI" secondAttribute="trailing" constant="16" id="e6Y-Vq-ZDv"/>
                                                                                     <constraint firstAttribute="trailing" secondItem="t0k-Xs-Zyp" secondAttribute="trailing" constant="16" id="iTp-NE-8tz"/>
+                                                                                    <constraint firstItem="Gzk-Ij-ojO" firstAttribute="width" secondItem="l3a-sZ-C7r" secondAttribute="width" multiplier="0.365809" id="yfu-6g-Cpe"/>
                                                                                     <constraint firstItem="kyJ-LW-AiI" firstAttribute="centerY" secondItem="t0k-Xs-Zyp" secondAttribute="centerY" id="zBv-Fj-SjQ"/>
                                                                                 </constraints>
                                                                                 <userDefinedRuntimeAttributes>
@@ -671,20 +674,20 @@
                                                                                                             <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                             <nil key="highlightedColor"/>
                                                                                                         </label>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Syncing..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgj-Em-K1P">
+                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Syncing..." textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qgj-Em-K1P">
                                                                                                             <rect key="frame" x="293" y="16" width="57" height="18"/>
                                                                                                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
                                                                                                             <color key="textColor" red="0.76862745098039209" green="0.79607843137254897" blue="0.82352941176470584" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                             <nil key="highlightedColor"/>
                                                                                                         </label>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block header fetched" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DdH-Jc-2Jj">
-                                                                                                            <rect key="frame" x="16" y="52.5" width="123.5" height="18"/>
+                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Block header fetched" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="DdH-Jc-2Jj">
+                                                                                                            <rect key="frame" x="16" y="52.5" width="197.5" height="18"/>
                                                                                                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
                                                                                                             <color key="textColor" red="0.34901960780000002" green="0.42745098040000001" blue="0.50588235290000005" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                             <nil key="highlightedColor"/>
                                                                                                         </label>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6000 of 164864" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LTy-nc-Uuj">
-                                                                                                            <rect key="frame" x="250.5" y="51.5" width="99.5" height="20.5"/>
+                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="36000 of 164864" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="LTy-nc-Uuj">
+                                                                                                            <rect key="frame" x="216" y="51.5" width="134" height="20.5"/>
                                                                                                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                                                                             <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                             <nil key="highlightedColor"/>
@@ -698,8 +701,8 @@
                                                                                                                 <userDefinedRuntimeAttribute type="string" keyPath="xibLocalizedStringKey" value="syncingProgress"/>
                                                                                                             </userDefinedRuntimeAttributes>
                                                                                                         </label>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="220 days behind" textAlignment="justified" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="270-pB-7cR">
-                                                                                                            <rect key="frame" x="241.5" y="86.5" width="108.5" height="20.5"/>
+                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="220 days behind" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="270-pB-7cR">
+                                                                                                            <rect key="frame" x="203.5" y="86.5" width="146.5" height="20.5"/>
                                                                                                             <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
                                                                                                             <color key="textColor" red="0.035294117649999998" green="0.078431372550000003" blue="0.25098039220000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                             <nil key="highlightedColor"/>
@@ -707,6 +710,7 @@
                                                                                                     </subviews>
                                                                                                     <color key="backgroundColor" red="0.95294117649999999" green="0.96078431369999995" blue="0.96470588239999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                                     <constraints>
+                                                                                                        <constraint firstItem="270-pB-7cR" firstAttribute="width" secondItem="idD-XG-cba" secondAttribute="width" multiplier="0.4" id="2hC-dU-45c"/>
                                                                                                         <constraint firstItem="q0C-8s-vXs" firstAttribute="leading" secondItem="idD-XG-cba" secondAttribute="leading" constant="16" id="5nU-6v-ITH"/>
                                                                                                         <constraint firstItem="LTy-nc-Uuj" firstAttribute="top" secondItem="33l-LR-5Ld" secondAttribute="bottom" constant="16" id="6Ky-ye-JiU"/>
                                                                                                         <constraint firstItem="33l-LR-5Ld" firstAttribute="leading" secondItem="idD-XG-cba" secondAttribute="leading" constant="16" id="8r1-eI-LdO"/>
@@ -716,8 +720,10 @@
                                                                                                         <constraint firstItem="DdH-Jc-2Jj" firstAttribute="centerY" secondItem="LTy-nc-Uuj" secondAttribute="centerY" id="dXn-i0-9mR"/>
                                                                                                         <constraint firstItem="270-pB-7cR" firstAttribute="top" secondItem="DdH-Jc-2Jj" secondAttribute="bottom" constant="16" id="fpk-Vv-MJh"/>
                                                                                                         <constraint firstAttribute="height" constant="125" id="joP-7X-avB"/>
+                                                                                                        <constraint firstItem="LTy-nc-Uuj" firstAttribute="width" secondItem="idD-XG-cba" secondAttribute="width" multiplier="0.365809" id="omD-Ry-bMg"/>
                                                                                                         <constraint firstItem="33l-LR-5Ld" firstAttribute="centerY" secondItem="qgj-Em-K1P" secondAttribute="centerY" id="r1Z-sB-I2L"/>
                                                                                                         <constraint firstAttribute="trailing" secondItem="qgj-Em-K1P" secondAttribute="trailing" constant="16" id="rly-7O-qP2"/>
+                                                                                                        <constraint firstItem="DdH-Jc-2Jj" firstAttribute="width" secondItem="idD-XG-cba" secondAttribute="width" multiplier="0.54" id="slb-wU-Qf9"/>
                                                                                                         <constraint firstItem="qgj-Em-K1P" firstAttribute="top" secondItem="idD-XG-cba" secondAttribute="top" constant="16" id="txi-oq-1lB"/>
                                                                                                         <constraint firstAttribute="trailing" secondItem="270-pB-7cR" secondAttribute="trailing" constant="16" id="wwG-cc-rEl"/>
                                                                                                     </constraints>

From d8a8ba6ab4102dd58477aa78e6ded9aa85ee8acd Mon Sep 17 00:00:00 2001
From: macsleven <abubakars29@yahoo.com>
Date: Tue, 2 Jun 2020 07:43:58 +0100
Subject: [PATCH 3/4] Refactor create/restore wallet function

---
 .../StartScreenViewController.swift           | 24 ++++++------
 .../RestoreExistingWalletViewController.swift | 39 ++++++++++---------
 .../Wallets/WalletsViewController.swift       | 26 ++++++-------
 Decred Wallet/Wallet Utils/WalletLoader.swift | 32 ---------------
 4 files changed, 44 insertions(+), 77 deletions(-)

diff --git a/Decred Wallet/Features/App Launch/StartScreenViewController.swift b/Decred Wallet/Features/App Launch/StartScreenViewController.swift
index d6d4fe51e..0bf212de2 100644
--- a/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
+++ b/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
@@ -141,19 +141,19 @@ class StartScreenViewController: UIViewController, CAAnimationDelegate {
         Security.spending(initialSecurityType: .password)
             .requestNewCode(sender: self, isChangeAttempt: false) { pinOrPassword, type, completion in
                 
-                WalletLoader.shared.createWallet(spendingPinOrPassword: pinOrPassword, securityType: type, walletName: LocalizedStrings.myWallet) {
-                    createWalletError in
-                    
-                    if createWalletError != nil {
-                        completion?.displayError(errorMessage: createWalletError!.localizedDescription)
-                    } else {
-                        
-                        if let wallet = WalletLoader.shared.wallets.filter({ $0.name == LocalizedStrings.myWallet}).first {
-                            Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                //let wallet: DcrlibwalletWallet = WalletLoader.shared.createWallet(spendingPinOrPassword: pinOrPassword, securityType: type, walletName: LocalizedStrings.myWallet)
+                DispatchQueue.global(qos: .userInitiated).async {
+                    do {
+                        let wallet = try WalletLoader.shared.multiWallet.createNewWallet(LocalizedStrings.myWallet, privatePassphrase: pinOrPassword, privatePassphraseType: type.type)
+                        Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                        DispatchQueue.main.async {
+                           completion?.dismissDialog()
+                           NavigationMenuTabBarController.setupMenuAndLaunchApp(isNewWallet: true)
+                        }
+                    } catch let error {
+                        DispatchQueue.main.async {
+                            completion?.displayError(errorMessage: error.localizedDescription)
                         }
-                        
-                        completion?.dismissDialog()
-                        NavigationMenuTabBarController.setupMenuAndLaunchApp(isNewWallet: true)
                     }
                 }
         }
diff --git a/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift b/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift
index ec3520288..f115cd1dc 100644
--- a/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift	
+++ b/Decred Wallet/Features/Wallet Setup/RestoreExistingWalletViewController.swift	
@@ -116,26 +116,27 @@ class RestoreExistingWalletViewController: UIViewController {
     func requestSpendingSecurityCodeAndRestoreWallet(with seed: String) {
         Security.spending(initialSecurityType: .password)
             .requestNewCode(sender: self, isChangeAttempt: false) { pinOrPassword, type, completion in
-            
-                WalletLoader.shared.restoreWallet(seed: seed, spendingPinOrPassword: pinOrPassword, securityType: type, walletName: self.walletName) {
-                    restoreError in
-                    
-                    if restoreError != nil {
-                        completion?.displayError(errorMessage: restoreError!.localizedDescription)
-                        return
-                    }
-                    
-                    if let wallet = WalletLoader.shared.wallets.filter({ $0.name == self.walletName.lowercased()}).first {
+                
+                DispatchQueue.global(qos: .userInitiated).async {
+                    do {
+                        let wallet = try WalletLoader.shared.multiWallet.restore(self.walletName, seedMnemonic: seed, privatePassphrase: pinOrPassword, privatePassphraseType: type.type)
+                        
                         Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
-                    }
-
-                    completion?.dismissDialog()
-                    
-                    if self.onWalletRestored == nil {
-                        self.performSegue(withIdentifier: "recoverySuccess", sender: self)
-                    } else {
-                        self.onWalletRestored!()
-                        self.dismissView()
+                        
+                        DispatchQueue.main.async {
+                            completion?.dismissDialog()
+                            
+                            if self.onWalletRestored == nil {
+                                self.performSegue(withIdentifier: "recoverySuccess", sender: self)
+                            } else {
+                                self.onWalletRestored!()
+                                self.dismissView()
+                            }
+                        }
+                    } catch let error {
+                        DispatchQueue.main.async {
+                            completion?.displayError(errorMessage: error.localizedDescription)
+                        }
                     }
                 }
         }
diff --git a/Decred Wallet/Features/Wallets/WalletsViewController.swift b/Decred Wallet/Features/Wallets/WalletsViewController.swift
index a4a2c028e..e3d6ddb26 100644
--- a/Decred Wallet/Features/Wallets/WalletsViewController.swift	
+++ b/Decred Wallet/Features/Wallets/WalletsViewController.swift	
@@ -126,22 +126,20 @@ class WalletsViewController: UIViewController {
                 if !errorValue.boolValue {
                     dialogDelegate?.dismissDialog()
                     Security.spending(initialSecurityType: .password).requestNewCode(sender: self, isChangeAttempt: false) { pinOrPassword, type, completion in
-                        WalletLoader.shared.createWallet(spendingPinOrPassword: pinOrPassword, securityType: type, walletName: walletName.lowercased()) { error in
-                            
-                            if error == nil {
-                                if let wallet = WalletLoader.shared.wallets.filter({ $0.name == walletName.lowercased()}).first {
-                                    Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
-                                    DispatchQueue.main.async {
-                                        completion?.dismissDialog()
-                                        self.loadWallets()
-                                        self.refreshAccountDetails()
-                                        self.customTabBar?.hasUnBackedUpWallets(true)
-                                        Utils.showBanner(in: self.view, type: .success, text: LocalizedStrings.walletCreated)
-                                    }
+                        DispatchQueue.global(qos: .userInitiated).async {
+                            do {
+                                let wallet = try WalletLoader.shared.multiWallet.createNewWallet(walletName.lowercased(), privatePassphrase: pinOrPassword, privatePassphraseType: type.type)
+                                Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                                DispatchQueue.main.async {
+                                   completion?.dismissDialog()
+                                   self.loadWallets()
+                                   self.refreshAccountDetails()
+                                   self.customTabBar?.hasUnBackedUpWallets(true)
+                                   Utils.showBanner(in: self.view, type: .success, text: LocalizedStrings.walletCreated)
                                 }
-                            } else {
+                            } catch let error {
                                 DispatchQueue.main.async {
-                                    completion?.displayError(errorMessage: error!.localizedDescription)
+                                    completion?.displayError(errorMessage: error.localizedDescription)
                                 }
                             }
                         }
diff --git a/Decred Wallet/Wallet Utils/WalletLoader.swift b/Decred Wallet/Wallet Utils/WalletLoader.swift
index aac8cd256..c15ea1860 100644
--- a/Decred Wallet/Wallet Utils/WalletLoader.swift	
+++ b/Decred Wallet/Wallet Utils/WalletLoader.swift	
@@ -47,36 +47,4 @@ class WalletLoader: NSObject {
         self.multiWallet = DcrlibwalletNewMultiWallet(WalletLoader.appDataDir, "bdb", BuildConfig.NetType, &error)
         return error
     }
-    
-    func createWallet(spendingPinOrPassword: String, securityType: SecurityType,walletName: String, completion: @escaping (Error?) -> Void) {
-        DispatchQueue.global(qos: .userInitiated).async {
-            do {
-                try self.multiWallet.createNewWallet(walletName, privatePassphrase: spendingPinOrPassword, privatePassphraseType: securityType.type)
-                
-                DispatchQueue.main.async {
-                    completion(nil)
-                }
-            } catch let error {
-                DispatchQueue.main.async {
-                    completion(error)
-                }
-            }
-        }
-    }
-    
-    func restoreWallet(seed: String, spendingPinOrPassword: String, securityType: SecurityType, walletName: String, completion: @escaping (Error?) -> Void) {
-        DispatchQueue.global(qos: .userInitiated).async {
-            do {
-                try self.multiWallet.restore(walletName, seedMnemonic: seed, privatePassphrase: spendingPinOrPassword, privatePassphraseType: securityType.type)
-                
-                DispatchQueue.main.async {
-                    completion(nil)
-                }
-            } catch let error {
-                DispatchQueue.main.async {
-                    completion(error)
-                }
-            }
-        }
-    }
 }

From ebd9518ffb8f71e6521f3ecd06d6ea368454532a Mon Sep 17 00:00:00 2001
From: macsleven <abubakars29@yahoo.com>
Date: Tue, 2 Jun 2020 07:50:23 +0100
Subject: [PATCH 4/4] remove commented code

---
 .../Features/App Launch/StartScreenViewController.swift      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Decred Wallet/Features/App Launch/StartScreenViewController.swift b/Decred Wallet/Features/App Launch/StartScreenViewController.swift
index 0bf212de2..2edfb4ebc 100644
--- a/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
+++ b/Decred Wallet/Features/App Launch/StartScreenViewController.swift	
@@ -140,12 +140,13 @@ class StartScreenViewController: UIViewController, CAAnimationDelegate {
     @IBAction func createNewwallet(_ sender: Any) {
         Security.spending(initialSecurityType: .password)
             .requestNewCode(sender: self, isChangeAttempt: false) { pinOrPassword, type, completion in
-                
-                //let wallet: DcrlibwalletWallet = WalletLoader.shared.createWallet(spendingPinOrPassword: pinOrPassword, securityType: type, walletName: LocalizedStrings.myWallet)
+            
                 DispatchQueue.global(qos: .userInitiated).async {
                     do {
                         let wallet = try WalletLoader.shared.multiWallet.createNewWallet(LocalizedStrings.myWallet, privatePassphrase: pinOrPassword, privatePassphraseType: type.type)
+                        
                         Utils.renameDefaultAccountToLocalLanguage(wallet: wallet)
+                        
                         DispatchQueue.main.async {
                            completion?.dismissDialog()
                            NavigationMenuTabBarController.setupMenuAndLaunchApp(isNewWallet: true)