updated snaps description

MetaMask · Sep 14, 2023 · b5e4de0 · b5e4de0
1 parent 8076485
commit b5e4de0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/ui/pages/connected-accounts/connected-accounts.component.js b/ui/pages/connected-accounts/connected-accounts.component.js
@@ -34,6 +34,29 @@ export default function ConnectedAccounts({
     permissionSubjects[originOfActiveTab]?.origin ===
     connectedSubjectsMetadata?.origin;
   const connectedSubjects = [connectedSubjectsMetadata];
+  const permissionSubjectsLength = Object.keys(
+    permissionSubjects[originOfActiveTab]?.permissions?.wallet_snap.caveats[0]
+      .value,
+  ).length;
+
+  const connectedAccountsDescription =
+    connectedAccounts.length > 0
+      ? t('connectedAccountsDescriptionPlural', [connectedAccounts.length])
+      : t('connectedAccountsDescriptionSingular');
+
+  let subtitle;
+  if (connectedAccounts.length && !isPermissionSubject) {
+    subtitle = connectedAccountsDescription;
+  } else if (isPermissionSubject && !connectedAccounts.length) {
+    subtitle = t('connectedSnapAndNoAccountDescription');
+  } else if (connectedAccounts.length && isPermissionSubject) {
+    subtitle = t('connectedAccountsAndSnapDescription', [
+      connectedAccounts.length,
+      permissionSubjectsLength,
+    ]);
+  } else {
+    subtitle = t('connectedAccountsEmptyDescription');
+  }
 
   const onDisconnect = (connectedOrigin) => {
     const caveatValue =
@@ -59,23 +82,14 @@ export default function ConnectedAccounts({
     }
   };
 
-  const connectedAccountsDescription =
-    connectedAccounts.length > 0
-      ? t('connectedAccountsDescriptionPlural', [connectedAccounts.length])
-      : t('connectedAccountsDescriptionSingular');
-
   return (
     <Popover
       title={
         isActiveTabExtension
           ? t('currentExtension')
           : getURLHost(activeTabOrigin)
       }
-      subtitle={
-        connectedAccounts.length
-          ? connectedAccountsDescription
-          : t('connectedAccountsEmptyDescription')
-      }
+      subtitle={subtitle}
       onClose={() => history.push(mostRecentOverviewPage)}
       footerClassName="connected-accounts__footer"
       footer={