Fixes brave/brave-browser#3900, disables ads in 0.62

brave · Mar 26, 2019 · 9eecbc9 · 9eecbc9
1 parent 24220d0
commit 9eecbc9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -192,6 +192,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
       std::string("rewards"), {
         { "adsCurrentEarnings",  IDS_BRAVE_REWARDS_LOCAL_ADS_CURRENT_EARNINGS },
         { "adsDesc",  IDS_BRAVE_REWARDS_LOCAL_ADS_DESC },
+        { "adsDisabledText", IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT },
         { "adsDisabledTextOne",  IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_ONE },                // NOLINT
         { "adsDisabledTextTwo",  IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_TWO },                // NOLINT
         { "adsNotificationsReceived",  IDS_BRAVE_REWARDS_LOCAL_ADS_NOTIFICATIONS_RECEIVED },     // NOLINT

diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc
@@ -458,11 +458,13 @@ void AdsServiceImpl::OnPrefsChanged(const std::string& pref) {
 }
 
 bool AdsServiceImpl::is_enabled() const {
-  bool ads_enabled = profile_->GetPrefs()->GetBoolean(
-      prefs::kBraveAdsEnabled);
-  bool rewards_enabled = profile_->GetPrefs()->GetBoolean(
-      brave_rewards::prefs::kBraveRewardsEnabled);
-  return (ads_enabled && rewards_enabled);
+  // bool ads_enabled = profile_->GetPrefs()->GetBoolean(
+  //     prefs::kBraveAdsEnabled);
+  // bool rewards_enabled = profile_->GetPrefs()->GetBoolean(
+  //     brave_rewards::prefs::kBraveRewardsEnabled);
+  // return (ads_enabled && rewards_enabled);
+  // Ads are disabled in 0.61.x builds
+  return false;
 }
 
 bool AdsServiceImpl::IsAdsEnabled() const {

diff --git a/components/brave_rewards/resources/ui/components/adsBox.tsx b/components/brave_rewards/resources/ui/components/adsBox.tsx
@@ -37,8 +37,7 @@ class AdsBox extends React.Component<Props, State> {
       <DisabledContent
         type={'ads'}
       >
-        • {getLocale('adsDisabledTextOne')} <br />
-        • {getLocale('adsDisabledTextTwo')}
+        <h3>{getLocale('adsDisabledText')}</h3>
       </DisabledContent>
     )
   }
@@ -89,27 +88,22 @@ class AdsBox extends React.Component<Props, State> {
 
   render () {
     let adsEnabled = false
-    let adsUIEnabled = false
-    const { adsData, enabledMain, firstLoad } = this.props.rewardsData
+    const { adsData, enabledMain } = this.props.rewardsData
 
     if (adsData) {
       adsEnabled = adsData.adsEnabled
-      adsUIEnabled = adsData.adsUIEnabled
     }
 
-    const toggle = !(!enabledMain || !adsUIEnabled)
-    const showDisabled = firstLoad !== false || !toggle || !adsEnabled
-
     return (
       <Box
         title={getLocale('adsTitle')}
         type={'ads'}
         description={getLocale('adsDesc')}
-        toggle={toggle}
+        toggle={false}
         checked={adsEnabled}
         settingsChild={this.adsSettings(adsEnabled && enabledMain)}
         testId={'braveAdsSettings'}
-        disabledContent={showDisabled ? this.adsDisabled() : null}
+        disabledContent={this.adsDisabled()}
         onToggle={this.onAdsSettingChange.bind(this, 'adsEnabled', '')}
         settingsOpened={this.state.settings}
         onSettingsClick={this.onSettingsToggle}

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -212,6 +212,7 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_SITES" desc="">Supported sites</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_TITLE" desc="">Tips</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DESC" desc="">Tip content creators directly as you browse. You can also set up recurring monthly tips so you can support sites continuously.</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT" desc="">Coming soon.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_ONE" desc="">Earnings are paid every month.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_TWO" desc="">Set your desired frequency to increase or decrease earnings.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_DISABLED_TEXT1" desc="">Reward creators for the content you love.</message>