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

Hide QR code in Rewards Settings (uplift to 1.18.x) #7352

Merged
merged 1 commit into from
Dec 5, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Dec 5, 2020

Uplift of #7350
Fixes brave/brave-browser#13053

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

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

@brave-builds brave-builds requested a review from a team as a code owner December 5, 2020 03:23
@brave-builds brave-builds requested review from marshall, zenparsing and a team and removed request for a team December 5, 2020 03:23
@brave-builds brave-builds self-assigned this Dec 5, 2020
@brave-builds brave-builds added this to the 1.18.x - Release milestone Dec 5, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Dec 5, 2020

test-browser failed on macOS due to RewardsBrowserTest.UpholdLimitNoBAT and RewardsPromotionBrowserTest.ClaimViaPanel failing as per https://ci.brave.com/job/pr-brave-browser-pr7350_bsc-remove-qr-code_1.18.x-macos/1/execution/node/250/log/. However, these are known intermittent issues and are being tracked via brave/brave-browser#12704 and brave/brave-browser#12605.

00:07:47  2 tests failed:
00:07:47      RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:397)
00:07:47      RewardsPromotionBrowserTest.ClaimViaPanel (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:201)

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.18.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7350 (comment).

@kjozwiak kjozwiak merged commit ef5bae0 into 1.18.x Dec 5, 2020
@kjozwiak kjozwiak deleted the pr7350_bsc-remove-qr-code_1.18.x branch December 5, 2020 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants