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

Pr17947 pr17981 display wallet icon when viewing bravewalletswap (Uplift to 1.50.x) #18024

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Pr17947 pr17981 display wallet icon when viewing bravewalletswap (Uplift to 1.50.x) #18024

merged 3 commits into from
Apr 18, 2023

Conversation

vadimstruts
Copy link
Collaborator

@vadimstruts vadimstruts commented Apr 12, 2023 •
edited by kjozwiak
Loading

Uplift of #17947
Uplift of #17981
Uplift of #18081
Resolves brave/brave-browser#29221
Resolves brave/brave-browser#29222
Resolves brave/brave-browser#29223
Resolves brave/brave-browser#29680

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@vadimstruts
added switching to android wallet when swap executed and back
e11a62b 
Signed-off-by: Vadym Struts <vstruts@brave.com>
@vadimstruts vadimstruts added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x86 CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Apr 12, 2023
@vadimstruts vadimstruts changed the base branch from master to 1.50.x April 12, 2023 17:59
@vadimstruts vadimstruts added CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x86 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 and removed CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x86 CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Apr 12, 2023
@vadimstruts vadimstruts marked this pull request as ready for review April 12, 2023 18:54
@vadimstruts vadimstruts requested a review from a team as a code owner April 12, 2023 18:54
@vadimstruts vadimstruts force-pushed the pr17947_pr17981_display-wallet-icon-when-viewing-bravewalletswap_1.50.x branch from 3195e7d to 92606ee Compare April 12, 2023 21:22
@vadimstruts
fix build
f4cbdd7 
Signed-off-by: Vadym Struts <vstruts@brave.com>
@vadimstruts vadimstruts removed CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS CI/skip-windows-x86 CI/skip-windows-x64 Do not run CI builds for Windows x64 labels Apr 13, 2023
@vadimstruts vadimstruts removed unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 CI/skip-linux-arm64 labels Apr 13, 2023
@vadimstruts vadimstruts force-pushed the pr17947_pr17981_display-wallet-icon-when-viewing-bravewalletswap_1.50.x branch from 92606ee to f4cbdd7 Compare April 13, 2023 07:52
@vadimstruts
Browser crashes when trying to Swap Solana tokens on brave://wallet/s…
b49b31f 
…wap (#18081)

* Added fix for issue:29680 Crash when trying to Swap Solana tokens

Changed Swap button to be visible for Solana network

Signed-off-by: Vadym Struts <vstruts@brave.com>

* fixed to use right icon and text for the Solana swap

Signed-off-by: Vadym Struts <vstruts@brave.com>

---------

Signed-off-by: Vadym Struts <vstruts@brave.com>
@kjozwiak kjozwiak added this to the 1.50.x - Release #4 milestone Apr 18, 2023
kjozwiak
kjozwiak approved these changes Apr 18, 2023
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.50.x approved 👍 QA has verified the PR on Nightly as per #17947 (comment) & #18081 (comment).

@kjozwiak kjozwiak merged commit a4cc981 into 1.50.x Apr 18, 2023
@kjozwiak kjozwiak deleted the pr17947_pr17981_display-wallet-icon-when-viewing-bravewalletswap_1.50.x branch April 18, 2023 03:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
None yet
Projects
None yet
Milestone
1.50.x - Release #4
3 participants
@vadimstruts @kjozwiak @brave-builds