🚀[Release v3.11.1] Merge into Develop (#214)

* bump build to date based number

Signed-off-by: kcw-grunt <[email protected]>

* Removed Ternio Card code

Signed-off-by: kcw-grunt <[email protected]>

* Polished the version tag in the lock screen

Signed-off-by: kcw-grunt <[email protected]>

* Build bump

Signed-off-by: kcw-grunt <[email protected]>

* Removed TabBarVC

- Cleanup to remove old references

Signed-off-by: kcw-grunt <[email protected]>

* Updated the Infura and partner IPFS access

- Required in the latest UD library

Signed-off-by: kcw-grunt <[email protected]>

* Added commit to partner keys

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

Author: kcw-grunt

.gitignore

@@ -30,14 +30,7 @@ Package.resolved
 
 # Add this line if you want to avoid checking in Xcode SPM integration.
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-
-Pods/ 
+ 
 
 # SwiftFormat
 BuildTools/.build
@@ -47,3 +40,5 @@ BuildTools/.swiftpm
 # Sensitive Partner API 
 Modules/litewallet-partner-api-ios
 litewallet-partner-api-ios
+
+/partner-keys.plist

loafwallet.xcodeproj/project.pbxproj

@@ -84,56 +84,27 @@ class MainViewController: UIViewController, Subscriber, LoginViewControllerDeleg
 	}
 
 	func didUnlockLogin() {
-		if UserDefaults.userIsInUSA {
-			guard let usaVC = UIStoryboard(name: "Main", bundle: nil)
-				.instantiateViewController(withIdentifier: "TabBarViewController")
-				as? TabBarViewController
-			else {
-				NSLog("TabBarViewController not intialized")
-				return
-			}
-
-			usaVC.store = store
-			usaVC.walletManager = walletManager
-
-			addChildViewController(usaVC, layout: {
-				usaVC.view.constrain(toSuperviewEdges: nil)
-				usaVC.view.alpha = 0
-				usaVC.view.layoutIfNeeded()
-			})
-
-			UIView.animate(withDuration: 0.3,
-			               delay: 0.1,
-			               options: .transitionCrossDissolve,
-			               animations: {
-			               	usaVC.view.alpha = 1
-
-			               }) { _ in
-				NSLog(" Ex US MainView Controller presented")
-			}
-		} else {
-			guard let exUSAVC = UIStoryboard(name: "Main", bundle: nil)
-				.instantiateViewController(withIdentifier: "NonUSTabBarViewController")
-				as? NonUSTabBarViewController
-			else {
-				NSLog("NonUSTabBarViewController not intialized")
-				return
-			}
+		guard let tabVC = UIStoryboard(name: "Main", bundle: nil)
+			.instantiateViewController(withIdentifier: "TabBarViewController")
+			as? TabBarViewController
+		else {
+			NSLog("TabBarViewController not intialized")
+			return
+		}
 
-			exUSAVC.store = store
-			exUSAVC.walletManager = walletManager
+		tabVC.store = store
+		tabVC.walletManager = walletManager
 
-			addChildViewController(exUSAVC, layout: {
-				exUSAVC.view.constrain(toSuperviewEdges: nil)
-				exUSAVC.view.alpha = 0
-				exUSAVC.view.layoutIfNeeded()
-			})
+		addChildViewController(tabVC, layout: {
+			tabVC.view.constrain(toSuperviewEdges: nil)
+			tabVC.view.alpha = 0
+			tabVC.view.layoutIfNeeded()
+		})
 
-			UIView.animate(withDuration: 0.3, delay: 0.1, options: .transitionCrossDissolve, animations: {
-				exUSAVC.view.alpha = 1
-			}) { _ in
-				NSLog("US MainView Controller presented")
-			}
+		UIView.animate(withDuration: 0.3, delay: 0.1, options: .transitionCrossDissolve, animations: {
+			tabVC.view.alpha = 1
+		}) { _ in
+			NSLog("US MainView Controller presented")
 		}
 	}