chore: optimizing usage of signals that are related to market prices/details

Author: saledjenic

src/app/modules/main/profile_section/wallet/accounts/module.nim

@@ -143,7 +143,7 @@ method load*(self: Module) =
     let arg = TokensPerAccountArgs(e)
     self.setBalance(arg.accountAddresses)
 
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e: Args):
+  self.events.on(SIGNAL_TOKENS_MARKET_VALUES_UPDATED) do(e: Args):
     self.refreshWalletAccounts()
 
   self.events.on(SIGNAL_WALLET_ACCOUNT_UPDATED) do(e:Args):

src/app/modules/main/wallet_section/accounts/module.nim

@@ -100,8 +100,6 @@ method load*(self: Module) =
 
   self.events.on(SIGNAL_TOKENS_MARKET_VALUES_UPDATED) do(e:Args):
     self.refreshAllWalletAccountsBalances()
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e:Args):
-    self.refreshAllWalletAccountsBalances()
   self.events.on(SIGNAL_CURRENCY_FORMATS_UPDATED) do(e:Args):
     self.refreshAllWalletAccountsBalances()
   self.events.on(SIGNAL_WALLET_ACCOUNT_TOKENS_REBUILT) do(e:Args):

src/app/modules/main/wallet_section/all_tokens/module.nim

@@ -59,10 +59,6 @@ method load*(self: Module) =
     self.view.tokensMarketValuesAboutToUpdate()
   self.events.on(SIGNAL_TOKENS_MARKET_VALUES_UPDATED) do(e: Args):
     self.view.tokensMarketValuesUpdated()
-  self.events.on(SIGNAL_TOKENS_PRICES_ABOUT_TO_BE_UPDATED) do(e: Args):
-    self.view.tokensMarketValuesAboutToUpdate()
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e: Args):
-    self.view.tokensMarketValuesUpdated()
   self.events.on(SIGNAL_TOKEN_PREFERENCES_UPDATED) do(e: Args):
     self.view.tokenPreferencesUpdated()
   self.events.on(SIGNAL_COMMUNITY_TOKENS_DETAILS_LOADED) do(e: Args):

src/app/modules/main/wallet_section/assets/module.nim

@@ -53,10 +53,6 @@ method load*(self: Module) =
     self.view.setHasBalanceCache(self.controller.getHasBalanceCache())
     self.view.setHasMarketValuesCache(self.controller.getHasMarketValuesCache())
 
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e:Args):
-    self.view.setHasBalanceCache(self.controller.getHasBalanceCache())
-    self.view.setHasMarketValuesCache(self.controller.getHasMarketValuesCache())
-
   self.controller.init()
   self.view.load()
 

src/app/modules/main/wallet_section/module.nim

@@ -304,9 +304,6 @@ method load*(self: Module) =
     self.notifyModulesBalanceIsLoaded()
     self.view.setLastReloadTimestamp(args.timestamp)
     self.view.setIsAccountTokensReloading(false)
-  self.events.on(SIGNAL_TOKENS_PRICES_UPDATED) do(e:Args):
-    self.setTotalCurrencyBalance()
-    self.notifyFilterChanged()
   self.events.on(SIGNAL_TOKENS_MARKET_VALUES_UPDATED) do(e:Args):
     self.setTotalCurrencyBalance()
     self.notifyFilterChanged()

src/app_service/service/token/service_main.nim

@@ -154,21 +154,9 @@ proc getPriceForToken*(self: Service, tokenKey: string): float64 =
 proc getTokensDetailsLoading*(self: Service): bool =
   return self.tokensDetailsLoading
 
-proc getTokensMarketValuesLoading*(self: Service): bool =
-  return self.tokensPricesLoading or self.tokensMarketDetailsLoading
-
 proc getHasMarketValuesCache*(self: Service): bool =
   return self.hasMarketDetailsCache and self.hasPriceValuesCache
 
-proc updateTokenPrices*(self: Service, updatedPrices: Table[string, float64]) =
-  var anyUpdated = false
-  for tokenKey, price in updatedPrices:
-    if not self.tokenPriceTable.hasKey(tokenKey) or self.tokenPriceTable[tokenKey] != price:
-      anyUpdated = true
-      self.tokenPriceTable[tokenKey] = price
-  if anyUpdated:
-    self.events.emit(SIGNAL_TOKENS_PRICES_UPDATED, Args())
-
 proc addNewCommunityToken*(self: Service, token: TokenItem) =
   if self.groupsOfInterestByKey.hasKey(token.groupKey):
     let tokens = self.groupsOfInterestByKey[token.groupKey].tokens

src/app_service/service/token/service_tokens_details.nim

