Skip to content
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.

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

fix(wallet): Filter Select Account by Mainnet or Testnet #24096

Merged

Conversation

Douglashdaniel
Copy link
Contributor

Description

Fixes a bug when selecting a Token to send, the Select Account prompt was not filtering accounts by Testnet Accounts vs Mainnet Accounts for Bitcoin, ZCash and Filecoin.

Resolves brave/brave-browser#38927

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  1. Go to the Send screen and select Bitcoin, Zcash or Filecoin to send.
  2. When the Select Account prompt appears, it should filter accounts based on Testnet or Mainnet.

Before:

Screen.Recording.3.mov

After:

Screen.Recording.4.mov

@Douglashdaniel Douglashdaniel self-assigned this Jun 10, 2024
@Douglashdaniel Douglashdaniel requested a review from a team as a code owner June 10, 2024 17:17
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet labels Jun 10, 2024
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Copy link
Contributor

@josheleonard josheleonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved with suggestions

@Douglashdaniel Douglashdaniel force-pushed the fix-wallet-filter-select-account-by-mainnet-or-testnet branch from 90a69ef to 8dceff0 Compare June 10, 2024 18:32
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@Douglashdaniel Douglashdaniel force-pushed the fix-wallet-filter-select-account-by-mainnet-or-testnet branch from 8dceff0 to e489b94 Compare June 10, 2024 19:30
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@Douglashdaniel Douglashdaniel merged commit c7c155b into master Jun 10, 2024
19 checks passed
@Douglashdaniel Douglashdaniel deleted the fix-wallet-filter-select-account-by-mainnet-or-testnet branch June 10, 2024 21:07
@github-actions github-actions bot added this to the 1.69.x - Nightly milestone Jun 10, 2024
Comment on lines +226 to +228
return accounts.filter((account) =>
BitcoinMainnetKeyringIds.includes(account.accountId.keyringId)
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Folks, there is

export const networkSupportsAccount = (
  network: Pick<BraveWallet.NetworkInfo, 'coin' | 'supportedKeyrings'>,
  accountId: BraveWallet.AccountId
) => {
  return (
    network.coin === accountId.coin &&
    network.supportedKeyrings.includes(accountId.keyringId)
  )
}

for that purpose
@josheleonard @Douglashdaniel fyi

@srirambv
Copy link
Contributor

Verification passed on

Brave 1.69.14 Chromium: 126.0.6478.56 (Official Build) nightly (64-bit)
Revision b74f168
OS Linux
  • Verified steps from PR description
  • Verified only Testnet accounts/Mainnet accounts are shown in account selection screen
24096.mp4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Select Account is not filtering by Testnet Accounts
5 participants