[#1207] Pending changes are broken
- Pending values were removed with new WalletBalances component, I needed to restore those in order to work again.
This commit is contained in:
parent
0892676253
commit
3b41b52dc1
|
@ -6,6 +6,9 @@ directly impact users rather than highlighting other crucial architectural updat
|
|||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
- Migration of DB ensures that the default Unified Address for existing wallets now contains an Orchard receiver.
|
||||
|
||||
## 1.0.5 build 2 (2024-04-17)
|
||||
|
||||
### Added
|
||||
|
|
|
@ -71,7 +71,7 @@ let package = Package(
|
|||
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.3.2"),
|
||||
.package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.6.0"),
|
||||
.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.1.4"),
|
||||
.package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.1.5"),
|
||||
.package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.24.0")
|
||||
],
|
||||
targets: [
|
||||
|
|
|
@ -95,6 +95,7 @@ public struct BalanceBreakdownReducer: Reducer {
|
|||
case shieldFundsFailure(ZcashError)
|
||||
case shieldFundsPartial([String], [String])
|
||||
case shieldFundsSuccess
|
||||
case synchronizerStateChanged(RedactableSynchronizerState)
|
||||
case syncProgress(SyncProgressReducer.Action)
|
||||
case updateDestination(BalanceBreakdownReducer.State.Destination?)
|
||||
case updateHintBoxVisibility(Bool)
|
||||
|
@ -139,7 +140,13 @@ public struct BalanceBreakdownReducer: Reducer {
|
|||
|
||||
case .onAppear:
|
||||
state.autoShieldingThreshold = zcashSDKEnvironment.shieldingThreshold
|
||||
return .none
|
||||
return .publisher {
|
||||
sdkSynchronizer.stateStream()
|
||||
.throttle(for: .seconds(0.2), scheduler: mainQueue, latest: true)
|
||||
.map { $0.redacted }
|
||||
.map(Action.synchronizerStateChanged)
|
||||
}
|
||||
.cancellable(id: CancelId, cancelInFlight: true)
|
||||
|
||||
case .onDisappear:
|
||||
return .cancel(id: CancelId)
|
||||
|
@ -203,6 +210,15 @@ public struct BalanceBreakdownReducer: Reducer {
|
|||
state.partialProposalErrorState.statuses = statuses
|
||||
return .send(.updateDestination(.partialProposalError))
|
||||
|
||||
case .synchronizerStateChanged(let latestState):
|
||||
let accountBalance = latestState.data.accountBalance?.data
|
||||
|
||||
state.changePending = (accountBalance?.saplingBalance.changePendingConfirmation ?? .zero) +
|
||||
(accountBalance?.orchardBalance.changePendingConfirmation ?? .zero)
|
||||
state.pendingTransactions = (accountBalance?.saplingBalance.valuePendingSpendability ?? .zero) +
|
||||
(accountBalance?.orchardBalance.valuePendingSpendability ?? .zero)
|
||||
return .none
|
||||
|
||||
case .syncProgress:
|
||||
return .none
|
||||
|
||||
|
|
|
@ -86,6 +86,8 @@ public struct BalanceBreakdownView: View {
|
|||
)
|
||||
)
|
||||
.task { await store.send(.restoreWalletTask).finish() }
|
||||
.onAppear { store.send(.onAppear) }
|
||||
.onDisappear { store.send(.onDisappear) }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1204,7 +1204,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
|
@ -1234,7 +1234,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
@ -1383,7 +1383,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-testnet";
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
|
@ -1413,7 +1413,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-testnet";
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
@ -1539,7 +1539,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
|
@ -1569,7 +1569,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
@ -1655,7 +1655,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-testnet";
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
@ -1684,7 +1684,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
@ -1759,7 +1759,7 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 2;
|
||||
CURRENT_PROJECT_VERSION = 4;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = RLPRR8CPQG;
|
||||
ENABLE_BITCODE = NO;
|
||||
|
|
|
@ -374,8 +374,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/zcash-hackworks/zcash-light-client-ffi",
|
||||
"state" : {
|
||||
"revision" : "e2d8763f3a963fb0026b6160af2d211b527453cd",
|
||||
"version" : "0.7.4"
|
||||
"revision" : "9314c83d7a09d88e1c0bd3ff3738a50833325059",
|
||||
"version" : "0.8.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
@ -383,8 +383,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk",
|
||||
"state" : {
|
||||
"revision" : "6bbb4a9e422fd059fbb65dac86e9961859fd6956",
|
||||
"version" : "2.1.4"
|
||||
"revision" : "31a584801302c04f8c644f652d44d25406007f5e",
|
||||
"version" : "2.1.5"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue