KomodoPlatform · CharlVS · Feb 10, 2025 · Oct 3, 2024 · Nov 15, 2024 · Oct 9, 2024
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -463,6 +463,8 @@
     "manageAnalytics": "Manage analytics",
     "logs": "Logs",
     "resetActivatedCoinsTitle": "Reset Activated Coins",
+    "privateKeys": "Private Keys",
+    "copyWarning": "Your Clipboard isn't a safe place for your private key! Copying the seed phrase or private keys can make them vulnerable to clipboard hacks. Please handle with caution and only copy if absolutely necessary.",
     "seedConfirmTitle": "Let's double check your seed phrase",
     "seedConfirmDescription": "Your seed phrase is the only way to access Your funds. That's why we want to ensure you saved it safely. Please input your seed phrase into text filed below.",
     "standardWallet": "Standard wallet",

diff --git a/lib/app_config/app_config.dart b/lib/app_config/app_config.dart
@@ -45,6 +45,7 @@ Map<String, int> priorityCoinsAbbrMap = {
   'DASH': 11,
   'MATIC': 10,
   'FTM': 10,
+  'ARB': 10,
   'AVAX': 10,
   'HT': 10,
   'MOVR': 10,

diff --git a/lib/bloc/dex_repository.dart b/lib/bloc/dex_repository.dart
@@ -1,4 +1,5 @@
 import 'package:rational/rational.dart';
+import 'package:web_dex/app_config/app_config.dart';
 import 'package:web_dex/mm2/mm2_api/mm2_api.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/base.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/best_orders/best_orders.dart';
@@ -139,4 +140,28 @@ class DexRepository {
 
     return Swap.fromJson(response['result']);
   }
+
+  Future<void> waitOrderbookAvailability({
+    int retries = 10,
+    int interval = 300,
+  }) async {
+    BestOrders orders;
+
+    for (int attempt = 0; attempt < retries; attempt++) {
+      orders = await getBestOrders(
+        BestOrdersRequest(
+          coin: defaultDexCoin,
+          type: BestOrdersRequestType.number,
+          number: 1,
+          action: 'sell',
+        ),
+      );
+
+      if (orders.result?.isNotEmpty ?? false) {
+        return;
+      }
+
+      await Future.delayed(Duration(milliseconds: interval));
+    }
+  }
 }
diff --git a/lib/bloc/fiat/base_fiat_provider.dart b/lib/bloc/fiat/base_fiat_provider.dart
@@ -29,6 +29,7 @@ class Currency {
         (t == CoinType.avx20 && symbol == 'AVAX') ||
         (t == CoinType.etc && symbol == 'ETC') ||
         (t == CoinType.ftm20 && symbol == 'FTM') ||
+        (t == CoinType.arb20 && symbol == 'ARB') ||
         (t == CoinType.hrc20 && symbol == 'ONE') ||
         (t == CoinType.plg20 && symbol == 'MATIC') ||
         (t == CoinType.mvr20 && symbol == 'MOVR')) return symbol;
