From 01faeabefeb449800ea8049a3801771de8184914 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Tue, 3 Dec 2024 14:04:11 +0300 Subject: [PATCH] test (#1842) * test * macos new build --- .github/workflows/pr_test_build_linux.yml | 2 +- lib/core/address_validator.dart | 2 +- .../screens/cake_pay/cards/cake_pay_buy_card_page.dart | 7 ++----- scripts/android/app_env.sh | 4 ++-- scripts/ios/app_env.sh | 8 ++++---- scripts/macos/app_env.sh | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml index 9e25f9f7a..c37b11582 100644 --- a/.github/workflows/pr_test_build_linux.yml +++ b/.github/workflows/pr_test_build_linux.yml @@ -38,7 +38,7 @@ jobs: - name: Flutter action uses: subosito/flutter-action@v1 with: - flutter-version: "3.24.4" + flutter-version: "3.24.0" channel: stable - name: Install package dependencies diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart index 9ca8a41ad..c122a872b 100644 --- a/lib/core/address_validator.dart +++ b/lib/core/address_validator.dart @@ -134,7 +134,7 @@ class AddressValidator extends TextValidator { case CryptoCurrency.btcln: pattern = '(lnbc|LNBC)([0-9]{1,}[a-zA-Z0-9]+)'; default: - pattern = '[0-9a-zA-Z]+'; + return ''; } return '$BEFORE_REGEX($pattern)$AFTER_REGEX'; diff --git a/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart b/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart index 21e35359b..bd1840974 100644 --- a/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart +++ b/lib/src/screens/cake_pay/cards/cake_pay_buy_card_page.dart @@ -248,14 +248,11 @@ class CakePayBuyCardPage extends BasePage { } bool isWordInCardsName(CakePayCard card, String word) { - // word must be followed by a space or beginning of the string - final regex = RegExp(r'(^|\s)' + word + r'(\s|$)', caseSensitive: false); - - return regex.hasMatch(card.name.toLowerCase()); + return card.name.toLowerCase().contains(word.toLowerCase()); } bool isIOSUnavailable(CakePayCard card) { - if (!Platform.isIOS) { + if (!Platform.isIOS && !Platform.isMacOS) { return false; } diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 79afc5c78..24f1f5a51 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -16,14 +16,14 @@ APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" MONERO_COM_VERSION="1.18.2" -MONERO_COM_BUILD_NUMBER=107 +MONERO_COM_BUILD_NUMBER=108 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="4.21.2" -CAKEWALLET_BUILD_NUMBER=238 +CAKEWALLET_BUILD_NUMBER=239 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 2ca0df21d..816ddd29a 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.18.1" -MONERO_COM_BUILD_NUMBER=104 +MONERO_COM_VERSION="1.18.2" +MONERO_COM_BUILD_NUMBER=105 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.21.1" -CAKEWALLET_BUILD_NUMBER=283 +CAKEWALLET_VERSION="4.21.2" +CAKEWALLET_BUILD_NUMBER=284 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 930a1e5ed..c9fa6d81e 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -22,7 +22,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="1.14.1" -CAKEWALLET_BUILD_NUMBER=96 +CAKEWALLET_BUILD_NUMBER=97 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then