From be8c5d75344ec5801e6966cec725af7ce8b27243 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Tue, 16 May 2023 10:21:30 +0200
Subject: [PATCH] fix(@wallet): Address details per chain

fixes #10068
---
 src/app_service/service/network/service.nim            | 3 +++
 src/app_service/service/wallet_account/async_tasks.nim | 3 ++-
 src/app_service/service/wallet_account/service.nim     | 2 ++
 src/backend/accounts.nim                               | 4 ++--
 vendor/status-go                                       | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app_service/service/network/service.nim b/src/app_service/service/network/service.nim
index 7c9deb425f..b72e42725a 100644
--- a/src/app_service/service/network/service.nim
+++ b/src/app_service/service/network/service.nim
@@ -122,6 +122,9 @@ proc getNetworkForBrowser*(self: Service): NetworkDto =
 proc getNetworkForChat*(self: Service): NetworkDto =
   return self.getNetworkForStickers()
 
+proc getNetworkForActivityCheck*(self: Service): NetworkDto =
+  return self.getNetworkForStickers()
+
 proc getNetworkForCollectibles*(self: Service): NetworkDto =
   if self.settingsService.areTestNetworksEnabled():
     return self.getNetwork(Goerli)
diff --git a/src/app_service/service/wallet_account/async_tasks.nim b/src/app_service/service/wallet_account/async_tasks.nim
index 97f30bb4e1..5755d9bb6b 100644
--- a/src/app_service/service/wallet_account/async_tasks.nim
+++ b/src/app_service/service/wallet_account/async_tasks.nim
@@ -43,6 +43,7 @@ const fetchDerivedAddressesForMnemonicTask*: Task = proc(argEncoded: string) {.g
 type
   FetchDetailsForAddressesTaskArg* = ref object of QObjectTaskArg
     uniqueId: string
+    chainId: int
     addresses: seq[string]
 
 const fetchDetailsForAddressesTask*: Task = proc(argEncoded: string) {.gcsafe, nimcall.} =
@@ -54,7 +55,7 @@ const fetchDetailsForAddressesTask*: Task = proc(argEncoded: string) {.gcsafe, n
       "error": ""
     }
     try:
-      let response = status_go_accounts.getAddressDetails(address)
+      let response = status_go_accounts.getAddressDetails(arg.chainId, address)
       sleep(250)
       data["details"] = response.result
     except Exception as e:
diff --git a/src/app_service/service/wallet_account/service.nim b/src/app_service/service/wallet_account/service.nim
index a0d936183f..83eb51d256 100644
--- a/src/app_service/service/wallet_account/service.nim
+++ b/src/app_service/service/wallet_account/service.nim
@@ -575,8 +575,10 @@ QtObject:
     ))
 
   proc fetchDetailsForAddresses*(self: Service, uniqueId: string, addresses: seq[string]) =
+    let network = self.networkService.getNetworkForActivityCheck()
     let arg = FetchDetailsForAddressesTaskArg(
       uniqueId: uniqueId,
+      chainId: network.chainId,
       addresses: addresses,
       tptr: cast[ByteAddress](fetchDetailsForAddressesTask),
       vptr: cast[ByteAddress](self.vptr),
diff --git a/src/backend/accounts.nim b/src/backend/accounts.nim
index 95587919f9..964a914a32 100644
--- a/src/backend/accounts.nim
+++ b/src/backend/accounts.nim
@@ -402,8 +402,8 @@ proc getDerivedAddressesForMnemonic*(mnemonic: string, paths: seq[string]): RpcR
   let payload = %* [mnemonic, paths]
   result = core.callPrivateRPC("wallet_getDerivedAddressesForMnemonic", payload)
 
-proc getAddressDetails*(address: string,): RpcResponse[JsonNode] {.raises: [Exception].} =
-  let payload = %* [address]
+proc getAddressDetails*(chainId: int, address: string): RpcResponse[JsonNode] {.raises: [Exception].} =
+  let payload = %* [chainId, address]
   result = core.callPrivateRPC("wallet_getAddressDetails", payload)
 
 proc verifyPassword*(password: string): RpcResponse[JsonNode] {.raises: [Exception].} =
diff --git a/vendor/status-go b/vendor/status-go
index 62e3e9bd62..8b05ba6d8b 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 62e3e9bd62a8634cfee9dc22f62811b944e4e43a
+Subproject commit 8b05ba6d8b44d441377ea896b0b95d004fc2583c