diff --git a/cw_bitcoin/lib/electrum_wallet_addresses.dart b/cw_bitcoin/lib/electrum_wallet_addresses.dart
index 828bda8af..69d0a6385 100644
--- a/cw_bitcoin/lib/electrum_wallet_addresses.dart
+++ b/cw_bitcoin/lib/electrum_wallet_addresses.dart
@@ -220,7 +220,9 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
   Future<void> updateAddressesInBox() async {
     try {
       addressesMap.clear();
-      addressesMap[address] = '';
+      _addresses.forEach((addressRecord) {
+        addressesMap[addressRecord.address] = addressRecord.name;
+      });
       await saveAddressesInBox();
     } catch (e) {
       print(e.toString());
diff --git a/lib/bitcoin/cw_bitcoin.dart b/lib/bitcoin/cw_bitcoin.dart
index e7a3f3d68..e543bc528 100644
--- a/lib/bitcoin/cw_bitcoin.dart
+++ b/lib/bitcoin/cw_bitcoin.dart
@@ -127,19 +127,23 @@ class CWBitcoin extends Bitcoin {
 
     final p2shAddr = sk.getPublic().toP2pkhInP2sh();
     final p2wpkhAddr = sk.getPublic().toP2wpkhAddress();
-    final estimatedTx = await electrumWallet.estimateTxFeeAndInputsToUse(
-        0,
-        true,
-        // Deposit address + change address
-        [p2shAddr, p2wpkhAddr],
-        [
-          BitcoinOutput(address: p2shAddr, value: BigInt.zero),
-          BitcoinOutput(address: p2wpkhAddr, value: BigInt.zero)
-        ],
-        null,
-        priority as BitcoinTransactionPriority);
+    try {
+      final estimatedTx = await electrumWallet.estimateTxFeeAndInputsToUse(
+          0,
+          true,
+          // Deposit address + change address
+          [p2shAddr, p2wpkhAddr],
+          [
+            BitcoinOutput(address: p2shAddr, value: BigInt.zero),
+            BitcoinOutput(address: p2wpkhAddr, value: BigInt.zero)
+          ],
+          null,
+          priority as BitcoinTransactionPriority);
 
-    return estimatedTx.amount;
+      return estimatedTx.amount;
+    } catch (_) {
+      return 0;
+    }
   }
 
   @override
diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
index 61355df05..1a5ab24e6 100644
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@@ -634,7 +634,7 @@ class ExchangePage extends BasePage {
               borderColor:
                   Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
               currencyValueValidator: (value) {
-                return !exchangeViewModel.isFixedRateMode
+                return !exchangeViewModel.isFixedRateMode && value != S.of(context).all
                     ? AmountValidator(
                         isAutovalidate: true,
                         currency: exchangeViewModel.depositCurrency,
diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart
index d2e3c27d4..8fa809de9 100644
--- a/lib/src/screens/exchange/widgets/exchange_card.dart
+++ b/lib/src/screens/exchange/widgets/exchange_card.dart
@@ -272,9 +272,7 @@ class ExchangeCardState extends State<ExchangeCard> {
                                   color: Theme.of(context)
                                       .extension<ExchangePageTheme>()!
                                       .hintTextColor),
-                              validator: widget.hasAllAmount
-                                  ? widget.allAmountValidator
-                                  : _isAmountEditable
+                              validator: _isAmountEditable
                                       ? widget.currencyValueValidator
                                       : null),
                         ),
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index ec851a89b..ed2b67de5 100644
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.15.1"
-CAKEWALLET_BUILD_NUMBER=199
+CAKEWALLET_VERSION="4.15.2"
+CAKEWALLET_BUILD_NUMBER=200
 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 53bbf4022..53514b39b 100644
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=77
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.15.1"
-CAKEWALLET_BUILD_NUMBER=218
+CAKEWALLET_VERSION="4.15.2"
+CAKEWALLET_BUILD_NUMBER=219
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"
diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
index 1e8022b7b..1654a022a 100755
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=10
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.8.1"
-CAKEWALLET_BUILD_NUMBER=58
+CAKEWALLET_VERSION="1.8.2"
+CAKEWALLET_BUILD_NUMBER=59
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then