Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-02-02 03:06:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password

Browse source
This commit is contained in:
OmarHatem 2024-03-21 16:32:25 +02:00
commit 317fd44408
7 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cw_bitcoin/lib/electrum_wallet_addresses.dart
View file

@ -220,7 +220,9 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
Future<void> updateAddressesInBox() async {
try {
addressesMap.clear();
addressesMap[address] = '';
_addresses.forEach((addressRecord) {
addressesMap[addressRecord.address] = addressRecord.name;
});
await saveAddressesInBox();
} catch (e) {
print(e.toString());

28
lib/bitcoin/cw_bitcoin.dart
View file

@ -127,19 +127,23 @@ class CWBitcoin extends Bitcoin {
final p2shAddr = sk.getPublic().toP2pkhInP2sh();
final p2wpkhAddr = sk.getPublic().toP2wpkhAddress();
final estimatedTx = await electrumWallet.estimateTxFeeAndInputsToUse(
0,
true,
// Deposit address + change address
[p2shAddr, p2wpkhAddr],
[
BitcoinOutput(address: p2shAddr, value: BigInt.zero),
BitcoinOutput(address: p2wpkhAddr, value: BigInt.zero)
],
null,
priority as BitcoinTransactionPriority);
try {
final estimatedTx = await electrumWallet.estimateTxFeeAndInputsToUse(
0,
true,
// Deposit address + change address
[p2shAddr, p2wpkhAddr],
[
BitcoinOutput(address: p2shAddr, value: BigInt.zero),
BitcoinOutput(address: p2wpkhAddr, value: BigInt.zero)
],
null,
priority as BitcoinTransactionPriority);
return estimatedTx.amount;
return estimatedTx.amount;
} catch (_) {
return 0;
}
}
@override

2
lib/src/screens/exchange/exchange_page.dart
View file

@ -634,7 +634,7 @@ class ExchangePage extends BasePage {
borderColor:
Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
currencyValueValidator: (value) {
return !exchangeViewModel.isFixedRateMode
return !exchangeViewModel.isFixedRateMode && value != S.of(context).all
? AmountValidator(
isAutovalidate: true,
currency: exchangeViewModel.depositCurrency,

4
lib/src/screens/exchange/widgets/exchange_card.dart
View file

@ -272,9 +272,7 @@ class ExchangeCardState extends State<ExchangeCard> {
color: Theme.of(context)
.extension<ExchangePageTheme>()!
.hintTextColor),
validator: widget.hasAllAmount
? widget.allAmountValidator
: _isAmountEditable
validator: _isAmountEditable
? widget.currencyValueValidator
: null),
),

4
scripts/android/app_env.sh
View file

@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app"
MONERO_COM_SCHEME="monero.com"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.15.1"
CAKEWALLET_BUILD_NUMBER=199
CAKEWALLET_VERSION="4.15.2"
CAKEWALLET_BUILD_NUMBER=200
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
CAKEWALLET_SCHEME="cakewallet"

4
scripts/ios/app_env.sh
View file

@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=77
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.15.1"
CAKEWALLET_BUILD_NUMBER=218
CAKEWALLET_VERSION="4.15.2"
CAKEWALLET_BUILD_NUMBER=219
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
HAVEN_NAME="Haven"

4
scripts/macos/app_env.sh
View file

@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=10
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.8.1"
CAKEWALLET_BUILD_NUMBER=58
CAKEWALLET_VERSION="1.8.2"
CAKEWALLET_BUILD_NUMBER=59
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then