Skip to content

fix: show notice that the account isn't connected when switching accounts - in side panel view #39063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NidhiKJha merged 2 commits into from
Jan 9, 2026
+5 −4
Merged

fix: show notice that the account isn't connected when switching accounts - in side panel view #39063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4bc260
updated active tab logic
NidhiKJha Jan 7, 2026
528b78f
type fix
NidhiKJha Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ui/components/app/toast-master/selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -162,11 +163,11 @@ export function selectShowConnectAccountGroupToast(
allowShowAccountSetting &&
accountGroup &&
isAccountSupported &&
state.activeTab.origin &&
activeTabOrigin &&
connectedAccounts.length > 0 &&
!isConnected;

return showConnectAccountToast;
return Boolean(showConnectAccountToast);
}

/**
Expand Down
Loading