Merge pull request #436 from cypherstack/disable_mb

Disable mb

lib/models/exchange/exchange_form_state.dart

@@ -2,9 +2,7 @@ import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
 import 'package:stackwallet/models/exchange/aggregate_currency.dart';
 import 'package:stackwallet/models/exchange/response_objects/estimate.dart';
-import 'package:stackwallet/services/exchange/change_now/change_now_exchange.dart';
 import 'package:stackwallet/services/exchange/exchange.dart';
-import 'package:stackwallet/services/exchange/majestic_bank/majestic_bank_exchange.dart';
 import 'package:stackwallet/utilities/enums/exchange_rate_type_enum.dart';
 import 'package:stackwallet/utilities/logger.dart';
 
@@ -325,28 +323,28 @@ class ExchangeFormState extends ChangeNotifier {
     required bool shouldNotifyListeners,
   }) async {
     try {
-      switch (exchange.name) {
+      // switch (exchange.name) {
-        case ChangeNowExchange.exchangeName:
+      //   case ChangeNowExchange.exchangeName:
-          if (!_exchangeSupported(
+      //     if (!_exchangeSupported(
-            exchangeName: exchange.name,
+      //       exchangeName: exchange.name,
-            sendCurrency: sendCurrency,
+      //       sendCurrency: sendCurrency,
-            receiveCurrency: receiveCurrency,
+      //       receiveCurrency: receiveCurrency,
-            exchangeRateType: exchangeRateType,
+      //       exchangeRateType: exchangeRateType,
-          )) {
+      //     )) {
-            _exchange = MajesticBankExchange.instance;
+      //       _exchange = MajesticBankExchange.instance;
-          }
+      //     }
-          break;
+      //     break;
-        case MajesticBankExchange.exchangeName:
+      //   case MajesticBankExchange.exchangeName:
-          if (!_exchangeSupported(
+      //     if (!_exchangeSupported(
-            exchangeName: exchange.name,
+      //       exchangeName: exchange.name,
-            sendCurrency: sendCurrency,
+      //       sendCurrency: sendCurrency,
-            receiveCurrency: receiveCurrency,
+      //       receiveCurrency: receiveCurrency,
-            exchangeRateType: exchangeRateType,
+      //       exchangeRateType: exchangeRateType,
-          )) {
+      //     )) {
-            _exchange = ChangeNowExchange.instance;
+      //       _exchange = ChangeNowExchange.instance;
-          }
+      //     }
-          break;
+      //     break;
-      }
+      // }
 
       await _updateRanges(shouldNotifyListeners: false);
       await _updateEstimate(shouldNotifyListeners: false);

lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart

@@ -9,7 +9,6 @@ import 'package:stackwallet/models/isar/exchange_cache/pair.dart';
 import 'package:stackwallet/pages/buy_view/sub_widgets/crypto_selection_view.dart';
 import 'package:stackwallet/services/exchange/change_now/change_now_exchange.dart';
 import 'package:stackwallet/services/exchange/exchange_data_loading_service.dart';
-import 'package:stackwallet/services/exchange/majestic_bank/majestic_bank_exchange.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/enums/coin_enum.dart';
@@ -95,11 +94,12 @@ class _ExchangeCurrencySelectionViewState
     if (widget.pairedTicker == null) {
       return await _getCurrencies();
     }
-    List<Currency> currencies = await ExchangeDataLoadingService
+    List<Currency> currencies = [];
-        .instance.isar.currencies
+    // await ExchangeDataLoadingService
-        .where()
+    //     .instance.isar.currencies
-        .exchangeNameEqualTo(MajesticBankExchange.exchangeName)
+    //     .where()
-        .findAll();
+    //     .exchangeNameEqualTo(MajesticBankExchange.exchangeName)
+    //     .findAll();
 
     final cn = await ChangeNowExchange.instance.getPairedCurrencies(
       widget.pairedTicker!,

lib/pages/exchange_view/sub_widgets/exchange_provider_options.dart

@@ -71,11 +71,12 @@ class _ExchangeProviderOptionsState
       sendCurrency: sendCurrency,
       receiveCurrency: receivingCurrency,
     );
-    final showMajesticBank = exchangeSupported(
+    final showMajesticBank = false;
-      exchangeName: MajesticBankExchange.exchangeName,
+    // exchangeSupported(
-      sendCurrency: sendCurrency,
+    //   exchangeName: MajesticBankExchange.exchangeName,
-      receiveCurrency: receivingCurrency,
+    //   sendCurrency: sendCurrency,
-    );
+    //   receiveCurrency: receivingCurrency,
+    // );
 
     return RoundedWhiteContainer(
       padding: isDesktop ? const EdgeInsets.all(0) : const EdgeInsets.all(12),

lib/pages/exchange_view/trade_details_view.dart

@@ -93,7 +93,8 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
             .trades
             .firstWhere((e) => e.tradeId == tradeId);
 
-        if (mounted) {
+        if (mounted &&
+            trade.exchangeName != MajesticBankExchange.exchangeName) {
           final exchange = Exchange.fromName(trade.exchangeName);
           final response = await exchange.updateTrade(trade);
 

lib/pages/stack_privacy_calls.dart

@@ -148,15 +148,16 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
                                   ),
                             children: infoToggle
                                 ? [
+                                    if (Constants.enableExchange)
+                                      const TextSpan(
+                                          text:
+                                              "Exchange data preloaded for a seamless experience.\n\n"),
                                     const TextSpan(
                                         text:
-                                            "Exchange data preloaded for a seamless experience."),
+                                            "CoinGecko enabled: (24 hour price change shown in-app, total wallet value shown in USD or other currency).\n\n"),
-                                    const TextSpan(
-                                        text:
-                                            "\n\nCoinGecko enabled: (24 hour price change shown in-app, total wallet value shown in USD or other currency)."),
                                     TextSpan(
                                       text:
-                                          "\n\nRecommended for most crypto users.",
+                                          "Recommended for most crypto users.",
                                       style: isDesktop
                                           ? STextStyles
                                               .desktopTextExtraExtraSmall600(
@@ -170,15 +171,16 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
                                     ),
                                   ]
                                 : [
+                                    if (Constants.enableExchange)
+                                      const TextSpan(
+                                          text:
+                                              "Exchange data not preloaded (slower experience).\n\n"),
                                     const TextSpan(
                                         text:
-                                            "Exchange data not preloaded (slower experience)."),
+                                            "CoinGecko disabled (price changes not shown, no wallet value shown in other currencies).\n\n"),
-                                    const TextSpan(
-                                        text:
-                                            "\n\nCoinGecko disabled (price changes not shown, no wallet value shown in other currencies)."),
                                     TextSpan(
                                       text:
-                                          "\n\nRecommended for the privacy conscious.",
+                                          "Recommended for the privacy conscious.",
                                       style: isDesktop
                                           ? STextStyles
                                               .desktopTextExtraExtraSmall600(

lib/pages_desktop_specific/settings/settings_menu/advanced_settings/stack_privacy_dialog.dart

@@ -96,9 +96,10 @@ class _StackPrivacyDialog extends ConsumerState<StackPrivacyDialog> {
                           ),
                     children: infoToggle
                         ? [
-                            const TextSpan(
+                            if (Constants.enableExchange)
-                                text:
+                              const TextSpan(
-                                    "Exchange data preloaded for a seamless experience."),
+                                  text:
+                                      "Exchange data preloaded for a seamless experience."),
                             const TextSpan(
                                 text:
                                     "\n\nCoinGecko enabled: (24 hour price change shown in-app, total wallet value shown in USD or other currency)."),

lib/services/exchange/exchange_data_loading_service.dart

@@ -273,25 +273,25 @@ class ExchangeDataLoadingService {
   // }
 
   Future<void> loadMajesticBankCurrencies() async {
-    final exchange = MajesticBankExchange.instance;
+    // final exchange = MajesticBankExchange.instance;
-    final responseCurrencies = await exchange.getAllCurrencies(false);
+    // final responseCurrencies = await exchange.getAllCurrencies(false);
-
+    //
-    if (responseCurrencies.value != null) {
+    // if (responseCurrencies.value != null) {
-      await isar.writeTxn(() async {
+    await isar.writeTxn(() async {
-        final idsToDelete = await isar.currencies
+      final idsToDelete = await isar.currencies
-            .where()
+          .where()
-            .exchangeNameEqualTo(MajesticBankExchange.exchangeName)
+          .exchangeNameEqualTo(MajesticBankExchange.exchangeName)
-            .idProperty()
+          .idProperty()
-            .findAll();
+          .findAll();
-        await isar.currencies.deleteAll(idsToDelete);
+      await isar.currencies.deleteAll(idsToDelete);
-        await isar.currencies.putAll(responseCurrencies.value!);
+      // await isar.currencies.putAll(responseCurrencies.value!);
-      });
+    });
-    } else {
+    // } else {
-      Logging.instance.log(
+    //   Logging.instance.log(
-        "loadMajesticBankCurrencies: $responseCurrencies",
+    //     "loadMajesticBankCurrencies: $responseCurrencies",
-        level: LogLevel.Warning,
+    //     level: LogLevel.Warning,
-      );
+    //   );
-    }
+    // }
   }
 
   // Future<void> loadMajesticBankPairs() async {

lib/services/exchange/majestic_bank/majestic_bank_api.dart

@@ -14,10 +14,11 @@ import 'package:stackwallet/services/exchange/exchange_response.dart';
 import 'package:stackwallet/utilities/logger.dart';
 
 class MajesticBankAPI {
-  static const String scheme = "https";
+  // ensure no api calls go out to mb
-  static const String authority = "majesticbank.sc";
+  static const String scheme = ""; //"""https";
-  static const String version = "v1";
+  static const String authority = ""; //"""majesticbank.sc";
-  static const kMajesticBankRefCode = "rjWugM";
+  static const String version = ""; //"""v1";
+  static const kMajesticBankRefCode = ""; //"""rjWugM";
 
   MajesticBankAPI._();
 
@@ -33,6 +34,8 @@ class MajesticBankAPI {
   }
 
   Future<dynamic> _makeGetRequest(Uri uri) async {
+    return null;
+
     final client = this.client ?? http.Client();
     int code = -1;
     try {

lib/services/notifications_service.dart

@@ -7,6 +7,7 @@ import 'package:stackwallet/hive/db.dart';
 import 'package:stackwallet/models/exchange/response_objects/trade.dart';
 import 'package:stackwallet/models/notification_model.dart';
 import 'package:stackwallet/services/exchange/exchange_response.dart';
+import 'package:stackwallet/services/exchange/majestic_bank/majestic_bank_exchange.dart';
 import 'package:stackwallet/services/node_service.dart';
 import 'package:stackwallet/services/notifications_api.dart';
 import 'package:stackwallet/services/trade_service.dart';
@@ -197,57 +198,59 @@ class NotificationsService extends ChangeNotifier {
       final oldTrade = trades.first;
       late final ExchangeResponse<Trade> response;
 
-      try {
+      if (oldTrade.exchangeName != MajesticBankExchange.exchangeName) {
-        final exchange = Exchange.fromName(oldTrade.exchangeName);
+        try {
-        response = await exchange.updateTrade(oldTrade);
+          final exchange = Exchange.fromName(oldTrade.exchangeName);
-      } catch (_) {
+          response = await exchange.updateTrade(oldTrade);
-        return;
+        } catch (_) {
-      }
+          return;
-
-      if (response.value == null) {
-        return;
-      }
-
-      final trade = response.value!;
-
-      // only update if status has changed
-      if (trade.status != notification.title) {
-        bool shouldWatchForUpdates = true;
-        // TODO: make sure we set shouldWatchForUpdates to correct value here
-        switch (trade.status) {
-          case "Refunded":
-          case "refunded":
-          case "Failed":
-          case "failed":
-          case "closed":
-          case "expired":
-          case "Finished":
-          case "finished":
-          case "Completed":
-          case "completed":
-          case "Not found":
-            shouldWatchForUpdates = false;
-            break;
-          default:
-            shouldWatchForUpdates = true;
         }
 
-        final updatedNotification = notification.copyWith(
+        if (response.value == null) {
-          title: trade.status,
+          return;
-          shouldWatchForUpdates: shouldWatchForUpdates,
-        );
-
-        // remove from watch list if shouldWatchForUpdates was changed
-        if (!shouldWatchForUpdates) {
-          await _deleteWatchedTradeNotification(notification);
         }
 
-        // replaces the current notification with the updated one
+        final trade = response.value!;
-        unawaited(add(updatedNotification, true));
 
-        // update the trade in db
+        // only update if status has changed
-        // over write trade stored in db with updated version
+        if (trade.status != notification.title) {
-        await tradesService.edit(trade: trade, shouldNotifyListeners: true);
+          bool shouldWatchForUpdates = true;
+          // TODO: make sure we set shouldWatchForUpdates to correct value here
+          switch (trade.status) {
+            case "Refunded":
+            case "refunded":
+            case "Failed":
+            case "failed":
+            case "closed":
+            case "expired":
+            case "Finished":
+            case "finished":
+            case "Completed":
+            case "completed":
+            case "Not found":
+              shouldWatchForUpdates = false;
+              break;
+            default:
+              shouldWatchForUpdates = true;
+          }
+
+          final updatedNotification = notification.copyWith(
+            title: trade.status,
+            shouldWatchForUpdates: shouldWatchForUpdates,
+          );
+
+          // remove from watch list if shouldWatchForUpdates was changed
+          if (!shouldWatchForUpdates) {
+            await _deleteWatchedTradeNotification(notification);
+          }
+
+          // replaces the current notification with the updated one
+          unawaited(add(updatedNotification, true));
+
+          // update the trade in db
+          // over write trade stored in db with updated version
+          await tradesService.edit(trade: trade, shouldNotifyListeners: true);
+        }
       }
     }
   }