fix(@desktop/wallet): Remove profile section's networks submodule and…

… udpate logic for combined networks

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

@@ -46,7 +46,7 @@ proc getChainIds*(self: Controller): seq[int] =
   return self.networkService.getCurrentNetworks().map(n => n.chainId)
 
 proc getEnabledChainIds*(self: Controller): seq[int] =
-  return self.networkService.getCurrentNetworks().filter(n => n.enabled).map(n => n.chainId)
+  return self.networkService.getCurrentNetworks().filter(n => n.isEnabled).map(n => n.chainId)
 
 proc getCurrentCurrency*(self: Controller): string =
   return self.walletAccountService.getCurrency()

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

@@ -6,6 +6,7 @@ import ../../../../../app_service/service/settings/service as settings_service
 import ../../../../../app_service/service/provider/service as provider_service
 import ../../../../../app_service/service/wallet_account/service
 import ../../../shared_modules/keycard_popup/io_interface as keycard_shared_module
+import app_service/service/network/network_item
 
 const UNIQUE_BROWSER_SECTION_TRANSACTION_MODULE_IDENTIFIER* = "BrowserSection-TransactionModule"
 
@@ -34,7 +35,7 @@ proc newController*(
 proc delete*(self: Controller) =
   discard
 
-proc getAppNetwork*(self: Controller): NetworkDto =
+proc getAppNetwork*(self: Controller): NetworkItem =
   return self.networkService.getAppNetwork()
 
 proc init*(self: Controller) =

src/app/modules/main/browser_section/provider/io_interface.nim

@@ -1,4 +1,4 @@
-import ../../../../../app_service/service/network/service
+import app_service/service/network/network_item
 
 type
   AccessInterface* {.pure inheritable.} = ref object of RootObj
@@ -33,7 +33,7 @@ method onPostMessage*(self: AccessInterface, payloadMethod: string, result: stri
 method viewDidLoad*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method updateNetwork*(self: AccessInterface, network: NetworkDto) {.base.} =
+method updateNetwork*(self: AccessInterface, network: NetworkItem) {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method authenticateToPostMessage*(self: AccessInterface,  payloadMethod: string, requestType: string, message: string) {.base.} =

src/app/modules/main/browser_section/provider/module.nim

@@ -6,10 +6,11 @@ import std/json
 import ../../../../core/eventemitter
 
 import ../io_interface as delegate_interface
-import ../../../../../app_service/service/settings/service as settings_service
-import ../../../../../app_service/service/network/service as network_service
-import ../../../../../app_service/service/provider/service as provider_service
-import ../../../../global/global_singleton
+import app_service/service/settings/service as settings_service
+import app_service/service/network/service as network_service
+import app_service/service/provider/service as provider_service
+import app_service/service/network/network_item
+import app/global/global_singleton
 export io_interface
 
 # Shouldn't be public ever, use only within this module.
@@ -77,7 +78,7 @@ method onPostMessage*(self: Module, payloadMethod: string, result: string, chain
 method ensResourceURL*(self: Module, ens: string, url: string): (string, string, string, string, bool) =
   return self.controller.ensResourceURL(ens, url)
 
-method updateNetwork*(self: Module, network: NetworkDto) =
+method updateNetwork*(self: Module, network: NetworkItem) =
   self.view.chainId = network.chainId
   self.view.chainName = network.chainName
 

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

@@ -14,6 +14,7 @@ import app_service/service/wallet_account/service as wallet_account_service
 import app_service/service/keycard/service as keycard_service
 import app_service/common/types
 import app/modules/shared_modules/keycard_popup/io_interface as keycard_shared_module
+import app_service/service/network/network_item
 
 const UNIQUE_COMMUNITIES_MODULE_AUTH_IDENTIFIER* = "CommunitiesModule-Authentication"
 const UNIQUE_COMMUNITIES_MODULE_SIGNING_IDENTIFIER* = "CommunitiesModule-Signing"
@@ -372,7 +373,7 @@ proc getCommunityTokens*(self: Controller, communityId: string): seq[CommunityTo
 proc getAllCommunityTokens*(self: Controller): seq[CommunityTokenDto] =
   self.communityTokensService.getAllCommunityTokens()
 
-proc getNetworkByChainId*(self:Controller, chainId: int): NetworkDto =
+proc getNetworkByChainId*(self:Controller, chainId: int): NetworkItem =
   self.networksService.getNetworkByChainId(chainId)
 
 proc getTokenBySymbolList*(self: Controller): seq[TokenBySymbolItem] =
@@ -480,7 +481,7 @@ proc runSigningOnKeycard*(self: Controller, keyUid: string, path: string, dataTo
 proc removeCommunityChat*(self: Controller, communityId: string, channelId: string) =
   self.communityService.deleteCommunityChat(communityId, channelId)
 
-proc getCurrentNetworks*(self: Controller): seq[NetworkDto] =
+proc getCurrentNetworks*(self: Controller): seq[NetworkItem] =
   return self.networksService.getCurrentNetworks()
 
 proc promoteSelfToControlNode*(self: Controller, communityId: string) =

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

@@ -5,6 +5,7 @@ import app_service/service/community_tokens/service as community_tokens_service
 import app_service/service/transaction/service as transaction_service
 import app_service/service/network/service as networks_service
 import app_service/service/community/service as community_service
+import app_service/service/network/network_item
 import app_service/common/types
 import app/core/signals/types
 import app/core/eventemitter
@@ -159,7 +160,7 @@ proc findContractByUniqueId*(self: Controller, contractUniqueKey: string): Commu
 proc computeBurnFee*(self: Controller, contractUniqueKey: string, amount: Uint256, addressFrom: string, requestId: string) =
   self.communityTokensService.computeBurnFee(contractUniqueKey, amount, addressFrom, requestId)
 
-proc getNetworkByChainId*(self:Controller, chainId: int): NetworkDto =
+proc getNetworkByChainId*(self:Controller, chainId: int): NetworkItem =
   self.networksService.getNetworkByChainId(chainId)
 
 proc getOwnerToken*(self: Controller, communityId: string): CommunityTokenDto =

src/app/modules/main/communities/tokens/models/token_item.nim

@@ -1,8 +1,8 @@
 import stew/shims/strformat, sequtils, stint
-import ../../../../../../app_service/service/community_tokens/dto/community_token
-import ../../../../../../app_service/service/community_tokens/community_collectible_owner
-import ../../../../../../app_service/service/network/dto
-import ../../../../../../app_service/common/types
+import app_service/service/community_tokens/dto/community_token
+import app_service/service/community_tokens/community_collectible_owner
+import app_service/service/network/network_item
+import app_service/common/types
 
 import token_owners_model
 import token_owners_item
@@ -23,7 +23,7 @@ type
 
 proc initTokenItem*(
   tokenDto: CommunityTokenDto,
-  network: NetworkDto,
+  network: NetworkItem,
   tokenOwners: seq[CommunityCollectibleOwner],
   accountName: string,
   burnState: ContractTransactionStatus,

src/app/modules/main/controller.nim

@@ -22,6 +22,7 @@ import app_service/service/token/service as token_service
 import app_service/service/network/service as networks_service
 import app_service/service/visual_identity/service as procs_from_visual_identity_service
 import app_service/service/shared_urls/service as urls_service
+import app_service/service/network/network_item
 
 import app_service/service/community_tokens/community_collectible_owner
 
@@ -573,10 +574,10 @@ proc getRemainingSupply*(self: Controller, chainId: int, contractAddress: string
 proc getRemoteDestructedAmount*(self: Controller, chainId: int, contractAddress: string): Uint256 =
   return self.communityTokensService.getRemoteDestructedAmount(chainId, contractAddress)
 
-proc getNetworkByChainId*(self:Controller, chainId: int): NetworkDto =
+proc getNetworkByChainId*(self:Controller, chainId: int): NetworkItem =
   self.networksService.getNetworkByChainId(chainId)
 
-proc getAppNetwork*(self:Controller): NetworkDto =
+proc getAppNetwork*(self:Controller): NetworkItem =
   self.networksService.getAppNetwork()
 
 proc slowdownArchivesImport*(self:Controller) =

src/app/modules/main/io_interface.nim

@@ -15,7 +15,7 @@ import app_service/service/community_tokens/service as community_tokens_service
 import app_service/service/community_tokens/community_collectible_owner
 import app_service/service/shared_urls/service as urls_service
 import app_service/service/network/service as network_service
-import app_service/service/network/dto as network_dto
+import app_service/service/network/network_item
 from app_service/common/types import StatusType, ContractTransactionStatus, MembershipRequestState, Shard
 
 import app/global/app_signals
@@ -44,7 +44,7 @@ method load*(
   {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method getAppNetwork*(self: AccessInterface): NetworkDto {.base.} =
+method getAppNetwork*(self: AccessInterface): NetworkItem {.base.} =
   raise newException(ValueError, "No implementation available")
 
 method onAppNetworkChanged*(self: AccessInterface) {.base.} =

src/app/modules/main/module.nim

@@ -69,6 +69,7 @@ import ../../../app_service/service/visual_identity/service as procs_from_visual
 import ../../../app_service/common/types
 import ../../../app_service/common/social_links
 import ../../../app_service/common/utils as common_utils
+import app_service/service/network/network_item
 
 import ../../core/notifications/details
 import ../../core/eventemitter
@@ -259,7 +260,7 @@ method delete*[T](self: Module[T]) =
   self.view.delete
   self.viewVariant.delete
 
-method getAppNetwork*[T](self: Module[T]): NetworkDto =
+method getAppNetwork*[T](self: Module[T]): NetworkItem =
   return self.controller.getAppNetwork()
 
 method onAppNetworkChanged*[T](self: Module[T]) =

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

@@ -11,6 +11,7 @@ import app_service/service/token/service as token_service
 import app_service/service/keycard/service as keycard_service
 from app_service/service/transaction/dto import PendingTransactionTypeDto
 import app/modules/shared_modules/keycard_popup/io_interface as keycard_shared_module
+import app_service/service/network/network_item
 
 logScope:
   topics = "profile-section-ens-usernames-module-controller"
@@ -72,7 +73,7 @@ proc init*(self: Controller) =
       return
     self.delegate.onKeypairAuthenticated(args.password,  args.pin)
 
-proc getAppNetwork*(self: Controller): NetworkDto =
+proc getAppNetwork*(self: Controller): NetworkItem =
   return self.networkService.getAppNetwork()
 
 proc checkEnsUsernameAvailability*(self: Controller, desiredEnsUsername: string, statusDomain: bool) =

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

@@ -104,9 +104,6 @@ proc getWalletAccounts*(self: Controller): seq[wallet_account_service.WalletAcco
 proc getChainIds*(self: Controller): seq[int] =
   self.networkService.getCurrentNetworks().map(n => n.chainId)
 
-proc getEnabledChainIds*(self: Controller): seq[int] =
-  self.networkService.getCurrentNetworks().filter(n => n.enabled).map(n => n.chainId)
-
 proc setSocialLinks*(self: Controller, links: SocialLinks) =
   self.settingsService.setSocialLinks(links)
 

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

@@ -81,6 +81,18 @@ QtObject:
         break
       i.inc
 
+  proc onPreferredSharingChainsUpdated*(self: Model, address, prodPreferredChainIds, testPreferredChainIds: string) =
+    var i = 0
+    for item in self.items.mitems:
+      if address == item.address:
+        item.prodPreferredChainIds = prodPreferredChainIds
+        item.testPreferredChainIds = testPreferredChainIds
+        let index = self.createIndex(i, 0, nil)
+        defer: index.delete
+        self.dataChanged(index, index, @[ModelRole.PreferredSharingChainIds.int])
+        break
+      i.inc
+
   method data(self: Model, index: QModelIndex, role: int): QVariant =
     if (not index.isValid):
       return

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

@@ -94,6 +94,7 @@ QtObject:
     self.refreshSelectedAccount()
 
   proc onPreferredSharingChainsUpdated*(self: View, keyUid, address, prodPreferredChainIds, testPreferredChainIds: string) =
+    self.accounts.onPreferredSharingChainsUpdated(address, prodPreferredChainIds, testPreferredChainIds)
     self.keyPairModel.onPreferredSharingChainsUpdated(keyUid, address, prodPreferredChainIds, testPreferredChainIds)
     self.refreshSelectedAccount()
 

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

@@ -31,12 +31,6 @@ method accountsModuleDidLoad*(self: AccessInterface) {.base.} =
 method getAccountsModule*(self: AccessInterface): QVariant {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method networksModuleDidLoad*(self: AccessInterface) {.base.} =
-  raise newException(ValueError, "No implementation available")
-
-method getNetworksModule*(self: AccessInterface): QVariant {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method getCollectiblesModel*(self: AccessInterface): QVariant {.base.} =
   raise newException(ValueError, "No implementation available")
 

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

@@ -5,7 +5,6 @@ import ./controller, ./view
 import ../io_interface as delegate_interface
 
 import ./accounts/module as accounts_module
-import ./networks/module as networks_module
 
 import app/global/global_singleton
 import app/core/eventemitter
@@ -36,7 +35,6 @@ type
     devicesService: devices_service.Service
     nodeService: node_service.Service
     accountsModule: accounts_module.AccessInterface
-    networksModule: networks_module.AccessInterface
     keypairImportModule: keypair_import_module.AccessInterface
 
 proc newModule*(
@@ -60,21 +58,18 @@ proc newModule*(
   result.walletAccountService = walletAccountService
   result.devicesService = devicesService
   result.accountsModule = accounts_module.newModule(result, events, walletAccountService, networkService)
-  result.networksModule = networks_module.newModule(result, events, networkService, walletAccountService, settingsService)
 
 method delete*(self: Module) =
   self.controller.delete
   self.view.delete
   self.viewVariant.delete
   self.accountsModule.delete
-  self.networksModule.delete
   if not self.keypairImportModule.isNil:
     self.keypairImportModule.delete
 
 method load*(self: Module) =
   self.controller.init()
   self.accountsModule.load()
-  self.networksModule.load()
 
 method isLoaded*(self: Module): bool =
   return self.moduleLoaded
@@ -89,9 +84,6 @@ proc checkIfModuleDidLoad(self: Module) =
   if(not self.accountsModule.isLoaded()):
     return
 
-  if(not self.networksModule.isLoaded()):
-    return
-
   self.moduleLoaded = true
   self.delegate.walletModuleDidLoad()
 
@@ -104,12 +96,6 @@ method accountsModuleDidLoad*(self: Module) =
 method getAccountsModule*(self: Module): QVariant =
   return self.accountsModule.getModuleAsVariant()
 
-method networksModuleDidLoad*(self: Module) =
-  self.checkIfModuleDidLoad()
-
-method getNetworksModule*(self: Module): QVariant =
-  return self.networksModule.getModuleAsVariant()
-
 method destroyKeypairImportPopup*(self: Module) =
   if self.keypairImportModule.isNil:
     return