V4.16.0 (#1445)

* update build numbers * fix UI issue * Add Nano to secret generation properly [skip ci] * remove to utc from expiration time * update app version Remove tron
cake-tech · May 10, 2024 · 97555f2 · 97555f2
1 parent 678dc3b
commit 97555f2
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
@@ -1,4 +1,3 @@
 Hardware wallets support for Bitcoin, Ethereum and Polygon
-Add Tron wallet
 Security enhancements
 Bug fixes and generic enhancements
diff --git a/cw_tron/lib/tron_client.dart b/cw_tron/lib/tron_client.dart
@@ -387,7 +387,7 @@ class TronClient {
     if (feeLimit > tronBalanceInt) {
       final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
       throw Exception(
-        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.\nTransaction fee: $feeInTrx TRX',
+        'You don\'t have enough TRX to cover the transaction fee for this transaction. Please top up.\nTransaction fee: $feeInTrx TRX',
       );
     }
 
@@ -444,7 +444,7 @@ class TronClient {
     if (feeLimit > tronBalanceInt) {
       final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
       throw Exception(
-        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up. Transaction fee: $feeInTrx TRX',
+        'You don\'t have enough TRX to cover the transaction fee for this transaction. Please top up. Transaction fee: $feeInTrx TRX',
       );
     }
 

diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
@@ -580,7 +580,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       }
 
       if (errorMessage.contains('Transaction expired')) {
-        return 'An error occurred while processing the transaction. Kindly retry the transaction';
+        return 'An error occurred while processing the transaction. Please retry the transaction';
       }
     }
 

diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
@@ -23,7 +23,7 @@ MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.16.0"
-CAKEWALLET_BUILD_NUMBER=209
+CAKEWALLET_BUILD_NUMBER=210
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

diff --git a/scripts/android/pubspec_gen.sh b/scripts/android/pubspec_gen.sh
@@ -10,7 +10,7 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--monero"
                 ;;
         $CAKEWALLET)
-                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana --tron"
+                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana"
                 ;;
         $HAVEN)
                 CONFIG_ARGS="--haven"

diff --git a/scripts/ios/app_config.sh b/scripts/ios/app_config.sh
@@ -28,7 +28,7 @@ case $APP_IOS_TYPE in
 		CONFIG_ARGS="--monero"
 		;;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana --tron"
+		CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana"
 		;;
 	$HAVEN)
 

diff --git a/scripts/macos/app_config.sh b/scripts/macos/app_config.sh
@@ -31,7 +31,7 @@ case $APP_MACOS_TYPE in
         $MONERO_COM)
 		CONFIG_ARGS="--monero";;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron";; #--haven
+		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana";; #--haven
 esac
 
 cp -rf pubspec_description.yaml pubspec.yaml

diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh
@@ -17,12 +17,12 @@ fi
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.3.0"
-MONERO_COM_BUILD_NUMBER=18
+MONERO_COM_BUILD_NUMBER=17
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="1.9.0"
-CAKEWALLET_BUILD_NUMBER=70
+CAKEWALLET_BUILD_NUMBER=71
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
-Original file line number
+Diff line change
@@ Expand Up @@
           }
           if (errorMessage.contains('Transaction expired')) {
-            return 'An error occurred while processing the transaction. Kindly retry the transaction';
+            return 'An error occurred while processing the transaction. Please retry the transaction';
           }
         }
@@ Expand Down @@