diff --git a/src/api/gramjs/apiBuilders/chats.ts b/src/api/gramjs/apiBuilders/chats.ts index 2cc342f87..93e9759d2 100644 --- a/src/api/gramjs/apiBuilders/chats.ts +++ b/src/api/gramjs/apiBuilders/chats.ts @@ -192,7 +192,7 @@ function buildApiChatPermissions(peerEntity: GramJs.TypeUser | GramJs.TypeChat): }; } -function buildApiChatRestrictions(peerEntity: GramJs.TypeUser | GramJs.TypeChat): { +function buildApiChatRestrictions(peerEntity: Entity): { isNotJoined?: boolean; isForbidden?: boolean; isRestricted?: boolean; @@ -212,17 +212,13 @@ function buildApiChatRestrictions(peerEntity: GramJs.TypeUser | GramJs.TypeChat) const restrictions = {}; - if ('restricted' in peerEntity) { - const restrictionReason = peerEntity.restricted - ? buildApiChatRestrictionReason(peerEntity.restrictionReason) - : undefined; + if ('restricted' in peerEntity && !peerEntity.min) { + const restrictionReason = buildApiChatRestrictionReason(peerEntity.restrictionReason); - if (restrictionReason) { - Object.assign(restrictions, { - isRestricted: true, - restrictionReason, - }); - } + Object.assign(restrictions, { + isRestricted: peerEntity.restricted, + restrictionReason, + }); } if (peerEntity instanceof GramJs.Chat) { diff --git a/src/components/modals/chatInvite/ChatInviteModal.tsx b/src/components/modals/chatInvite/ChatInviteModal.tsx index 3e767fd72..97f5ad6f4 100644 --- a/src/components/modals/chatInvite/ChatInviteModal.tsx +++ b/src/components/modals/chatInvite/ChatInviteModal.tsx @@ -43,9 +43,11 @@ const ChatInviteModal = ({ modal }: OwnProps) => { const handleAccept = useLastCallback(() => { acceptChatInvite({ hash: hash! }); - showNotification({ - message: isBroadcast ? lang('RequestToJoinChannelSentDescription') : lang('RequestToJoinGroupSentDescription'), - }); + if (isRequestNeeded) { + showNotification({ + message: isBroadcast ? lang('RequestToJoinChannelSentDescription') : lang('RequestToJoinGroupSentDescription'), + }); + } handleClose(); });