fix: swap issues

Author: julian-CStack

lib/app_config.dart

@@ -23,7 +23,8 @@ abstract class AppConfig {
 
   static List<CryptoCurrency> get coins => _supportedCoins;
 
-  static ({String from, String to}) get swapDefaults => _swapDefaults;
+  static ({String from, String fromFuzzyNet, String to, String toFuzzyNet})
+  get swapDefaults => _swapDefaults;
 
   static bool get isSingleCoinApp => coins.length == 1;
 

lib/models/exchange/aggregate_currency.dart

@@ -42,13 +42,29 @@ class AggregateCurrency {
 
   bool get isStackCoin => _map.values.first!.isStackCoin;
 
+  String get fuzzyNet => _map.values.first!.getFuzzyNet();
+
   @override
   String toString() {
     String str = "AggregateCurrency: {";
     for (final key in _map.keys) {
-      str += " $key: ${_map[key]},";
+      str += "\n $key: ${_map[key]},";
     }
-    str += " }";
+    str += "\n}";
     return str;
   }
+
+  @override
+  bool operator ==(Object other) {
+    return other is AggregateCurrency &&
+        other.ticker == ticker &&
+        other._map.isNotEmpty &&
+        other._map.length == _map.length &&
+        other._map.values.first!.getFuzzyNet() ==
+            _map.values.first!.getFuzzyNet();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(ticker, _map.values.first!.getFuzzyNet(), _map.length);
 }

lib/models/exchange/change_now/estimated_exchange_amount.dart

@@ -29,7 +29,7 @@ class EstimatedExchangeAmount {
   final String? rateId;
 
   /// Date and time before which the estimated amount is valid if using `rateId`.
-  final DateTime validUntil;
+  final DateTime? validUntil;
 
   /// Dash-separated min and max estimated time in minutes.
   final String? transactionSpeedForecast;
@@ -87,7 +87,7 @@ class EstimatedExchangeAmount {
       flow: _parseFlow(json["flow"] as String),
       type: _parseType(json["type"] as String),
       rateId: json["rateId"] as String?,
-      validUntil: DateTime.parse(json["validUntil"] as String),
+      validUntil: DateTime.tryParse(json["validUntil"] as String? ?? ""),
       transactionSpeedForecast: json["transactionSpeedForecast"] as String?,
       warningMessage: json["warningMessage"] as String?,
       depositFee: Decimal.parse(json["depositFee"].toString()),
@@ -108,7 +108,7 @@ class EstimatedExchangeAmount {
       "flow": flow.name.replaceAll("fixedRate", "fixed-rate"),
       "type": type.name,
       "rateId": rateId,
-      "validUntil": validUntil.toIso8601String(),
+      "validUntil": validUntil?.toIso8601String(),
       "transactionSpeedForecast": transactionSpeedForecast,
       "warningMessage": warningMessage,
       "depositFee": depositFee.toString(),

lib/models/isar/exchange_cache/currency.dart

@@ -11,6 +11,11 @@
 import 'package:isar/isar.dart';
 
 import '../../../app_config.dart';
+import '../../../services/exchange/change_now/change_now_exchange.dart';
+import '../../../services/exchange/exchange.dart';
+import '../../../services/exchange/majestic_bank/majestic_bank_exchange.dart';
+import '../../../services/exchange/nanswap/nanswap_exchange.dart';
+import '../../../services/exchange/trocador/trocador_exchange.dart';
 import 'pair.dart';
 
 part 'currency.g.dart';
@@ -23,12 +28,7 @@ class Currency {
   final String exchangeName;
 
   /// Currency ticker
-  @Index(
-    composite: [
-      CompositeIndex("exchangeName"),
-      CompositeIndex("name"),
-    ],
-  )
+  @Index(composite: [CompositeIndex("exchangeName"), CompositeIndex("name")])
   final String ticker;
 
   /// Currency name
@@ -68,6 +68,33 @@ class Currency {
       rateType == SupportedRateType.estimated ||
       rateType == SupportedRateType.both;
 
+  // used to group coins across providers
+  @ignore
+  String? _fuzzyCache;
+  String getFuzzyNet() {
+    return _fuzzyCache ??= switch (Exchange.fromName(
+      exchangeName,
+    ).runtimeType) {
+      // already lower case ticker basically
+      const (ChangeNowExchange) => network,
+
+      // not used at the time being
+      // case const (SimpleSwapExchange):
+
+      // currently a hardcoded of coins so we can just
+      const (MajesticBankExchange) => ticker.toLowerCase(),
+
+      const (TrocadorExchange) =>
+        (network == "Mainnet" ? ticker.toLowerCase() : network),
+
+      // only a few coins and `network` is the ticker
+      const (NanswapExchange) =>
+        network.isNotEmpty ? network.toLowerCase() : ticker.toLowerCase(),
+
+      _ => throw Exception("Unknown exchange: $exchangeName"),
+    };
+  }
+
   Currency({
     required this.exchangeName,
     required this.ticker,

lib/pages/exchange_view/exchange_coin_selection/exchange_currency_selection_view.dart

@@ -13,18 +13,18 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:isar/isar.dart';
+import 'package:tuple/tuple.dart';
 
 import '../../../app_config.dart';
+import '../../../models/exchange/aggregate_currency.dart';
 import '../../../models/isar/exchange_cache/currency.dart';
 import '../../../models/isar/exchange_cache/pair.dart';
 import '../../../services/exchange/exchange.dart';
 import '../../../services/exchange/exchange_data_loading_service.dart';
-import '../../../services/exchange/majestic_bank/majestic_bank_exchange.dart';
-import '../../../services/exchange/nanswap/nanswap_exchange.dart';
-import '../../../services/exchange/trocador/trocador_exchange.dart';
 import '../../../themes/stack_colors.dart';
 import '../../../utilities/assets.dart';
 import '../../../utilities/constants.dart';
+import '../../../utilities/logger.dart';
 import '../../../utilities/prefs.dart';
 import '../../../utilities/text_styles.dart';
 import '../../../utilities/util.dart';
@@ -42,14 +42,12 @@ import '../../buy_view/sub_widgets/crypto_selection_view.dart';
 class ExchangeCurrencySelectionView extends StatefulWidget {
   const ExchangeCurrencySelectionView({
     super.key,
-    required this.willChangeTicker,
-    required this.pairedTicker,
+    required this.pairedCurrency,
     required this.isFixedRate,
     required this.willChangeIsSend,
   });
 
-  final String? willChangeTicker;
-  final String? pairedTicker;
+  final AggregateCurrency? pairedCurrency;
   final bool isFixedRate;
   final bool willChangeIsSend;
 
@@ -64,7 +62,7 @@ class _ExchangeCurrencySelectionViewState
   final _searchFocusNode = FocusNode();
   final isDesktop = Util.isDesktop;
 
-  List<Currency> _currencies = [];
+  List<AggregateCurrency> _currencies = [];
 
   bool _loaded = false;
   String _searchString = "";
@@ -99,26 +97,7 @@ class _ExchangeCurrencySelectionViewState
     return result;
   }
 
-  Future<List<Currency>> _loadCurrencies() async {
-    if (widget.pairedTicker == null) {
-      return await _getCurrencies();
-    }
-    await ExchangeDataLoadingService.instance.initDB();
-    final List<Currency> currencies =
-        await ExchangeDataLoadingService.instance.isar.currencies
-            .where()
-            .filter()
-            .exchangeNameEqualTo(MajesticBankExchange.exchangeName)
-            .or()
-            .exchangeNameStartsWith(TrocadorExchange.exchangeName)
-            .or()
-            .exchangeNameStartsWith(NanswapExchange.exchangeName)
-            .findAll();
-
-    return _getDistinctCurrenciesFrom(currencies);
-  }
-
-  Future<List<Currency>> _getCurrencies() async {
+  Future<List<AggregateCurrency>> _loadCurrencies() async {
     await ExchangeDataLoadingService.instance.initDB();
     final currencies =
         await ExchangeDataLoadingService.instance.isar.currencies
@@ -154,53 +133,78 @@ class _ExchangeCurrencySelectionViewState
       }
     }
 
-    return _getDistinctCurrenciesFrom(currencies);
+    return await _getDistinctCurrenciesFrom(currencies);
   }
 
-  List<Currency> _getDistinctCurrenciesFrom(List<Currency> currencies) {
-    final List<Currency> distinctCurrencies = [];
+  Future<List<AggregateCurrency>> _getDistinctCurrenciesFrom(
+    List<Currency> currencies,
+  ) async {
+    final Map<String, List<Currency>> groups = {};
+
     for (final currency in currencies) {
-      if (!distinctCurrencies.any(
-        (e) => e.ticker.toLowerCase() == currency.ticker.toLowerCase(),
-      )) {
-        distinctCurrencies.add(currency);
-      }
+      final key = '${currency.ticker.toLowerCase()}|${currency.getFuzzyNet()}';
+
+      groups.putIfAbsent(key, () => []).add(currency);
     }
-    return distinctCurrencies;
-  }
 
-  List<Currency> filter(String text) {
-    if (widget.pairedTicker == null) {
-      if (text.isEmpty) {
-        return _currencies;
-      }
+    final Set<AggregateCurrency> results = {};
+
+    for (final group in groups.values) {
+      final items = group
+          .map((e) => Tuple2(e.exchangeName, e))
+          .toList(growable: false);
+
+      results.add(AggregateCurrency(exchangeCurrencyPairs: items));
+    }
+
+    if (widget.pairedCurrency != null) {
+      results.remove(widget.pairedCurrency);
+    }
 
-      return _currencies
-          .where(
-            (e) =>
-                e.name.toLowerCase().contains(text.toLowerCase()) ||
-                e.ticker.toLowerCase().contains(text.toLowerCase()),
-          )
-          .toList();
-    } else {
-      if (text.isEmpty) {
-        return _currencies
+    final walletCoins =
+        results
             .where(
-              (e) =>
-                  e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase(),
+              (currency) =>
+                  AppConfig.coins
+                      .where(
+                        (coin) =>
+                            coin.ticker.toLowerCase() ==
+                                currency.ticker.toLowerCase() &&
+                            currency.fuzzyNet == coin.ticker.toLowerCase(),
+                      )
+                      .isNotEmpty,
             )
             .toList();
-      }
 
-      return _currencies
-          .where(
-            (e) =>
-                e.ticker.toLowerCase() != widget.pairedTicker!.toLowerCase() &&
-                (e.name.toLowerCase().contains(text.toLowerCase()) ||
-                    e.ticker.toLowerCase().contains(text.toLowerCase())),
-          )
-          .toList();
+    final list = results.toList();
+
+    // sort alphabetically by name
+    list.sort((a, b) => a.name.compareTo(b.name));
+
+    // reverse sort walletCoins to prepare for next step
+    walletCoins.sort((a, b) => b.name.compareTo(a.name));
+
+    // insert wallet coins at beginning
+    for (final c in walletCoins) {
+      list.remove(c);
+      list.insert(0, c);
+    }
+
+    return list;
+  }
+
+  List<AggregateCurrency> filter(String text) {
+    if (text.isEmpty) {
+      return _currencies.toList();
     }
+
+    return _currencies
+        .where(
+          (e) =>
+              e.name.toLowerCase().contains(text.toLowerCase()) ||
+              e.ticker.toLowerCase().contains(text.toLowerCase()),
+        )
+        .toList();
   }
 
   @override
@@ -325,40 +329,8 @@ class _ExchangeCurrencySelectionViewState
             Flexible(
               child: Builder(
                 builder: (context) {
-                  final coins = AppConfig.coins.where(
-                    (e) =>
-                        e.ticker.toLowerCase() !=
-                        widget.pairedTicker?.toLowerCase(),
-                  );
-
                   final items = filter(_searchString);
 
-                  final walletCoins =
-                      items
-                          .where(
-                            (currency) =>
-                                coins
-                                    .where(
-                                      (coin) =>
-                                          coin.ticker.toLowerCase() ==
-                                          currency.ticker.toLowerCase(),
-                                    )
-                                    .isNotEmpty,
-                          )
-                          .toList();
-
-                  // sort alphabetically by name
-                  items.sort((a, b) => a.name.compareTo(b.name));
-
-                  // reverse sort walletCoins to prepare for next step
-                  walletCoins.sort((a, b) => b.name.compareTo(a.name));
-
-                  // insert wallet coins at beginning
-                  for (final c in walletCoins) {
-                    items.remove(c);
-                    items.insert(0, c);
-                  }
-
                   return RoundedWhiteContainer(
                     padding: const EdgeInsets.all(0),
                     child: ListView.builder(
@@ -373,7 +345,9 @@ class _ExchangeCurrencySelectionViewState
                           padding: const EdgeInsets.symmetric(vertical: 4),
                           child: GestureDetector(
                             onTap: () {
-                              Navigator.of(context).pop(items[index]);
+                              final selected = items[index];
+                              Logging.instance.d("swap selected: $selected");
+                              Navigator.of(context).pop(selected);
                             },
                             child: RoundedWhiteContainer(
                               child: Row(