Merge pull request #4445 from brave/ntp-ads-unsupported-region

New Tab Page WebUI: Rewards widget does not display Ads item if non-ads region
brave · Jan 29, 2020 · 21edcf4 · 21edcf4
1 parent 91a9174
commit 21edcf4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/components/brave_new_tab_ui/components/default/rewards/index.tsx b/components/brave_new_tab_ui/components/default/rewards/index.tsx
@@ -220,7 +220,8 @@ class Rewards extends React.PureComponent<RewardsProps, {}> {
   renderRewardsInfo = () => {
     const {
       enabledMain,
-      walletCreated
+      walletCreated,
+      adsSupported
     } = this.props
 
     if (!enabledMain || !walletCreated) {
@@ -229,7 +230,7 @@ class Rewards extends React.PureComponent<RewardsProps, {}> {
 
     return (
       <div data-test-id2={'enableMain'}>
-        {this.renderAmountItem(AmountItemType.ADS)}
+        {adsSupported && this.renderAmountItem(AmountItemType.ADS)}
         {this.renderAmountItem(AmountItemType.TIPS)}
       </div>
     )

diff --git a/components/brave_new_tab_ui/components/default/rewards/style.tsx b/components/brave_new_tab_ui/components/default/rewards/style.tsx
@@ -194,7 +194,7 @@ export const NotificationButton = styled(CoinsButton)`
 `
 
 export const AmountItem = styled<StyleProps, 'div'>('div')`
-  margin-top: ${p => p.isLast ? 18 : 12}px;
+  margin-top: 18px;
   margin-bottom: ${p => p.isLast ? -10 : 0}px;
   ${p => p.isActionPrompt && css`
     text-align: center;

diff --git a/components/brave_new_tab_ui/stories/default.tsx b/components/brave_new_tab_ui/stories/default.tsx
@@ -18,6 +18,7 @@ storiesOf('New Tab/Default', module)
         showBrandedWallpaper={boolean('Show branded wallpaper?', false)}
         showTopSitesNotification={boolean('Show top sites notification?', false)}
         isAdsOn={boolean('Ads on?', true)}
+        isAdsSupported={boolean('Ads region supported?', true)}
       />
     )
   })
diff --git a/components/brave_new_tab_ui/stories/default/index.tsx b/components/brave_new_tab_ui/stories/default/index.tsx
@@ -48,6 +48,7 @@ interface Props {
   showBrandedWallpaper: boolean
   showTopSitesNotification: boolean
   isAdsOn: boolean
+  isAdsSupported: boolean
 }
 
 export default class NewTabPage extends React.PureComponent<Props, State> {
@@ -240,7 +241,7 @@ export default class NewTabPage extends React.PureComponent<Props, State> {
           {(showRewards || (showBrandedWallpaper && !this.state.isBrandedWallpaperNotificationDismissed)) &&
           <Page.GridItemRewards>
             <Rewards
-              adsSupported={true}
+              adsSupported={this.props.isAdsSupported}
               promotions={promotions}
               balance={balance}
               enabledAds={enabledAds}