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

transaction description key id address (#1755)

Browse source 
* transaction description key id+address

* minor fix[skip ci]

* fix backward compatibility

* add monero primary address
This commit is contained in:
Serhii 2024-10-18 05:58:57 +03:00 committed by GitHub
parent 6c9de67599
commit 5c2735be42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cw_core/lib/wallet_addresses.dart
View file

@ -23,7 +23,7 @@ abstract class WalletAddresses {
return _localAddress ?? address; return _localAddress ?? address;
} }
String? get primaryAddress => null; String get primaryAddress;
String? _localAddress; String? _localAddress;

3
cw_evm/lib/evm_chain_wallet_addresses.dart
View file

@ -17,6 +17,9 @@ abstract class EVMChainWalletAddressesBase extends WalletAddresses with Store {
@observable @observable
String address; String address;
@override
String get primaryAddress => address;
@override @override
Future<void> init() async { Future<void> init() async {
address = walletInfo.address; address = walletInfo.address;

3
cw_monero/lib/monero_wallet_addresses.dart
View file

@ -29,6 +29,9 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
@observable @observable
String address; String address;
@override
String get primaryAddress => getAddress(accountIndex: account?.id ?? 0, addressIndex: 0);
@override @override
String get latestAddress { String get latestAddress {
var addressIndex = subaddress_list.numSubaddresses(account?.id??0) - 1; var addressIndex = subaddress_list.numSubaddresses(account?.id??0) - 1;

3
cw_nano/lib/nano_wallet_addresses.dart
View file

@ -18,6 +18,9 @@ abstract class NanoWalletAddressesBase extends WalletAddresses with Store {
@observable @observable
String address; String address;
@override
String get primaryAddress => address;
@observable @observable
NanoAccount? account; NanoAccount? account;

3
cw_solana/lib/solana_wallet_addresses.dart
View file

@ -14,6 +14,9 @@ abstract class SolanaWalletAddressesBase extends WalletAddresses with Store {
@override @override
String address; String address;
@override
String get primaryAddress => address;
@override @override
Future<void> init() async { Future<void> init() async {
address = walletInfo.address; address = walletInfo.address;

3
cw_tron/lib/tron_wallet_addresses.dart
View file

@ -17,6 +17,9 @@ abstract class TronWalletAddressesBase extends WalletAddresses with Store {
@observable @observable
String address; String address;
@override
String get primaryAddress => address;
@override @override
Future<void> init() async { Future<void> init() async {
address = walletInfo.address; address = walletInfo.address;

3
cw_wownero/lib/wownero_wallet_addresses.dart
View file

@ -29,6 +29,9 @@ abstract class WowneroWalletAddressesBase extends WalletAddresses with Store {
@observable @observable
String address; String address;
@override
String get primaryAddress => getAddress(accountIndex: account?.id ?? 0, addressIndex: 0);
@override @override
String get latestAddress { String get latestAddress {
var addressIndex = subaddress_list.numSubaddresses(account?.id??0) - 1; var addressIndex = subaddress_list.numSubaddresses(account?.id??0) - 1;

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

@ -482,12 +482,18 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
nano!.updateTransactions(wallet); nano!.updateTransactions(wallet);
} }
if (pendingTransaction!.id.isNotEmpty) { if (pendingTransaction!.id.isNotEmpty) {
final descriptionKey = '${pendingTransaction!.id}_${wallet.walletAddresses.primaryAddress}';
_settingsStore.shouldSaveRecipientAddress _settingsStore.shouldSaveRecipientAddress
? await transactionDescriptionBox.add(TransactionDescription( ? await transactionDescriptionBox.add(TransactionDescription(
id: pendingTransaction!.id, recipientAddress: address, transactionNote: note)) id: descriptionKey,
: await transactionDescriptionBox recipientAddress: address,
.add(TransactionDescription(id: pendingTransaction!.id, transactionNote: note)); transactionNote: note))
: await transactionDescriptionBox.add(TransactionDescription(
id: descriptionKey,
transactionNote: note));
} }
state = TransactionCommitted(); state = TransactionCommitted();

6
lib/view_model/transaction_details_view_model.dart
View file

@ -110,9 +110,11 @@ abstract class TransactionDetailsViewModelBase with Store {
} catch (e) {} } catch (e) {}
})); }));
final descriptionKey = '${transactionInfo.txHash}_${wallet.walletAddresses.primaryAddress}';
final description = transactionDescriptionBox.values.firstWhere( final description = transactionDescriptionBox.values.firstWhere(
(val) => val.id == transactionInfo.txHash, (val) => val.id == descriptionKey || val.id == transactionInfo.txHash,
orElse: () => TransactionDescription(id: transactionInfo.txHash)); orElse: () => TransactionDescription(id: descriptionKey));
items.add(TextFieldListItem( items.add(TextFieldListItem(
title: S.current.note_tap_to_change, title: S.current.note_tap_to_change,