fix: Fixed logic conflicts with other chains

MXCzkEVM · Sep 20, 2023 · 0b3a53b · 0b3a53b
1 parent 56a1bee
commit 0b3a53b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/lib/common/components/recent_transactions/domain/transactions_use_case.dart b/lib/common/components/recent_transactions/domain/transactions_use_case.dart
@@ -1,3 +1,4 @@
+import 'package:datadashwallet/common/common.dart';
 import 'package:datadashwallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import '../entity/transaction_history_model.dart';
@@ -71,15 +72,17 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
   }
 
   void checkForPendingTransactions(int chainId) {
-    final index = transactionsHistory.value
-        .indexWhere((element) => element.chainId == chainId);
-
-    if (index != -1) {
-      final chainTx = transactionsHistory.value[index];
-      final pendingTxList = chainTx.txList
-          .where((element) => element.status == TransactionStatus.pending);
-      for (TransactionModel pendingTx in pendingTxList) {
-        spyOnTransaction(pendingTx, chainId);
+    if (!Config.isMxcChains(chainId)) {
+      final index = transactionsHistory.value
+          .indexWhere((element) => element.chainId == chainId);
+
+      if (index != -1) {
+        final chainTx = transactionsHistory.value[index];
+        final pendingTxList = chainTx.txList
+            .where((element) => element.status == TransactionStatus.pending);
+        for (TransactionModel pendingTx in pendingTxList) {
+          spyOnTransaction(pendingTx, chainId);
+        }
       }
     }
   }

diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart
@@ -181,18 +181,20 @@ class SendCryptoPresenter extends CompletePresenter<SendCryptoState> {
           amount: amount,
           tokenAddress: token.address);
 
-      final tx = TransactionModel(
-          hash: res,
-          status: TransactionStatus.pending,
-          type: TransactionType.sent,
-          value: amount.getValueInUnit(EtherUnit.wei).toString(),
-          token: token,
-          timeStamp: DateTime.now());
-
-      _transactionHistoryUseCase.updateItemTx(tx, state.network!.chainId);
-
-      _transactionHistoryUseCase.spyOnTransaction(tx, state.network!.chainId);
-
+      if (!Config.isMxcChains(state.network!.chainId)) {
+        final tx = TransactionModel(
+            hash: res,
+            status: TransactionStatus.pending,
+            type: TransactionType.sent,
+            value: amount.getValueInUnit(EtherUnit.wei).toString(),
+            token: token,
+            timeStamp: DateTime.now());
+
+        _transactionHistoryUseCase.updateItemTx(tx, state.network!.chainId);
+
+        _transactionHistoryUseCase.spyOnTransaction(tx, state.network!.chainId);
+      }
+
       return res;
     } catch (e, s) {
       addError(e, s);