IOS-7571: Fix duplicate entries in tx history (#793)

Signed-off-by: Andrey Fedorov <[email protected]>
tangem · Aug 8, 2024 · d255513 · d255513
1 parent 3589f57
commit d255513
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/BlockchainSdk/Common/TransactionHistory/Algorand/AlgorandTransactionHistoryProvider.swift b/BlockchainSdk/Common/TransactionHistory/Algorand/AlgorandTransactionHistoryProvider.swift
@@ -47,7 +47,12 @@ extension AlgorandTransactionHistoryProvider: TransactionHistoryProvider {
     }
 
     var description: String {
-        return "nextToken: \(page?.next ?? "-")"
+        return objectDescription(
+            self,
+            userInfo: [
+                "nextToken": page?.next ?? "-",
+            ]
+        )
     }
 
     func reset() {

diff --git a/BlockchainSdk/Common/TransactionHistory/Ethereum/EthereumTransactionHistoryMapper.swift b/BlockchainSdk/Common/TransactionHistory/Ethereum/EthereumTransactionHistoryMapper.swift
@@ -279,10 +279,11 @@ private extension EthereumTransactionHistoryMapper {
     ) -> [TransactionRecord] {
         let hash = transaction.txid
         let fee = Fee(Amount(with: blockchain, value: feeValue / blockchain.decimalValue))
-        let index = transactionIndicesCounter[hash, default: 0]
-        transactionIndicesCounter[hash] = index + 1
 
         return transactionInfos.map { transactionInfo in
+            let index = transactionIndicesCounter[hash, default: 0]
+            transactionIndicesCounter[hash] = index + 1
+
             return TransactionRecord(
                 hash: hash,
                 index: index,

diff --git a/BlockchainSdk/Common/TransactionHistory/Ethereum/EthereumTransactionHistoryProvider.swift b/BlockchainSdk/Common/TransactionHistory/Ethereum/EthereumTransactionHistoryProvider.swift
@@ -37,7 +37,14 @@ extension EthereumTransactionHistoryProvider: TransactionHistoryProvider {
     }
 
     var description: String {
-        return "number: \(String(describing: page?.number)); \(totalPages); \(totalRecordsCount)"
+        return objectDescription(
+            self,
+            userInfo: [
+                "pageNumber": String(describing: page?.number),
+                "totalPages": totalPages,
+                "totalRecordsCount": totalRecordsCount,
+            ]
+        )
     }
 
     func reset() {

diff --git a/BlockchainSdk/Common/TransactionHistory/Tron/TronTransactionHistoryMapper.swift b/BlockchainSdk/Common/TransactionHistory/Tron/TronTransactionHistoryMapper.swift
@@ -157,10 +157,10 @@ final class TronTransactionHistoryMapper {
         let type = transactionType(transaction, amountType: amountType)
         let tokenTransfers = tokenTransfers(transaction)
 
-        let index = transactionIndicesCounter[hash, default: 0]
-        transactionIndicesCounter[hash] = index + 1
-
         return transactionInfos.map { transactionInfo in
+            let index = transactionIndicesCounter[hash, default: 0]
+            transactionIndicesCounter[hash] = index + 1
+
             return TransactionRecord(
                 hash: hash,
                 index: index,

diff --git a/BlockchainSdk/Common/TransactionHistory/UTXO/UTXOTransactionHistoryProvider.swift b/BlockchainSdk/Common/TransactionHistory/UTXO/UTXOTransactionHistoryProvider.swift
@@ -40,7 +40,14 @@ extension UTXOTransactionHistoryProvider: TransactionHistoryProvider {
     }
 
     var description: String {
-        return "number: \(String(describing: page?.number)); \(totalPages); \(totalRecordsCount)"
+        return objectDescription(
+            self,
+            userInfo: [
+                "pageNumber": String(describing: page?.number),
+                "totalPages": totalPages,
+                "totalRecordsCount": totalRecordsCount,
+            ]
+        )
     }
 
     func reset() {