diff --git a/modules/Package.swift b/modules/Package.swift index f9f1edfb..8afcfe7c 100644 --- a/modules/Package.swift +++ b/modules/Package.swift @@ -92,7 +92,7 @@ let package = Package( .package(url: "https://github.com/zcash-hackworks/MnemonicSwift", from: "2.2.4"), .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.7"), .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0"), - .package(url: "https://github.com/flexa/flexa-ios.git", from: "1.0.7"), + .package(url: "https://github.com/flexa/flexa-ios.git", from: "1.0.8"), .package(url: "https://github.com/pacu/zcash-swift-payment-uri", from: "0.1.0-beta.9"), .package(url: "https://github.com/airbnb/lottie-spm.git", from: "4.5.0") ], diff --git a/modules/Sources/Dependencies/FlexaHandler/FlexaHandlerLiveKey.swift b/modules/Sources/Dependencies/FlexaHandler/FlexaHandlerLiveKey.swift index 00ca76bf..78118ae4 100644 --- a/modules/Sources/Dependencies/FlexaHandler/FlexaHandlerLiveKey.swift +++ b/modules/Sources/Dependencies/FlexaHandler/FlexaHandlerLiveKey.swift @@ -16,12 +16,15 @@ import CryptoKit import Generated import UIKit +/// This is a quick fix for Flexa changing the balances of the account from an expected value to 0. +var accountHashInMemoryUUID = UUID() + enum Constants { static let zecHash = "bip122:00040fe8ec8471911baa1db1266ea15d" static let zecId = "\(Constants.zecHash)/slip44:133" static func assetAccountHash() -> String { - let uuid = UUID() + let uuid = accountHashInMemoryUUID let uuidString = uuid.uuidString let data = Data(uuidString.utf8) let hash = SHA256.hash(data: data) @@ -54,6 +57,8 @@ extension FlexaHandlerClient: DependencyKey { isPrepared.value = true }, open: { + accountHashInMemoryUUID = UUID() + if !isPrepared.value { FlexaHandlerClient.prepare() isPrepared.value = true diff --git a/secant.xcodeproj/project.pbxproj b/secant.xcodeproj/project.pbxproj index 6a855565..b55e3e89 100644 --- a/secant.xcodeproj/project.pbxproj +++ b/secant.xcodeproj/project.pbxproj @@ -2232,7 +2232,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "secant-distrib.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\""; DEVELOPMENT_TEAM = RLPRR8CPQG; @@ -2273,7 +2273,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "secant-distrib.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\""; DEVELOPMENT_TEAM = RLPRR8CPQG; ENABLE_BITCODE = NO; @@ -2474,7 +2474,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "secant-distrib.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\""; DEVELOPMENT_TEAM = RLPRR8CPQG; ENABLE_BITCODE = NO; diff --git a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4b05e900..1e5ffcce 100644 --- a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -86,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/flexa/flexa-ios.git", "state" : { - "revision" : "746135db93da03605628380d86000d22b5bcbbfa", - "version" : "1.0.7" + "revision" : "5d33adf6507ea33e239f7fb8ec27978cf4e08243", + "version" : "1.0.8" } }, {