feat: removed old disappearing message display from header

show disappearing message screen when clicking the correct option
pull/2660/head
William Grant 2 years ago
parent 26995e1873
commit 1ff9f7b91e

@ -366,27 +366,6 @@
} }
} }
.module-conversation-header__expiration {
display: flex;
flex-direction: row;
align-items: center;
padding-inline-start: 8px;
padding-inline-end: 8px;
flex-shrink: 0;
}
.module-conversation-header__expiration__clock-icon {
@include color-svg('../images/timer.svg', var(--button-icon-stroke-color));
height: 20px;
width: 20px;
display: inline-block;
}
.module-conversation-header__expiration__setting {
margin-inline-start: 5px;
text-align: center;
}
// Module: Message Detail // Module: Message Detail
.module-message-detail { .module-message-detail {

@ -33,12 +33,7 @@ import {
} from '../../state/ducks/conversations'; } from '../../state/ducks/conversations';
import { callRecipient } from '../../interactions/conversationInteractions'; import { callRecipient } from '../../interactions/conversationInteractions';
import { getHasIncomingCall, getHasOngoingCall } from '../../state/selectors/call'; import { getHasIncomingCall, getHasOngoingCall } from '../../state/selectors/call';
import { import { useConversationUsername, useIsRequest } from '../../hooks/useParamSelector';
useConversationUsername,
useExpireTimer,
useIsKickedFromGroup,
useIsRequest,
} from '../../hooks/useParamSelector';
import { import {
SessionButton, SessionButton,
SessionButtonColor, SessionButtonColor,
@ -52,6 +47,7 @@ import {
DisappearingMessageConversationType, DisappearingMessageConversationType,
ExpirationTimerOptions, ExpirationTimerOptions,
} from '../../util/expiringMessages'; } from '../../util/expiringMessages';
import { setRightOverlayMode } from '../../state/ducks/section';
export interface TimerOption { export interface TimerOption {
name: string; name: string;
@ -171,26 +167,6 @@ const TripleDotsMenu = (props: { triggerId: string; showBackButton: boolean }) =
); );
}; };
const ExpirationLength = (props: { expirationSettingName?: string }) => {
const { expirationSettingName } = props;
if (!expirationSettingName) {
return null;
}
return (
<div className="module-conversation-header__expiration">
<div className="module-conversation-header__expiration__clock-icon" />
<div
className="module-conversation-header__expiration__setting"
data-testid="disappearing-messages-indicator"
>
{expirationSettingName}
</div>
</div>
);
};
const AvatarHeader = (props: { const AvatarHeader = (props: {
pubkey: string; pubkey: string;
showBackButton: boolean; showBackButton: boolean;
@ -417,13 +393,18 @@ const ConversationHeaderTitle = () => {
return ( return (
<div <div
className="module-conversation-header__title" className="module-conversation-header__title"
// onClick={() => { onClick={() => {
// if (isRightPanelOn) { if (isRightPanelOn) {
// dispatch(closeRightPanel()); dispatch(closeRightPanel());
// } else { } else {
// dispatch(openRightPanel()); if (visibleTitleIndex === 2) {
// } dispatch(setRightOverlayMode('disappearing-messages'));
// }} } else {
dispatch(setRightOverlayMode('panel-settings'));
}
dispatch(openRightPanel());
}
}}
role="button" role="button"
> >
<span className="module-contact-name__profile-name" data-testid="header-conversation-name"> <span className="module-contact-name__profile-name" data-testid="header-conversation-name">
@ -491,12 +472,6 @@ export const ConversationHeaderWithDetails = () => {
return null; return null;
} }
const isKickedFromGroup = useIsKickedFromGroup(selectedConvoKey);
const expireTimerSetting = useExpireTimer(selectedConvoKey);
const expirationSettingName = expireTimerSetting
? ExpirationTimerOptions.getName(expireTimerSetting || 0)
: undefined;
const triggerId = 'conversation-header'; const triggerId = 'conversation-header';
return ( return (
@ -524,9 +499,6 @@ export const ConversationHeaderWithDetails = () => {
flexGrow={0} flexGrow={0}
flexShrink={0} flexShrink={0}
> >
{!isKickedFromGroup && (
<ExpirationLength expirationSettingName={expirationSettingName} />
)}
<CallButton /> <CallButton />
<AvatarHeader <AvatarHeader
onAvatarClick={() => { onAvatarClick={() => {

Loading…
Cancel
Save