Merge branch 'staging' into fix/paynym

Author: julian-CStack

asset_sources/svg/campfire/exchange_icons/exolix.png

@@ -13,6 +13,7 @@ import 'package:isar_community/isar.dart';
 import '../../../app_config.dart';
 import '../../../services/exchange/change_now/change_now_exchange.dart';
 import '../../../services/exchange/exchange.dart';
+import '../../../services/exchange/exolix/exolix_exchange.dart';
 import '../../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../../services/exchange/trocador/trocador_exchange.dart';
 import '../../../services/exchange/wizard_swap/wizard_swap_exchange.dart';
@@ -83,6 +84,8 @@ class Currency {
       // already lower case ticker basically
       const (ChangeNowExchange) => network,
 
+      const (ExolixExchange) => network.toLowerCase(),
+
       // not used at the time being
       // case const (SimpleSwapExchange):
 

asset_sources/svg/stack_duo/exchange_icons/exolix.png

@@ -30,6 +30,7 @@ import '../../services/exchange/change_now/change_now_exchange.dart';
 import '../../services/exchange/exchange.dart';
 import '../../services/exchange/exchange_data_loading_service.dart';
 import '../../services/exchange/exchange_response.dart';
+import '../../services/exchange/exolix/exolix_exchange.dart';
 import '../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../services/exchange/trocador/trocador_exchange.dart';
 import '../../services/exchange/wizard_swap/wizard_swap_exchange.dart';
@@ -81,6 +82,7 @@ class _ExchangeFormState extends ConsumerState<ExchangeForm> {
     } else {
       return [
         ChangeNowExchange.instance,
+        ExolixExchange.instance,
         TrocadorExchange.instance,
         NanswapExchange.instance,
         WizardSwapExchange.instance,

asset_sources/svg/stack_wallet/exchange_icons/exolix.png

@@ -11,7 +11,6 @@
 import 'package:decimal/decimal.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_svg/svg.dart';
 
 import '../../../app_config.dart';
 import '../../../models/exchange/aggregate_currency.dart';
@@ -24,7 +23,6 @@ import '../../../themes/stack_colors.dart';
 import '../../../utilities/amount/amount.dart';
 import '../../../utilities/amount/amount_formatter.dart';
 import '../../../utilities/amount/amount_unit.dart';
-import '../../../utilities/assets.dart';
 import '../../../utilities/enums/exchange_rate_type_enum.dart';
 import '../../../utilities/logger.dart';
 import '../../../utilities/text_styles.dart';
@@ -37,6 +35,7 @@ import '../../../widgets/desktop/primary_button.dart';
 import '../../../widgets/dialogs/basic_dialog.dart';
 import '../../../widgets/exchange/trocador/trocador_kyc_info_button.dart';
 import '../../../widgets/exchange/trocador/trocador_rating_type_enum.dart';
+import '../../../widgets/icon_widgets/exchange_icon.dart';
 
 class ExchangeOption extends ConsumerStatefulWidget {
   const ExchangeOption({
@@ -395,25 +394,13 @@ class _ProviderOptionState extends ConsumerState<ExchProviderOption> {
                                     }
                                   },
                               errorBuilder: (context, error, stackTrace) {
-                                return SvgPicture.asset(
-                                  Assets.exchange.getIconFor(
-                                    exchangeName: widget.exchange.name,
-                                  ),
-                                  width: isDesktop ? 32 : 24,
-                                  height: isDesktop ? 32 : 24,
-                                );
+                                return ExchangeIcon(exchange: widget.exchange);
                               },
                               width: isDesktop ? 32 : 24,
                               height: isDesktop ? 32 : 24,
                             ),
                           )
-                        : SvgPicture.asset(
-                            Assets.exchange.getIconFor(
-                              exchangeName: widget.exchange.name,
-                            ),
-                            width: isDesktop ? 32 : 24,
-                            height: isDesktop ? 32 : 24,
-                          ),
+                        : ExchangeIcon(exchange: widget.exchange),
                   ),
                 ),
                 const SizedBox(width: 10),

lib/models/isar/exchange_cache/currency.dart

@@ -15,6 +15,7 @@ import '../../../models/exchange/aggregate_currency.dart';
 import '../../../providers/providers.dart';
 import '../../../services/exchange/change_now/change_now_exchange.dart';
 import '../../../services/exchange/exchange.dart';
+import '../../../services/exchange/exolix/exolix_exchange.dart';
 import '../../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../../services/exchange/trocador/trocador_exchange.dart';
 import '../../../services/exchange/wizard_swap/wizard_swap_exchange.dart';
@@ -97,6 +98,11 @@ class _ExchangeProviderOptionsState
       sendCurrency: sendCurrency,
       receiveCurrency: receivingCurrency,
     );
