feat: Removing new service files and combining it with existing token…

…_service

src/app/boot/app_controller.nim

@@ -31,7 +31,6 @@ import ../../app_service/service/mailservers/service as mailservers_service
 import ../../app_service/service/gif/service as gif_service
 import ../../app_service/service/ens/service as ens_service
 import ../../app_service/service/community_tokens/service as tokens_service
-import ../../app_service/service/new_token/service as new_tokens_service
 import ../../app_service/service/network_connection/service as network_connection_service
 import ../../app_service/service/shared_urls/service as shared_urls_service
 
@@ -98,7 +97,6 @@ type
     gifService: gif_service.Service
     ensService: ens_service.Service
     tokensService: tokens_service.Service
-    newTokensService: new_tokens_service.Service
     networkConnectionService: network_connection_service.Service
     sharedUrlsService: shared_urls_service.Service
 
@@ -228,7 +226,6 @@ proc newAppController*(statusFoundation: StatusFoundation): AppController =
     result.networkService, result.tokenService)
   result.tokensService = tokens_service.newService(statusFoundation.events, statusFoundation.threadpool,
     result.transactionService, result.tokenService, result.settingsService, result.walletAccountService)
-  result.newTokensService = new_tokens_service.newService(statusFoundation.events, statusFoundation.threadpool, result.networkService)
   result.providerService = provider_service.newService(statusFoundation.events, statusFoundation.threadpool, result.ensService)
   result.networkConnectionService = network_connection_service.newService(statusFoundation.events, result.walletAccountService, result.networkService, result.nodeService)
   result.sharedUrlsService = shared_urls_service.newService(statusFoundation.events, statusFoundation.threadpool)
@@ -280,8 +277,7 @@ proc newAppController*(statusFoundation: StatusFoundation): AppController =
     result.generalService,
     result.keycardService,
     result.networkConnectionService,
-    result.sharedUrlsService,
-    result.newTokensService
+    result.sharedUrlsService
   )
 
   # Do connections
@@ -315,7 +311,6 @@ proc delete*(self: AppController) =
   self.communityService.delete
   self.currencyService.delete
   self.tokenService.delete
-  self.newTokensService.delete
   self.transactionService.delete
   self.walletAccountService.delete
   self.aboutService.delete
@@ -439,7 +434,6 @@ proc load(self: AppController) =
 
   self.networkService.init()
   self.tokenService.init()
-  self.newTokensService.init()
   self.currencyService.init()
   self.walletAccountService.init()
 

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

@@ -480,7 +480,7 @@ proc buildTokensAndCollectiblesFromWallet(self: Module) =
       key = token.symbol,
       name = token.name,
       symbol = token.symbol,
-      color = token.color,
+      color = "",
       communityId = token.communityId,
       image = "",
       category = ord(TokenListItemCategory.General),

src/app/modules/main/module.nim

@@ -35,7 +35,6 @@ import ../../../app_service/service/chat/service as chat_service
 import ../../../app_service/service/community/service as community_service
 import ../../../app_service/service/message/service as message_service
 import ../../../app_service/service/token/service as token_service
-import ../../../app_service/service/new_token/service as new_token_service
 import ../../../app_service/service/currency/service as currency_service
 import ../../../app_service/service/transaction/service as transaction_service
 import ../../../app_service/service/wallet_account/service as wallet_account_service
@@ -154,8 +153,7 @@ proc newModule*[T](
   generalService: general_service.Service,
   keycardService: keycard_service.Service,
   networkConnectionService: network_connection_service.Service,
-  sharedUrlsService: urls_service.Service,
-  newTokensService: new_token_service.Service
+  sharedUrlsService: urls_service.Service
 ): Module[T] =
   result = Module[T]()
   result.delegate = delegate
