diff --git a/ui/components/app/toast-master/selectors.ts b/ui/components/app/toast-master/selectors.ts index 5e4aa2704437..80d88d88e812 100644 --- a/ui/components/app/toast-master/selectors.ts +++ b/ui/components/app/toast-master/selectors.ts @@ -116,6 +116,7 @@ export function selectShowConnectAccountToast( account: InternalAccount, ): boolean { const allowShowAccountSetting = getAlertEnabledness(state).unconnectedAccount; + const activeTabOrigin = getOriginOfCurrentTab(state); const connectedAccounts = getAllPermittedAccountsForCurrentTab(state); // We only support connection with EVM or Solana accounts @@ -127,12 +128,12 @@ export function selectShowConnectAccountToast( const showConnectAccountToast = allowShowAccountSetting && account && - state.activeTab.origin && + activeTabOrigin && isConnectableAccount && connectedAccounts.length > 0 && !isInternalAccountInPermittedAccountIds(account, connectedAccounts); - return showConnectAccountToast; + return Boolean(showConnectAccountToast); } // If there is more than one connected account to activeTabOrigin, @@ -162,11 +163,11 @@ export function selectShowConnectAccountGroupToast( allowShowAccountSetting && accountGroup && isAccountSupported && - state.activeTab.origin && + activeTabOrigin && connectedAccounts.length > 0 && !isConnected; - return showConnectAccountToast; + return Boolean(showConnectAccountToast); } /**