From d5d4bba3746036781874c871b88827ee1e9e5c65 Mon Sep 17 00:00:00 2001
From: Dario Gabriel Lipicar <dario@status.im>
Date: Tue, 20 Jun 2023 16:46:04 -0300
Subject: [PATCH] fix(@wallet): use fixed activity type from backend

Part of #11080
---
 .../main/wallet_section/activity/entry.nim    | 19 ++++---------------
 vendor/status-go                              |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/app/modules/main/wallet_section/activity/entry.nim b/src/app/modules/main/wallet_section/activity/entry.nim
index 3220a0ca84..a6f96a1d07 100644
--- a/src/app/modules/main/wallet_section/activity/entry.nim
+++ b/src/app/modules/main/wallet_section/activity/entry.nim
@@ -32,7 +32,6 @@ QtObject:
       multi_transaction: MultiTransactionDto
       transaction: ref Item
       isPending: bool
-      activityType: backend.ActivityType
 
       metadata: backend.ActivityEntry
       extradata: ExtraData
@@ -59,12 +58,6 @@ QtObject:
     result.isPending = metadata.payloadType == backend.PayloadType.PendingTransaction
     result.metadata = metadata
     result.extradata = extradata
-    result.activityType = backend.ActivityType.Send
-    if tr != nil:
-      for address in fromAddresses:
-        if (cmpIgnoreCase(address, tr[].getTo()) == 0):
-          result.activityType = backend.ActivityType.Receive
-          break
     result.setup()
 
   proc isMultiTransaction*(self: ActivityEntry): bool {.slot.} =
@@ -214,7 +207,7 @@ QtObject:
     read = getInput
 
   proc getTxType*(self: ActivityEntry): int {.slot.} =
-    return self.activityType.int
+    return self.metadata.activityType.int
 
   QtProperty[int] txType:
     read = getTxType
@@ -270,7 +263,7 @@ QtObject:
       error "getSymbol: ActivityEntry is not an transaction.Item"
       return ""
 
-    if self.activityType == backend.ActivityType.Receive:
+    if self.metadata.activityType == backend.ActivityType.Receive:
       return self.getInSymbol()
 
     return self.getOutSymbol()
@@ -301,14 +294,10 @@ QtObject:
       error "getToAmount: ActivityEntry is a MultiTransaction"
       return 0.0
 
-    if self.activityType == backend.ActivityType.Receive:
+    if self.metadata.activityType == backend.ActivityType.Receive:
       return self.getInAmount()
 
-    # For some reason status-go is categorizing every activity as Receive,
-    # inverting the In/Out fields for Send operations. Revert this when
-    # that gets fixed.
-    #return self.getOutAmount()
-    return self.getInAmount()
+    return self.getOutAmount()
 
   QtProperty[float] value:
     read = getValue
\ No newline at end of file
diff --git a/vendor/status-go b/vendor/status-go
index 8e63f44735..bf54a57780 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 8e63f447352fef5fb4eb1dbd0a87a296b2b96d78
+Subproject commit bf54a577805671df7f07c69b414184764b79e091