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

Removing back arrow in asset detail view, updating top buy link [crypto.com widget 1.17] #6943

Merged
merged 1 commit into from
Oct 25, 2020

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Oct 24, 2020

Uplift of: #6942
Fixes: brave/brave-browser#12277, brave/brave-browser#12304

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.

Removing back arrow in asset detail view, updating top buy link [crypto.com widget]
@ryanml ryanml added this to the 1.17.x - Beta milestone Oct 24, 2020
@ryanml ryanml requested a review from a team October 24, 2020 01:33
@ryanml ryanml self-assigned this Oct 24, 2020
@kjozwiak
Copy link
Member

Restarting iOS via https://ci.brave.com/job/pr-brave-browser-cdc-fixes-2-17-ios/2/ due to build failing as per https://ci.brave.com/job/pr-brave-browser-cdc-fixes-2-17-ios/1/execution/node/185/log.

22:12:14  FAILED: gen/brave/vendor/brave-ios/ads.mojom.objc.h gen/brave/vendor/brave-ios/ads.mojom.objc+private.h gen/brave/vendor/brave-ios/ads.mojom.objc.mm gen/brave/vendor/brave-ios/objc_templates_bytecode/ads_objc_templates.zip 

test-browser failed on macOS due to RewardsContributionBrowserTest.AutoContributeWhenACOff failing as per https://ci.brave.com/job/pr-brave-browser-cdc-fixes-2-17-macos/1/execution/node/249/log/. However, this is a known intermittent issue and doesn't block uplift.

23:01:33  1 test crashed:
23:01:33      RewardsContributionBrowserTest.AutoContributeWhenACOff (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:259)

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.17.x approved after deliberating with @brave/uplift-approvers. QA & @rebron have verified the PR on Nightly as per #6942 (comment) & #6942 (comment).

@kjozwiak kjozwiak merged commit bf39a75 into 1.17.x Oct 25, 2020
@kjozwiak kjozwiak deleted the cdc-fixes-2-17 branch October 25, 2020 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants