From e4f1660aad9d6834ea285654bc93df61a059d728 Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 21 Jul 2026 15:12:59 +0300 Subject: [PATCH 1/5] update app versions --- scripts/android/app_env.sh | 2 +- scripts/ios/app_env.sh | 2 +- scripts/linux/app_env.sh | 4 ++-- scripts/macos/app_env.sh | 8 ++++---- scripts/windows/build_exe_installer.iss | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 014e2d49a..aa754be0e 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -22,7 +22,7 @@ MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="6.3.0" -CAKEWALLET_BUILD_NUMBER=4414 +CAKEWALLET_BUILD_NUMBER=4415 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 4c0650f3d..753bd475f 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -18,7 +18,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="6.3.0" -CAKEWALLET_BUILD_NUMBER=424 +CAKEWALLET_BUILD_NUMBER=425 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index 0a66f626c..b0cbb833e 100755 --- a/scripts/linux/app_env.sh +++ b/scripts/linux/app_env.sh @@ -14,8 +14,8 @@ if [ -n "$1" ]; then fi CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.1.0" -CAKEWALLET_BUILD_NUMBER=79 +CAKEWALLET_VERSION="6.3.0" +CAKEWALLET_BUILD_NUMBER=80 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then echo "Wrong app type." diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 4d699307d..63e317798 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -16,13 +16,13 @@ if [ -n "$1" ]; then fi MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="6.2.0" -MONERO_COM_BUILD_NUMBER=80 +MONERO_COM_VERSION="6.3.0" +MONERO_COM_BUILD_NUMBER=81 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="6.2.0" -CAKEWALLET_BUILD_NUMBER=148 +CAKEWALLET_VERSION="6.3.0" +CAKEWALLET_BUILD_NUMBER=149 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss index d8fbc6e7e..9fba68e60 100644 --- a/scripts/windows/build_exe_installer.iss +++ b/scripts/windows/build_exe_installer.iss @@ -1,5 +1,5 @@ #define MyAppName "Cake Wallet" -#define MyAppVersion "6.1.0" +#define MyAppVersion "6.3.0" #define MyAppPublisher "Cake Labs LLC" #define MyAppURL "https://cakewallet.com/" #define MyAppExeName "CakeWallet.exe" From a43c32d62672a2422ac57cb4fe3721d7c8f056b3 Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 21 Jul 2026 19:18:15 +0300 Subject: [PATCH 2/5] add a back button so you can always go back from the hardware wallet connect screen --- .../connect_device/connect_device_page.dart | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index ed1ae3154..bde91e711 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -4,6 +4,7 @@ import "dart:io"; import "package:cake_wallet/entities/hardware_wallet/hardware_wallet_device.dart"; import "package:cake_wallet/generated/i18n.dart"; import "package:cake_wallet/main.dart"; +import "package:cake_wallet/new-ui/widgets/modern_button.dart"; import "package:cake_wallet/new-ui/widgets/new_primary_button.dart"; import "package:cake_wallet/routes.dart"; import "package:cake_wallet/src/screens/base_page.dart"; @@ -56,7 +57,43 @@ class ConnectDevicePage extends BasePage { : S.current.restore_title_from_hardware_wallet; @override - Widget? leading(BuildContext context) => !isReconnect ? super.leading(context) : null; + Widget? leading(BuildContext context) { + if (!isReconnect) { + return super.leading(context); + } + + return MergeSemantics( + child: Padding( + padding: const EdgeInsets.only(top: 4.0), + child: ButtonTheme( + minWidth: double.minPositive, + child: Semantics( + label: S.of(context).seed_alert_back, + child: ModernButton( + size: 37, + icon: Icon(CupertinoIcons.back), + iconColor: Theme.of(context).colorScheme.onSurfaceVariant, + onPressed: () => _onReconnectBack(context), + ), + ), + ), + ), + ); + } + + void _onReconnectBack(BuildContext context) { + final navigator = Navigator.of(context); + if (navigator.canPop()) { + navigator.pop(); + return; + } + + navigator.pushNamed( + Routes.walletList, + arguments: (BuildContext context) => + Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false), + ); + } @override Widget body(BuildContext context) => PopScope( From 7dd048d24431ba97bae7c95eae6a6333a1b32cd1 Mon Sep 17 00:00:00 2001 From: cyan Date: Tue, 21 Jul 2026 10:20:16 -0700 Subject: [PATCH 3/5] fix: address leaks (#3426) --- cw_zcash/lib/src/zcash_wallet_addresses.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cw_zcash/lib/src/zcash_wallet_addresses.dart b/cw_zcash/lib/src/zcash_wallet_addresses.dart index 31bdbbf9e..42bd30423 100644 --- a/cw_zcash/lib/src/zcash_wallet_addresses.dart +++ b/cw_zcash/lib/src/zcash_wallet_addresses.dart @@ -108,7 +108,7 @@ abstract class ZcashWalletAddressesBase extends WalletAddresses with Store { Set hiddenAddresses = {}; Future _initAddresses() async { - addressesMap = await walletInfo.getAddresses(); + addressesMap = {}; addressInfos = await walletInfo.getAddressInfos(); usedAddresses = await walletInfo.getUsedAddresses(); manualAddresses = await walletInfo.getManualAddresses(); @@ -236,7 +236,7 @@ abstract class ZcashWalletAddressesBase extends WalletAddresses with Store { if (!isPlaceholderAddress(address)) { walletInfo.address = address; } - await walletInfo.setAddresses(addressesMap); + await walletInfo.setAddresses({}); await walletInfo.setAddressInfos(addressInfos); await walletInfo.setUsedAddresses(usedAddresses.toList()); await walletInfo.setHiddenAddresses(hiddenAddresses.toList()); From d2521aa01c30950bca6afe4a29a4e7cd5da856be Mon Sep 17 00:00:00 2001 From: Omar Date: Tue, 21 Jul 2026 20:42:47 +0300 Subject: [PATCH 4/5] revert and just show the change wallet button if it's a reconnect --- .../connect_device/connect_device_page.dart | 41 +------------------ 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart index bde91e711..2c08bd23c 100644 --- a/lib/src/screens/connect_device/connect_device_page.dart +++ b/lib/src/screens/connect_device/connect_device_page.dart @@ -4,7 +4,6 @@ import "dart:io"; import "package:cake_wallet/entities/hardware_wallet/hardware_wallet_device.dart"; import "package:cake_wallet/generated/i18n.dart"; import "package:cake_wallet/main.dart"; -import "package:cake_wallet/new-ui/widgets/modern_button.dart"; import "package:cake_wallet/new-ui/widgets/new_primary_button.dart"; import "package:cake_wallet/routes.dart"; import "package:cake_wallet/src/screens/base_page.dart"; @@ -43,7 +42,7 @@ class ConnectDevicePage extends BasePage { ConnectDevicePage(ConnectDevicePageParams params, this.hardwareWalletVM) : walletType = params.walletType, onConnectDevice = params.onConnectDevice, - allowChangeWallet = params.allowChangeWallet, + allowChangeWallet = params.allowChangeWallet || params.isReconnect, isReconnect = params.isReconnect; final WalletType walletType; final OnConnectDevice onConnectDevice; @@ -57,43 +56,7 @@ class ConnectDevicePage extends BasePage { : S.current.restore_title_from_hardware_wallet; @override - Widget? leading(BuildContext context) { - if (!isReconnect) { - return super.leading(context); - } - - return MergeSemantics( - child: Padding( - padding: const EdgeInsets.only(top: 4.0), - child: ButtonTheme( - minWidth: double.minPositive, - child: Semantics( - label: S.of(context).seed_alert_back, - child: ModernButton( - size: 37, - icon: Icon(CupertinoIcons.back), - iconColor: Theme.of(context).colorScheme.onSurfaceVariant, - onPressed: () => _onReconnectBack(context), - ), - ), - ), - ), - ); - } - - void _onReconnectBack(BuildContext context) { - final navigator = Navigator.of(context); - if (navigator.canPop()) { - navigator.pop(); - return; - } - - navigator.pushNamed( - Routes.walletList, - arguments: (BuildContext context) => - Navigator.of(context).pushNamedAndRemoveUntil(Routes.dashboard, (route) => false), - ); - } + Widget? leading(BuildContext context) => !isReconnect ? super.leading(context) : null; @override Widget body(BuildContext context) => PopScope( From 7a05544c6560b91207dd66e91d78b39815d573b7 Mon Sep 17 00:00:00 2001 From: Omar Date: Wed, 22 Jul 2026 03:50:10 +0300 Subject: [PATCH 5/5] update build numbers --- scripts/android/app_env.sh | 2 +- scripts/ios/app_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index aa754be0e..bba8c29e6 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -22,7 +22,7 @@ MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="6.3.0" -CAKEWALLET_BUILD_NUMBER=4415 +CAKEWALLET_BUILD_NUMBER=4416 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_SCHEME="cakewallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 753bd475f..c65c74115 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -18,7 +18,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="6.3.0" -CAKEWALLET_BUILD_NUMBER=425 +CAKEWALLET_BUILD_NUMBER=426 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"