diff --git a/ts/components/leftpane/LeftPaneSectionHeader.tsx b/ts/components/leftpane/LeftPaneSectionHeader.tsx index 6bf0a7a50..edf3fe0be 100644 --- a/ts/components/leftpane/LeftPaneSectionHeader.tsx +++ b/ts/components/leftpane/LeftPaneSectionHeader.tsx @@ -5,11 +5,11 @@ import { disableRecoveryPhrasePrompt } from '../../state/ducks/userConfig'; import { getShowRecoveryPhrasePrompt } from '../../state/selectors/userConfig'; import { recoveryPhraseModal } from '../../state/ducks/modalDialog'; import { Flex } from '../basic/Flex'; -import { getFocusedSection } from '../../state/selectors/section'; -import { SectionType } from '../../state/ducks/section'; +import { getFocusedSection, getOverlayMode } from '../../state/selectors/section'; +import { SectionType, setOverlayMode } from '../../state/ducks/section'; import { UserUtils } from '../../session/utils'; import { SessionButton, SessionButtonType } from '../basic/SessionButton'; -import { SessionIcon } from '../icon'; +import { SessionIcon, SessionIconButton } from '../icon'; const SectionTitle = styled.h1` padding: 0 var(--margins-sm); @@ -20,10 +20,13 @@ const SectionTitle = styled.h1` export const LeftPaneSectionHeader = (props: { buttonClicked?: any }) => { const showRecoveryPhrasePrompt = useSelector(getShowRecoveryPhrasePrompt); const focusedSection = useSelector(getFocusedSection); + const overlayMode = useSelector(getOverlayMode); + const dispatch = useDispatch(); let label: string | undefined; const isMessageSection = focusedSection === SectionType.Message; + const isMessageRequestOverlay = overlayMode === 'message-requests'; switch (focusedSection) { case SectionType.Contact: @@ -33,7 +36,9 @@ export const LeftPaneSectionHeader = (props: { buttonClicked?: any }) => { label = window.i18n('settingsHeader'); break; case SectionType.Message: - label = window.i18n('messagesHeader'); + label = isMessageRequestOverlay + ? window.i18n('messageRequests') + : window.i18n('messagesHeader'); break; default: } @@ -41,8 +46,19 @@ export const LeftPaneSectionHeader = (props: { buttonClicked?: any }) => { return (
+ {isMessageRequestOverlay && ( + { + dispatch(setOverlayMode(undefined)); + }} + iconType="chevron" + iconRotation={90} + iconSize="medium" + margin="0 0 var(--margins-xs) 0" + /> + )} {label} - {isMessageSection && ( + {isMessageSection && !isMessageRequestOverlay && ( diff --git a/ts/components/leftpane/overlay/OverlayHeader.tsx b/ts/components/leftpane/overlay/OverlayHeader.tsx index e185714fa..990fcea17 100644 --- a/ts/components/leftpane/overlay/OverlayHeader.tsx +++ b/ts/components/leftpane/overlay/OverlayHeader.tsx @@ -12,7 +12,8 @@ export const OverlayHeader = ({ subtitle, title }: { title: string; subtitle: st
{ dispatch(setOverlayMode(undefined)); }} diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index 98e6b4f5b..2708db53c 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -68,15 +68,10 @@ export const OverlayMessageRequest = () => { const messageRequestSetting = useSelector(getIsMessageRequestsEnabled); - const title = window.i18n('messageRequests'); - const subtitle = window.i18n('requestsSubtitle'); const buttonText = window.i18n('blockAll'); return (
- - -