fix: Transactions send/receive boolean value fixed and the array is s…

…orted in reverse
Securrency-OSS · Feb 23, 2024 · 7fd7da7 · 7fd7da7
1 parent b5511c4
commit 7fd7da7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/packages/mirai_web3/lib/services/web_modal_service.dart b/packages/mirai_web3/lib/services/web_modal_service.dart
@@ -328,19 +328,22 @@ class Web3ModalService {
             ]),
       )
           .then((logs) {
-        for (FilterEvent l in logs) {
+        for (FilterEvent l in logs.reversed.toList()) {
           final result = transferEvent.decodeResults(l.topics!, l.data!);
+          final senderAddress = (result[0] as EthereumAddress);
+          final receiverAddress = (result[1] as EthereumAddress);
+          final walletAddress = EthereumAddress.fromHex(connectedWalletAddress);
 
-          if (result
-              .contains(EthereumAddress.fromHex(connectedWalletAddress))) {
+          if (senderAddress.toString() == walletAddress.toString() ||
+              receiverAddress.toString() == walletAddress.toString()) {
             transactions.add(
               TransactionDetails(
-                senderAddress: (result[0] as EthereumAddress).hex,
-                receiverAddress: (result[1] as EthereumAddress).hex,
+                senderAddress: senderAddress.hex,
+                receiverAddress: receiverAddress.hex,
                 amount: (result[2] as BigInt)
                     .toAmountInDouble(contractToken.decimals),
-                received: (result[1] as EthereumAddress).hex ==
-                    connectedWalletAddress,
+                received:
+                    receiverAddress.toString() == walletAddress.toString(),
                 tranHash: l.transactionHash ?? '',
                 tokenAddress: contractToken.address,
                 tokenName: contractToken.name,