Fix Exchange field not taking numbers (#1341)

Omar Hatem committed Mar 21, 2024 at 15:42 UTC ecb4f32cdaafdd0c362027f641f6b6ff0e480324
5 files changed +8 -10
lib/src/screens/exchange/exchange_page.dart
+1 -1
@@ -634,7 +634,7 @@ class ExchangePage extends BasePage {
634 borderColor:
635 Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
636 currencyValueValidator: (value) {
637 - return !exchangeViewModel.isFixedRateMode
637 + return !exchangeViewModel.isFixedRateMode && value != S.of(context).all
638 ? AmountValidator(
639 isAutovalidate: true,
640 currency: exchangeViewModel.depositCurrency,
lib/src/screens/exchange/widgets/exchange_card.dart
+1 -3
@@ -272,9 +272,7 @@ class ExchangeCardState extends State<ExchangeCard> {
272 color: Theme.of(context)
273 .extension<ExchangePageTheme>()!
274 .hintTextColor),
275 - validator: widget.hasAllAmount
276 - ? widget.allAmountValidator
277 - : _isAmountEditable
275 + validator: _isAmountEditable
276 ? widget.currencyValueValidator
277 : null),
278 ),
scripts/android/app_env.sh
+2 -2
@@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app"
22 MONERO_COM_SCHEME="monero.com"
23
24 CAKEWALLET_NAME="Cake Wallet"
25 -CAKEWALLET_VERSION="4.15.1"
26 -CAKEWALLET_BUILD_NUMBER=199
25 +CAKEWALLET_VERSION="4.15.2"
26 +CAKEWALLET_BUILD_NUMBER=200
27 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29 CAKEWALLET_SCHEME="cakewallet"
scripts/ios/app_env.sh
+2 -2
@@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=77
18 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20 CAKEWALLET_NAME="Cake Wallet"
21 -CAKEWALLET_VERSION="4.15.1"
22 -CAKEWALLET_BUILD_NUMBER=218
21 +CAKEWALLET_VERSION="4.15.2"
22 +CAKEWALLET_BUILD_NUMBER=219
23 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25 HAVEN_NAME="Haven"
scripts/macos/app_env.sh
+2 -2
@@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=10
21 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
22
23 CAKEWALLET_NAME="Cake Wallet"
24 -CAKEWALLET_VERSION="1.8.1"
25 -CAKEWALLET_BUILD_NUMBER=58
24 +CAKEWALLET_VERSION="1.8.2"
25 +CAKEWALLET_BUILD_NUMBER=59
26 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
27
28 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then