From 4bcf6162f11d45273d509c0e158c4fe07fa7372d Mon Sep 17 00:00:00 2001
From: Konstantin Ullrich <konstantinullrich12@gmail.com>
Date: Fri, 8 Sep 2023 19:12:54 +0200
Subject: [PATCH] CW-476 Only get Transactions of one Account on tx-history
 refresh (#1077)

---
 cw_monero/lib/api/transaction_history.dart | 2 +-
 cw_monero/lib/monero_wallet.dart           | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
index 6f848cb3d..1964c4067 100644
--- a/cw_monero/lib/api/transaction_history.dart
+++ b/cw_monero/lib/api/transaction_history.dart
@@ -55,7 +55,7 @@ void refreshTransactions() => transactionsRefreshNative();
 
 int countOfTransactions() => transactionsCountNative();
 
-List<TransactionInfoRow> getAllTransations() {
+List<TransactionInfoRow> getAllTransactions() {
   final size = transactionsCountNative();
   final transactionsPointer = transactionsGetAllNative();
   final transactionsAddresses = transactionsPointer.asTypedList(size);
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 39c0604a3..69cd5458e 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -482,7 +482,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
   @override
   Future<Map<String, MoneroTransactionInfo>> fetchTransactions() async {
     transaction_history.refreshTransactions();
-    return _getAllTransactions(null).fold<Map<String, MoneroTransactionInfo>>(
+    return _getAllTransactionsOfAccount(walletAddresses.account?.id).fold<Map<String, MoneroTransactionInfo>>(
         <String, MoneroTransactionInfo>{},
         (Map<String, MoneroTransactionInfo> acc, MoneroTransactionInfo tx) {
       acc[tx.id] = tx;
@@ -497,6 +497,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       }
 
       _isTransactionUpdating = true;
+      transactionHistory.clear();
       final transactions = await fetchTransactions();
       transactionHistory.addMany(transactions);
       await transactionHistory.save();
@@ -511,10 +512,11 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     return monero_wallet.getSubaddressLabel(accountIndex, addressIndex);
   }
 
-  List<MoneroTransactionInfo> _getAllTransactions(dynamic _) =>
+  List<MoneroTransactionInfo> _getAllTransactionsOfAccount(int? accountIndex) =>
       transaction_history
-          .getAllTransations()
+          .getAllTransactions()
           .map((row) => MoneroTransactionInfo.fromRow(row))
+          .where((element) => element.accountIndex == (accountIndex ?? 0))
           .toList();
 
   void _setListeners() {