Merge branch 'main' into MrCyjaneK-cyjan-monerodart

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

cw_tron/lib/tron_client.dart

@@ -208,7 +208,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().toUtc().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(hours: 24));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(
@@ -369,7 +369,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().toUtc().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(hours: 24));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(
@@ -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',
       );
     }
 

lib/src/screens/dashboard/pages/balance_page.dart

@@ -69,14 +69,14 @@ class BalancePage extends StatelessWidget {
                       ),
                       labelColor:
                           Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
-                      dividerColor:
+                      dividerColor: Colors.transparent,
-                          Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                       indicatorColor:
                           Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
                       unselectedLabelColor: Theme.of(context)
                           .extension<DashboardPageTheme>()!
                           .pageTitleTextColor
                           .withOpacity(0.5),
+                      tabAlignment: TabAlignment.start,
                       tabs: [
                         Tab(text: 'My Crypto'),
                         Tab(text: 'My NFTs'),

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';
       }
     }
 

scripts/android/app_env.sh

@@ -16,14 +16,14 @@ APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.13.0"
-MONERO_COM_BUILD_NUMBER=85
+MONERO_COM_BUILD_NUMBER=86
 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.16.0"
-CAKEWALLET_BUILD_NUMBER=208
+CAKEWALLET_BUILD_NUMBER=210
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

scripts/android/pubspec_gen.sh

@@ -10,7 +10,7 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--monero"
                 ;;
         $CAKEWALLET)
-                CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron" #TODO: fix and add back --haven
+                CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana" #TODO: fix and add back --haven
                 ;;
         $HAVEN)
                 CONFIG_ARGS="--haven"

scripts/ios/app_config.sh

@@ -30,7 +30,7 @@ case $APP_IOS_TYPE in
 		CONFIG_ARGS="--monero"
 		;;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron"
+		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana"
 		if [ "$CW_WITH_HAVEN" = true ];then
 		    CONFIG_ARGS="$CONFIG_ARGS --haven"
 		fi

scripts/ios/app_env.sh

@@ -14,12 +14,12 @@ APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
 MONERO_COM_VERSION="1.13.0"
-MONERO_COM_BUILD_NUMBER=83
+MONERO_COM_BUILD_NUMBER=84
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.16.0"
-CAKEWALLET_BUILD_NUMBER=234
+CAKEWALLET_BUILD_NUMBER=236
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/macos/app_config.sh

@@ -33,7 +33,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

scripts/macos/app_env.sh

@@ -22,7 +22,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="1.9.0"
-CAKEWALLET_BUILD_NUMBER=69
+CAKEWALLET_BUILD_NUMBER=71
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then