chore: refactor after review

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

@@ -304,10 +304,10 @@ proc init*(self: Controller) =
       if args.communityId == self.sectionId:
        self.delegate.setPermissionsToJoinCheckOngoing(false)
 
-    self.events.on(SIGNAL_CONTROL_NODE_OFFLINE) do(e: Args):
+    self.events.on(SIGNAL_WAITING_ON_NEW_COMMUNITY_OWNER_TO_CONFIRM_REQUEST_TO_REJOIN) do(e: Args):
       let args = CommunityIdArgs(e)
       if args.communityId == self.sectionId:
-        self.delegate.onControlNodeOffline()
+        self.delegate.onWaitingOnNewCommunityOwnerToConfirmRequestToRejoin()
 
     self.events.on(SignalType.Wallet.event, proc(e: Args) =
       var data = WalletSignal(e)
@@ -683,5 +683,5 @@ proc collectCommunityMetricsMessagesTimestamps*(self: Controller, intervals: str
 proc collectCommunityMetricsMessagesCount*(self: Controller, intervals: string) =
   self.communityService.collectCommunityMetricsMessagesCount(self.getMySectionId(), intervals)
 
-proc isCommunityRequestAwaitingAddress*(self: Controller, communityId: string): bool =
-  self.communityService.isCommunityRequestAwaitingAddress(communityId)
+proc waitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: Controller, communityId: string): bool =
+  self.communityService.waitingOnNewCommunityOwnerToConfirmRequestToRejoin(communityId)

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

@@ -406,5 +406,5 @@ method setChannelsPermissionsCheckOngoing*(self: AccessInterface, value: bool) {
 method getChannelsPermissionsCheckOngoing*(self: AccessInterface): bool {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method onControlNodeOffline*(self: AccessInterface) {.base.} =
+method onWaitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")

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

@@ -339,7 +339,7 @@ method onChatsLoaded*(
   else:
     let community = self.controller.getMyCommunity()
     self.view.setAmIMember(community.joined)
-    self.view.setIsControlNodeOffline(self.controller.isCommunityRequestAwaitingAddress(community.id))
+    self.view.setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin(self.controller.waitingOnNewCommunityOwnerToConfirmRequestToRejoin(community.id))
     self.initCommunityTokenPermissionsModel(channelGroup)
     self.onCommunityCheckAllChannelsPermissionsResponse(channelGroup.channelPermissions)
     self.controller.asyncCheckPermissionsToJoin()
@@ -891,11 +891,11 @@ method onCommunityCheckAllChannelsPermissionsResponse*(self: Module, checkAllCha
 method onKickedFromCommunity*(self: Module) =
   self.view.setAmIMember(false)
   let communityId = self.controller.getMySectionId()
-  self.view.setIsControlNodeOffline(self.controller.isCommunityRequestAwaitingAddress(communityId))
+  self.view.setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin(self.controller.waitingOnNewCommunityOwnerToConfirmRequestToRejoin(communityId))
 
 method onJoinedCommunity*(self: Module) =
   self.view.setAmIMember(true)
-  self.view.setIsControlNodeOffline(false)
+  self.view.setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin(false)
 
 method onMarkAllMessagesRead*(self: Module, chat: ChatDto) =
   self.updateBadgeNotifications(chat, hasUnreadMessages=false, unviewedMentionsCount=0)
@@ -1347,5 +1347,5 @@ method setChannelsPermissionsCheckOngoing*(self: Module, value: bool) =
     if self.view.chatsModel().getItemPermissionsRequired(chatId):
       cModule.setPermissionsCheckOngoing(true)
 
-method onControlNodeOffline*(self: Module) =
-  self.view.setIsControlNodeOffline(true)
+method onWaitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: Module) =
+  self.view.setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin(true)

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

@@ -29,7 +29,7 @@ QtObject:
       chatsLoaded: bool
       communityMetrics: string # NOTE: later this should be replaced with QAbstractListModel-based model
       permissionsCheckOngoing: bool
-      isControlNodeOffline: bool
+      isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin: bool
 
   proc delete*(self: View) =
     self.model.delete
@@ -68,7 +68,7 @@ QtObject:
     result.requiresTokenPermissionToJoin = false
     result.chatsLoaded = false
     result.communityMetrics = "[]"
-    result.isControlNodeOffline = false
+    result.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin = false
 
   proc load*(self: View) =
     self.delegate.viewDidLoad()
@@ -391,7 +391,6 @@ QtObject:
   proc amIMemberChanged*(self: View) {.signal.}
 
   proc setAmIMember*(self: View, value: bool) =
-    writeStackTrace()
     if (value == self.amIMember):
       return
     self.amIMember = value
@@ -450,17 +449,17 @@ QtObject:
     self.permissionsCheckOngoing = value
     self.permissionsCheckOngoingChanged()
 
-  proc getIsControlNodeOffline*(self: View): bool {.slot.} =
-    return self.isControlNodeOffline
+  proc getWaitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: View): bool {.slot.} =
+    return self.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin
 
-  proc isControlNodeOfflineChanged*(self: View) {.signal.}
+  proc isWaitingOnNewCommunityOwnerToConfirmRequestToRejoinChanged*(self: View) {.signal.}
 
-  proc setIsControlNodeOffline*(self: View, value: bool) =
-    if (value == self.isControlNodeOffline):
+  proc setWaitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: View, value: bool) =
+    if (value == self.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin):
       return
-    self.isControlNodeOffline = value
-    self.isControlNodeOfflineChanged()
+    self.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin = value
+    self.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoinChanged()
 
-  QtProperty[bool] isControlNodeOffline:
-    read = getIsControlNodeOffline
-    notify = isControlNodeOfflineChanged
+  QtProperty[bool] isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin:
+    read = getWaitingOnNewCommunityOwnerToConfirmRequestToRejoin
+    notify = isWaitingOnNewCommunityOwnerToConfirmRequestToRejoinChanged

src/app_service/service/community/async_tasks.nim

@@ -11,14 +11,14 @@ const asyncLoadCommunitiesDataTask: Task = proc(argEncoded: string) {.gcsafe, ni
     let responseCommunities = status_go.getAllCommunities()
     let responseSettings = status_go.getCommunitiesSettings()
     let responseMyPendingRequestsToJoin = status_go.myPendingRequestsToJoin()
-    let responseMyAwaitingRequestsToJoin = status_go.myAwaitingRequestsToJoin()
+    let responseMyAwaitingAddressesRequestsToJoin = status_go.myAwaitingAddressesRequestsToJoin()
 
     arg.finish(%* {
       "tags": responseTags,
       "communities": responseCommunities,
       "settings": responseSettings,
       "myPendingRequestsToJoin": responseMyPendingRequestsToJoin,
-      "myAwaitingRequestsToJoin": responseMyAwaitingRequestsToJoin,
+      "myAwaitingAddressesRequestsToJoin": responseMyAwaitingAddressesRequestsToJoin,
       "error": "",
     })
   except Exception as e:

src/app_service/service/community/service.nim

@@ -180,7 +180,7 @@ const SIGNAL_COMMUNITY_MEMBERS_CHANGED* = "communityMembersChanged"
 const SIGNAL_COMMUNITY_KICKED* = "communityKicked"
 const SIGNAL_NEW_REQUEST_TO_JOIN_COMMUNITY* = "newRequestToJoinCommunity"
 const SIGNAL_REQUEST_TO_JOIN_COMMUNITY_CANCELED* = "requestToJoinCommunityCanceled"
-const SIGNAL_CONTROL_NODE_OFFLINE* = "controlNodeOffline"
+const SIGNAL_WAITING_ON_NEW_COMMUNITY_OWNER_TO_CONFIRM_REQUEST_TO_REJOIN* = "waitingOnNewCommunityOwnerToConfirmRequestToRejoin"
 const SIGNAL_CURATED_COMMUNITY_FOUND* = "curatedCommunityFound"
 const SIGNAL_CURATED_COMMUNITIES_UPDATED* = "curatedCommunitiesUpdated"
 const SIGNAL_COMMUNITY_MUTED* = "communityMuted"
@@ -233,7 +233,7 @@ QtObject:
       historyArchiveDownloadTaskCommunityIds*: HashSet[string]
       requestedCommunityIds*: HashSet[string]
       communityMetrics: Table[string, CommunityMetricsDto]
-      myAwaitingRequestsToJoin: Table[string, CommunityMembershipRequestDto]
+      myAwaitingAddressesRequestsToJoin: Table[string, CommunityMembershipRequestDto]
 
   # Forward declaration
   proc asyncLoadCuratedCommunities*(self: Service)
@@ -331,7 +331,7 @@ QtObject:
               self.updateMembershipRequestToNewState(membershipRequest.communityId, membershipRequest.id, community,
                 requestToJoinState)
               if requestToJoinState == RequestToJoinType.AwaitingAddress:
-                self.events.emit(SIGNAL_CONTROL_NODE_OFFLINE, CommunityIdArgs(communityId: membershipRequest.communityId))
+                self.events.emit(SIGNAL_WAITING_ON_NEW_COMMUNITY_OWNER_TO_CONFIRM_REQUEST_TO_REJOIN, CommunityIdArgs(communityId: membershipRequest.communityId))
             except Exception as e:
               error "Unknown request", msg = e.msg
 
@@ -665,8 +665,8 @@ QtObject:
 
       # If the community was not joined before but is now, we signal it
       if(not wasJoined and community.joined and community.isMember):
-        if community.id in self.myAwaitingRequestsToJoin:
-          self.myAwaitingRequestsToJoin.del(community.id)
+        if community.id in self.myAwaitingAddressesRequestsToJoin:
+          self.myAwaitingAddressesRequestsToJoin.del(community.id)
 
         self.events.emit(SIGNAL_COMMUNITY_JOINED, CommunityArgs(community: community, fromUserAction: false))
 
@@ -726,12 +726,12 @@ QtObject:
           let communityRequest = jsonCommunityReqest.toCommunityMembershipRequestDto()
           self.myCommunityRequests.add(communityRequest)
 
-      let myAwaitingRequestResponse = responseObj["myAwaitingRequestsToJoin"]
+      let myAwaitingRequestResponse = responseObj["myAwaitingAddressesRequestsToJoin"]
 
       if myAwaitingRequestResponse{"result"}.kind != JNull:
         for jsonCommunityReqest in myAwaitingRequestResponse["result"]:
             let communityRequest = jsonCommunityReqest.toCommunityMembershipRequestDto()
-            self.myAwaitingRequestsToJoin[communityRequest.communityId] = communityRequest
+            self.myAwaitingAddressesRequestsToJoin[communityRequest.communityId] = communityRequest
 
       self.events.emit(SIGNAL_COMMUNITY_DATA_LOADED, Args())
     except Exception as e:
@@ -1830,9 +1830,9 @@ QtObject:
 
         # If the state is no longer pending, delete the request
         community.pendingRequestsToJoin.delete(indexPending)
-        # Delete if control node changed status for awaiting request to join
-        if communityId in self.myAwaitingRequestsToJoin:
-          self.myAwaitingRequestsToJoin.del(communityId)
+        # Delete if control node changed status for awaiting addresses request to join
+        if communityId in self.myAwaitingAddressesRequestsToJoin:
+          self.myAwaitingAddressesRequestsToJoin.del(communityId)
 
       else:
         community.pendingRequestsToJoin[indexPending].state = newState.int
@@ -2004,8 +2004,8 @@ QtObject:
         return true
     return false
 
-  proc isCommunityRequestAwaitingAddress*(self: Service, communityId: string): bool {.slot.} =
-    return communityId in self.myAwaitingRequestsToJoin
+  proc waitingOnNewCommunityOwnerToConfirmRequestToRejoin*(self: Service, communityId: string): bool {.slot.} =
+    return communityId in self.myAwaitingAddressesRequestsToJoin
 
   proc requestExtractDiscordChannelsAndCategories*(self: Service, filesToImport: seq[string]) =
     try:

src/backend/communities.nim

@@ -8,7 +8,7 @@ export response_type
 
 proc getCommunityTags*(): RpcResponse[JsonNode] {.raises: [Exception].} =
   result = callPrivateRPC("communityTags".prefix)
-  
+
 proc muteCategory*(communityId: string, categoryId: string, interval: int): RpcResponse[JsonNode] {.raises: [Exception].} =
   result = callPrivateRPC("muteCommunityCategory".prefix, %* [
     {
@@ -82,7 +82,7 @@ proc reevaluateCommunityMembersPermissions*(
   result = callPrivateRPC("reevaluateCommunityMembersPermissions".prefix, %*[{
     "communityId": communityId
   }])
-  
+
 proc checkCommunityChannelPermissions*(communityId: string, chatId: string): RpcResponse[JsonNode] {.raises: [Exception].} =
   result = callPrivateRPC("checkCommunityChannelPermissions".prefix, %*[{
     "communityId": communityId,
@@ -98,8 +98,8 @@ proc checkAllCommunityChannelsPermissions*(communityId: string, addresses: seq[s
 proc myPendingRequestsToJoin*(): RpcResponse[JsonNode] {.raises: [Exception].} =
   result =  callPrivateRPC("myPendingRequestsToJoin".prefix)
 
-proc myAwaitingRequestsToJoin*(): RpcResponse[JsonNode] {.raises: [Exception].} =
-  result =  callPrivateRPC("myAwaitingRequestsToJoin".prefix)
+proc myAwaitingAddressesRequestsToJoin*(): RpcResponse[JsonNode] {.raises: [Exception].} =
+  result =  callPrivateRPC("myAwaitingAddressesRequestsToJoin".prefix)
 
 proc myCanceledRequestsToJoin*(): RpcResponse[JsonNode] {.raises: [Exception].} =
   result =  callPrivateRPC("myCanceledRequestsToJoin".prefix)
@@ -258,7 +258,7 @@ proc deleteCommunityTokenPermission*(communityId: string, permissionId: string):
     "communityId": communityId,
     "permissionId": permissionId
   }])
-  
+
 proc requestCancelDiscordCommunityImport*(communityId: string): RpcResponse[JsonNode] {.raises: [Exception].} =
   result = callPrivateRPC("requestCancelDiscordCommunityImport".prefix, %*[communityId])
 
@@ -426,9 +426,9 @@ proc unbanUserFromCommunity*(communityId: string, pubKey: string): RpcResponse[J
   }])
 
 proc setCommunityMuted*(communityId: string, mutedType: int): RpcResponse[JsonNode] {.raises: [Exception].}  =
-  return callPrivateRPC("setCommunityMuted".prefix, %*[{ 
-    "communityId": communityId, 
-    "mutedType": mutedType 
+  return callPrivateRPC("setCommunityMuted".prefix, %*[{
+    "communityId": communityId,
+    "mutedType": mutedType
   }])
 
 proc shareCommunityToUsers*(communityId: string, pubKeys: seq[string], inviteMessage: string): RpcResponse[JsonNode] {.raises: [Exception].} =

ui/app/AppLayouts/Chat/ChatLayout.qml

@@ -57,8 +57,8 @@ StackLayout {
 
         sourceComponent: {
             if (chatItem.isCommunity() && !chatItem.amIMember) {
-                if (chatItem.isControlNodeOffline) {
-                    return controlNodeOffline
+                if (chatItem.isWaitingOnNewCommunityOwnerToConfirmRequestToRejoin) {
+                    return controlNodeOfflineComponent
                 } else if (chatItem.requiresTokenPermissionToJoin) {
                     return joinCommunityViewComponent
                 }
@@ -336,35 +336,21 @@ StackLayout {
     }
 
     Component {
-        id: controlNodeOffline
+        id: controlNodeOfflineComponent
         ControlNodeOfflineCommunityView {
-            id: joinCommunityView
+            id: controlNodeOfflineView
             readonly property var communityData: sectionItemModel
             readonly property string communityId: communityData.id
             name: communityData.name
             communityDesc: communityData.description
             color: communityData.color
             image: communityData.image
             membersCount: communityData.members.count
-            joinCommunity: true
-            amISectionAdmin: communityData.memberRole === Constants.memberRole.owner ||
-                             communityData.memberRole === Constants.memberRole.admin ||
-                             communityData.memberRole === Constants.memberRole.tokenMaster
             communityItemsModel: root.rootStore.communityItemsModel
             notificationCount: activityCenterStore.unreadNotificationsCount
             hasUnseenNotifications: activityCenterStore.hasUnseenNotifications
-            openCreateChat: rootStore.openCreateChat
             onNotificationButtonClicked: Global.openActivityCenterPopup()
             onAdHocChatButtonClicked: rootStore.openCloseCreateChatView()
-
-            Connections {
-                target: root.rootStore.communitiesModuleInst
-                function onCommunityAccessRequested(communityId: string) {
-                    if (communityId === joinCommunityView.communityId) {
-                        joinCommunityView.isInvitationPending = root.rootStore.isCommunityRequestPending(communityId)
-                    }
-                }
-            }
         }
     }
     // End of components related to transfer community ownership flow.

ui/app/AppLayouts/Communities/panels/ControlNodeOfflineCenterPanel.qml

@@ -47,12 +47,6 @@ ColumnLayout {
                     text: root.listUsersText
                     font.pixelSize: 13
                 }
-
-                StatusBaseText {
-                    text: qsTr("joined the channel")
-                    font.pixelSize: 13
-                    color: Theme.palette.baseColor1
-                }
             }
 
             ListView {

ui/app/AppLayouts/Communities/views/ControlNodeOfflineCommunityView.qml

@@ -20,14 +20,11 @@ StatusSectionLayout {
     id: root
 
     // General properties:
-    property bool amISectionAdmin: false
-    property bool openCreateChat: false
     property string name
     property string communityDesc
     property color color
     property string channelName
     property string channelDesc
-    property bool joinCommunity: true // Otherwise it means join channel action
 
     // Blur view properties:
     property int membersCount
@@ -37,7 +34,6 @@ StatusSectionLayout {
     property string listUsersText
     property var messagesModel
 
-    signal infoButtonClicked
     signal adHocChatButtonClicked
 
 
@@ -48,7 +44,6 @@ StatusSectionLayout {
     }
 
     headerContent: JoinCommunityHeaderPanel {
-        joinCommunity: root.joinCommunity
         color: root.color
         name: root.name
         channelName: root.channelName
@@ -66,16 +61,15 @@ StatusSectionLayout {
             membersCount: root.membersCount
             image: root.image
             color: root.color
-            amISectionAdmin: root.amISectionAdmin
-            openCreateChat: root.openCreateChat
-            onInfoButtonClicked: if(root.amISectionAdmin) root.infoButtonClicked()
+            amISectionAdmin: false
+            openCreateChat: false
             onAdHocChatButtonClicked: root.adHocChatButtonClicked()
         }
 
         ColumnLayout {
             Layout.fillWidth: true
             Layout.margins: Style.current.halfPadding
-            layer.enabled: root.joinCommunity
+            layer.enabled: true
             layer.effect: fastBlur
 
             Repeater {