Fix null checks for accessing csprName properties.

make-software · Nov 25, 2024 · ecabf24 · ecabf24
1 parent f9fc016
commit ecabf24
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/apps/connect-to-app/pages/switch-account/content.tsx b/src/apps/connect-to-app/pages/switch-account/content.tsx
@@ -134,7 +134,7 @@ export function SwitchAccountContent({ requestId }: SwitchAccountContentProps) {
               rows={connectedAccountsListItems}
               renderRow={(account, index) => {
                 const csprName =
-                  accountsInfo && accountsInfo[account.accountHash].csprName;
+                  accountsInfo && accountsInfo[account.accountHash]?.csprName;
 
                 return (
                   <ListItemContainer key={account.name}>

diff --git a/src/apps/connect-to-app/pages/switch-account/unconnected-accounts-list.tsx b/src/apps/connect-to-app/pages/switch-account/unconnected-accounts-list.tsx
@@ -69,7 +69,7 @@ export const UnconnectedAccountsList = ({
         renderRow={(unconnectedAccount, index) => {
           const csprName =
             accountsInfo &&
-            accountsInfo[unconnectedAccount.accountHash].csprName;
+            accountsInfo[unconnectedAccount.accountHash]?.csprName;
 
           return (
             <ListItemContainer key={unconnectedAccount.name}>

diff --git a/src/apps/popup/pages/connected-sites/index.tsx b/src/apps/popup/pages/connected-sites/index.tsx
@@ -97,7 +97,7 @@ export function ConnectedSitesPage() {
               const accountHash = getAccountHashFromPublicKey(publicKey);
 
               const csprName =
-                accountsInfo && accountsInfo[accountHash].csprName;
+                accountsInfo && accountsInfo[accountHash]?.csprName;
 
               return (
                 <SiteGroupItem