Merge remote-tracking branch 'tom/wc-unspecified-account'

Author: thisconnect

CHANGELOG.md

@@ -9,6 +9,8 @@
 - Fix BitBoxApp crash on GrapheneOS and other phones without Google Play Services when scanning QR codes.
 - Add DMG installer for macOS
 - Use mempool.space as preferred fee estimation source for BTC
+- Fix Wallet Connect issue where account unspecified by the connecting dapp caused a UI crash
+- Fix Wallet Connect issue with required/optionalNamespace and handling all possible namespace definitions
 
 ## 4.42.0
 - Preselect backup when there's only one backup available

frontends/web/src/locales/en/app.json

@@ -1753,13 +1753,15 @@
     "connect": {
       "button": "Connect",
       "dappLabel": "Enter URI address of dapp",
-      "invalidPairingUri": "Invalid pairing uri"
+      "invalidPairingUri": "Invalid pairing uri",
+      "missingNamespace": "Connecting app request did not define necessary namespace"
     },
     "dashboard": {
       "allSessions": "All sessions",
       "disclaimer": "Walletconnect is a protocol to connect to Ethereum based Dapps. These dapps are run by third-party services, so only connect to dapps you trust and be sure to always know what you are signing when making a transaction.",
       "newConnection": "New connection",
-      "noConnectedSessions": "No accounts are currently connected to any dapps."
+      "noConnectedSessions": "No accounts are currently connected to any dapps.",
+      "unspecifiedAccount": "Unspecified account"
     },
     "invalidPairingChain": "Error in approving pairing. Please make sure to use one of the supported chains: {{chains}}",
     "pairingRequest": {

frontends/web/src/routes/account/walletconnect/components/incoming-pairing/incoming-pairing.tsx

@@ -61,12 +61,18 @@ export const WCIncomingPairing = ({
     setPairingLoading(true);
     try {
       const { id, params } = currentProposal;
-      const { requiredNamespaces } = params;
-      const eipList = Object.values(requiredNamespaces);
+      const { requiredNamespaces, optionalNamespaces } = params;
+      const eipList = Object.keys(requiredNamespaces).length !== 0 ? Object.values(requiredNamespaces) : Object.values(optionalNamespaces);
+      if (!eipList) {
+        alertUser(`${t('walletConnect.connect.missingNamespace')}`);
+        await handleRejectPairing();
+        setPairingLoading(false);
+        return;
+      }
       const accounts = eipList.flatMap(eip => eip.chains?.map(chain => `${chain}:${receiveAddress}`) || []);
-      // For supported chains, use an intersection of supported chains and required chains
+      // For supported chains, use an intersection of supported chains and required chains, default to mainnet if no chains present
       const chains: string[] = eipList.flatMap(proposal =>
-        proposal.chains ? proposal.chains.filter(chain => Object.keys(SUPPORTED_CHAINS).includes(chain)) : []
+        proposal.chains ? proposal.chains.filter(chain => Object.keys(SUPPORTED_CHAINS).includes(chain)) : ['eip155:1']
       );
 
       // buildApprovedNamespaces is a

frontends/web/src/routes/account/walletconnect/components/session-card/session-card.tsx

@@ -63,7 +63,7 @@ export const WCSessionCard = ({ metadata, receiveAddress, onDisconnect }: TWCSes
   const { name, url, icons } = metadata;
   const accountDetail = useLoad(() => getEthAccountCodeAndNameByAddress(receiveAddress), []);
   const truncatedAddress = truncateAddress(receiveAddress);
-  const accountName = accountDetail && accountDetail.success ? accountDetail.name : '';
+  const accountName = accountDetail && accountDetail.success ? accountDetail.name : t('walletConnect.dashboard.unspecifiedAccount');
 
   return (
     <div className={styles.container}>

frontends/web/src/routes/account/walletconnect/dashboard.tsx

@@ -106,14 +106,16 @@ export const DashboardWalletConnect = ({ code, accounts }: TProps) => {
               {hasSession &&
             <div className={styles.sessionCardsContainer}>
               <p className={styles.allSessionsHeading}>{t('walletConnect.dashboard.allSessions')}</p>
-              {sessions.map(session =>
-                <WCSessionCard
-                  key={session.topic}
-                  receiveAddress={getAddressFromEIPString(session.namespaces['eip155'].accounts[0])}
-                  metadata={session.peer.metadata}
-                  onDisconnect={() => handleDisconnectSession(session.topic)}
-                />
-              )}
+              {sessions.map(session => {
+                return (
+                  <WCSessionCard
+                    key={session.topic}
+                    receiveAddress={session.namespaces['eip155'].accounts[0] ? getAddressFromEIPString(session.namespaces['eip155'].accounts[0]) : ''}
+                    metadata={session.peer.metadata}
+                    onDisconnect={() => handleDisconnectSession(session.topic)}
+                  />
+                );
+              })}
             </div>
               }
               {!hasSession &&