@@ -155,6 +156,8 @@ abstract class BaseFiatProvider {
         return 'ETC';
       case CoinType.ftm20:
         return 'FTM';
+      case CoinType.arb20:
+        return 'ARB';
       case CoinType.hrc20:
         return 'HARMONY';
       case CoinType.plg20:
@@ -261,6 +264,8 @@ abstract class BaseFiatProvider {
         return CoinType.etc;
       case "FTM":
         return CoinType.ftm20;
+      case "ARB":
+        return CoinType.arb20;
       case "HARMONY":
         return CoinType.hrc20;
       case "MATIC":

diff --git a/lib/bloc/taker_form/taker_bloc.dart b/lib/bloc/taker_form/taker_bloc.dart
@@ -240,18 +240,18 @@ class TakerBloc extends Bloc<TakerEvent, TakerState> {
     TakerSetDefaults event,
     Emitter<TakerState> emit,
   ) async {
-    if (state.sellCoin == null) await _setDefaultSellCoin();
-  }
-
-  Future<void> _setDefaultSellCoin() async {
-    final Coin? defaultCoin = _coinsRepo.getCoin(defaultDexCoin);
-    add(TakerSetSellCoin(defaultCoin));
+    if (state.sellCoin == null) {
+      final Coin? defaultCoin = _coinsRepo.getCoin(defaultDexCoin);
+      add(TakerSetSellCoin(defaultCoin, setOnlyIfNotSet: true));
+    }
   }
 
   Future<void> _onSetSellCoin(
     TakerSetSellCoin event,
     Emitter<TakerState> emit,
   ) async {
+    if (event.setOnlyIfNotSet && state.sellCoin != null) return;
+
     emit(state.copyWith(
       sellCoin: () => event.coin,
       showCoinSelector: () => false,

diff --git a/lib/bloc/taker_form/taker_event.dart b/lib/bloc/taker_form/taker_event.dart
@@ -25,10 +25,12 @@ class TakerCoinSelectorClick extends TakerEvent {}
 class TakerOrderSelectorClick extends TakerEvent {}
 
 class TakerSetSellCoin extends TakerEvent {
-  TakerSetSellCoin(this.coin, {this.autoSelectOrderAbbr});
+  TakerSetSellCoin(this.coin,
+      {this.autoSelectOrderAbbr, this.setOnlyIfNotSet = false});
 
   final Coin? coin;
   final String? autoSelectOrderAbbr;
+  final bool setOnlyIfNotSet;
 }
 
 class TakerSelectOrder extends TakerEvent {

diff --git a/lib/blocs/maker_form_bloc.dart b/lib/blocs/maker_form_bloc.dart
@@ -526,7 +526,11 @@ class MakerFormBloc implements BlocBase {
     if (amountStr.isEmpty) {
       amount = null;
     } else {
-      amount = Rational.parse(amountStr);
+      try {
+        amount = Rational.parse(amountStr);
+      } catch (_) {
+        amount = null;
+      }
     }
 
     isMaxActive = false;
@@ -544,7 +548,11 @@ class MakerFormBloc implements BlocBase {
     if (amountStr.isEmpty) {
       amount = null;
     } else {
-      amount = Rational.parse(amountStr);
+      try {
+        amount = Rational.parse(amountStr);
+      } catch (_) {
+        amount = null;
+      }
     }
 
     if (amount == buyAmount) return;

diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
@@ -491,6 +491,8 @@ abstract class LocaleKeys {
   static const manageAnalytics = 'manageAnalytics';
   static const logs = 'logs';
   static const resetActivatedCoinsTitle = 'resetActivatedCoinsTitle';
+  static const privateKeys = 'privateKeys';
+  static const copyWarning = 'copyWarning';
   static const seedConfirmTitle = 'seedConfirmTitle';
   static const seedConfirmDescription = 'seedConfirmDescription';
   static const standardWallet = 'standardWallet';

diff --git a/lib/mm2/mm2_api/mm2_api.dart b/lib/mm2/mm2_api/mm2_api.dart
@@ -47,6 +47,8 @@ import 'package:web_dex/mm2/mm2_api/rpc/rpc_error.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/sell/sell_request.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/send_raw_transaction/send_raw_transaction_request.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/setprice/setprice_request.dart';
+import 'package:web_dex/mm2/mm2_api/rpc/show_priv_key/show_priv_key_request.dart';
+import 'package:web_dex/mm2/mm2_api/rpc/show_priv_key/show_priv_key_response.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/stop/stop_req.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/trade_preimage/trade_preimage_request.dart';
 import 'package:web_dex/mm2/mm2_api/rpc/trade_preimage/trade_preimage_response.dart';
@@ -999,4 +1001,25 @@ class Mm2Api {
 
     return response;
   }
+
+  Future<ShowPrivKeyResponse?> showPrivKey(
+    ShowPrivKeyRequest request,
+  ) async {
+    try {
+      final String response = await _call(request);
+      final Map<String, dynamic> json = jsonDecode(response);
+      if (json['error'] != null) {
+        return null;
+      }
+      return ShowPrivKeyResponse.fromJson(json);
+    } catch (e, s) {
+      log(
+        'Error getting privkey ${request.coin}: ${e.toString()}',
+        path: 'api => showPrivKey',
+        trace: s,
+        isError: true,
+      );
+      return null;
+    }
+  }
 }
diff --git a/lib/mm2/mm2_api/rpc/show_priv_key/show_priv_key_request.dart b/lib/mm2/mm2_api/rpc/show_priv_key/show_priv_key_request.dart
@@ -0,0 +1,19 @@
+import 'package:web_dex/mm2/mm2_api/rpc/base.dart';
+
+class ShowPrivKeyRequest implements BaseRequest {
+  ShowPrivKeyRequest({
+    required this.coin,
+  });
+  @override
+  late String userpass;
+  @override
+  final String method = 'show_priv_key';
+  final String coin;
+
+  @override
+  Map<String, dynamic> toJson() => <String, dynamic>{
+        'method': method,
+        'userpass': userpass,
+        'coin': coin,
+      };
+}
diff --git a/lib/mm2/mm2_api/rpc/show_priv_key/show_priv_key_response.dart b/lib/mm2/mm2_api/rpc/show_priv_key/show_priv_key_response.dart
@@ -0,0 +1,14 @@
+class ShowPrivKeyResponse {
+  ShowPrivKeyResponse({
+    required this.coin,
+    required this.privKey,
+  });
+
+  factory ShowPrivKeyResponse.fromJson(Map<String, dynamic> json) =>
+      ShowPrivKeyResponse(
+        coin: json['result']['coin'] ?? '',
+        privKey: json['result']['priv_key'] ?? '',
+      );
+  final String coin;
+  final String privKey;
+}
diff --git a/lib/model/coin.dart b/lib/model/coin.dart
@@ -455,6 +455,12 @@ CoinType? getCoinType(String? jsonType, String coinAbbr) {
         } else {
           continue;
         }
+      case CoinType.arb20:
+        if (jsonType == 'Arbitrum') {
+          return value;
+        } else {
+          continue;
+        }
       case CoinType.etc:
         if (jsonType == 'Ethereum Classic') {
           return value;

diff --git a/lib/model/coin_type.dart b/lib/model/coin_type.dart
@@ -7,6 +7,7 @@ enum CoinType {
   bep20,
   qrc20,
   ftm20,
+  arb20,
   avx20,
   hrc20,
   mvr20,

diff --git a/lib/model/coin_utils.dart b/lib/model/coin_utils.dart
@@ -122,6 +122,8 @@ String getCoinTypeName(CoinType type) {
       return 'Smart Chain';
     case CoinType.ftm20:
       return 'FTM-20';
+    case CoinType.arb20:
+      return 'ARB-20';
     case CoinType.etc:
       return 'ETC';
     case CoinType.avx20:
@@ -163,6 +165,8 @@ String getCoinTypeNameLong(CoinType type) {
       return 'Smart Chain';
     case CoinType.ftm20:
       return 'Fantom';
+    case CoinType.arb20:
+      return 'Arbitrum';
     case CoinType.etc:
       return 'Ethereum Classic';
     case CoinType.avx20:

diff --git a/lib/router/navigators/app_router_delegate.dart b/lib/router/navigators/app_router_delegate.dart
@@ -104,6 +104,11 @@ class AppRouterDelegate extends RouterDelegate<AppRoutePath>
     routingState.selectedMenu = MainMenuValue.dex;
     routingState.dexState.action = path.action;
     routingState.dexState.uuid = path.uuid;
+    routingState.dexState.fromCurrency = path.fromCurrency;
+    routingState.dexState.fromAmount = path.fromAmount;
+    routingState.dexState.toCurrency = path.toCurrency;
+    routingState.dexState.toAmount = path.toAmount;
+    routingState.dexState.orderType = path.orderType;
   }
 
   void _setNewMarketMakerBotRoutePath(MarketMakerBotRoutePath path) {
@@ -165,7 +170,13 @@ class AppRouterDelegate extends RouterDelegate<AppRoutePath>
       );
     }
 
-    return DexRoutePath.dex();
+    return DexRoutePath.dex(
+      fromAmount: routingState.dexState.fromAmount,
+      fromCurrency: routingState.dexState.fromCurrency,
+      toAmount: routingState.dexState.toAmount,
+      toCurrency: routingState.dexState.toCurrency,
+      orderType: routingState.dexState.orderType,
+    );
   }
 
   AppRoutePath get _currentMarketMakerBotConfiguration {

diff --git a/lib/router/parsers/dex_route_parser.dart b/lib/router/parsers/dex_route_parser.dart
@@ -14,6 +14,15 @@ class _DexRouteParser implements BaseRouteParser {
       }
     }
 
+    if (uri.pathSegments.length == 1) {
+      return DexRoutePath.dex(
+        fromCurrency: uri.queryParameters['from_currency'] ?? '',
+        fromAmount: uri.queryParameters['from_amount'] ?? '',
+        toCurrency: uri.queryParameters['to_currency'] ?? '',
+        toAmount: uri.queryParameters['to_amount'] ?? '',
+        orderType: uri.queryParameters['order_type'] ?? '',
+      );
+    }
     return DexRoutePath.dex();
   }
 }

diff --git a/lib/router/parsers/root_route_parser.dart b/lib/router/parsers/root_route_parser.dart
@@ -22,10 +22,10 @@ class RootRouteInformationParser extends RouteInformationParser<AppRoutePath> {
   @override
   Future<AppRoutePath> parseRouteInformation(
       RouteInformation routeInformation) async {
-    final uri = Uri.parse(routeInformation.uri.path);
-    final BaseRouteParser parser = _getRoutParser(uri);
+    final BaseRouteParser parser =
+        _getRoutParser(Uri.parse(routeInformation.uri.path));
 
-    return parser.getRoutePath(uri);
+    return parser.getRoutePath(routeInformation.uri);
   }
 
   @override

diff --git a/lib/router/routes.dart b/lib/router/routes.dart
@@ -39,16 +39,33 @@ class FiatRoutePath implements AppRoutePath {
 }
 
 class DexRoutePath implements AppRoutePath {
-  DexRoutePath.dex()
-      : location = '/${firstUriSegment.dex}',
+  DexRoutePath.dex({
+    this.fromCurrency = '',
+    this.fromAmount = '',
+    this.toCurrency = '',
+    this.toAmount = '',
+    this.orderType = '',
+  })  : location = '/${firstUriSegment.dex}',
         uuid = '';
+
   DexRoutePath.swapDetails(this.action, this.uuid)
-      : location = '/${firstUriSegment.dex}/trading_details/$uuid';
+      : location = '/${firstUriSegment.dex}/trading_details/$uuid',
+        fromCurrency = '',
+        fromAmount = '',
+        toCurrency = '',
+        toAmount = '',
+        orderType = '';
 
   @override
   final String location;
   final String uuid;
   DexAction action = DexAction.none;
+
+  final String fromCurrency;
+  final String fromAmount;
+  final String toCurrency;
+  final String toAmount;
+  final String orderType;
 }
 
 class BridgeRoutePath implements AppRoutePath {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ enum CoinType { @@
       bep20,
       qrc20,
       ftm20,
+      arb20,
       avx20,
       hrc20,
       mvr20,
@@ Expand Down @@