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

Add layout for fall back UI for top tiles (uplift to 1.18.x) #7256

Merged
merged 1 commit into from
Nov 27, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Nov 26, 2020

Uplift of #7255
Resolves brave/brave-browser#12837

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 November 26, 2020 05:02
@brave-builds brave-builds self-assigned this Nov 26, 2020
@brave-builds brave-builds added this to the 1.18.x - Beta milestone Nov 26, 2020
@kjozwiak
Copy link
Member

test-browser failed on macOS due to several reward failures as per https://ci.brave.com/job/pr-brave-browser-pr7255_fallback_ui_for_top_tiles_android_1.18.x-macos/1/execution/node/250/log/. However, these are intermittent and don't block uplift. Plus, this specific PR is Android specific and doesn't touch other code.

01:47:14  4 tests failed:
01:47:14      RewardsBrowserTest.ActivateSettingsModal (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:119)
01:47:14      RewardsContributionBrowserTest.TipConnectedPublisherVerified (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:585)
01:47:14      RewardsContributionBrowserTest.TipUnverifiedPublisher (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:303)
01:47:14      RewardsPromotionBrowserTest.PromotionRemovedFromEndpoint (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:230)
01:47:14  3 tests timed out:
01:47:14      RewardsBrowserTest.BackupRestoreModalHasNotice (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:303)
01:47:14      RewardsBrowserTest.ResetRewardsWithBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:374)
01:47:14      RewardsPromotionBrowserTest.ClaimViaSettingsPage (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:195)
01:47:14  1 test crashed:
01:47:14      RewardsBrowserTest.ToggleAutoContribute (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:130)

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 also verified the PR on Nightly as per #7255 (comment).

@kjozwiak kjozwiak merged commit df10a4f into 1.18.x Nov 27, 2020
@kjozwiak kjozwiak deleted the pr7255_fallback_ui_for_top_tiles_android_1.18.x branch November 27, 2020 02:43
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