+    final showExolix = exchangeSupported(
+      exchangeName: ExolixExchange.exchangeName,
+      sendCurrency: sendCurrency,
+      receiveCurrency: receivingCurrency,
+    );
 
     return RoundedWhiteContainer(
       padding: isDesktop ? const EdgeInsets.all(0) : const EdgeInsets.all(12),
@@ -106,6 +112,7 @@ class _ExchangeProviderOptionsState
       child: SortedExchangeProviders(
         exchangees: [
           if (showChangeNow) ChangeNowExchange.instance,
+          if (showExolix) ExolixExchange.instance,
           if (showTrocador) TrocadorExchange.instance,
           if (showNanswap) NanswapExchange.instance,
           if (showWizardSwap) WizardSwapExchange.instance,

lib/pages/exchange_view/exchange_form.dart

@@ -29,6 +29,7 @@ import '../../providers/providers.dart';
 import '../../route_generator.dart';
 import '../../services/exchange/change_now/change_now_exchange.dart';
 import '../../services/exchange/exchange.dart';
+import '../../services/exchange/exolix/exolix_exchange.dart';
 import '../../services/exchange/nanswap/nanswap_exchange.dart';
 import '../../services/exchange/simpleswap/simpleswap_exchange.dart';
 import '../../services/exchange/trocador/trocador_exchange.dart';
@@ -119,17 +120,21 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
   String _fetchIconAssetForStatus(String statusString, IThemeAssets assets) {
     ChangeNowTransactionStatus? status;
     try {
-      if (statusString.toLowerCase().startsWith("waiting")) {
+      if (statusString.toLowerCase().startsWith("waiting") ||
+          statusString.toLowerCase() == "wait") {
         statusString = "Waiting";
       }
       status = changeNowTransactionStatusFromStringIgnoreCase(statusString);
     } on ArgumentError catch (_) {
       switch (statusString.toLowerCase()) {
+        case "confirmed": // exolix case
+        case "confirmation": // exolix case
         case "funds confirming":
         case "processing payment":
           return assets.txExchangePending;
 
         case "completed":
+        case "success": // exolix case
           return assets.txExchange;
 
         default:
@@ -168,6 +173,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
         sentFromStack ||
         !(trade.status == "New" ||
             trade.status == "new" ||
+            trade.status == "wait" ||
             trade.status == "Waiting" ||
             trade.status == "waiting" ||
             trade.status == "Refunded" ||
@@ -178,6 +184,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
             trade.status == "expired" ||
             trade.status == "Failed" ||
             trade.status == "failed" ||
+            trade.status == "overdue" ||
             trade.status.toLowerCase().startsWith("waiting"));
 
     //todo: check if print needed
@@ -202,6 +209,7 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
         (trade.status == "New" ||
             trade.status == "new" ||
             trade.status == "waiting" ||
+            trade.status == "wait" ||
             trade.status == "Waiting");
 
     return ConditionalParent(
@@ -1162,6 +1170,10 @@ class _TradeDetailsViewState extends ConsumerState<TradeDetailsView> {
                             url =
                                 "https://www.wizardswap.io/api/exchange/${trade.tradeId}";
                             break;
+                          case ExolixExchange.exchangeName:
+                            url =
+                                "https://exolix.com/transaction/${trade.tradeId}";
+                            break;
 
                           default:
                             if (trade.exchangeName.startsWith(

lib/pages/exchange_view/sub_widgets/exchange_provider_option.dart

@@ -16,6 +16,7 @@ import '../../models/exchange/response_objects/trade.dart';
 import '../../models/isar/exchange_cache/currency.dart';
 import 'change_now/change_now_exchange.dart';
 import 'exchange_response.dart';
+import 'exolix/exolix_exchange.dart';
 import 'nanswap/nanswap_exchange.dart';
 import 'simpleswap/simpleswap_exchange.dart';
 import 'trocador/trocador_exchange.dart';
@@ -38,6 +39,8 @@ abstract class Exchange {
         return NanswapExchange.instance;
       case WizardSwapExchange.exchangeName:
         return WizardSwapExchange.instance;
+      case ExolixExchange.exchangeName:
+        return ExolixExchange.instance;
       default:
         final split = name.split(" ");
         if (split.length >= 2) {
@@ -110,6 +113,7 @@ abstract class Exchange {
   static List<Exchange> get exchangesWithTorSupport => [
     // MajesticBankExchange.instance,
     TrocadorExchange.instance,
+    ExolixExchange.instance, // Maybe??
     NanswapExchange.instance, // Maybe??
   ];
 

lib/pages/exchange_view/sub_widgets/exchange_provider_options.dart

@@ -25,6 +25,7 @@ import '../../utilities/logger.dart';
 import '../../utilities/prefs.dart';
 import '../../utilities/stack_file_system.dart';
 import 'change_now/change_now_exchange.dart';
+import 'exolix/exolix_exchange.dart';
 import 'nanswap/nanswap_exchange.dart';
 import 'trocador/trocador_exchange.dart';
 import 'wizard_swap/wizard_swap_exchange.dart';
@@ -209,6 +210,7 @@ class ExchangeDataLoadingService {
           loadTrocadorCurrencies(),
           loadNanswapCurrencies(),
           loadWizardSwapCurrencies(),
+          loadExolixCurrencies(),
         ];
 
         // If using Tor, don't load data for exchanges which don't support Tor.
@@ -460,6 +462,29 @@ class ExchangeDataLoadingService {
     }
   }
 
+  Future<void> loadExolixCurrencies() async {
+    if (_isar == null) {
+      await initDB();
+    }
+    final responseCurrencies = await ExolixExchange.instance.getAllCurrencies(
+      false,
+    );
+
+    if (responseCurrencies.value != null) {
+      await (await isar).writeTxn(() async {
+        final idsToDelete = await (await isar).currencies
+            .where()
+            .exchangeNameEqualTo(ExolixExchange.exchangeName)
+            .idProperty()
+            .findAll();
+        await (await isar).currencies.deleteAll(idsToDelete);
+        await (await isar).currencies.putAll(responseCurrencies.value!);
+      });
+    } else {
+      Logging.instance.w("loadExolixCurrencies: $responseCurrencies");
+    }
+  }
+
   // Future<void> loadMajesticBankPairs() async {
   //   final exchange = MajesticBankExchange.instance;
   //