@@ -200,8 +198,7 @@ proc newModule*[T](
     result, events, tokenService, currencyService,
     transactionService, walletAccountService,
     settingsService, savedAddressService, networkService, accountsService,
-    keycardService, nodeService, networkConnectionService, devicesService,
-    newTokensService
+    keycardService, nodeService, networkConnectionService, devicesService
   )
   result.browserSectionModule = browser_section_module.newModule(
     result, events, bookmarkService, settingsService, networkService,
@@ -248,7 +245,7 @@ method delete*[T](self: Module[T]) =
   self.view.delete
   self.viewVariant.delete
 
-proc createTokenItem[T](self: Module[T], tokenDto: CommunityTokenDto) : TokenItem =
+proc createTokenItem[T](self: Module[T], tokenDto: CommunityTokenDto) : token_item.TokenItem =
   let network = self.controller.getNetwork(tokenDto.chainId)
   let tokenOwners = self.controller.getCommunityTokenOwners(tokenDto.communityId, tokenDto.chainId, tokenDto.address)
   let ownerAddressName = if len(tokenDto.deployer) > 0: self.controller.getCommunityTokenOwnerName(tokenDto.deployer) else: ""
@@ -258,7 +255,7 @@ proc createTokenItem[T](self: Module[T], tokenDto: CommunityTokenDto) : TokenIte
   let destructedAmount = self.controller.getRemoteDestructedAmount(tokenDto.chainId, tokenDto.address)
   result = initTokenItem(tokenDto, network, tokenOwners, ownerAddressName, burnState, remoteDestructedAddresses, remainingSupply, destructedAmount)
 
-proc createTokenItemImproved[T](self: Module[T], tokenDto: CommunityTokenDto, communityTokenJsonItems: JsonNode) : TokenItem =
+proc createTokenItemImproved[T](self: Module[T], tokenDto: CommunityTokenDto, communityTokenJsonItems: JsonNode) : token_item.TokenItem =
   # These 3 values come from local caches so they can be done sync
   let network = self.controller.getNetwork(tokenDto.chainId)
   let tokenOwners = self.controller.getCommunityTokenOwners(tokenDto.communityId, tokenDto.chainId, tokenDto.address)

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

@@ -158,7 +158,7 @@ proc getStatusToken*(self: Controller): string =
   let jsonObj = %* {
     "name": token.name,
     "symbol": token.symbol,
-    "address": token.addressAsString()
+    "address": token.address
   }
   return $jsonObj
 

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

@@ -168,7 +168,7 @@ proc getStatusToken*(self: Controller): string =
   let jsonObj = %* {
     "name": token.name,
     "symbol": token.symbol,
-    "address": token.addressAsString()
+    "address": token.address
   }
   return $jsonObj
 

src/app/modules/main/wallet_section/activity/controller.nim

@@ -18,6 +18,7 @@ import app/core/signals/types
 import backend/activity as backend_activity
 import backend/backend as backend
 
+import app_service/common/conversion
 import app_service/service/currency/service as currency_service
 import app_service/service/transaction/service as transaction_service
 import app_service/service/token/service as token_service
@@ -361,7 +362,7 @@ QtObject:
           assets.add(backend_activity.Token(
             tokenType: tokenType,
             chainId: backend_activity.ChainId(token.chainId),
-            address: some(token.address)
+            address: some(parseAddress(token.address))
           ))
 
     self.currentActivityFilter.assets = assets

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

@@ -24,7 +24,6 @@ import app/modules/shared_modules/add_account/module as add_account_module
 import app/modules/shared_modules/keypair_import/module as keypair_import_module
 import app_service/service/keycard/service as keycard_service
 import app_service/service/token/service as token_service
-import app_service/service/new_token/service as new_token_service
 import app_service/service/currency/service as currency_service
 import app_service/service/transaction/service as transaction_service
 import app_service/service/wallet_account/service as wallet_account_service
@@ -104,7 +103,6 @@ proc newModule*(
   nodeService: node_service.Service,
   networkConnectionService: network_connection_service.Service,
   devicesService: devices_service.Service,
-  newTokenService: new_token_service.Service,
 ): Module =
   result = Module()
   result.delegate = delegate
@@ -126,7 +124,7 @@ proc newModule*(
   result.buySellCryptoModule = buy_sell_crypto_module.newModule(result, events, transactionService)
   result.overviewModule = overview_module.newModule(result, events, walletAccountService, currencyService)
   result.networksModule = networks_module.newModule(result, events, networkService, walletAccountService, settingsService)
-  result.newTokensModule = new_tokens_module.newModule(result, events, newTokenService)
+  result.newTokensModule = new_tokens_module.newModule(result, events, tokenService)
 
   result.networksService = networkService
 

src/app/modules/main/wallet_section/new_tokens/controller.nim

@@ -1,5 +1,5 @@
-import app_service/service/new_token/service as token_service
-import app_service/service/new_token/service_items
+import app_service/service/token/service as token_service
+import app_service/service/token/service_items
 
 import ./io_interface
 

src/app/modules/main/wallet_section/new_tokens/io_interface.nim

@@ -1,4 +1,4 @@
-import app_service/service/new_token/service_items
+import app_service/service/token/service_items
 
 type
   SourcesOfTokensModelDataSource* = tuple[

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

@@ -1,7 +1,7 @@
 import NimQml, sequtils, sugar
 
-import app_service/service/new_token/service as token_service
-import app_service/service/new_token/service_items
+import app_service/service/token/service as token_service
+import app_service/service/token/service_items
 
 import app/global/global_singleton
 import app/core/eventemitter

src/app_service/service/ens/service.nim

@@ -414,8 +414,8 @@ QtObject:
   proc getSNTBalance*(self: Service): string =
     let token = self.getStatusToken()
     let account = self.walletAccountService.getWalletAccount(0).address
-    let balances = status_go_backend.getTokensBalancesForChainIDs(@[self.getChainId()], @[account], @[token.addressAsString()]).result
-    return ens_utils.hex2Token(balances{account}{token.addressAsString()}.getStr, token.decimals)
+    let balances = status_go_backend.getTokensBalancesForChainIDs(@[self.getChainId()], @[account], @[token.address]).result
+    return ens_utils.hex2Token(balances{account}{token.address}.getStr, token.decimals)
 
   proc resourceUrl*(self: Service, username: string): (string, string, string) =
     try:

src/app_service/service/message/service.nim

@@ -414,11 +414,11 @@ QtObject:
 
   proc getTransactionDetails*(self: Service, message: MessageDto): (string, string) =
     let networksDto = self.networkService.getNetworks()
-    var token = newTokenDto(networksDto[0].nativeCurrencyName, networksDto[0].chainId, parseAddress(ZERO_ADDRESS), networksDto[0].nativeCurrencySymbol, networksDto[0].nativeCurrencyDecimals, true)
+    var token = self.tokenService.findTokenByAddress(networksDto[0].chainId, ZERO_ADDRESS)
 
     if message.transactionParameters.contract != "":
       for networkDto in networksDto:
-        let tokenFound = self.tokenService.findTokenByAddress(networkDto, parseAddress(message.transactionParameters.contract))
+        let tokenFound = self.tokenService.findTokenByAddress(networkDto.chainId, message.transactionParameters.contract)
         if tokenFound == nil:
           continue