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

CW-854 Monero Wallet Group Fix (#1865)

Browse source 
* Fix: Tentative fix to wrong wallet groupings, specifically monero or non bip39 wallet types

* fix: Modify logic to filter out single wallets and multi group wallets

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
This commit is contained in:
David Adegoke 2024-12-11 19:51:09 +01:00 committed by GitHub
parent 82bad3a951
commit 6e8cc9c39e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
lib/view_model/wallet_list/wallet_list_view_model.dart
View file

@ -2,6 +2,7 @@ import 'package:cake_wallet/core/wallet_loading_service.dart';
import 'package:cake_wallet/entities/wallet_group.dart'; import 'package:cake_wallet/entities/wallet_group.dart';
import 'package:cake_wallet/entities/wallet_list_order_types.dart'; import 'package:cake_wallet/entities/wallet_list_order_types.dart';
import 'package:cake_wallet/entities/wallet_manager.dart'; import 'package:cake_wallet/entities/wallet_manager.dart';
import 'package:cake_wallet/reactions/bip39_wallet_utils.dart';
import 'package:hive/hive.dart'; import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/store/app_store.dart';
@ -90,20 +91,59 @@ abstract class WalletListViewModelBase with Store {
multiWalletGroups.clear(); multiWalletGroups.clear();
singleWalletsList.clear(); singleWalletsList.clear();
wallets.addAll( for (var info in _walletInfoSource.values) {
_walletInfoSource.values wallets.add(convertWalletInfoToWalletListItem(info));
.map((info) => convertWalletInfoToWalletListItem(info)), }
);
//========== Split into shared seed groups and single wallets list //========== Split into shared seed groups and single wallets list
_walletManager.updateWalletGroups(); _walletManager.updateWalletGroups();
for (var group in _walletManager.walletGroups) { final walletGroupsFromManager = _walletManager.walletGroups;
for (var group in walletGroupsFromManager) {
if (group.wallets.length == 1) { if (group.wallets.length == 1) {
singleWalletsList singleWalletsList.add(convertWalletInfoToWalletListItem(group.wallets.first));
.add(convertWalletInfoToWalletListItem(group.wallets.first)); continue;
} else { }
// Identify wallets that should be moved to singleWalletsList using the filters: the type/derivation
final excludedWallets = <WalletInfo>[];
for (var wallet in group.wallets) {
// Check for non-BIP39 wallet types
final isNonBIP39 = !isBIP39Wallet(wallet.type);
// Check for nano derivation type
final isNanoDerivation = wallet.type == WalletType.nano &&
wallet.derivationInfo?.derivationType == DerivationType.nano;
// Check for electrum derivation type
final isElectrumDerivation =
(wallet.type == WalletType.bitcoin || wallet.type == WalletType.litecoin) &&
wallet.derivationInfo?.derivationType == DerivationType.electrum;
if (isNonBIP39 || isNanoDerivation || isElectrumDerivation) {
excludedWallets.add(wallet);
}
}
// Add excluded wallets to singleWalletsList
for (var excludedWallet in excludedWallets) {
singleWalletsList.add(convertWalletInfoToWalletListItem(excludedWallet));
}
// Remove excluded wallets from the group's wallets to avoid duplication
group.wallets.removeWhere((wallet) {
return excludedWallets.any((excluded) => excluded.address == wallet.address);
});
// Check if the group has more than one wallet after the excluded wallets are removed.
if (group.wallets.length > 1) {
//Add the entire group to the multi wallet group list since its still a multi wallet
multiWalletGroups.add(group); multiWalletGroups.add(group);
} else if (group.wallets.length == 1) {
// Add the group to the wallet left to the single wallets list
singleWalletsList.add(convertWalletInfoToWalletListItem(group.wallets.first));
} }
} }
} }