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

Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) #5296

Merged
merged 3 commits into from
Apr 22, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Apr 20, 2020

Uplift of #4975
Uplift of #4866
Uplift of #5290

Fixes brave/brave-browser#8540
Fixes brave/brave-browser#8218
Fixes brave/brave-browser#9329

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 self-assigned this Apr 20, 2020
@brave-builds brave-builds added this to the 1.8.x - Beta milestone Apr 20, 2020
@bsclifton bsclifton requested review from a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv April 20, 2020 20:18
@bsclifton bsclifton changed the title Don't show branded wallpaper notification when SR is in active (uplift to 1.8.x) WIP : Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Apr 20, 2020
…ponent

Rename ntp_sponsored_images module to ntp_background_images
@bsclifton bsclifton force-pushed the pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x branch from 86d6d99 to 97ca94d Compare April 20, 2020 20:53
@brave-builds brave-builds requested a review from bridiver as a code owner April 20, 2020 20:53
@bsclifton bsclifton changed the title WIP : Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Apr 20, 2020
@bsclifton
Copy link
Member

I think there is an Android error here, possibly due to merge conflict resolution that I did:
https://ci.brave.com/job/brave-browser-build-pr/job/pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x/2/execution/node/280/log/

Will check this out

@bsclifton bsclifton changed the title Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) WIP: Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Apr 20, 2020
@bsclifton
Copy link
Member

Linux had an issue too:

14:08:29  ../../brave/browser/extensions/api/settings_private/brave_prefs_util.cc:22:7: error: use of undeclared identifier 'ntp_background_images'
14:08:29  using ntp_background_images::prefs::kNewTabPageSuperReferralThemesOption;
14:08:29        ^
14:08:29  ../../brave/browser/extensions/api/settings_private/brave_prefs_util.cc:24:5: error: use of undeclared identifier 'ntp_background_images'
14:08:29      ntp_background_images::prefs::kNewTabPageShowSponsoredImagesBackgroundImage;
14:08:29      ^
14:08:29  ../../brave/browser/extensions/api/settings_private/brave_prefs_util.cc:25:7: error: use of undeclared identifier 'ntp_background_images'
14:08:29  using ntp_background_images::prefs::kNewTabPageShowBackgroundImage;
14:08:29        ^
14:08:29  ../../brave/browser/extensions/api/settings_private/brave_prefs_util.cc:71:24: error: use of undeclared identifier 'kNewTabPageSuperReferralThemesOption'
14:08:29    (*s_brave_whitelist)[kNewTabPageSuperReferralThemesOption] =
14:08:29                         ^
14:08:29  ../../brave/browser/extensions/api/settings_private/brave_prefs_util.cc:74:24: error: use of undeclared identifier 'kNewTabPageShowSponsoredImagesBackgroundImage'
14:08:29    (*s_brave_whitelist)[kNewTabPageShowSponsoredImagesBackgroundImage] =
14:08:29                         ^
14:08:29  5 errors generated.

https://ci.brave.com/job/brave-browser-build-pr/job/pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x/2/execution/node/360/log/

@bsclifton bsclifton force-pushed the pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x branch from 97ca94d to 2685a5c Compare April 20, 2020 22:48
@bsclifton bsclifton changed the title WIP: Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Implement NTP Custom homepage ("super referral") (uplift to 1.8.x) Apr 20, 2020
@bsclifton
Copy link
Member

bsclifton commented Apr 22, 2020

CI looks good! There was one browser test failure on macOS:

17:36:22  [507/507] BraveRewardsBrowserTest.NotVerifiedWallet (6341 ms)
17:36:22  1 test failed:
17:36:22      BraveRewardsBrowserTest.NotVerifiedWallet (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:2323)

https://ci.brave.com/job/brave-browser-build-pr/job/pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x/4/execution/node/681/log/

This is a known intermittent issue captured with brave/brave-browser#9339

Ready for uplift consideration 😄

@kjozwiak kjozwiak requested a review from a team April 22, 2020 18:03
@kjozwiak
Copy link
Member

QA verified the PRs on Nightly as per #4866 (comment) and #5290 (comment)

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.8.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 32653a7 into 1.8.x Apr 22, 2020
@kjozwiak kjozwiak deleted the pr5290_handle_branded_wallpaper_noti_for_sr_1.8.x branch April 22, 2020 23:07
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.

5 participants