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

Show the QR code in Brave Rewards (brave://rewards) #7413

Merged
merged 1 commit into from Dec 17, 2020

Conversation

bsclifton
Copy link
Member

Fixes brave/brave-browser#13159


Revert "Merge pull request #7350 from brave/bsc-remove-qr-code"

This reverts commit 858ca76, reversing
changes made to ba5983c.

Resolves

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • 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).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • 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:

@bsclifton bsclifton added this to the 1.20.x - Nightly milestone Dec 11, 2020
@bsclifton bsclifton requested a review from a team December 11, 2020 07:11
@bsclifton bsclifton self-assigned this Dec 11, 2020
@bsclifton bsclifton requested review from marshall, emerick, kjozwiak and LaurenWags and removed request for a team December 11, 2020 07:11
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM

@bsclifton
Copy link
Member Author

Partially blocked on brave-intl/bat-go#611

@kjozwiak
Copy link
Member

kjozwiak commented Dec 14, 2020

Restarting macOS via https://ci.brave.com/job/pr-brave-browser-bsc-show-qr-code-macos/2/ as build failed as per https://ci.brave.com/job/pr-brave-browser-bsc-show-qr-code-macos/1/execution/node/207/log/.

02:42:05  FAILED: gen/chrome/browser/resources/extensions/extensions.rollup.js gen/chrome/browser/resources/extensions/build_manifest.json 

Fixes brave/brave-browser#13159

----------

Revert "Merge pull request #7350 from brave/bsc-remove-qr-code"

This reverts commit 858ca76, reversing
changes made to ba5983c.
@bsclifton
Copy link
Member Author

iOS failing is not related to this; created brave/brave-browser#13210 to cover that

@kjozwiak
Copy link
Member

awesome, thanks for getting this PR in good shape @bsclifton 👍 As soon as we're done with https://github.com/brave/internal/issues/739, we'll get it merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants