fix: fix issues

MetaMask · Jan 21, 2025 · 5218ea4 · 5218ea4
1 parent ebd3695
commit 5218ea4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -5705,17 +5705,20 @@ export default class MetamaskController extends EventEmitter {
       isMultichainOrigin: false,
     };
 
-    const approvedChains =
-      permissions[PermissionNames.permittedChains].caveats[0].value;
+    const requestedChains =
+      permissions[PermissionNames.permittedChains]?.caveats?.[0]?.value ?? [];
+
+    const requestedAccounts =
+      permissions[PermissionNames.eth_accounts]?.caveats?.[0]?.value ?? [];
 
     const caveatValueWithChains = setPermittedEthChainIds(
       newCaveatValue,
-      isSnapId(origin) ? [] : approvedChains,
+      isSnapId(origin) ? [] : requestedChains,
     );
 
     const caveatValueWithAccounts = setEthAccounts(
       caveatValueWithChains,
-      this.getPermittedAccounts(origin),
+      requestedAccounts,
     );
 
     await this.requestPermissionApproval(

diff --git a/ui/pages/permissions-connect/connect-page/connect-page.tsx b/ui/pages/permissions-connect/connect-page/connect-page.tsx
@@ -77,6 +77,7 @@ export function getCommonAccounts(
     }),
   );
 
+  // TODO: get every unique acc instead of only common accounts
   return accountArrays.reduce((commonAccounts, currentAccounts) => {
     return commonAccounts.filter((account) =>
       currentAccounts.includes(account),