From 9d47e0e67ca429fee6fde61ade98b1eb2e8ac4bd Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Mon, 24 Apr 2023 14:02:17 +0200 Subject: [PATCH] V4.6.3_1.3.3 (#893) * - Update App versions - Add release notes * Modify Monero.com release notes * Fix issues with Frozen balance for Monero.com build * Update cake wallet app build number --- assets/text/Monerocom_Release_Notes.txt | 26 ++++++++--------- assets/text/Release_Notes.txt | 29 ++++++++++--------- cw_core/lib/balance.dart | 2 ++ .../dashboard/balance_view_model.dart | 10 +------ .../restore/wallet_restore_from_qr_code.dart | 3 -- scripts/android/app_env.sh | 8 ++--- scripts/ios/app_env.sh | 6 ++-- scripts/macos/app_env.sh | 2 +- 8 files changed, 40 insertions(+), 46 deletions(-) diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 6a091fc90..6c1994ede 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,13 +1,13 @@ -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges -WWEE(enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronization function -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronization function -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronizatio \ No newline at end of file +This update includes a HUGE number of usability improvements! +Type a fiat amount in the receive screen +Easily restore wallets from QR code +Pay Bitcoin Lightning invoices in exchange +Optionally disable the marketplace in display settings +Better warning messages if trying to exchange outside the min/max limits +More address flexibility when exchanging the currently-active wallet asset +Modernized the seed language selection picker +Adjusted pickers to resize if the keyboard is active +Improved accessibility +Click to copy additional fields in the exchange checkout +Fix padding on some devices +Bug fixes and code refactoring \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 6a091fc90..6e63d3372 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,13 +1,16 @@ -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges -WWEE(enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate)Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronization function -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronization function -Added Fixed Rate for exchanges (enter the "receive" amount on the exchange page to get the fixed rate) -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Changed algorithm for choosing of change address for BTC and LTC electrum wallets -Keep screen awake while the synchronizatio \ No newline at end of file +This update includes a HUGE number of usability improvements! +BTC/LTC coin control enhancements and bugfixes; easily look up Ordinals +Type a fiat amount in the receive screen +New Onramper Buy widget +Easily restore wallets from QR code +Substantially better reliability for seeing incoming, unconfirmed BTC/LTC transactions +Pay Bitcoin Lightning invoices in exchange +Optionally disable the marketplace in display settings +Better warning messages if trying to exchange outside the min/max limits +More address flexibility when exchanging the currently-active wallet asset +Modernized the seed language selection picker +Adjusted pickers to resize if the keyboard is active +Improved accessibility +Click to copy additional fields in the exchange checkout +Fix padding on some devices +Bug fixes and code refactoring \ No newline at end of file diff --git a/cw_core/lib/balance.dart b/cw_core/lib/balance.dart index cf98f9e0f..6145411c4 100644 --- a/cw_core/lib/balance.dart +++ b/cw_core/lib/balance.dart @@ -8,4 +8,6 @@ abstract class Balance { String get formattedAvailableBalance; String get formattedAdditionalBalance; + + String get formattedFrozenBalance => ''; } diff --git a/lib/view_model/dashboard/balance_view_model.dart b/lib/view_model/dashboard/balance_view_model.dart index 3b9dcce55..810d8e415 100644 --- a/lib/view_model/dashboard/balance_view_model.dart +++ b/lib/view_model/dashboard/balance_view_model.dart @@ -1,9 +1,5 @@ -import 'package:cake_wallet/bitcoin/bitcoin.dart'; import 'package:cake_wallet/entities/fiat_api_mode.dart'; -import 'package:cw_bitcoin/bitcoin_amount_format.dart'; -import 'package:cw_bitcoin/electrum_balance.dart'; import 'package:cw_core/transaction_history.dart'; -import 'package:cw_core/unspent_coins_info.dart'; import 'package:cw_core/wallet_base.dart'; import 'package:cw_core/balance.dart'; import 'package:cw_core/crypto_currency.dart'; @@ -15,7 +11,6 @@ import 'package:cake_wallet/entities/calculate_fiat_amount.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart'; -import 'package:hive/hive.dart'; import 'package:mobx/mobx.dart'; part 'balance_view_model.g.dart'; @@ -361,9 +356,6 @@ abstract class BalanceViewModelBase with Store { } } - - String getFormattedFrozenBalance(Balance walletBalance) => - walletBalance is ElectrumBalance ? walletBalance.formattedFrozenBalance : ''; - + String getFormattedFrozenBalance(Balance walletBalance) => walletBalance.formattedFrozenBalance; } diff --git a/lib/view_model/restore/wallet_restore_from_qr_code.dart b/lib/view_model/restore/wallet_restore_from_qr_code.dart index 241b2d3fd..9ebf01429 100644 --- a/lib/view_model/restore/wallet_restore_from_qr_code.dart +++ b/lib/view_model/restore/wallet_restore_from_qr_code.dart @@ -1,11 +1,8 @@ -import 'package:cake_wallet/core/address_validator.dart'; import 'package:cake_wallet/core/seed_validator.dart'; -import 'package:cake_wallet/entities/mnemonic_item.dart'; import 'package:cake_wallet/entities/parse_address_from_domain.dart'; import 'package:cake_wallet/entities/qr_scanner.dart'; import 'package:cake_wallet/view_model/restore/restore_mode.dart'; import 'package:cake_wallet/view_model/restore/restore_wallet.dart'; -import 'package:cw_bitcoin/bitcoin_mnemonic.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:flutter/cupertino.dart'; diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 298bb69f4..fa822f0af 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.3.2" -MONERO_COM_BUILD_NUMBER=42 +MONERO_COM_VERSION="1.3.3" +MONERO_COM_BUILD_NUMBER=43 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.6.2" -CAKEWALLET_BUILD_NUMBER=151 +CAKEWALLET_VERSION="4.6.3" +CAKEWALLET_BUILD_NUMBER=154 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 3b700df46..ca2bf1f12 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.3.2" -MONERO_COM_BUILD_NUMBER=40 +MONERO_COM_VERSION="1.3.3" +MONERO_COM_BUILD_NUMBER=41 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="4.6.3" -CAKEWALLET_BUILD_NUMBER=146 +CAKEWALLET_BUILD_NUMBER=148 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 8cb2d86b9..d788fed1c 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -16,7 +16,7 @@ fi CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="1.0.2" -CAKEWALLET_BUILD_NUMBER=12 +CAKEWALLET_BUILD_NUMBER=14 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then