fix: Show crypto account for respective wallet address only #2833

TalaoDAO · Aug 14, 2024 · 70f0afc · 70f0afc
1 parent 8fbede6
commit 70f0afc
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 20 deletions.
diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -2180,21 +2180,42 @@ Future<Map<String, dynamic>?> checkVerifierAttestation({
   return cnf['jwk'] as Map<String, dynamic>;
 }
 
-String? getWalletAddress(CredentialSubjectModel credentialSubjectModel) {
+/// walletaddress and blockchain type
+(String?, BlockchainType?) getWalletAddress(
+  CredentialSubjectModel credentialSubjectModel,
+) {
   if (credentialSubjectModel is TezosAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.tezos,
+    );
   } else if (credentialSubjectModel is EthereumAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.ethereum,
+    );
   } else if (credentialSubjectModel is PolygonAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.polygon,
+    );
   } else if (credentialSubjectModel is BinanceAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.binance,
+    );
   } else if (credentialSubjectModel is FantomAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.fantom,
+    );
   } else if (credentialSubjectModel is EtherlinkAssociatedAddressModel) {
-    return credentialSubjectModel.associatedAddress;
+    return (
+      credentialSubjectModel.associatedAddress,
+      BlockchainType.etherlink,
+    );
   }
-  return null;
+  return (null, null);
 }
 
 Future<String> fetchRpcUrl({

diff --git a/lib/dashboard/home/tab_bar/credentials/list/widgets/home_credential_category_list.dart b/lib/dashboard/home/tab_bar/credentials/list/widgets/home_credential_category_list.dart
@@ -89,22 +89,38 @@ class _HomeCredentialCategoryListState
                             /// crypto credential account to be shown always
                             if (element.credentialPreview.credentialSubjectModel
                                 .credentialSubjectType.isBlockchainAccount) {
-                              /// only show crypto card with matches current account
-                              /// wallet address
-                              final String? currentWalletAddress = context
+                              /// only show crypto card with matches current
+                              /// account wallet address
+
+                              final currentAccount = context
                                   .read<WalletCubit>()
                                   .state
-                                  .currentAccount
-                                  ?.walletAddress;
+                                  .currentAccount;
 
-                              final String? walletAddress = getWalletAddress(
-                                element
-                                    .credentialPreview.credentialSubjectModel,
-                              );
+                              if (currentAccount != null) {
+                                final currentWalletAddress =
+                                    currentAccount.walletAddress;
 
-                              if (currentWalletAddress.toString() !=
-                                  walletAddress.toString()) {
-                                return false;
+                                final currentBlockchainType =
+                                    currentAccount.blockchainType;
+
+                                final (walletAddress, blockchainType) =
+                                    getWalletAddress(
+                                  element
+                                      .credentialPreview.credentialSubjectModel,
+                                );
+
+                                final matchesWalletAddress =
+                                    currentWalletAddress !=
+                                        walletAddress.toString();
+
+                                final matchesBlockchainType =
+                                    currentBlockchainType != blockchainType;
+
+                                if (matchesWalletAddress ||
+                                    matchesBlockchainType) {
+                                  return false;
+                                }
                               }
                             }