diff --git a/src/components/middle/MiddleColumn.scss b/src/components/middle/MiddleColumn.scss index 2d4004b89..90941e34b 100644 --- a/src/components/middle/MiddleColumn.scss +++ b/src/components/middle/MiddleColumn.scss @@ -302,6 +302,7 @@ .messaging-disabled { .mask-image-disabled & { box-shadow: 0 .25rem .5rem .125rem var(--color-default-shadow); + border-radius: var(--border-radius-messages); } } diff --git a/src/components/middle/MiddleColumn.tsx b/src/components/middle/MiddleColumn.tsx index 54e070ee1..8ebb2d952 100644 --- a/src/components/middle/MiddleColumn.tsx +++ b/src/components/middle/MiddleColumn.tsx @@ -270,6 +270,8 @@ const MiddleColumn: FC = ({ useHistoryBack(isMobileSearchActive, closeLocalTextSearch); useHistoryBack(isSelectModeActive, exitMessageSelectMode); + const isMessagingDisabled = Boolean(!isPinnedMessageList && !renderingCanPost && messageSendingRestrictionReason); + return (
= ({
)} - {!isPinnedMessageList && !renderingCanPost && messageSendingRestrictionReason && ( + {isMessagingDisabled && (
@@ -370,6 +372,7 @@ const MiddleColumn: FC = ({
{IS_SINGLE_COLUMN_LAYOUT && } diff --git a/src/components/middle/ScrollDownButton.scss b/src/components/middle/ScrollDownButton.scss index 8f22ded08..18ec4f95e 100644 --- a/src/components/middle/ScrollDownButton.scss +++ b/src/components/middle/ScrollDownButton.scss @@ -61,7 +61,7 @@ opacity: 1; pointer-events: all; - &.no-composer { + &.no-composer:not(.with-extra-shift) { transform: translateY(4rem); } } diff --git a/src/components/middle/ScrollDownButton.tsx b/src/components/middle/ScrollDownButton.tsx index 141382c0e..7a889c2dd 100644 --- a/src/components/middle/ScrollDownButton.tsx +++ b/src/components/middle/ScrollDownButton.tsx @@ -20,6 +20,7 @@ import './ScrollDownButton.scss'; type OwnProps = { isShown: boolean; canPost?: boolean; + withExtraShift?: boolean; }; type StateProps = { @@ -36,6 +37,7 @@ const ScrollDownButton: FC = ({ canPost, messageListType, unreadCount, + withExtraShift, focusNextReply, }) => { const lang = useLang(); @@ -65,6 +67,7 @@ const ScrollDownButton: FC = ({ 'ScrollDownButton', isShown && 'revealed', !canPost && 'no-composer', + withExtraShift && 'with-extra-shift', ); return (