Wallet is only setup if there is a walletId present

vergecurrency · Nov 15, 2019 · bb099d0 · bb099d0
1 parent 2b548f8
commit bb099d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/VergeiOS.xcodeproj/project.pbxproj b/VergeiOS.xcodeproj/project.pbxproj
@@ -2470,8 +2470,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CF_BUNDLE_BUILD_VERSION_STRING = 201911060001;
-				CF_BUNDLE_SHORT_VERSION_STRING = 1.2.2;
+				CF_BUNDLE_BUILD_VERSION_STRING = 201911140001;
+				CF_BUNDLE_SHORT_VERSION_STRING = 1.2.3;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2534,8 +2534,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CF_BUNDLE_BUILD_VERSION_STRING = 201911060001;
-				CF_BUNDLE_SHORT_VERSION_STRING = 1.2.2;
+				CF_BUNDLE_BUILD_VERSION_STRING = 201911140001;
+				CF_BUNDLE_SHORT_VERSION_STRING = 1.2.3;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

diff --git a/VergeiOS/Controllers/Setup/FinishSetupViewController.swift b/VergeiOS/Controllers/Setup/FinishSetupViewController.swift
@@ -71,7 +71,7 @@ class FinishSetupViewController: AbstractPaperkeyViewController {
 
         self.credentials.reset(mnemonic: mnemonic, passphrase: passphrase)
 
-        walletClient.createWallet(
+        self.walletClient.createWallet(
             walletName: "ioswallet",
             copayerName: "iosuser",
             m: 1,

diff --git a/VergeiOS/Repositories/ApplicationRepository.swift b/VergeiOS/Repositories/ApplicationRepository.swift
@@ -16,7 +16,7 @@ class ApplicationRepository {
 
     // Is the wallet already setup?
     var setup: Bool {
-        return self.mnemonic?.count == 12 && (self.passphrase?.count ?? 0) > 7 && self.pin != ""
+        return self.mnemonic?.count == 12 && (self.passphrase?.count ?? 0) > 7 && self.pin != "" && self.walletId != nil
     }
 
     // Store the wallet pin in the app key chain.
@@ -34,7 +34,7 @@ class ApplicationRepository {
             if self.pin.count > 0 {
                 self.pinCount = self.pin.count
             }
-            
+
             userDefaults.register(defaults: ["wallet.pinCount": 6])
             return userDefaults.integer(forKey: "wallet.pinCount")
         }