release 1.6.0

vergecurrency · Dec 18, 2020 · b8de3a2 · justinvforvendetta · Dec 18, 2020 · justinvforvendetta
1 parent e7abdf4
commit b8de3a2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/VergeiOS.xcodeproj/project.pbxproj b/VergeiOS.xcodeproj/project.pbxproj
@@ -2786,8 +2786,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CF_BUNDLE_BUILD_VERSION_STRING = 202006190001;
-				CF_BUNDLE_SHORT_VERSION_STRING = 1.5.1;
+				CF_BUNDLE_BUILD_VERSION_STRING = 202012140001;
+				CF_BUNDLE_SHORT_VERSION_STRING = 1.6.0;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2852,8 +2852,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CF_BUNDLE_BUILD_VERSION_STRING = 202006190001;
-				CF_BUNDLE_SHORT_VERSION_STRING = 1.5.1;
+				CF_BUNDLE_BUILD_VERSION_STRING = 202012140001;
+				CF_BUNDLE_SHORT_VERSION_STRING = 1.6.0;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

diff --git a/VergeiOS/Controllers/Send/SendViewController.swift b/VergeiOS/Controllers/Send/SendViewController.swift
@@ -650,7 +650,9 @@ extension SendViewController: SendTransactionDelegate {
     // MARK: - Send Transaction Delegate
 
     func didChangeSendTransaction(_ transaction: WalletTransactionFactory) {
-        self.present(self.loadingAlert, animated: true)
+        if !self.loadingAlert.isBeingPresented {
+            self.present(self.loadingAlert, animated: true)
+        }
 
         self.txFactory.address = transaction.address
         self.txFactory.memo = transaction.memo
@@ -671,7 +673,10 @@ extension SendViewController: SendTransactionDelegate {
 
 extension SendViewController: CurrencyDelegate {
     func didSelectCurrency(currency: String, sender: Any?) {
-        self.present(self.loadingAlert, animated: true)
+        if !self.loadingAlert.isBeingPresented {
+            self.present(self.loadingAlert, animated: true)
+        }
+
         self.txFactory.currency = .FIAT
 
         self.txFactory.setBy(fiatCurrency: currency).then { _ in

diff --git a/VergeiOS/Info.plist b/VergeiOS/Info.plist
@@ -137,7 +137,6 @@
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
-		<string>nfc</string>
 	</array>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>

diff --git a/VergeiOS/VergeiOS.entitlements b/VergeiOS/VergeiOS.entitlements
@@ -10,7 +10,6 @@
 	</array>
 	<key>com.apple.developer.nfc.readersession.formats</key>
 	<array>
-		<string>NDEF</string>
 		<string>TAG</string>
 	</array>
 	<key>com.apple.developer.siri</key>