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

Fixes claim for existing wallets (uplift to 1.13.x) #6428

Merged
merged 2 commits into from
Aug 25, 2020
Merged

Fixes claim for existing wallets (uplift to 1.13.x) #6428

merged 2 commits into from
Aug 25, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Aug 17, 2020 •
edited by LaurenWags
Loading

Uplift of #6384
Uplift of #6401
Resolves brave/brave-browser#11144
Resolves brave/brave-browser#11150

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 August 17, 2020 06:56
@brave-builds brave-builds self-assigned this Aug 17, 2020
@brave-builds brave-builds added this to the 1.13.x - Beta milestone Aug 17, 2020
@NejcZdovc NejcZdovc removed their request for review August 17, 2020 06:57
@NejcZdovc NejcZdovc removed the request for review from kylehickinson August 17, 2020 21:48
@kjozwiak
Copy link
Member

@NejcZdovc mind taking a look at this one again? Looks like we have merge conflict as per

  • vendor/bat-native-ledger/src/bat/ledger/internal/state/state_migration.cc

@LaurenWags
Copy link
Member

test-browser failed on Win x64 due to SpeedReaderBrowserTest.SmokeTest failing as per https://ci.brave.com/job/pr-brave-browser-pr6384_claim-200_1.13.x-windows/5/execution/node/216/log/. However this is a known intermittent failure/issue and doesn't block uplift.

03:19:04  [  FAILED  ] SpeedReaderBrowserTest.SmokeTest, where TypeParam =  and GetParam() =  (3351 ms)
03:19:04  
03:19:04  [606/606] SpeedReaderBrowserTest.SmokeTest (3514 ms)
03:19:04  1 test failed:
03:19:04      SpeedReaderBrowserTest.SmokeTest (../../brave/browser/speedreader/speedreader_browsertest.cc:71)

LaurenWags
LaurenWags approved these changes Aug 24, 2020
View reviewed changes
Copy link
Member

@LaurenWags LaurenWags left a comment

Choose a reason for hiding this comment

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

Uplift to 1.13.x approved after deliberating with @brave/uplift-approvers. QA has also verified this PR on Nightly as per #6384 (comment) and #6401 (comment).

@LaurenWags
Copy link
Member

Restarted Linux, macOS, Win

@kjozwiak
Copy link
Member

Looks like the merge conflicts have been resolved. Merging 👍

@kjozwiak kjozwiak merged commit bda7fb7 into 1.13.x Aug 25, 2020
@kjozwiak kjozwiak deleted the pr6384_claim-200_1.13.x branch August 25, 2020 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LaurenWags LaurenWags LaurenWags approved these changes

Assignees

@brave-builds brave-builds

Labels
feature/rewards
Projects
None yet
Milestone
1.13.x - Release #1
Development

Successfully merging this pull request may close these issues.
5 participants
@brave-builds @kjozwiak @LaurenWags @NejcZdovc @brave-browser-releases