Enable NTP Background customization if SuperReferral is not active

fix brave/brave-browser#28144
brave · Jan 31, 2023 · 7b797b6 · 7b797b6
1 parent 320de29
commit 7b797b6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/components/brave_new_tab_ui/containers/newTab/index.tsx b/components/brave_new_tab_ui/containers/newTab/index.tsx
@@ -563,6 +563,10 @@ class NewTabPage extends React.Component<Props, State> {
       showTopSites = this.props.gridSitesData.gridSites.length !== 0
     }
 
+    // Allow background customization if Super Referrals is not activated.
+    const isSuperReferral = newTabData.brandedWallpaper && !newTabData.brandedWallpaper.isSponsored
+    const allowBackgroundCustomization = !isSuperReferral
+
     if (forceToHideWidget) {
       showTopSites = false
       showStats = false
@@ -726,7 +730,7 @@ class NewTabPage extends React.Component<Props, State> {
           showRewards={newTabData.showRewards}
           braveRewardsSupported={newTabData.braveRewardsSupported}
           brandedWallpaperOptIn={newTabData.brandedWallpaperOptIn}
-          allowSponsoredWallpaperUI={newTabData.featureFlagBraveNTPSponsoredImagesWallpaper}
+          allowBackgroundCustomization={allowBackgroundCustomization}
           toggleShowRewards={this.toggleShowRewards}
           braveTalkSupported={newTabData.braveTalkSupported}
           toggleShowBraveTalk={this.toggleShowBraveTalk}

diff --git a/components/brave_new_tab_ui/containers/newTab/settings.tsx b/components/brave_new_tab_ui/containers/newTab/settings.tsx
@@ -73,7 +73,7 @@ export interface Props {
   showTopSites: boolean
   customLinksEnabled: boolean
   brandedWallpaperOptIn: boolean
-  allowSponsoredWallpaperUI: boolean
+  allowBackgroundCustomization: boolean
   showRewards: boolean
   showBraveTalk: boolean
   braveRewardsSupported: boolean
@@ -163,7 +163,7 @@ export default class Settings extends React.PureComponent<Props, State> {
   }
 
   getInitialTab () {
-    let tab = this.props.allowSponsoredWallpaperUI
+    let tab = this.props.allowBackgroundCustomization
       ? TabType.BackgroundImage
       : TabType.BraveStats
     if (this.props.setActiveTab) {
@@ -196,17 +196,10 @@ export default class Settings extends React.PureComponent<Props, State> {
   }
 
   getActiveTabTypes (): TabType[] {
-    // TODO(petemill): We're not allowing
-    // any background image changes when user is not
-    // in a sponsored image region, which is weird.
-    // Seems like this should actually only be for
-    // super referral users, where the bg image is
-    // mandatory. Maybe that's the only case
-    // allowSponsoredWallpaperUI is false?
-    if (!this.props.allowSponsoredWallpaperUI) {
-      return this.allTabTypesWithoutBackground
-    } else {
+    if (this.props.allowBackgroundCustomization) {
       return this.allTabTypes
+    } else {
+      return this.allTabTypesWithoutBackground
     }
   }
 

diff --git a/components/test/brave_new_tab_ui/components/settings_test.tsx b/components/test/brave_new_tab_ui/components/settings_test.tsx
@@ -27,7 +27,7 @@ describe('settings component tests', () => {
     toggleShowRewards: () => undefined,
     toggleBrandedWallpaperOptIn: () => undefined,
     brandedWallpaperOptIn: false,
-    allowSponsoredWallpaperUI: false,
+    allowBackgroundCustomization: false,
     showRewards: false
   }
 
@@ -48,7 +48,7 @@ describe('settings component tests', () => {
         toggleShowRewards={mockProps.toggleShowRewards}
         toggleBrandedWallpaperOptIn={mockProps.toggleBrandedWallpaperOptIn}
         brandedWallpaperOptIn={mockProps.brandedWallpaperOptIn}
-        allowSponsoredWallpaperUI={mockProps.allowSponsoredWallpaperUI}
+        allowBackgroundCustomization={mockProps.allowBackgroundCustomization}
         showRewards={mockProps.showRewards}
       />)
     expect(wrapper.find(SettingsMenu)).toHaveLength(0)
@@ -71,7 +71,7 @@ describe('settings component tests', () => {
         toggleShowRewards={mockProps.toggleShowRewards}
         toggleBrandedWallpaperOptIn={mockProps.toggleBrandedWallpaperOptIn}
         brandedWallpaperOptIn={mockProps.brandedWallpaperOptIn}
-        allowSponsoredWallpaperUI={mockProps.allowSponsoredWallpaperUI}
+        allowBackgroundCustomization={mockProps.allowBackgroundCustomization}
         showRewards={mockProps.showRewards}
       />)
     expect(wrapper.find(SettingsMenu)).toHaveLength(1)