fix: dApp switch banner appearing on non-injectable pages (#1713)

rainbow-me · Oct 2, 2024 · 6a4d0b6 · 6a4d0b6
1 parent 4e1d07d
commit 6a4d0b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/entries/popup/components/AppConnection/AppConnectionNudgeBanner.tsx b/src/entries/popup/components/AppConnection/AppConnectionNudgeBanner.tsx
@@ -105,7 +105,10 @@ export const AppConnectionNudgeBanner = ({
                     </Inline>
                     <TextOverflow color="label" size="14pt" weight="bold">
                       {i18n.t('app_connection_switcher.banner.connect_to', {
-                        appName: dappMetadata?.appName || dappMetadata?.appHost,
+                        appName:
+                          dappMetadata?.appName ||
+                          dappMetadata?.appHost ||
+                          'dApp',
                       })}
                     </TextOverflow>
                   </Stack>

diff --git a/src/entries/popup/components/AppConnection/AppConnectionWatcher.tsx b/src/entries/popup/components/AppConnection/AppConnectionWatcher.tsx
@@ -58,7 +58,7 @@ export const AppConnectionWatcher = () => {
     if (showNudgeSheet) setShowNudgeSheet(false);
     triggerToast({
       title: i18n.t('app_connection_switcher.banner.app_connected', {
-        appName: dappMetadata?.appName || dappMetadata?.appHostName,
+        appName: dappMetadata?.appName || dappMetadata?.appHostName || 'dApp',
       }),
       description: chainsLabel[activeSession?.chainId || ChainId.mainnet],
     });
@@ -117,6 +117,9 @@ export const AppConnectionWatcher = () => {
       clearTimeout(timeoutRef.current);
     }
 
+    // Injection failed, or attempting to connect to `chrome://` url
+    if (url === '') return;
+
     if (
       nudgeSheetEnabled &&
       !appHasInteractedWithNudgeSheet({ host: dappMetadata?.appHost })
@@ -139,6 +142,7 @@ export const AppConnectionWatcher = () => {
     handleBannerTimeout,
     nudgeSheetEnabled,
     setAppHasInteractedWithNudgeSheet,
+    url,
   ]);
 
   const hide = useCallback(() => {