Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-23 03:59:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into MrCyjaneK-cyjan-monerodart

Browse source
This commit is contained in:
Omar Hatem 2024-05-12 02:45:34 +03:00 committed by GitHub
commit f6d41f318e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/text/Release_Notes.txt
View file

@ -1,4 +1,3 @@
Hardware wallets support for Bitcoin, Ethereum and Polygon
Add Tron wallet
Security enhancements
Bug fixes and generic enhancements

8
cw_tron/lib/tron_client.dart
View file

@ -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',
);
}

6
lib/src/screens/dashboard/pages/balance_page.dart
View file

@ -69,14 +69,14 @@ class BalancePage extends StatelessWidget {
),
labelColor:
Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
dividerColor:
Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
dividerColor: Colors.transparent,
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'),
@ -351,7 +351,7 @@ class BalanceRowWidget extends StatelessWidget {
style: TextStyle(
fontSize: 16,
fontFamily: 'Lato',
fontWeight: FontWeight.w500,
fontWeight: FontWeight.w500,
color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
height: 1)),
],

2
lib/view_model/send/send_view_model.dart
View file

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

4
scripts/android/app_env.sh
View file

@ -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"

2
scripts/android/pubspec_gen.sh
View file

@ -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"

2
scripts/ios/app_config.sh
View file

@ -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

4
scripts/ios/app_env.sh
View file

@ -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"

2
scripts/macos/app_config.sh
View file

@ -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

2
scripts/macos/app_env.sh
View file

@ -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