Merge branch 'develop' into main

kukai-wallet · Jul 18, 2024 · 9ca796b · 9ca796b
2 parents 3b933b7 + 08de41b
commit 9ca796b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/Kukai Mobile.xcodeproj/project.pbxproj b/Kukai Mobile.xcodeproj/project.pbxproj
@@ -2430,7 +2430,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Kukai Mobile/Kukai Mobile.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 316;
+				CURRENT_PROJECT_VERSION = 317;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
@@ -2470,7 +2470,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 316;
+				CURRENT_PROJECT_VERSION = 317;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;
@@ -2656,7 +2656,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 316;
+				CURRENT_PROJECT_VERSION = 317;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;

diff --git a/Kukai Mobile/Info.plist b/Kukai Mobile/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>316</string>
+	<string>317</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Kukai Mobile/Modules/Launch/LaunchViewController.swift b/Kukai Mobile/Modules/Launch/LaunchViewController.swift
@@ -161,7 +161,9 @@ class LaunchViewController: UIViewController, CAAnimationDelegate {
 			self.performSegue(withIdentifier: "onboarding", sender: nil)
 
 		} else {
-			SentrySDK.capture(message: "Reinstall cache clear - unknown")
+			if hasWallet {
+				SentrySDK.capture(message: "Reinstall cache clear - unknown")
+			}
 			let _ = WalletCacheService().deleteAllCacheAndKeys()
 			StorageService.deleteKeychainItems()
 			self.performSegue(withIdentifier: "onboarding", sender: nil)

diff --git a/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift b/Kukai Mobile/Modules/Onboarding/CreateWithSocialViewController.swift
@@ -152,7 +152,7 @@ class CreateWithSocialViewController: UIViewController {
 
 				// Cancelled errors
 				if (error.subType?.domain != "com.apple.AuthenticationServices.AuthorizationError" && error.subType?.code != 1001) &&
-					(error.errorType != .internalApplication && error.subType?.code != 1)
+					!(error.errorType == .internalApplication && error.subType?.code == 1)
 				{
 					self.windowError(withTitle: "error".localized(), description: error.description)
 				}

diff --git a/Kukai Mobile/Services/AppUpdateService.swift b/Kukai Mobile/Services/AppUpdateService.swift
@@ -29,7 +29,7 @@ public class AppUpdateService {
 
 
 	// mt = meida type. 8 = mobile application. See: https://stackoverflow.com/questions/1781427/what-is-mt-8-in-itunes-links-for-the-app-store
-	public static let appStoreURL = URL(string: "https://apps.apple.com/ie/app/id1576499860?mt=8")!
+	public static let appStoreURL = URL(string: "https://apps.apple.com/app/id1576499860?mt=8")!
 
 	public var requiredVersion: String? = nil
 	public var isRequiredUpdate = false

diff --git a/Kukai Mobile/Services/MigrationService.swift b/Kukai Mobile/Services/MigrationService.swift
@@ -22,15 +22,17 @@ class MigrationService {
 
 		if currentBuildInt == previousBuildInt { return }
 
+		/*
+		 // Only leaving here as a sample for future record of how to use this setup. Can be removed once a new usecase is added
 		if previousBuildInt < 296 {
 			markSocialWalletsAsNotBackedUp()
 		}
+		*/
 
 		UserDefaults.standard.set(currentBuildString, forKey: MigrationService.userDefaultsVersionKey)
 	}
 
-
-	// TODO: can be removed on v1 release to app store
+	/*
 	private static func markSocialWalletsAsNotBackedUp() {
 		guard StorageService.didCompleteOnboarding(), DependencyManager.shared.walletList.socialWallets.count > 0 else { return }
 
@@ -49,4 +51,5 @@ class MigrationService {
 			DependencyManager.shared.selectedWalletMetadata = DependencyManager.shared.walletList.metadata(forAddress: address)
 		}
 	}
+	*/
 }
diff --git a/Kukai Mobile/Services/TransactionService.swift b/Kukai Mobile/Services/TransactionService.swift
@@ -256,7 +256,6 @@ public class TransactionService {
 	public var batchData: BatchData
 	public var walletConnectOperationData: WalletConnectOperationData
 
-	// TODO: make sure to reset all batch data
 	private init() {
 		self.currentTransactionType = .none
 		self.currentOperationsAndFeesData = OperationsAndFeesData(estimatedOperations: [])

diff --git a/Kukai MobileTests/Info.plist b/Kukai MobileTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>316</string>
+	<string>317</string>
 </dict>
 </plist>
diff --git a/Kukai MobileUITests/Info.plist b/Kukai MobileUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>316</string>
+	<string>317</string>
 </dict>
 </plist>