@@ -1,7 +1,39 @@
+proc getTokensMarketValuesLoading*(self: Service): bool =
+  return self.tokensPricesLoading or self.tokensMarketDetailsLoading
+
+# resolveTokensMarketValuesLoadingStateAndNotify ensures that only a single signal is emitted when:
+# - either tokens prices or tokens market details are about to be updated
+# - tokens prices and tokens market details are updated (when both are loaded)
+proc resolveTokensMarketValuesLoadingStateAndNotify(self: Service, tokensPricesLoading: bool, tokensMarketDetailsLoading: bool) =
+  if not self.getTokensMarketValuesLoading():
+    self.tokensPricesLoading = tokensPricesLoading
+    self.tokensMarketDetailsLoading = tokensMarketDetailsLoading
+    if self.getTokensMarketValuesLoading():
+      self.events.emit(SIGNAL_TOKENS_MARKET_VALUES_ABOUT_TO_BE_UPDATED, Args())
+    return
+  self.tokensPricesLoading = tokensPricesLoading
+  self.tokensMarketDetailsLoading = tokensMarketDetailsLoading
+  if not self.getTokensMarketValuesLoading():
+    self.events.emit(SIGNAL_TOKENS_MARKET_VALUES_UPDATED, Args())
+
+proc setTokensMarketDetailsLoadingStateAndNotify(self: Service, state: bool) =
+  self.resolveTokensMarketValuesLoadingStateAndNotify(self.tokensPricesLoading, state)
+
+proc setTokensPricesLoadingStateAndNotify(self: Service, state: bool) =
+  self.resolveTokensMarketValuesLoadingStateAndNotify(state, self.tokensMarketDetailsLoading)
+
+proc updateTokenPrices*(self: Service, updatedPrices: Table[string, float64]) =
+  var anyUpdated = false
+  for tokenKey, price in updatedPrices:
+    if not self.tokenPriceTable.hasKey(tokenKey) or self.tokenPriceTable[tokenKey] != price:
+      anyUpdated = true
+      self.tokenPriceTable[tokenKey] = price
+  if anyUpdated:
+    self.events.emit(SIGNAL_TOKENS_MARKET_VALUES_UPDATED, Args())
+
 # if tokensKeys is empty, market values for all tokens will be fetched
 proc fetchTokensMarketValues(self: Service, tokensKeys: seq[string] = @[]) =
-  self.tokensMarketDetailsLoading = true
-  defer: self.events.emit(SIGNAL_TOKENS_MARKET_VALUES_ABOUT_TO_BE_UPDATED, Args())
+  defer: self.setTokensMarketDetailsLoadingStateAndNotify(true)
   let arg = FetchTokensMarketValuesTaskArg(
     tptr: fetchTokensMarketValuesTask,
     vptr: cast[uint](self.vptr),
@@ -13,8 +45,7 @@ proc fetchTokensMarketValues(self: Service, tokensKeys: seq[string] = @[]) =
 
 proc tokensMarketValuesRetrieved(self: Service, response: string) {.slot.} =
   # this is emited so that the models can notify about market values being available
-  self.tokensMarketDetailsLoading = false
-  defer: self.events.emit(SIGNAL_TOKENS_MARKET_VALUES_UPDATED, Args())
+  defer: self.setTokensMarketDetailsLoadingStateAndNotify(false)
   try:
     let parsedJson = response.parseJson
     var errorString: string
@@ -82,8 +113,7 @@ proc tokensDetailsRetrieved(self: Service, response: string) {.slot.} =
 
 # if tokensKeys is empty, prices for all tokens will be fetched
 proc fetchTokensPrices(self: Service, tokensKeys: seq[string] = @[]) =
-  self.tokensPricesLoading = true
-  defer: self.events.emit(SIGNAL_TOKENS_PRICES_ABOUT_TO_BE_UPDATED, Args())
+  defer: self.setTokensPricesLoadingStateAndNotify(true)
   let arg = FetchTokensPricesTaskArg(
     tptr: fetchTokensPricesTask,
     vptr: cast[uint](self.vptr),
@@ -94,9 +124,8 @@ proc fetchTokensPrices(self: Service, tokensKeys: seq[string] = @[]) =
   self.threadpool.start(arg)
 
 proc tokensPricesRetrieved(self: Service, response: string) {.slot.} =
-  self.tokensPricesLoading = false
   # this is emited so that the models can notify about prices being available
-  defer: self.events.emit(SIGNAL_TOKENS_PRICES_UPDATED, Args())
+  defer: self.setTokensPricesLoadingStateAndNotify(false)
   try:
     let parsedJson = response.parseJson
     var errorString: string

src/app_service/service/token/signals_and_payloads.nim

@@ -6,9 +6,7 @@ const SIGNAL_TOKEN_HISTORICAL_DATA_LOADED* = "tokenHistoricalDataLoaded"
 const SIGNAL_TOKENS_LIST_UPDATED* = "tokensListUpdated"
 const SIGNAL_TOKENS_DETAILS_UPDATED* = "tokensDetailsUpdated"
 const SIGNAL_TOKENS_MARKET_VALUES_ABOUT_TO_BE_UPDATED* = "tokensMarketValuesAboutToBeUpdated"
-const SIGNAL_TOKENS_PRICES_ABOUT_TO_BE_UPDATED* = "tokensPricesValuesAboutToBeUpdated"
 const SIGNAL_TOKENS_MARKET_VALUES_UPDATED* = "tokensMarketValuesUpdated"
-const SIGNAL_TOKENS_PRICES_UPDATED* = "tokensPricesValuesUpdated"
 const SIGNAL_TOKEN_PREFERENCES_UPDATED* = "tokenPreferencesUpdated"
 
 #################################################