fix: Fixed pending tx update in different chains & tx history mix in …

…different chains
MXCzkEVM · Nov 10, 2023 · c8c3a47 · c8c3a47
1 parent 94fef9b
commit c8c3a47
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 27 deletions.
diff --git a/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart b/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart
@@ -1,12 +1,19 @@
+import 'dart:async';
+
 import 'package:datadashwallet/common/common.dart';
 import 'package:datadashwallet/core/core.dart';
+import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
 
 class TransactionsHistoryUseCase extends ReactiveUseCase {
-  TransactionsHistoryUseCase(this._repository, this._web3Repository);
+  TransactionsHistoryUseCase(
+      this._repository, this._web3Repository, this._chainConfigurationUseCase) {
+    initTransactionHistoryListening();
+  }
 
   final Web3Repository _web3Repository;
+  final ChainConfigurationUseCase _chainConfigurationUseCase;
 
   final TransactionsHistoryRepository _repository;
 
@@ -17,7 +24,25 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
 
   late final ValueStream<bool> shouldUpdateBalances = reactive(false);
 
-  List<String> updatingTxList = [];
+  int? currentChainId;
+
+  Map<String, StreamSubscription<TransactionReceipt?>> updatingTransactions =
+      {};
+
+  initTransactionHistoryListening() {
+    transactionsHistory.listen(listenToTransactionsHistory);
+  }
+
+  listenToTransactionsHistory(List<TransactionModel> event) {
+    final selectedNetwork = _chainConfigurationUseCase.selectedNetwork.value;
+    if (selectedNetwork != null) {
+      final chainId = selectedNetwork.chainId;
+      checkChainChange(chainId);
+      if (!Config.isMxcChains(chainId)) {
+        checkForPendingTransactions();
+      }
+    }
+  }
 
   void updateItem(
     TransactionModel item,
@@ -52,13 +77,15 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
   void spyOnTransaction(
     TransactionModel item,
   ) {
-    if (!updatingTxList.contains(item.hash)) {
-      updatingTxList.add(item.hash);
-      final stream = _web3Repository.tokenContract.spyTransaction(item.hash);
+    if (!updatingTransactions.keys.contains(item.hash)) {
+      updatingTransactions[item.hash] =
+          _web3Repository.tokenContract.spyTransaction(item.hash);
 
-      stream.onData((receipt) {
+      updatingTransactions[item.hash]?.onData((receipt) {
         if (receipt?.status ?? false) {
           // success
+          updatingTransactions[item.hash]?.cancel();
+
           final itemValue = item.value ??
               (receipt!.gasUsed! * receipt.effectiveGasPrice!.getInWei)
                   .toString();
@@ -68,32 +95,31 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
           updateItem(
             updatedItem,
           );
-          updatingTxList.remove(item.hash);
+          updatingTransactions.remove(item.hash);
           update(shouldUpdateBalances, true);
-
-          stream.cancel();
         }
       });
     }
   }
 
   /// This function will run through all the transactions and will start spying on
   /// pending transactions
-  void checkForPendingTransactions(int chainId) {
-    if (!Config.isMxcChains(chainId)) {
-      final txList = transactionsHistory.value;
-      final pendingTxList = txList
-          .where((element) => element.status == TransactionStatus.pending);
-      for (TransactionModel pendingTx in pendingTxList) {
-        spyOnTransaction(
-          pendingTx,
-        );
-      }
+  void checkForPendingTransactions() async {
+    final txList = transactionsHistory.value;
+    final pendingTxList =
+        txList.where((element) => element.status == TransactionStatus.pending);
+    for (TransactionModel pendingTx in pendingTxList) {
+      spyOnTransaction(
+        pendingTx,
+      );
     }
   }
 
   void spyOnUnknownTransaction(
-      String hash, String address, Token token, int chainId) async {
+    String hash,
+    String address,
+    Token token,
+  ) async {
     TransactionInformation? receipt;
 
     receipt = await _web3Repository.tokenContract
@@ -107,4 +133,14 @@ class TransactionsHistoryUseCase extends ReactiveUseCase {
       );
     }
   }
+
+  void checkChainChange(int chainId) async {
+    if (currentChainId != chainId) {
+      for (String txHash in updatingTransactions.keys) {
+        await updatingTransactions[txHash]?.cancel();
+      }
+      updatingTransactions.clear();
+    }
+    currentChainId = chainId;
+  }
 }
diff --git a/lib/core/src/providers/providers_use_cases.dart b/lib/core/src/providers/providers_use_cases.dart
@@ -127,7 +127,6 @@ final Provider<TransactionsHistoryUseCase> transactionHistoryUseCaseProvider =
   (ref) => TransactionsHistoryUseCase(
     ref.watch(datadashCacheProvider).transactionsHistoryRepository,
     ref.watch(web3RepositoryProvider),
-    ref.watch(globalCacheProvider).chainConfigurationRepository,
     ref.watch(chainConfigurationUseCaseProvider),
   ),
 );

diff --git a/lib/features/wallet/presentation/wallet_page_presenter.dart b/lib/features/wallet/presentation/wallet_page_presenter.dart
@@ -31,7 +31,6 @@ class WalletPresenter extends CompletePresenter<WalletState> {
     super.initState();
 
     getMXCTweets();
-    checkForPendingTx();
 
     listen(_accountUserCase.account, (value) {
       if (value != null) {
@@ -431,11 +430,6 @@ class WalletPresenter extends CompletePresenter<WalletState> {
     }
   }
 
-  void checkForPendingTx() {
-    _transactionHistoryUseCase.checkForPendingTransactions(
-        _chainConfigurationUseCase.getCurrentNetworkWithoutRefresh().chainId);
-  }
-
   void initBalanceUpdateStream() {
     state.balancesUpdateSubscription ??=
         listen(_transactionHistoryUseCase.shouldUpdateBalances, (value) {