init

Author: saledjenic

src/app/core/signals/remote_signals/wallet.nim

@@ -109,8 +109,8 @@ proc fromEvent*(T: type WalletSignal, signalType: SignalType, jsonSignal: JsonNo
           result.errorCode = errorResponseJsonNode["code"].getStr
       result.updatedPrices = initTable[string, float64]()
       if event.contains("UpdatedPrices"):
-        for tokenSymbol, price in event["UpdatedPrices"].pairs():
-          result.updatedPrices[tokenSymbol] = price.getFloat
+        for tokenKey, price in event["UpdatedPrices"].pairs():
+          result.updatedPrices[tokenKey] = price.getFloat
     except Exception as e:
       error "Error parsing best route: ", err=e.msg
     return

src/app/modules/main/browser_section/current_account/controller.nim

@@ -50,8 +50,8 @@ proc getEnabledChainIds*(self: Controller): seq[int] =
 proc getCurrentCurrency*(self: Controller): string =
   return self.walletAccountService.getCurrency()
 
-proc getCurrencyFormat*(self: Controller, symbol: string): CurrencyFormatDto =
-  return self.currencyService.getCurrencyFormat(symbol)
+proc getCurrencyFormat*(self: Controller, key: string): CurrencyFormatDto =
+  return self.currencyService.getCurrencyFormat(key)
 
 proc areTestNetworksEnabled*(self: Controller): bool =
   return self.walletAccountService.areTestNetworksEnabled()

src/app/modules/main/chat_section/chat_content/input_area/view.nim

@@ -2,9 +2,9 @@ import nimqml, sets
 import ./io_interface
 import ./preserved_properties
 import ./urls_model
-import ../../../../../../app/modules/shared_models/link_preview_model as link_preview_model
-import ../../../../../../app/modules/shared_models/payment_request_model as payment_request_model
-import ../../../../../../app/modules/shared_models/default_emoji_reactions_model as default_emoji_reactions_model
+import app/modules/shared_models/link_preview_model as link_preview_model
+import app/modules/shared_models/payment_request_model as payment_request_model
+import app/modules/shared_models/default_emoji_reactions_model as default_emoji_reactions_model
 
 QtObject:
   type
@@ -89,7 +89,7 @@ QtObject:
   QtProperty[bool] askToEnableLinkPreview:
     read = getAskToEnableLinkPreview
     notify = askToEnableLinkPreviewChanged
-    
+
   # Currently used to fetch link previews, but could be used elsewhere
   proc setText*(self: View, text: string) {.slot.} =
     self.delegate.setText(text, true)
@@ -100,7 +100,7 @@ QtObject:
   proc updateLinkPreviewsFromCache*(self: View, urls: seq[string]) =
     let linkPreviews = self.delegate.linkPreviewsFromCache(urls)
     self.linkPreviewModel.updateLinkPreviews(linkPreviews)
-    
+
     for contactId in self.linkPreviewModel.getContactIds().items:
       let contact = self.delegate.getContactDetails(contactId)
       if contact.dto.displayName != "":
@@ -115,25 +115,25 @@ QtObject:
 
   proc reloadLinkPreview(self: View, link: string) {.slot.} =
     self.delegate.loadLinkPreviews(@[link])
-  
+
   proc loadLinkPreviews(self: View, links: seq[string]) =
     self.delegate.loadLinkPreviews(links)
-  
+
   proc enableLinkPreview(self: View) {.slot.} =
     self.delegate.setLinkPreviewEnabled(true)
-  
+
   proc disableLinkPreview(self: View) {.slot.} =
     self.delegate.setLinkPreviewEnabled(false)
-  
+
   proc setLinkPreviewEnabledForCurrentMessage(self: View, enabled: bool) {.slot.} =
     self.delegate.setLinkPreviewEnabledForThisMessage(enabled)
     self.delegate.reloadUnfurlingPlan()
 
   proc removeLinkPreviewData*(self: View, index: int) {.slot.} =
     self.linkPreviewModel.removePreviewData(index)
 
-  proc addPaymentRequest*(self: View, receiver: string, amount: string, symbol: string, chainId: int) {.slot.} =
-    self.paymentRequestModel.addPaymentRequest(receiver, amount, symbol, chainId)
+  proc addPaymentRequest*(self: View, receiver: string, amount: string, tokenKey: string, symbol: string) {.slot.} =
+    self.paymentRequestModel.addPaymentRequest(receiver, amount, tokenKey, symbol)
 
   proc removePaymentRequestPreviewData*(self: View, index: int) {.slot.} =
     self.paymentRequestModel.removeItemWithIndex(index)

src/app/modules/main/chat_section/controller.nim

@@ -21,7 +21,7 @@ import ../../../core/signals/types
 import ../../../core/eventemitter
 import ../../../core/unique_event_emitter
 
-import backend/collectibles_types
+# import backend/collectibles_types
 
 type
   Controller* = ref object of RootObj
@@ -279,7 +279,7 @@ proc init*(self: Controller) =
       let args = CommunityTokenPermissionArgs(e)
       if (args.communityId == self.sectionId):
         self.delegate.onCommunityTokenPermissionUpdated(args.communityId, args.tokenPermission)
-  
+
     self.events.on(SIGNAL_COMMUNITY_TOKEN_PERMISSION_DELETED) do(e: Args):
       let args = CommunityTokenPermissionArgs(e)
       if (args.communityId == self.sectionId):
@@ -725,37 +725,38 @@ proc createOrEditCommunityTokenPermission*(self: Controller, tokenPermission: Co
 proc deleteCommunityTokenPermission*(self: Controller, permissionId: string) =
   self.communityService.deleteCommunityTokenPermission(self.sectionId, permissionId)
 
-proc allAccountsTokenBalance*(self: Controller, symbol: string): float64 =
-  return self.walletAccountService.allAccountsTokenBalance(symbol)
-
-proc getTokenDecimals*(self: Controller, symbol: string): int =
-  let asset = self.tokenService.findTokenBySymbol(symbol)
-  if asset != nil:
-    return asset.decimals
-  return 0
+## TODO: implement this - check usage of `getTokenDecimals` most likely will be removed cause token could be used there, and decimals could be taken from token
+# proc getTokenDecimals*(self: Controller, symbol: string): int =
+#   let asset = self.tokenService.findTokenBySymbol(symbol)
+#   if asset != nil:
+#     return asset.decimals
+#   return 0
 
 # find addresses by tokenKey from UI
 # tokenKey can be: symbol for ERC20, or chain+address[+tokenId] for ERC721
 proc getContractAddressesForToken*(self: Controller, tokenKey: string): Table[int, string] =
   var contractAddresses = initTable[int, string]()
-  let token = self.tokenService.findTokenBySymbol(tokenKey)
-  if token != nil:
-    for addrPerChain in token.addressPerChainId:
-      # depending on areTestNetworksEnabled (in getNetworkByChainId), contractAddresses will
-      # contain mainnets or testnets only
-      let network = self.networkService.getNetworkByChainId(addrPerChain.chainId)
-      if network == nil:
-        continue
-      contractAddresses[addrPerChain.chainId] = addrPerChain.address
-  let communityToken = self.communityService.getCommunityTokenBySymbol(self.getMySectionId(), tokenKey)
-  if communityToken.address != "":
-    contractAddresses[communityToken.chainId] = communityToken.address
-  if contractAddresses.len == 0:
-    try:
-      let chainAndAddress = toContractID(tokenKey)
-      contractAddresses[chainAndAddress.chainID] = chainAndAddress.address
-    except Exception:
-      discard
+
+  ## TODO: implement this - check usage of `getContractAddressesForToken` and align implementation
+
+  # let token = self.tokenService.findTokenBySymbol(tokenKey)
+  # if token != nil:
+  #   for addrPerChain in token.addressPerChainId:
+  #     # depending on areTestNetworksEnabled (in getNetworkByChainId), contractAddresses will
+  #     # contain mainnets or testnets only
+  #     let network = self.networkService.getNetworkByChainId(addrPerChain.chainId)
+  #     if network == nil:
+  #       continue
+  #     contractAddresses[addrPerChain.chainId] = addrPerChain.address
+  # let communityToken = self.communityService.getCommunityTokenBySymbol(self.getMySectionId(), tokenKey)
+  # if communityToken.address != "":
+  #   contractAddresses[communityToken.chainId] = communityToken.address
+  # if contractAddresses.len == 0:
+  #   try:
+  #     let chainAndAddress = toContractID(tokenKey)
+  #     contractAddresses[chainAndAddress.chainID] = chainAndAddress.address
+  #   except Exception:
+  #     discard
   return contractAddresses
 
 proc getCommunityTokenList*(self: Controller): seq[CommunityTokenDto] =

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

@@ -369,7 +369,7 @@ method onChatsLoaded*(
     sharedUrlsService: shared_urls_service.Service,
   ) =
   self.chatsLoaded = true
-  
+
   self.buildChatSectionUI(community, chats, events, settingsService, nodeConfigurationService,
     contactService, chatService, communityService, messageService, mailserversService, sharedUrlsService)
 
@@ -451,7 +451,7 @@ method activeItemSet*(self: Module, itemId: string) =
     # Should never be here
     error "chat-view unexisting item id: ", itemId, methodName="activeItemSet"
     return
-  
+
   if not self.chatContentModules[itemId].isLoaded:
     self.chatContentModules[itemId].load(chat_item)
 
@@ -834,7 +834,7 @@ method onCommunityChannelDeletedOrChatLeft*(self: Module, chatId: string) =
   let activeChatId = self.controller.getActiveChatId()
   if chatId == activeChatId:
     self.setFirstChannelAsActive()
-  
+
   self.updateParentBadgeNotifications()
 
 proc refreshHiddenBecauseNotPermittedState(self: Module) =
@@ -1487,8 +1487,9 @@ method createOrEditCommunityTokenPermission*(self: Module, permissionId: string,
 
     let tokenKey = tokenCriteria{"key"}.getStr()
     var tokenCriteriaDto = tokenCriteria.toTokenCriteriaDto
-    if tokenCriteriaDto.`type` == TokenType.ERC20:
-      tokenCriteriaDto.decimals = self.controller.getTokenDecimals(tokenKey)
+    # if tokenCriteriaDto.`type` == TokenType.ERC20:
+      ## TODO: implement this - figure out token usage here
+      # tokenCriteriaDto.decimals = self.controller.getTokenDecimals(tokenKey)
 
     let contractAddresses = self.controller.getContractAddressesForToken(tokenKey)
     if contractAddresses.len == 0 and tokenCriteriaDto.`type` != TokenType.ENS:
@@ -1536,7 +1537,7 @@ method setChannelsPermissionsCheckOngoing*(self: Module, value: bool) =
   for id, chat_item in self.view.chatsModel().items():
     if self.view.chatsModel().getItemPermissionsRequired(chat_item.id):
       self.view.chatsModel().updatePermissionsCheckOngoing(chat_item.id, true)
-  
+
 method onWaitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: Module) =
   self.view.setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin(true)
 

src/app/modules/main/communities/controller.nim

@@ -354,9 +354,6 @@ proc getAllCommunityTokens*(self: Controller): seq[CommunityTokenDto] =
 proc getNetworkByChainId*(self:Controller, chainId: int): NetworkItem =
   self.networksService.getNetworkByChainId(chainId)
 
-proc getTokenBySymbolList*(self: Controller): seq[TokenBySymbolItem] =
-  return self.tokenService.getTokenBySymbolList()
-
 proc shareCommunityUrlWithChatKey*(self: Controller, communityId: string): string =
   return self.communityService.shareCommunityUrlWithChatKey(communityId)
 
@@ -450,7 +447,7 @@ proc runSigningOnKeycard*(self: Controller, keyUid: string, path: string, dataTo
   var finalDataToSign = status_general.hashMessageForSigning(dataToSign)
   if finalDataToSign.startsWith("0x"):
     finalDataToSign = finalDataToSign[2..^1]
-  
+
   if pin.len == 0:
     let data = SharedKeycarModuleSigningArgs(uniqueIdentifier: UNIQUE_COMMUNITIES_MODULE_SIGNING_IDENTIFIER,
       keyUid: keyUid,

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

@@ -513,7 +513,7 @@ method requestCancelDiscordChannelImport*(self: Module, discordChannelId: string
   self.controller.requestCancelDiscordChannelImport(discordChannelId)
 
 proc createCommunityTokenItem(self: Module, token: CommunityTokensMetadataDto, communityId: string, supply: string,
-    infiniteSupply: bool, privilegesLevel: int): TokenListItem =
+    infiniteSupply: bool, privilegesLevel: int): token_list_item.TokenListItem =
   let communityTokenDecimals = if token.tokenType == TokenType.ERC20: 18 else: 0
   let key = if token.tokenType == TokenType.ERC721: token.getContractIdFromFirstAddress() else: token.symbol
   result = initTokenListItem(
@@ -531,7 +531,7 @@ proc createCommunityTokenItem(self: Module, token: CommunityTokensMetadataDto, c
   )
 
 proc buildCommunityTokenItemFallback(self: Module, communityTokens: seq[CommunityTokenDto],
-    token: CommunityTokensMetadataDto, communityId: string): TokenListItem =
+    token: CommunityTokensMetadataDto, communityId: string): token_list_item.TokenListItem =
   # Set fallback supply to infinite in case we don't have it
   var supply = "1"
   var infiniteSupply = true
@@ -545,8 +545,8 @@ proc buildCommunityTokenItemFallback(self: Module, communityTokens: seq[Communit
   return self.createCommunityTokenItem(token, communityId, supply, infiniteSupply, privilegesLevel)
 
 proc buildTokensAndCollectiblesFromCommunities(self: Module, communities: seq[CommunityDto]) =
-  var tokenListItems: seq[TokenListItem]
-  var collectiblesListItems: seq[TokenListItem]
+  var tokenListItems: seq[token_list_item.TokenListItem]
+  var collectiblesListItems: seq[token_list_item.TokenListItem]
 
   let communityTokens = self.controller.getAllCommunityTokens()
   for community in communities:
@@ -571,34 +571,34 @@ proc buildTokensAndCollectiblesFromAllCommunities(self: Module) =
   self.buildTokensAndCollectiblesFromCommunities(communities)
 
 proc buildTokensAndCollectiblesFromWallet(self: Module) =
-  var tokenListItems: seq[TokenListItem]
-
-  # Common ERC20 tokens
-  let allNetworks = self.controller.getCurrentNetworksChainIds()
-  let erc20Tokens = self.controller.getTokenBySymbolList().filter(t => (block:
-    let filteredChains = t.addressPerChainId.filter(apC => allNetworks.contains(apc.chainId))
-    return filteredChains.len != 0
-    ))
-  for token in erc20Tokens:
-    let communityTokens = self.controller.getCommunityTokens(token.communityId)
-    var privilegesLevel = PrivilegesLevel.Community.int
-    for communityToken in communityTokens:
-      if communityToken.symbol == token.symbol:
-        privilegesLevel = communityToken.privilegesLevel.int
-        break
-
-    let tokenListItem = initTokenListItem(
-      key = token.symbol,
-      name = token.name,
-      symbol = token.symbol,
-      color = "",
-      communityId = token.communityId,
-      image = "",
-      category = ord(TokenListItemCategory.General),
-      decimals = token.decimals,
-      privilegesLevel = privilegesLevel
-    )
-    tokenListItems.add(tokenListItem)
+  var tokenListItems: seq[token_list_item.TokenListItem]
+
+  # # Common ERC20 tokens
+  # let allNetworks = self.controller.getCurrentNetworksChainIds()
+  # let erc20Tokens = self.controller.getTokenBySymbolList().filter(t => (block:
+  #   let filteredChains = t.addressPerChainId.filter(apC => allNetworks.contains(apc.chainId))
+  #   return filteredChains.len != 0
+  #   ))
+  # for token in erc20Tokens:
+  #   let communityTokens = self.controller.getCommunityTokens(token.communityId)
+  #   var privilegesLevel = PrivilegesLevel.Community.int
+  #   for communityToken in communityTokens:
+  #     if communityToken.symbol == token.symbol:
+  #       privilegesLevel = communityToken.privilegesLevel.int
+  #       break
+
+  #   let tokenListItem = initTokenListItem(
+  #     key = token.symbol,
+  #     name = token.name,
+  #     symbol = token.symbol,
+  #     color = "",
+  #     communityId = token.communityId,
+  #     image = "",
+  #     category = ord(TokenListItemCategory.General),
+  #     decimals = token.decimals,
+  #     privilegesLevel = privilegesLevel
+  #   )
+  #   tokenListItems.add(tokenListItem)
 
   self.view.tokenListModel.setWalletTokenItems(tokenListItems)
 

src/app/modules/main/profile_section/ens_usernames/controller.nim

@@ -115,11 +115,8 @@ proc getWalletDefaultAddress*(self: Controller): string =
 proc getCurrentCurrency*(self: Controller): string =
   return self.settingsService.getCurrency()
 
-proc getPriceBySymbol*(self: Controller, crypto: string): float64 =
-  return self.tokenService.getPriceBySymbol(crypto)
-
-proc getStatusTokenKey*(self: Controller): string =
-  return self.tokenService.getStatusTokenKey()
+proc getPriceForToken*(self: Controller, tokenKey: string): float64 =
+  return self.tokenService.getPriceForToken(tokenKey)
 
 proc ensnameResolverAddress*(self: Controller, ensUsername: string): string =
   return self.ensService.ensnameResolverAddress(ensUsername)

src/app/modules/main/profile_section/ens_usernames/io_interface.nim

@@ -67,9 +67,6 @@ method getCryptoValue*(self: AccessInterface, fiatAmount: string, cryptoSymbol:
   {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method getStatusTokenKey*(self: AccessInterface): string {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method setPrefferedEnsUsername*(self: AccessInterface, ensUsername: string) {.base.} =
   raise newException(ValueError, "No implementation available")
 

src/app/modules/main/profile_section/ens_usernames/module.nim

@@ -171,37 +171,34 @@ method getWalletDefaultAddress*(self: Module): string =
 method getCurrentCurrency*(self: Module): string =
   return self.controller.getCurrentCurrency()
 
-method getFiatValue*(self: Module, cryptoBalance: string, cryptoSymbol: string): string =
+method getFiatValue*(self: Module, cryptoBalance: string, tokenKey: string): string =
   var floatCryptoBalance: float = 0
   try:
     floatCryptoBalance = parseFloat(cryptoBalance)
   except ValueError:
     return "0.00"
 
-  if (cryptoBalance == "" or cryptoSymbol == ""):
+  if (cryptoBalance == "" or tokenKey == ""):
     return "0.00"
 
-  let price = self.controller.getPriceBySymbol(cryptoSymbol)
+  let price = self.controller.getPriceForToken(tokenKey)
   let value = floatCryptoBalance * price
   return fmt"{value}"
 
-method getCryptoValue*(self: Module, fiatAmount: string, cryptoSymbol: string): string =
+method getCryptoValue*(self: Module, fiatAmount: string, tokenKey: string): string =
   var fiatAmountBalance: float = 0
   try:
     fiatAmountBalance = parseFloat(fiatAmount)
   except ValueError:
     return "0.00"
 
-  if (fiatAmount == "" or cryptoSymbol == ""):
+  if (fiatAmount == "" or tokenKey == ""):
     return "0.00"
 
-  let price = self.controller.getPriceBySymbol(cryptoSymbol)
+  let price = self.controller.getPriceForToken(tokenKey)
   let value = fiatAmountBalance / price
   return fmt"{value}"
 
-method getStatusTokenKey*(self: Module): string =
-  return self.controller.getStatusTokenKey()
-
 method setPrefferedEnsUsername*(self: Module, ensUsername: string) =
   self.controller.setPreferredName(ensUsername)