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

Adding Bitcoin.com widget to NTP [1.15] #6764

Merged
merged 3 commits into from
Oct 5, 2020
Merged

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Oct 3, 2020

Uplift of: #6681, #6756, #6754
Issue: brave/brave-browser#11982

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.

ryanml added 2 commits October 3, 2020 06:04
Adding Bitcoin.com widget to the NTP
Ensures both bitcoin.com dropdowns aren't open at the same time
@ryanml ryanml added this to the 1.15.x - Release #1 milestone Oct 3, 2020
@ryanml ryanml requested a review from a team October 3, 2020 13:08
@ryanml ryanml requested a review from bridiver as a code owner October 3, 2020 13:08
@ryanml ryanml self-assigned this Oct 3, 2020
@ryanml ryanml force-pushed the bitcoin-dot-com-1.15 branch from 6aefcc2 to c0c604e Compare October 3, 2020 13:33
Fixes breaking amount input field on Windows and Linux
@ryanml ryanml force-pushed the bitcoin-dot-com-1.15 branch from c0c604e to 85a2b5c Compare October 4, 2020 06:06
@kjozwiak
Copy link
Member

kjozwiak commented Oct 4, 2020

Restarting Win x64 via https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-windows/4/ as dist failed as per https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-windows/3/execution/node/246/log.

04:00:27  SignTool Error: The specified timestamp server either could not be reached or
04:00:27  returned an invalid response.
04:00:27  SignTool Error: An error occurred while attempting to sign: scons-out\opt-win\obj\goopdate\BraveUpdateBroker.exe

Restarting Linux via https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-linux/4/ due to init failing as per https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-linux/3/execution/node/119/log/.

02:15:46  Aborting
02:15:46  error: could not detach HEAD
02:15:46  ----------------------------------------
02:15:46  Error: 49> Unrecognized error, please merge or rebase manually.
02:15:46  49> cd /home/ubuntu/workspace/pr-brave-browser-bitcoin-dot-com-1.15-linux/src/third_party/grpc/src && git rebase --onto 74b981a6a3d9ba17f3acae1d72b9109325ef656d refs/remotes/origin/master

@kjozwiak
Copy link
Member

kjozwiak commented Oct 4, 2020

Restarting Linux https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-linux/5/ via using WIPE_WORKSPACE due to init failing as per https://ci.brave.com/job/pr-brave-browser-bitcoin-dot-com-1.15-linux/4/execution/node/119/log/.

14:45:02  Aborting
14:45:02  error: could not detach HEAD
14:45:02  ----------------------------------------
14:45:02  Error: 49> Unrecognized error, please merge or rebase manually.
14:45:02  49> cd /home/ubuntu/workspace/pr-brave-browser-bitcoin-dot-com-1.15-linux/src/third_party/grpc/src && git rebase --onto 74b981a6a3d9ba17f3acae1d72b9109325ef656d refs/remotes/origin/master

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.15.x approved after deliberating with @brave/uplift-approvers. QA has also verified the PR on Nightly as per #6681 (comment), #6756 (comment) & #6754 (comment).

@kjozwiak kjozwiak merged commit c375968 into 1.15.x Oct 5, 2020
@kjozwiak kjozwiak deleted the bitcoin-dot-com-1.15 branch October 5, 2020 05:48
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.

2 participants