Do not tag own address

horizontalsystems · Feb 27, 2024 · b3a61f3 · b3a61f3
1 parent 0d38f6f
commit b3a61f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/erc20kit/src/main/java/io/horizontalsystems/erc20kit/events/TransferEventInstance.kt b/erc20kit/src/main/java/io/horizontalsystems/erc20kit/events/TransferEventInstance.kt
@@ -17,16 +17,15 @@ class TransferEventInstance(
         if (from == userAddress) {
             tags.add(TransactionTag.tokenOutgoing(contractAddress.hex))
             tags.add(TransactionTag.OUTGOING)
+            tags.add(TransactionTag.toAddress(to.hex))
         }
 
         if (to == userAddress) {
             tags.add(TransactionTag.tokenIncoming(contractAddress.hex))
             tags.add(TransactionTag.INCOMING)
+            tags.add(TransactionTag.fromAddress(from.hex))
         }
 
-        tags.add(TransactionTag.fromAddress(from.hex))
-        tags.add(TransactionTag.toAddress(to.hex))
-
         return tags
     }
 

diff --git a/nftkit/src/main/java/io/horizontalsystems/nftkit/events/Eip1155TransferEventInstance.kt b/nftkit/src/main/java/io/horizontalsystems/nftkit/events/Eip1155TransferEventInstance.kt
@@ -23,15 +23,14 @@ class Eip1155TransferEventInstance(
             if (from == userAddress) {
                 add(TransactionTag.tokenOutgoing(contractAddress.hex))
                 add(TransactionTag.OUTGOING)
+                add(TransactionTag.toAddress(to.hex))
             }
 
             if (to == userAddress) {
                 add(TransactionTag.tokenIncoming(contractAddress.hex))
                 add(TransactionTag.INCOMING)
+                add(TransactionTag.fromAddress(from.hex))
             }
-
-            add(TransactionTag.fromAddress(from.hex))
-            add(TransactionTag.toAddress(to.hex))
         }
     }
 

diff --git a/nftkit/src/main/java/io/horizontalsystems/nftkit/events/Eip721TransferEventInstance.kt b/nftkit/src/main/java/io/horizontalsystems/nftkit/events/Eip721TransferEventInstance.kt
@@ -21,15 +21,14 @@ class Eip721TransferEventInstance(
         if (from == userAddress) {
             add(TransactionTag.tokenOutgoing(contractAddress.hex))
             add(TransactionTag.OUTGOING)
+            add(TransactionTag.toAddress(to.hex))
         }
 
         if (to == userAddress) {
             add(TransactionTag.tokenIncoming(contractAddress.hex))
             add(TransactionTag.INCOMING)
+            add(TransactionTag.fromAddress(from.hex))
         }
-
-        add(TransactionTag.fromAddress(from.hex))
-        add(TransactionTag.toAddress(to.hex))
     }
 
     companion object {