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

CW-647-Birdpay-Trc20 (#1469)

Browse source 
* fix: Desktop resize bug

* fix: Birdpay working for trc20 and adjust transaction fee currency

* fix: Filter logic

* fix: Solana token balance not fully displaying

* fix: Minor enhancements
This commit is contained in:
Adegoke David 2024-05-28 14:32:36 +01:00 committed by GitHub
parent 058522caf1
commit 24f6541fa6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cw_core/lib/crypto_currency.dart
View file

@ -253,7 +253,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
static CryptoCurrency fromString(String name, {CryptoCurrency? walletCurrency}) { static CryptoCurrency fromString(String name, {CryptoCurrency? walletCurrency}) {
try { try {
return CryptoCurrency.all.firstWhere((element) => return CryptoCurrency.all.firstWhere((element) =>
element.title.toLowerCase() == name && element.title.toLowerCase() == name.toLowerCase() &&
(element.tag == null || (element.tag == null ||
element.tag == walletCurrency?.title || element.tag == walletCurrency?.title ||
element.tag == walletCurrency?.tag)); element.tag == walletCurrency?.tag));

4
cw_solana/lib/solana_balance.dart
View file

@ -15,8 +15,8 @@ class SolanaBalance extends Balance {
String _balanceFormatted() { String _balanceFormatted() {
String stringBalance = balance.toString(); String stringBalance = balance.toString();
if (stringBalance.toString().length >= 6) { if (stringBalance.toString().length >= 12) {
stringBalance = stringBalance.substring(0, 6); stringBalance = stringBalance.substring(0, 12);
} }
return stringBalance; return stringBalance;
} }

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

@ -139,8 +139,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
String get pendingTransactionFeeFiatAmount { String get pendingTransactionFeeFiatAmount {
try { try {
if (pendingTransaction != null) { if (pendingTransaction != null) {
final currency = final currency = pendingTransactionFeeCurrency(walletType);
isEVMCompatibleChain(walletType) ? wallet.currency : selectedCryptoCurrency;
final fiat = calculateFiatAmount( final fiat = calculateFiatAmount(
price: _fiatConversationStore.prices[currency]!, price: _fiatConversationStore.prices[currency]!,
cryptoAmount: pendingTransaction!.feeFormatted); cryptoAmount: pendingTransaction!.feeFormatted);
@ -153,6 +152,18 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
} }
} }
CryptoCurrency pendingTransactionFeeCurrency(WalletType type) {
switch (type) {
case WalletType.ethereum:
case WalletType.polygon:
case WalletType.tron:
case WalletType.solana:
return wallet.currency;
default:
return selectedCryptoCurrency;
}
}
FiatCurrency get fiat => _settingsStore.fiatCurrency; FiatCurrency get fiat => _settingsStore.fiatCurrency;
TransactionPriority get transactionPriority { TransactionPriority get transactionPriority {