Merge remote-tracking branch 'benma/disablesafello'

Author: benma

backend/coins/btc/exchange.go

@@ -23,7 +23,7 @@ import (
 func (account *Account) SafelloBuySupported() bool {
 	switch account.coin.Net().Net {
 	case chaincfg.MainNetParams.Net, chaincfg.TestNet3Params.Net:
-		return true
+		return false // Safello suspended services, maybe temporarily, so we keep this around for a bit.
 	}
 	return false
 }

frontends/qt/main.cpp

@@ -53,6 +53,7 @@ class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
         if (info.requestUrl().scheme() == "qrc" || info.requestUrl().scheme() == "blob") {
             return;
         }
+#if 0 // Safello suspended services, maybe temporarily, so we keep this around for a bit.
         auto currentUrl = mainPage->requestedUrl().toString();
         bool onBuyPage = currentUrl.contains(QRegularExpression("^qrc:/account/[^/]+?/buy$"));
         // We treat the buy page specially, as we need to allow Safello to load in the iframe, as
@@ -66,7 +67,7 @@ class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
             }
             return;
         }
-
+#endif
         std::cerr << "Blocked: " << info.requestUrl().toString().toStdString() << std::endl;
         info.block(true);
     };

frontends/web/src/routes/settings/settings.tsx

@@ -209,6 +209,7 @@ class Settings extends Component<Props, State> {
         this.setState({ activeProxyDialog: false });
     }
 
+    /*
     private setServicesConfig = servicesConfig => {
         setConfig({
             backend: { services: servicesConfig },
@@ -227,6 +228,7 @@ class Settings extends Component<Props, State> {
         services.safello = target.checked;
         this.setServicesConfig(services);
     }
+    */
 
     private handleRestartDismissMessage = () => {
         this.setState({ restart: false });
@@ -408,6 +410,7 @@ class Settings extends Component<Props, State> {
                                                     </div>
                                                 </div>
 
+                                                {/* Safello suspended services, maybe temporarily, so we keep this around for a bit.
                                                 <div className="column column-1-3">
                                                     <div class="subHeaderContainer">
                                                         <div class="subHeader">
@@ -430,6 +433,7 @@ class Settings extends Component<Props, State> {
 
                                                     </div>
                                                 </div>
+                                                */}
                                             </div>
                                             {
                                                 restart && (