diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index faf57258a..7a6b75343 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,4 +1,3 @@ -Add built-in Tor support (experimental) -Ledger improvements -UI/UX improvements -Bug fixes \ No newline at end of file +New Cake Pay mobile UI +Monero enhancements +Integrated exchange bug fixes \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index c49b895e3..39c85dd1f 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,9 +1,5 @@ -Add built-in Tor support (experimental) -Add dEuro investments -Solana fixes/enhancements -Polygon fixes/enhancements -WalletConnect improvements -Ledger improvements -Payjoin improvements -UI/UX improvements -Bug fixes \ No newline at end of file +Silent Payment sync bug fixes +New Cake Pay mobile UI +Monero enhancements +dEURO savings module improvements +Integrated exchange bug fixes \ No newline at end of file diff --git a/cw_bitcoin/lib/pending_bitcoin_transaction.dart b/cw_bitcoin/lib/pending_bitcoin_transaction.dart index bd68e2bda..43c4b3963 100644 --- a/cw_bitcoin/lib/pending_bitcoin_transaction.dart +++ b/cw_bitcoin/lib/pending_bitcoin_transaction.dart @@ -59,7 +59,21 @@ class PendingBitcoinTransaction with PendingTransaction { String get amountFormatted => bitcoinAmountToString(amount: amount); @override - String get feeFormatted => "$feeFormattedValue BTC"; + String get feeFormatted => "$feeFormattedValue ${_feeCurrency}"; + + String get _feeCurrency { + switch(type) { + case WalletType.bitcoin: + return "BTC"; + case WalletType.litecoin: + return "LTC"; + case WalletType.bitcoinCash: + return "BCH"; + default: + return type.name; + } + + } @override String get feeFormattedValue => bitcoinAmountToString(amount: fee); diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 65aeaf206..93c089b11 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="5.1.0" -MONERO_COM_BUILD_NUMBER=127 +MONERO_COM_VERSION="5.1.2" +MONERO_COM_BUILD_NUMBER=128 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_SCHEME="monero.com" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="5.1.1" -CAKEWALLET_BUILD_NUMBER=268 +CAKEWALLET_VERSION="5.1.2" +CAKEWALLET_BUILD_NUMBER=269 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 5930a554c..b201726a3 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="5.1.0" -MONERO_COM_BUILD_NUMBER=127 +MONERO_COM_VERSION="5.1.2" +MONERO_COM_BUILD_NUMBER=128 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="5.1.1" -CAKEWALLET_BUILD_NUMBER=325 +CAKEWALLET_VERSION="5.1.2" +CAKEWALLET_BUILD_NUMBER=326 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index c83e819c3..da4ec9885 100755 --- a/scripts/linux/app_env.sh +++ b/scripts/linux/app_env.sh @@ -14,8 +14,8 @@ if [ -n "$1" ]; then fi CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="5.1.1" -CAKEWALLET_BUILD_NUMBER=59 +CAKEWALLET_VERSION="5.1.2" +CAKEWALLET_BUILD_NUMBER=60 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then echo "Wrong app type." diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 3ad1034c5..47cdc8b33 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -16,13 +16,13 @@ if [ -n "$1" ]; then fi MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="5.1.0" -MONERO_COM_BUILD_NUMBER=56 +MONERO_COM_VERSION="5.1.2" +MONERO_COM_BUILD_NUMBER=57 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="5.1.1" -CAKEWALLET_BUILD_NUMBER=120 +CAKEWALLET_VERSION="5.1.2" +CAKEWALLET_BUILD_NUMBER=121 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then diff --git a/scripts/windows/build_exe_installer.iss b/scripts/windows/build_exe_installer.iss index 3309787c8..1425b614b 100644 --- a/scripts/windows/build_exe_installer.iss +++ b/scripts/windows/build_exe_installer.iss @@ -1,5 +1,5 @@ #define MyAppName "Cake Wallet" -#define MyAppVersion "5.1.1" +#define MyAppVersion "5.1.2" #define MyAppPublisher "Cake Labs LLC" #define MyAppURL "https://cakewallet.com/" #define MyAppExeName "CakeWallet.exe"