Skip to content

fix: mf-6835 keep external wallet connected after done and show provider icon - #12486

Merged
guanbinrui merged 2 commits into
developfrom
fix/mf-6835-popup-connect-external-wallet
Sep 10, 2026
Merged

fix: mf-6835 keep external wallet connected after done and show provider icon#12486
guanbinrui merged 2 commits into
developfrom
fix/mf-6835-popup-connect-external-wallet

Conversation

@swkatmask

Copy link
Copy Markdown
Contributor

Summary

Fixes the MF-6835 regression from #12433/#12435 (built-in Mask wallet removal): connecting an external wallet from the popup appeared to work but never stuck, and every external wallet showed Mask's own logo.

  • ConnectWallet handleDone: no longer calls EVMWeb3.disconnect({ providerType }) — "Done" keeps the connection and just closes the popup window. Pre-removal, Done intentionally fell back to the built-in Mask wallet; with that gone, the disconnect tore down the connection the user just made. Persistence already works because non-background contexts proxy KV writes to the background, which broadcasts to all open contexts.
  • WalletAvatar: for non-Firefly wallets, render the current EVM provider's icon (from getRegisteredWeb3Providers descriptor) instead of always falling back to Icons.MaskBlue. MaskBlue remains the fallback when no descriptor matches.
  • WalletHeaderUI: the header only renders when an account exists, so show the green dot + Connected instead of the hardcoded grey "Not Connected" (leftover from the useConnected removal); drop the dead status transform on the network arrow.

Test Plan

  • tsc --noEmit -p packages/mask clean
  • pnpm lint clean
  • Manual verification in Chrome-for-Testing with MetaMask: connect via popup → ConnectWallet page shows MetaMask icon/name/address → Done → popup Wallet tab shows connected (green dot + Connected) → reopen popup still connected

Closes MF-6835

@vercel

vercel Bot commented Sep 10, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
book Ready Ready Preview Sep 10, 2026 4:55pm UTC

Request Review

@guanbinrui
guanbinrui merged commit d401202 into develop Sep 10, 2026
11 checks passed
@guanbinrui
guanbinrui deleted the fix/mf-6835-popup-connect-external-wallet branch September 10, 2026 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants