status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(wallet) remove optimization for all chains selected 

The optimization was breaking testnet enabled use case by showing
the cached activity for all chains ignoring the testnet on/off flag

Closes #12200
This commit is contained in:
Stefan 2023-09-20 12:37:23 +02:00 committed by Stefan Dunca
parent 7c8436f492
commit d443e631b6
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/modules/main/wallet_section/activity/controller.nim
View File

@ -51,7 +51,6 @@ QtObject:
allAddressesSelected: bool allAddressesSelected: bool
# call updateAssetsIdentities after updating chainIds # call updateAssetsIdentities after updating chainIds
chainIds: seq[int] chainIds: seq[int]
allChainsSelected: bool
requestId: int32 requestId: int32
@ -151,8 +150,7 @@ QtObject:
self.eventsHandler.updateSubscribedChainIDs(self.chainIds) self.eventsHandler.updateSubscribedChainIDs(self.chainIds)
self.status.setNewDataAvailable(false) self.status.setNewDataAvailable(false)
let chains = if not self.allChainsSelected: self.chainIds else: @[] let response = backend_activity.filterActivityAsync(self.requestId, self.addresses, self.allAddressesSelected, seq[backend_activity.ChainId](self.chainIds), self.currentActivityFilter, 0, FETCH_BATCH_COUNT_DEFAULT)
let response = backend_activity.filterActivityAsync(self.requestId, self.addresses, self.allAddressesSelected, seq[backend_activity.ChainId](chains), self.currentActivityFilter, 0, FETCH_BATCH_COUNT_DEFAULT)
if response.error != nil: if response.error != nil:
error "error fetching activity entries: ", response.error error "error fetching activity entries: ", response.error
self.status.setLoadingData(false) self.status.setLoadingData(false)
@ -160,8 +158,8 @@ QtObject:
proc loadMoreItems(self: Controller) {.slot.} = proc loadMoreItems(self: Controller) {.slot.} =
self.status.setLoadingData(true) self.status.setLoadingData(true)
let chains = if not self.allChainsSelected: self.chainIds else: @[]
let response = backend_activity.filterActivityAsync(self.requestId, self.addresses, self.allAddressesSelected, seq[backend_activity.ChainId](chains), self.currentActivityFilter, self.model.getCount(), FETCH_BATCH_COUNT_DEFAULT) let response = backend_activity.filterActivityAsync(self.requestId, self.addresses, self.allAddressesSelected, seq[backend_activity.ChainId](self.chainIds), self.currentActivityFilter, self.model.getCount(), FETCH_BATCH_COUNT_DEFAULT)
if response.error != nil: if response.error != nil:
self.status.setLoadingData(false) self.status.setLoadingData(false)
error "error fetching activity entries: ", response.error error "error fetching activity entries: ", response.error
@ -257,7 +255,6 @@ QtObject:
result.addresses = @[] result.addresses = @[]
result.allAddressesSelected = false result.allAddressesSelected = false
result.chainIds = @[] result.chainIds = @[]
result.allChainsSelected = true
result.setup() result.setup()
@ -346,7 +343,6 @@ QtObject:
proc setFilterChains*(self: Controller, chainIds: seq[int], allEnabled: bool) = proc setFilterChains*(self: Controller, chainIds: seq[int], allEnabled: bool) =
self.chainIds = chainIds self.chainIds = chainIds
self.allChainsSelected = allEnabled
self.status.setIsFilterDirty(true) self.status.setIsFilterDirty(true)
self.updateAssetsIdentities() self.updateAssetsIdentities()