Fixes brave/brave-browser#9416 - Removes Binance options from newtab …

…settings when unsupported
brave · Apr 26, 2020 · 0334325 · 0334325
1 parent 44b1a64
commit 0334325
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/browser/binance/binance_util.cc b/browser/binance/binance_util.cc
@@ -3,9 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "brave/browser/binance/binance_util.h"
+
 #include "chrome/browser/profiles/profile.h"
 #include "components/country_codes/country_codes.h"
-#include "static_values.h"
+#include "brave/browser/binance/static_values.h"
 
 namespace binance {
 

diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.js b/browser/resources/settings/brave_new_tab_page/brave_new_tab_browser_proxy.js
@@ -9,6 +9,11 @@
      * @return {!Promise<Boolean>}
      */
     getIsSuperReferralActive() {}
+
+    /**
+     * @return {!Promise<Boolean>}
+     */
+    getIsBinanceSupported() {}
   }
 
   /**
@@ -19,6 +24,11 @@
     getIsSuperReferralActive() {
       return cr.sendWithPromise('getIsSuperReferralActive');
     }
+
+    /** @override */
+    getIsBinanceSupported() {
+      return cr.sendWithPromise('getIsBinanceSupported')
+    }
   }
 
   cr.addSingletonGetter(BraveNewTabBrowserProxyImpl);

diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.html
@@ -54,10 +54,12 @@
           pref="{{prefs.brave.new_tab_page.show_rewards}}"
           label="$i18n{braveNewTabBraveRewards}">
       </settings-toggle-button>
-      <settings-toggle-button
-          pref="{{prefs.brave.new_tab_page.show_binance}}"
-          label="$i18n{braveNewTabBinance}">
-      </settings-toggle-button>
+      <template is="dom-if" if="[[isBinanceSupported_]]">
+        <settings-toggle-button
+            pref="{{prefs.brave.new_tab_page.show_binance}}"
+            label="$i18n{braveNewTabBinance}">
+        </settings-toggle-button>
+      </template>
       <settings-toggle-button
           pref="{{prefs.brave.new_tab_page.show_top_sites}}"
           label="$i18n{braveNewTabTopSites}">

diff --git a/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.js b/browser/resources/settings/brave_new_tab_page/brave_new_tab_page.js
@@ -21,19 +21,24 @@
 
     properties: {
       isSuperReferralActive_: Boolean,
+      isBinanceSupported_: Boolean,
     },
 
     /** @override */
     created: function() {
       this.browserProxy_ = settings.BraveNewTabBrowserProxyImpl.getInstance();
       isSuperReferralActive_ = false;
+      isBinanceSupported_ = false;
     },
 
     /** @override */
     ready: function() {
       this.browserProxy_.getIsSuperReferralActive().then(isSuperReferralActive => {
         this.isSuperReferralActive_ = isSuperReferralActive;
       })
+      this.browserProxy_.getIsBinanceSupported().then(isBinanceSupported => {
+        this.isBinanceSupported_ = isBinanceSupported;
+      })
 
       this.addWebUIListener('super-referral-active-state-changed', (isSuperReferralActive) => {
         this.isSuperReferralActive_ = isSuperReferralActive;

diff --git a/browser/ui/webui/settings/brave_appearance_handler.cc b/browser/ui/webui/settings/brave_appearance_handler.cc
@@ -9,6 +9,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "brave/browser/ntp_background_images/view_counter_service_factory.h"
 #include "brave/browser/themes/brave_dark_mode_utils.h"
+#include "brave/browser/binance/binance_util.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/ntp_background_images/browser/ntp_background_images_data.h"
 #include "brave/components/ntp_background_images/browser/view_counter_service.h"
@@ -67,6 +68,10 @@ void BraveAppearanceHandler::RegisterMessages() {
       "getIsSuperReferralActive",
       base::BindRepeating(&BraveAppearanceHandler::GetIsSuperReferralActive,
                           base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "getIsBinanceSupported",
+      base::BindRepeating(&BraveAppearanceHandler::GetIsBinanceSupported,
+                          base::Unretained(this)));
 }
 
 void BraveAppearanceHandler::SetBraveThemeType(const base::ListValue* args) {
@@ -99,6 +104,15 @@ void BraveAppearanceHandler::GetIsSuperReferralActive(
                             base::Value(IsSuperReferralActive(profile_)));
 }
 
+void BraveAppearanceHandler::GetIsBinanceSupported(
+    const base::ListValue* args) {
+  CHECK_EQ(args->GetSize(), 1U);
+
+  AllowJavascript();
+  ResolveJavascriptCallback(args->GetList()[0],
+      base::Value(::binance::IsBinanceSupported(profile_)));
+}
+
 void BraveAppearanceHandler::OnBraveDarkModeChanged() {
   // GetBraveThemeType() should be used because settings option displays all
   // available options including default.

diff --git a/browser/ui/webui/settings/brave_appearance_handler.h b/browser/ui/webui/settings/brave_appearance_handler.h
@@ -32,6 +32,7 @@ class BraveAppearanceHandler : public settings::SettingsPageUIHandler {
   void SetBraveThemeType(const base::ListValue* args);
   void GetBraveThemeType(const base::ListValue* args);
   void GetIsSuperReferralActive(const base::ListValue* args);
+  void GetIsBinanceSupported(const base::ListValue* args);
 
   Profile* profile_ = nullptr;
   PrefChangeRegistrar local_state_change_registrar_;