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.

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

Jump to bottom

feat(wallet): Add contract address and tokenId to send page #18592

Merged
merged 6 commits into from May 31, 2023
Merged

feat(wallet): Add contract address and tokenId to send page #18592

merged 6 commits into from May 31, 2023

Conversation

muliswilliam
Copy link
Collaborator

Resolves brave/brave-browser#30547

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • 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 lint, 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:

Screen.Recording.2023-05-24.at.12.54.43.mov

@muliswilliam muliswilliam requested a review from a team as a code owner May 24, 2023 10:35
@github-actions github-actions bot added CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet labels May 24, 2023
@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

@brave-builds
Copy link
Collaborator

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

josheleonard
josheleonard reviewed May 25, 2023
View reviewed changes
components/brave_wallet_ui/page/screens/send/send/send.tsx Outdated
Comment on lines 368 to 373
const asset = sendAssetOptions.find((option) =>
tokenId
? option.contractAddress.toLowerCase() ===
contractAddress.toLowerCase() && option.tokenId === tokenId
: option.contractAddress.toLowerCase() === contractAddress.toLowerCase()
)
Copy link
Collaborator

Choose a reason for hiding this comment

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

should selectedSendAsset be included in this computation?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't think that is necessary.

components/brave_wallet_ui/page/screens/send/send/send.tsx Outdated
@@ -344,6 +361,43 @@ export const Send = (props: Props) => {
}
}, [selectedTokensNetwork])

React.useEffect(() => {
// check if the user has selected an asset
if (!contractAddress || !accountAddress || !chainId || selectedSendAsset) return
Copy link
Collaborator

Choose a reason for hiding this comment

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

selectedSendAsset currently isn't used in any computations of this effect

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@josheleonard Yes, we should not override what the user has selected. This can happen when a user selects an asset and the component rerenders, it would trigger the useEffect and that would override their choice. That is why the check is necessary.

components/brave_wallet_ui/page/screens/send/send/send.tsx Outdated Show resolved Hide resolved
components/brave_wallet_ui/page/screens/send/send/send.tsx Outdated Show resolved Hide resolved
@brave-builds
Copy link
Collaborator

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

josheleonard
josheleonard approved these changes May 30, 2023
View reviewed changes
Copy link
Collaborator

@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.

++

We should follow-up to make sure that the send page URL params update when account/asset selections are changed.

@brave-builds
Copy link
Collaborator

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

@muliswilliam muliswilliam merged commit c646de4 into master May 31, 2023
16 checks passed
@muliswilliam muliswilliam deleted the feat-send-screen-params branch May 31, 2023 05:50
@github-actions github-actions bot added this to the 1.54.x - Nightly milestone May 31, 2023
@supermassive supermassive mentioned this pull request May 31, 2023
Merged
25 tasks
@srirambv srirambv mentioned this pull request Jul 25, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onyb onyb onyb left review comments

@josheleonard josheleonard josheleonard approved these changes

Assignees

@muliswilliam muliswilliam

Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet
Projects
None yet
Milestone
1.57.x - Release
4 participants
@muliswilliam @brave-builds @onyb @josheleonard