Merge branch 'develop' into main

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 = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				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 = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				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 = 317;
+				CURRENT_PROJECT_VERSION = 318;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;

Kukai Mobile/Info.plist

@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift

@@ -387,7 +387,7 @@ class CollectiblesCollectionsViewModel: ViewModel, UICollectionViewDiffableDataS
 			}
 
 		} else if let obj = dataSource?.itemIdentifier(for: forIndexPath) as? NFT {
-			urls = [MediaProxyService.smallURL(forNFT: obj)]
+			urls = [MediaProxyService.mediumURL(forNFT: obj)]
 		}
 
 		Logger.app.info("willDisplayImages: \(urls)")

Kukai Mobile/Modules/Onboarding/ConfirmPasscodeViewController.swift

@@ -131,10 +131,16 @@ extension ConfirmPasscodeViewController: ValidatorTextFieldDelegate {
 		updateDigitViewsWithLength(length: text.count)
 
 		if validated {
-			if StorageService.validateTempPasscodeAndCommit(text) == true {
+			let storageResult = StorageService.validateTempPasscodeAndCommit(text)
+
+			if storageResult == .success {
 				navigate()
+
+			} else if storageResult == .biometricSetupError {
+				displayBiometricErrorAndReset()
+
 			} else {
-				displayErrorAndReset()
+				displayValidationErrorAndReset()
 			}
 		} else if text == "" {
 			errorLabel.isHidden = true
@@ -145,8 +151,19 @@ extension ConfirmPasscodeViewController: ValidatorTextFieldDelegate {
 
 	}
 
-	func displayErrorAndReset() {
+	func displayValidationErrorAndReset() {
 		DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
+			self?.errorLabel.text = "Incorrect passcode try again"
+			self?.errorLabel.isHidden = false
+			self?.hiddenTextfield.text = ""
+			self?.updateDigitViewsWithLength(length: 0)
+		}
+	}
+
+	func displayBiometricErrorAndReset() {
+		DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
+			let biometricTypeText = (CurrentDevice.biometricTypeSupported() == .touchID ? "Touch ID" : "Face ID")
+			self?.errorLabel.text = "Unknown error occured trying to use \(biometricTypeText). Please check your device settings and ensure its setup correctly"
 			self?.errorLabel.isHidden = false
 			self?.hiddenTextfield.text = ""
 			self?.updateDigitViewsWithLength(length: 0)

Kukai Mobile/Services/StorageService.swift

@@ -35,6 +35,12 @@ public class StorageService {
 		public static let collectiblesGroupModeEnabled = "app.kukai.collectibles.group-mode"
 	}
 
+	public enum PasscodeStoreResult {
+		case success
+		case failure
+		case biometricSetupError
+	}
+
 
 
 	// MARK: - Cleanup
@@ -81,28 +87,39 @@ public class StorageService {
 	}
 
 	/// Compare temporary passcode with user supplied passcode. If valid, commit passcode to real storage (overwritting if necessary)
-	public static func validateTempPasscodeAndCommit(_ passcode: String) -> Bool {
+	public static func validateTempPasscodeAndCommit(_ passcode: String) -> PasscodeStoreResult {
 		guard let hash = KeychainSwift().get(StorageService.KeychainKeys.tempPasscode) else {
-			return false
+			return .failure
 		}
 
 		if Sodium.shared.pwHash.strVerify(hash: hash, passwd: passcode.bytes) {
 			return recordPasscode(passcode)
 		}
 
-		return false
+		return .failure
 	}
 
 	/// Delete previous record (if present) and create a new one with usePresence set
-	private static func recordPasscode(_ passcode: String) -> Bool {
+	private static func recordPasscode(_ passcode: String) -> PasscodeStoreResult {
 		guard let hash = Sodium.shared.pwHash.str(passwd: passcode.bytes, opsLimit: Sodium.shared.pwHash.OpsLimitInteractive, memLimit: Sodium.shared.pwHash.MemLimitInteractive) else {
-			return false
+			return .failure
 		}
 
 		// Recording the passcode only once with biometic flag, means when biometric enabled, users are unable to enter the passcode on its own (i.e. tapping cancel to biometric)
 		// Because retrieving the passcode to do the verification requires succesful biometrics
 		// Instead it needs to be stored twice, once where it can be accessed without biometrics and one with to enable both cases
-		return recordPasscodeHash(hash, withUserPresence: true) && recordPasscodeHash(hash, withUserPresence: false)
+		let res1 = recordPasscodeHash(hash, withUserPresence: true)
+		let res2 = recordPasscodeHash(hash, withUserPresence: false)
+
+		if res1 == false {
+			return .biometricSetupError
+
+		} else if res1 && res2 {
+			return .success
+
+		} else {
+			return .failure
+		}
 	}
 
 	private static func recordPasscodeHash(_ hash: String, withUserPresence: Bool) -> Bool {

Kukai MobileTests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 </dict>
 </plist>

Kukai MobileUITests/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>317</string>
+	<string>318</string>
 </dict>
 </plist>