diff --git a/src/app_service/service/activity_center/service.nim b/src/app_service/service/activity_center/service.nim index 9c037a4ea8..fec8a4f844 100644 --- a/src/app_service/service/activity_center/service.nim +++ b/src/app_service/service/activity_center/service.nim @@ -125,12 +125,15 @@ QtObject: if (receivedData.activityCenterNotifications.len > 0): self.handleNewNotificationsLoaded(receivedData.activityCenterNotifications) - proc parseActivityCenterResponse*(self: Service, response: RpcResponse[JsonNode]) = + proc parseActivityCenterNotifications*(self: Service, notificationsJson: JsonNode) = var activityCenterNotifications: seq[ActivityCenterNotificationDto] = @[] + for notificationJson in notificationsJson: + activityCenterNotifications.add(notificationJson.toActivityCenterNotificationDto) + self.handleNewNotificationsLoaded(activityCenterNotifications) + + proc parseActivityCenterResponse*(self: Service, response: RpcResponse[JsonNode]) = if response.result{"activityCenterNotifications"} != nil: - for jsonMsg in response.result["activityCenterNotifications"]: - activityCenterNotifications.add(jsonMsg.toActivityCenterNotificationDto) - self.handleNewNotificationsLoaded(activityCenterNotifications) + self.parseActivityCenterNotifications(response.result["activityCenterNotifications"]) proc setActiveNotificationGroup*(self: Service, group: ActivityCenterGroup) = self.activeGroup = group diff --git a/src/app_service/service/community/service.nim b/src/app_service/service/community/service.nim index 4f36b75bad..8f374606e9 100644 --- a/src/app_service/service/community/service.nim +++ b/src/app_service/service/community/service.nim @@ -1367,6 +1367,7 @@ QtObject: self.events.emit(SIGNAL_COMMUNITY_EDITED, CommunityArgs(community: self.communities[communityId])) self.events.emit(SIGNAL_COMMUNITY_MEMBER_APPROVED, CommunityMemberArgs(communityId: communityId, pubKey: userKey, requestId: requestId)) + self.activityCenterService.parseActivityCenterNotifications(rpcResponseObj["response"]["result"]["activityCenterNotifications"]) except Exception as e: let errMsg = e.msg diff --git a/vendor/status-go b/vendor/status-go index e5093124f2..302437e32e 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit e5093124f2e2b4c51b8501bf1d48af9bcce71560 +Subproject commit 302437e32ecfedfa9964eeb6ea10fc0122c8a984