fix: show loading indicator instead of no-wallet during wallet deletion#10555

Closed

PatrickChoo wants to merge 5 commits intoOneKeyHQ:xfrom

PatrickChoo:fix/hide-account-selector-no-wallet

Collaborator

PatrickChoo commented Mar 9, 2026 •

edited

Loading

Summary

When deleting a wallet (with other wallets still present), the UI briefly flashed the "No Wallet" empty state. Now shows a loading spinner during the async wallet switch transition using accountSelectorSyncLoadingAtom.
Hide account selector and header components gracefully during wallet removal by checking sync loading state across HomePageView, AccountSelectorTriggerHome, SelectorTrigger, WalletConnectionGroup, MDHeader, and InPageHeader.
Extract accountUtils.hasNoUsableWallet() to replace duplicated no-wallet detection logic, replacing the coarse if (wallet) check with a precise !wallet || (isOthersWallet && !account) condition.
Extract useIsAccountSelectorSyncLoading(num) hook to centralize sync loading reads.
Extract NoWalletContent component to isolate sync loading subscription from the HomePageView page memo.

Screenshot 2026-03-09 at 22 00 46

Jira

OK-51091
OK-51094

Test plan

Create multiple wallets, delete one wallet — verify no "No Wallet" flash, spinner shown briefly instead
Delete the last wallet — verify "No Wallet" empty state still shows correctly
Web dapp mode with no wallet — verify Connect button still shows
Verify Android/iOS Home header Row 2 hides when no usable wallet
URL account scenario (Discovery tab) — verify SelectorTrigger behaves correctly

PatrickChoo requested review from ezailWang, huhuanming, originalix, revan-zhang and sidmorizon as code owners

March 9, 2026 14:11

Contributor

revan-zhang commented Mar 9, 2026 •

edited

Loading

✅ Snyk checks have passed. No issues have been found so far.

Status	Scan Engine	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues
✅	Licenses	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

Minnzen previously approved these changes

View reviewed changes

This comment was marked as resolved.

Sign in to view

originalix requested changes

View reviewed changes

packages/kit/src/components/TabPageHeader/components/WalletConnectionGroup.tsx Outdated

originalix reviewed

View reviewed changes

...ges/kit/src/components/AccountSelector/AccountSelectorTrigger/AccountSelectorTriggerHome.tsx Outdated

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

PatrickChoo dismissed Minnzen’s stale review via

a761350

March 10, 2026 06:13

This comment was marked as resolved.

Sign in to view

chatgpt-codex-connector bot commented Mar 10, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

PatrickChoo requested a review from originalix

March 10, 2026 09:29

chatgpt-codex-connector bot commented Mar 10, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

7 similar comments

chatgpt-codex-connector bot commented Mar 10, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 10, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 11, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 11, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 11, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 11, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

chatgpt-codex-connector bot commented Mar 11, 2026

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

This comment was marked as resolved.

Sign in to view

PatrickChoo force-pushed the fix/hide-account-selector-no-wallet branch 3 times, most recently from 3d3c769 to 1ac035e Compare

April 9, 2026 17:16

PatrickChoo added 5 commits

April 11, 2026 01:33


          fix: show loading indicator instead of no-wallet during wallet deletion

cc3a71d

When deleting a wallet with multiple wallets present, the UI briefly
flashed the "No Wallet" empty state before auto-selecting the next
wallet. Use accountSelectorSyncLoadingAtom to show a spinner during
the async transition instead.

Also fix AndroidManifest intent tag with multiple data schemes.

OK-51091 OK-51094


          fix: extract hasNoUsableWallet to shared util and fix web dapp mode r…

…egression

- Add accountUtils.hasNoUsableWallet() to eliminate 5x duplicated logic
- Remove hideNoWalletTrigger from shared AccountSelectorTriggerBase to
  avoid hiding trigger in Swap/RewardCenter contexts
- Add platformEnv.isWebDappMode exclusion in WalletConnectionGroup and
  AccountSelectorTriggerHome to preserve Connect button in web dapp mode
- Show Spinner instead of blank state during sync loading in HomePageView


          refactor: extract useIsAccountSelectorSyncLoading hook

fa1e8c7

Every header/trigger consumer was hand-rolling the same
`syncLoading?.[num]?.isLoading` read after subscribing to the full
accountSelectorSyncLoadingAtom. Centralize it in a single hook so the
call sites stop copy-pasting the same nullable chain and the atom
subscription has a single place to swap in slot-keyed derivation later
if we ever need to narrow the re-render surface.

Applied to the six components that this PR already touches: HomePageView,
HeaderRight, MDHeader, WalletConnectionGroup, TabPageHeader/index,
AccountSelectorTriggerHome. The two DApp trigger variants
(NetworkSelectorTriggerDApp / AccountSelectorTriggerDApp) pair the read
with `|| mockIsLoading`, so they stay on the raw atom for now and are
out of scope.


          refactor: remove hasNoUsableWallet prop drilling, compute locally

f61a9c0

- Remove hasNoUsableWallet from ITabPageHeaderProp, TabPageHeader,
  MDHeader, InPageHeader — each component now derives the value from
  useActiveAccount + accountUtils.hasNoUsableWallet
- Remove unnecessary useMemo wrapping trivial boolean check in
  WalletConnectionGroup and HomePageView
- Trim verbose comment on useIsAccountSelectorSyncLoading hook


          fix: add isWebDappMode guard to SelectorTrigger, extract NoWalletContent

a6a61d3

- SelectorTrigger: add !platformEnv.isWebDappMode check for consistency
  with other guard sites, preventing accidental hiding in dapp mode
- HomePageView: extract NoWalletContent component to isolate
  isSyncLoading subscription, removing it from the homePage useMemo
  deps to avoid two full-page re-renders per wallet deletion

PatrickChoo marked this pull request as draft

April 10, 2026 17:47

PatrickChoo force-pushed the fix/hide-account-selector-no-wallet branch from 1ac035e to a6a61d3 Compare

April 10, 2026 17:50

Collaborator Author

PatrickChoo commented Apr 10, 2026

Closing in favor of a clean PR with rebased commits and review fixes applied.

PatrickChoo closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

devin-ai-integration[bot] devin-ai-integration[bot] left review comments

chatgpt-codex-connector[bot] chatgpt-codex-connector[bot] left review comments

Minnzen Minnzen left review comments

ezailWang Awaiting requested review from ezailWang ezailWang is a code owner

revan-zhang Awaiting requested review from revan-zhang revan-zhang is a code owner

sidmorizon Awaiting requested review from sidmorizon sidmorizon is a code owner

huhuanming Awaiting requested review from huhuanming huhuanming is a code owner

originalix Awaiting requested review from originalix originalix is a code owner

Labels

None yet