refactor fusion server prefs

lib/pages/cashfusion/cashfusion_view.dart

@@ -55,7 +55,7 @@ class _CashFusionViewState extends ConsumerState<CashFusionView> {
   late final FocusNode portFocusNode;
   late final TextEditingController fusionRoundController;
   late final FocusNode fusionRoundFocusNode;
-  Coin? coin;
+  late final Coin coin;
 
   bool _enableSSLCheckbox = false;
   bool _enableStartButton = false;
@@ -89,11 +89,7 @@ class _CashFusionViewState extends ConsumerState<CashFusionView> {
     );
 
     // update user prefs (persistent)
-    if (coin == Coin.bitcoincash) {
+    ref.read(prefsChangeNotifierProvider).setFusionServerInfo(coin, newInfo);
-      ref.read(prefsChangeNotifierProvider).fusionServerInfoBch = newInfo;
-    } else {
-      ref.read(prefsChangeNotifierProvider).fusionServerInfoXec = newInfo;
-    }
 
     unawaited(
       fusionWallet.fuse(
@@ -123,9 +119,8 @@ class _CashFusionViewState extends ConsumerState<CashFusionView> {
         .wallet
         .coin;
 
-    final info = (coin == Coin.bitcoincash)
+    final info =
-        ? ref.read(prefsChangeNotifierProvider).fusionServerInfoBch
+        ref.read(prefsChangeNotifierProvider).getFusionServerInfo(coin);
-        : ref.read(prefsChangeNotifierProvider).fusionServerInfoXec;
 
     serverController.text = info.host;
     portController.text = info.port.toString();

lib/pages/cashfusion/fusion_progress_view.dart

@@ -43,7 +43,7 @@ class FusionProgressView extends ConsumerStatefulWidget {
 }
 
 class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
-  Coin? coin;
+  late final Coin coin;
 
   Future<bool> _requestAndProcessCancel() async {
     final shouldCancel = await showDialog<bool?>(
@@ -88,6 +88,16 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
     }
   }
 
+  @override
+  void initState() {
+    coin = ref
+        .read(walletsChangeNotifierProvider)
+        .getManager(widget.walletId)
+        .wallet
+        .coin;
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     final bool _succeeded =
@@ -100,12 +110,6 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
         .watch(fusionProgressUIStateProvider(widget.walletId))
         .fusionRoundsCompleted;
 
-    coin = ref
-        .read(walletsChangeNotifierProvider)
-        .getManager(widget.walletId)
-        .wallet
-        .coin;
-
     return WillPopScope(
       onWillPop: () async {
         return await _requestAndProcessCancel();
@@ -234,9 +238,8 @@ class _FusionProgressViewState extends ConsumerState<FusionProgressView> {
     final fusionWallet =
         ref.read(pWallets).getWallet(widget.walletId) as CashFusion;
 
-    final fusionInfo = (coin == Coin.bitcoincash)
+    final fusionInfo =
-        ? ref.read(prefsChangeNotifierProvider).fusionServerInfoBch
+        ref.read(prefsChangeNotifierProvider).getFusionServerInfo(coin);
-        : ref.read(prefsChangeNotifierProvider).fusionServerInfoXec;
 
     try {
       fusionWallet.uiState = ref.read(

lib/pages_desktop_specific/cashfusion/desktop_cashfusion_view.dart

@@ -93,11 +93,8 @@ class _DesktopCashFusion extends ConsumerState<DesktopCashFusionView> {
     );
 
     // update user prefs (persistent)
-    if (coin == Coin.bitcoincash) {
+
-      ref.read(prefsChangeNotifierProvider).fusionServerInfoBch = newInfo;
+    ref.read(prefsChangeNotifierProvider).setFusionServerInfo(coin, newInfo);
-    } else {
-      ref.read(prefsChangeNotifierProvider).fusionServerInfoXec = newInfo;
-    }
 
     unawaited(
       fusionWallet.fuse(
@@ -132,9 +129,8 @@ class _DesktopCashFusion extends ConsumerState<DesktopCashFusionView> {
         .wallet
         .coin;
 
-    final info = (coin == Coin.bitcoincash)
+    final info =
-        ? ref.read(prefsChangeNotifierProvider).fusionServerInfoBch
+        ref.read(prefsChangeNotifierProvider).getFusionServerInfo(coin);
-        : ref.read(prefsChangeNotifierProvider).fusionServerInfoXec;
 
     serverController.text = info.host;
     portController.text = info.port.toString();

lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart

@@ -40,7 +40,7 @@ class FusionDialogView extends ConsumerStatefulWidget {
 }
 
 class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
-  Coin? coin;
+  late final Coin coin;
 
   Future<bool> _requestAndProcessCancel() async {
     if (!ref.read(fusionProgressUIStateProvider(widget.walletId)).running) {
@@ -142,6 +142,16 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
     }
   }
 
+  @override
+  void initState() {
+    coin = ref
+        .read(walletsChangeNotifierProvider)
+        .getManager(widget.walletId)
+        .wallet
+        .coin;
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     final bool _succeeded =
@@ -154,12 +164,6 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
         .watch(fusionProgressUIStateProvider(widget.walletId))
         .fusionRoundsCompleted;
 
-    coin = ref
-        .read(walletsChangeNotifierProvider)
-        .getManager(widget.walletId)
-        .wallet
-        .coin;
-
     return DesktopDialog(
       maxHeight: 600,
       child: SingleChildScrollView(
@@ -293,9 +297,8 @@ class _FusionDialogViewState extends ConsumerState<FusionDialogView> {
     final fusionWallet =
         ref.read(pWallets).getWallet(widget.walletId) as CashFusion;
 
-    final fusionInfo = (coin == Coin.bitcoincash)
+    final fusionInfo =
-        ? ref.read(prefsChangeNotifierProvider).fusionServerInfoBch
+        ref.read(prefsChangeNotifierProvider).getFusionServerInfo(coin);
-        : ref.read(prefsChangeNotifierProvider).fusionServerInfoXec;
 
     try {
       fusionWallet.uiState = ref.read(

lib/utilities/prefs.dart

@@ -8,6 +8,8 @@
  *
  */
 
+import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
 import 'package:stackwallet/db/hive/db.dart';
 import 'package:stackwallet/services/event_bus/events/global/tor_status_changed_event.dart';
@@ -65,8 +67,7 @@ class Prefs extends ChangeNotifier {
       await _setAmountUnits();
       await _setMaxDecimals();
       _useTor = await _getUseTor();
-      _fusionServerInfoBch = await _getFusionServerInfoBch();
+      _fusionServerInfo = await _getFusionServerInfo();
-      _fusionServerInfoXec = await _getFusionServerInfoXec();
 
       _initialized = true;
     }
@@ -937,59 +938,84 @@ class Prefs extends ChangeNotifier {
 
   // fusion server info
 
-  FusionInfo _fusionServerInfoBch = FusionInfo.BCH_DEFAULTS;
+  final Map<Coin, FusionInfo> _fusionServerInfoDefaults = {
-  FusionInfo _fusionServerInfoXec = FusionInfo.XEC_DEFAULTS;
+    Coin.bitcoincash: FusionInfo.BCH_DEFAULTS,
+    Coin.bitcoincashTestnet: FusionInfo.BCH_DEFAULTS,
+    Coin.eCash: FusionInfo.XEC_DEFAULTS,
+  };
 
-  FusionInfo get fusionServerInfoBch => _fusionServerInfoBch;
+  Map<Coin, FusionInfo> _fusionServerInfo = {
-  FusionInfo get fusionServerInfoXec => _fusionServerInfoXec;
+    Coin.bitcoincash: FusionInfo.BCH_DEFAULTS,
+    Coin.bitcoincashTestnet: FusionInfo.BCH_DEFAULTS,
+    Coin.eCash: FusionInfo.XEC_DEFAULTS,
+  };
+
+  FusionInfo getFusionServerInfo(Coin coin) {
+    return _fusionServerInfo[coin] ?? _fusionServerInfoDefaults[coin]!;
+  }
+
+  void setFusionServerInfo(Coin coin, FusionInfo fusionServerInfo) {
+    if (_fusionServerInfo[coin] != fusionServerInfo) {
+      _fusionServerInfo[coin] = fusionServerInfo;
 
-  set fusionServerInfoBch(FusionInfo fusionServerInfo) {
-    if (fusionServerInfoBch != fusionServerInfo) {
       DB.instance.put<dynamic>(
+        boxName: DB.boxNamePrefs,
+        key: "fusionServerInfoMap",
+        value: _fusionServerInfo.map(
+          (key, value) => MapEntry(
+            key.name,
+            value.toJsonString(),
+          ),
+        ),
+      );
+      notifyListeners();
+    }
+  }
+
+  Future<Map<Coin, FusionInfo>> _getFusionServerInfo() async {
+    final map = await DB.instance.get<dynamic>(
+      boxName: DB.boxNamePrefs,
+      key: "fusionServerInfoMap",
+    ) as Map?;
+
+    if (map == null) {
+      return _fusionServerInfo;
+    }
+
+    final actualMap = Map<String, String>.from(map).map(
+      (key, value) => MapEntry(
+        coinFromPrettyName(key),
+        FusionInfo.fromJsonString(value),
+      ),
+    );
+
+    // legacy bch check
+    if (actualMap[Coin.bitcoincash] == null ||
+        actualMap[Coin.bitcoincashTestnet] == null) {
+      final saved = await DB.instance.get<dynamic>(
         boxName: DB.boxNamePrefs,
         key: "fusionServerInfo",
-        value: fusionServerInfo.toJsonString(),
+      ) as String?;
-      );
-      _fusionServerInfoBch = fusionServerInfo;
-      notifyListeners();
-    }
-  }
 
-  set fusionServerInfoXec(FusionInfo fusionServerInfo) {
+      if (saved != null) {
-    if (fusionServerInfoXec != fusionServerInfo) {
+        final bchInfo = FusionInfo.fromJsonString(saved);
+        actualMap[Coin.bitcoincash] = bchInfo;
+        actualMap[Coin.bitcoincashTestnet] = bchInfo;
+        unawaited(
           DB.instance.put<dynamic>(
             boxName: DB.boxNamePrefs,
-        key: "fusionServerInfoXec",
+            key: "fusionServerInfoMap",
-        value: fusionServerInfo.toJsonString(),
+            value: actualMap.map(
+              (key, value) => MapEntry(
+                key.name,
+                value.toJsonString(),
+              ),
+            ),
+          ),
         );
-      _fusionServerInfoXec = fusionServerInfo;
-      notifyListeners();
       }
     }
 
-  Future<FusionInfo> _getFusionServerInfoBch() async {
+    return actualMap;
-    final saved = await DB.instance.get<dynamic>(
-      boxName: DB.boxNamePrefs,
-      key: "fusionServerInfoBch",
-    ) as String?;
-
-    try {
-      return FusionInfo.fromJsonString(saved!);
-    } catch (_) {
-      return FusionInfo.BCH_DEFAULTS;
-    }
-  }
-
-  Future<FusionInfo> _getFusionServerInfoXec() async {
-    final saved = await DB.instance.get<dynamic>(
-      boxName: DB.boxNamePrefs,
-      key: "fusionServerInfoXec",
-    ) as String?;
-
-    try {
-      return FusionInfo.fromJsonString(saved!);
-    } catch (_) {
-      return FusionInfo.XEC_DEFAULTS;
-    }
   }
 }