From cde6c5331826a6f44e6b4dc2d20c35799aa174e5 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 26 Jun 2023 11:05:10 -0400 Subject: [PATCH] move asset and collectible rebuild to communities module --- src/app/modules/main/chat_section/controller.nim | 2 -- src/app/modules/main/chat_section/io_interface.nim | 6 ------ src/app/modules/main/chat_section/module.nim | 6 ------ src/app/modules/main/communities/controller.nim | 12 +++++++++--- src/app/modules/main/communities/io_interface.nim | 6 ++++++ src/app/modules/main/communities/module.nim | 6 ++++++ 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/app/modules/main/chat_section/controller.nim b/src/app/modules/main/chat_section/controller.nim index 8ac131e402..5d13f79154 100644 --- a/src/app/modules/main/chat_section/controller.nim +++ b/src/app/modules/main/chat_section/controller.nim @@ -318,11 +318,9 @@ proc init*(self: Controller) = self.delegate.onCommunityCheckAllChannelsPermissionsResponse(args.checkAllChannelsPermissionsResponse) self.events.on(SIGNAL_OWNED_COLLECTIBLES_UPDATE_FINISHED) do(e: Args): - self.delegate.onOwnedCollectiblesUpdated() self.asyncCheckPermissions() self.events.on(SIGNAL_WALLET_ACCOUNT_TOKENS_REBUILT) do(e: Args): - self.delegate.onWalletAccountTokensRebuilt() self.asyncCheckPermissions() self.events.on(SIGNAL_COMMUNITY_KICKED) do (e: Args): diff --git a/src/app/modules/main/chat_section/io_interface.nim b/src/app/modules/main/chat_section/io_interface.nim index 6a14a88c79..4741eb24c0 100644 --- a/src/app/modules/main/chat_section/io_interface.nim +++ b/src/app/modules/main/chat_section/io_interface.nim @@ -367,9 +367,6 @@ method onCommunityTokenPermissionDeleted*(self: AccessInterface, communityId: st method onCommunityTokenPermissionDeletionFailed*(self: AccessInterface, communityId: string) {.base.} = raise newException(ValueError, "No implementation available") -method onWalletAccountTokensRebuilt*(self: AccessInterface) {.base.} = - raise newException(ValueError, "No implementation available") - method onKickedFromCommunity*(self: AccessInterface) {.base.} = raise newException(ValueError, "No implementation available") @@ -391,9 +388,6 @@ method onDeactivateChatLoader*(self: AccessInterface, chatId: string) {.base.} = method requestToJoinCommunityWithAuthentication*(self: AccessInterface, communityId: string, ensName: string) {.base.} = raise newException(ValueError, "No implementation available") -method onOwnedcollectiblesUpdated*(self: AccessInterface) {.base.} = - raise newException(ValueError, "No implementation available") - method onCommunityCheckPermissionsToJoinResponse*(self: AccessInterface, checkPermissionsToJoinResponse: CheckPermissionsToJoinResponseDto) {.base.} = raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim index fb3f0fe083..ef30d38734 100644 --- a/src/app/modules/main/chat_section/module.nim +++ b/src/app/modules/main/chat_section/module.nim @@ -304,12 +304,6 @@ proc reevaluateRequiresTokenPermissionToJoin(self: Module) = proc initCommunityTokenPermissionsModel(self: Module, channelGroup: ChannelGroupDto) = self.rebuildCommunityTokenPermissionsModel() -method onWalletAccountTokensRebuilt*(self: Module) = - self.rebuildCommunityTokenPermissionsModel() - -method onOwnedcollectiblesUpdated*(self: Module) = - self.rebuildCommunityTokenPermissionsModel() - proc convertPubKeysToJson(self: Module, pubKeys: string): seq[string] = return map(parseJson(pubKeys).getElems(), proc(x:JsonNode):string = x.getStr) diff --git a/src/app/modules/main/communities/controller.nim b/src/app/modules/main/communities/controller.nim index 59f26b5b02..5e2c4a05b7 100644 --- a/src/app/modules/main/communities/controller.nim +++ b/src/app/modules/main/communities/controller.nim @@ -1,4 +1,4 @@ -import Tables, stint +import stint import ./io_interface import ../../../core/signals/types @@ -8,8 +8,8 @@ import ../../../../app_service/service/contacts/service as contacts_service import ../../../../app_service/service/network/service as networks_service import ../../../../app_service/service/community_tokens/service as community_tokens_service import ../../../../app_service/service/token/service as token_service - -import ../../shared_models/token_permissions_model +import ../../../../app_service/service/wallet_account/service as wallet_account_service +import ../../../../app_service/service/collectible/service as collectible_service type Controller* = ref object of RootObj @@ -120,6 +120,12 @@ proc init*(self: Controller) = let args = CommunityTokenMetadataArgs(e) self.delegate.onCommunityTokenMetadataAdded(args.communityId, args.tokenMetadata) + self.events.on(SIGNAL_OWNED_COLLECTIBLES_UPDATE_FINISHED) do(e: Args): + self.delegate.onOwnedCollectiblesUpdated() + + self.events.on(SIGNAL_WALLET_ACCOUNT_TOKENS_REBUILT) do(e: Args): + self.delegate.onWalletAccountTokensRebuilt() + proc getCommunityTags*(self: Controller): string = result = self.communityService.getCommunityTags() diff --git a/src/app/modules/main/communities/io_interface.nim b/src/app/modules/main/communities/io_interface.nim index f7c2122bf2..d3ffff8820 100644 --- a/src/app/modules/main/communities/io_interface.nim +++ b/src/app/modules/main/communities/io_interface.nim @@ -153,3 +153,9 @@ method communityInfoAlreadyRequested*(self: AccessInterface) {.base.} = method onCommunityTokenMetadataAdded*(self: AccessInterface, communityId: string, tokenMetadata: CommunityTokensMetadataDto) {.base.} = raise newException(ValueError, "No implementation available") + +method onOwnedCollectiblesUpdated*(self: AccessInterface) {.base.} = + raise newException(ValueError, "No implementation available") + +method onWalletAccountTokensRebuilt*(self: AccessInterface) {.base.} = + raise newException(ValueError, "No implementation available") diff --git a/src/app/modules/main/communities/module.nim b/src/app/modules/main/communities/module.nim index 6c00b5373b..111463ed4f 100644 --- a/src/app/modules/main/communities/module.nim +++ b/src/app/modules/main/communities/module.nim @@ -424,6 +424,12 @@ proc buildTokenList(self: Module) = self.view.setTokenListItems(tokenListItems) self.view.setCollectiblesListItems(collectiblesListItems) +method onWalletAccountTokensRebuilt*(self: Module) = + self.buildTokenList() + +method onOwnedCollectiblesUpdated*(self: Module) = + self.buildTokenList() + method onCommunityTokenMetadataAdded*(self: Module, communityId: string, tokenMetadata: CommunityTokensMetadataDto) = let tokenListItem = initTokenListItem( key = tokenMetadata.symbol,