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

Fix external wallet redirect modals on Android #11661

Merged
merged 2 commits into from
Dec 21, 2021
Merged

Fix external wallet redirect modals on Android #11661

merged 2 commits into from
Dec 21, 2021

Conversation

emerick
Copy link
Contributor

@emerick emerick commented Dec 21, 2021 •
edited
Loading

Resolves brave/brave-browser#20176
Resolves brave/brave-browser#20175

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, npm run lint, 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:

@emerick emerick requested a review from a team as a code owner December 21, 2021 12:24
@emerick emerick self-assigned this Dec 21, 2021
@emerick emerick force-pushed the rewards-fix-redirect-modals-on-android branch from 9c361af to 73f49d5 Compare December 21, 2021 13:52
@emerick emerick force-pushed the rewards-fix-redirect-modals-on-android branch from fa94e34 to c4febdf Compare December 21, 2021 14:28
deeppandya
deeppandya reviewed Dec 21, 2021
View reviewed changes
android/java/org/chromium/chrome/browser/BraveWalletProvider.java
AlertDialog dialog = builder.create();
dialog.show();
String originalUrl = params.getUrl().getSpec();
String url = originalUrl.replaceFirst("^rewards://", "chrome://rewards/");
Copy link
Contributor

Choose a reason for hiding this comment

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

i think we should update it to "brave://rewards/" i will update it in a separate issue.

deeppandya
deeppandya approved these changes Dec 21, 2021
View reviewed changes
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

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

changes LGTM

@emerick emerick merged commit d37d4a5 into master Dec 21, 2021
@emerick emerick deleted the rewards-fix-redirect-modals-on-android branch December 21, 2021 21:24
@emerick emerick added this to the 1.35.x - Nightly milestone Dec 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deeppandya deeppandya deeppandya approved these changes

@zenparsing zenparsing Awaiting requested review from zenparsing zenparsing is a code owner automatically assigned from brave/rewards-client

Assignees

@emerick emerick

Labels
None yet
Projects
None yet
Milestone
1.35.x - Release
Development

Successfully merging this pull request may close these issues.

[Android] bitFlyer error modals need to be implemented [Android] Uphold error modals need to be implemented
2 participants
@emerick @deeppandya