From ecb4f32cdaafdd0c362027f641f6b6ff0e480324 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Thu, 21 Mar 2024 15:42:16 +0200
Subject: [PATCH] Fix Exchange field not taking numbers (#1341)

---
 lib/src/screens/exchange/exchange_page.dart         | 2 +-
 lib/src/screens/exchange/widgets/exchange_card.dart | 4 +---
 scripts/android/app_env.sh                          | 4 ++--
 scripts/ios/app_env.sh                              | 4 ++--
 scripts/macos/app_env.sh                            | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

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