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

chore(wallet): migrate swap to brave-core #18562

Merged
merged 22 commits into from May 25, 2023
Merged

chore(wallet): migrate swap to brave-core #18562

merged 22 commits into from May 25, 2023

Conversation

onyb
Copy link
Member

@onyb onyb commented May 22, 2023

Resolves brave/brave-browser#30370

Note to @brave/js-deps-reviewers

  • @brave/swap-interface is removed from package.json.
  • async npm library is added to package.json. It was one of the dependencies of @brave/swap-interface.

Note to other reviewers

Added some FIXME(douglashdaniel) and optional FIXME(josheleonard) comments for @Douglashdaniel and @josheleonard respectively.

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:

Please test all aspects of 0x and Jupiter swaps on desktop and android.

@onyb onyb self-assigned this May 22, 2023
@github-actions github-actions bot added CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet labels May 22, 2023
@socket-security
Copy link

New dependency changes detected. Learn more about Socket for GitHub ↗︎

👍 No new dependency issues detected in pull request

Bot Commands

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@* or ignore all packages with @SocketSecurity ignore-all

Pull request alert summary
Issue Status
Critical CVE ✅ 0 issues
Native code ✅ 0 issues
Bin script shell injection ✅ 0 issues
Unresolved require ✅ 0 issues
Invalid package.json ✅ 0 issues
HTTP dependency ✅ 0 issues
Git dependency ✅ 0 issues
Potential typo squat ✅ 0 issues
Known Malware ✅ 0 issues
Telemetry ✅ 0 issues
Protestware/Troll package ✅ 0 issues
AI detected security risk ✅ 0 issues
AI warning ✅ 0 issues

📊 Modified Dependency Overview:

➕ Added Package Capability Access +/- Transitive Count Publisher
@types/async@3.2.20 None +0 types

🚮 Removed packages: @brave/swap-interface@2.1.1

@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

@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

@brave-builds
Copy link
Collaborator

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

@onyb onyb marked this pull request as ready for review May 23, 2023 17:22
@onyb onyb requested review from a team as code owners May 23, 2023 17:22
github-actions[bot]
github-actions bot reviewed May 23, 2023
View reviewed changes
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/apeswap.svg Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/apeswap.svg Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/biswap.svg Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/ironswap.svg Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/penguin.svg Outdated Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/shibaswap.svg Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/stepn.svg Outdated Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/stepn.svg Outdated Show resolved Hide resolved
components/brave_wallet_ui/page/screens/swap/assets/lp-icons/sushiswap.svg Show resolved Hide resolved
@thypon
Copy link
Member

thypon commented May 23, 2023

@onyb left a couple of comments

@fmarier fmarier removed their assignment May 23, 2023
@onyb onyb force-pushed the migrate-swap-to-brave-core branch from b786278 to 37dea58 Compare May 24, 2023 02:00
@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

@thypon thypon removed their assignment May 24, 2023
onyb and others added 20 commits May 25, 2023 10:14
@onyb
chore(wallet): Swap V2 integration fixes
8ed4d88
@onyb
chore(wallet): Swap v2 android fixes
23e67c0
@onyb
chore(wallet): fix presubmit errors
4f42c69
@Douglashdaniel @onyb
fix-icons
63c4b98
@Douglashdaniel @onyb
fix-more-presubmit-errors
b80b58b
@Douglashdaniel @onyb
add-reduce-network-name-util
b2529fc
@Douglashdaniel @onyb
fix-noopener-error
3a3b557
@Douglashdaniel @onyb
fix-button-color
f02e88e
@onyb
chore(wallet): add useSelectedAccountQuery slice(extra)
98d8ebb
@onyb
fix(wallet): fix spot prices and cleanup types
5435c81
@Douglashdaniel @onyb
fix-lp-wrapping-and-additional-icons
a20614a
@onyb
review(thypon): fix console.log statements
7daa37c
@onyb
review(thypon): convert fake SVGs to PNG files
44c00df
@onyb
chore: fix presubmit error
39e72a2
@onyb
fix vulnerable regex
d04f219
@onyb
fix vulnerable regex v2
d236e1a
@onyb
more presubmit fixes
0da4fd4
@onyb
review(josheleonard): review fixes (part 1)
039acbd
@onyb
presubmit fixes
b776d05
@onyb
review(josheleonard): review fixes (part 2)
db3c59f
@onyb onyb force-pushed the migrate-swap-to-brave-core branch from db128d8 to db3c59f Compare May 25, 2023 04:44
@brave-builds
Copy link
Collaborator

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

thypon
thypon approved these changes May 25, 2023
View reviewed changes
Copy link
Member

@thypon thypon left a comment

Choose a reason for hiding this comment

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

deps ok

@vadimstruts
fixed build for android
d4097ef 
Signed-off-by: Vadym Struts <vstruts@brave.com>
@brave-builds
Copy link
Collaborator

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

josheleonard
josheleonard approved these changes May 25, 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.

++

@onyb onyb merged commit d293cd9 into master May 25, 2023
15 of 16 checks passed
@onyb onyb deleted the migrate-swap-to-brave-core branch May 25, 2023 17:19
@github-actions github-actions bot added this to the 1.54.x - Nightly milestone May 25, 2023
@srirambv srirambv mentioned this pull request Jul 31, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions left review comments

@thypon thypon thypon approved these changes

@josheleonard josheleonard josheleonard approved these changes

Assignees

@onyb onyb

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build feature/web3/wallet
Projects
None yet
Milestone
1.57.x - Release
7 participants
@onyb @brave-builds @thypon @josheleonard @fmarier @Douglashdaniel @vadimstruts