Merge branch 'main' into 1205-Release-1-0-5-3

Update to README.md

CHANGELOG.md

@@ -6,7 +6,7 @@ directly impact users rather than highlighting other crucial architectural updat
 
 ## [Unreleased]
 
-## 1.0.5 build 3 (2024-04-18)
+## 1.0.5 build 4 (2024-04-19)
 
 ### Fixed
 - Migration of DB ensures that the default Unified Address for existing wallets now contains an Orchard receiver.

README.md

@@ -3,13 +3,13 @@
 This is the official home of the Zashi Zcash wallet for Wallet, a no-frills
 Zcash mobile wallet leveraging the [Zcash Swift SDK](https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk).
 
-# Beta Testing
+# Production
 
-The Zashi IOS wallet is currently in closed beta testing, and will be publicly
-available from the Apple Store when testing is complete.
+The Zashi IOS wallet is publicly available for download in the [AppStore](https://apps.apple.com/cz/app/zashi-zcash-wallet/id1672392439).
 
-If you'd like to be added to the waitlist to become a Zashi beta tester,
-please [sign up here](https://docs.google.com/forms/d/e/1FAIpQLSeQpykeMF8QcxnX5W8ya0pXIf5YPRRpUXD7H1gvbzv_WyASPw/viewform).
+# Zashi Discord
+
+Join the Zashi community on ECC Discord server, report bugs, share ideas, request new features, and help shape Zashi's journey!
 
 # Reporting an issue
 
@@ -24,7 +24,7 @@ If you wish to report a security issue, please follow our
 See the [Wallet App Threat Model](https://github.com/Electric-Coin-Company/zashi/blob/master/wallet_threat_model.md)
 for more information about the security and privacy limitations of the wallet.
 
-General Zcash questions and/or support requests and are best directed to either:
+General Zcash questions and/or support requests may also be directed to either:
  * [Zcash Forum](https://forum.zcashcommunity.com/)
  * [Discord Community](https://discord.io/zcash-community)
 

modules/Sources/Features/BalanceBreakdown/BalanceBreakdownStore.swift

@@ -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
 

modules/Sources/Features/BalanceBreakdown/BalanceBreakdownView.swift

@@ -86,6 +86,8 @@ public struct BalanceBreakdownView: View {
             )
         )
         .task { await store.send(.restoreWalletTask).finish() }
+        .onAppear { store.send(.onAppear) }
+        .onDisappear { store.send(.onDisappear) }
     }
 }
 

secant.xcodeproj/project.pbxproj

@@ -1204,7 +1204,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				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 = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"secant/Preview Content\"";
 				DEVELOPMENT_TEAM = RLPRR8CPQG;
 				ENABLE_BITCODE = NO;