Disabled archiving

pull/1102/head
Vincent 5 years ago
parent 43772b8ee2
commit d09dc92e3d

@ -97,6 +97,7 @@ window.CONSTANTS = {
// Max attachment size: 10 MB // Max attachment size: 10 MB
MAX_ATTACHMENT_FILESIZE: 10000000, MAX_ATTACHMENT_FILESIZE: 10000000,
NOTIFICATION_ENABLE_TIMEOUT_SECONDS: 10, // number of seconds to turn on notifications after reconnect/start of app NOTIFICATION_ENABLE_TIMEOUT_SECONDS: 10, // number of seconds to turn on notifications after reconnect/start of app
ARCHIVING_ENABLED: false,
}; };
window.versionInfo = { window.versionInfo = {

@ -38,7 +38,7 @@ interface Props {
isMe: boolean; isMe: boolean;
isClosable?: boolean; isClosable?: boolean;
isGroup: boolean; isGroup: boolean;
isArchived: boolean; isArchived?: boolean;
isPublic: boolean; isPublic: boolean;
isRss: boolean; isRss: boolean;
amMod: boolean; amMod: boolean;
@ -74,7 +74,7 @@ interface Props {
onCloseOverlay: () => void; onCloseOverlay: () => void;
onDeleteSelectedMessages: () => void; onDeleteSelectedMessages: () => void;
onArchive: () => void; onArchive?: () => void;
onMoveToInbox: () => void; onMoveToInbox: () => void;
onShowSafetyNumber: () => void; onShowSafetyNumber: () => void;
@ -498,16 +498,17 @@ export class ConversationHeader extends React.Component<Props> {
// hasNickname && ( // hasNickname && (
// <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem> // <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
// ); // );
const archiveConversationMenuItem = isArchived ? ( const archiveConversationMenuItem = window.CONSTANTS.ARCHIVING_ENABLED
&& (isArchived ? (
<MenuItem onClick={onMoveToInbox}> <MenuItem onClick={onMoveToInbox}>
{i18n('moveConversationToInbox')} {i18n('moveConversationToInbox')}
</MenuItem> </MenuItem>
) : ( ) : (
<MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem> <MenuItem onClick={onArchive}>{i18n('archiveConversation')}</MenuItem>
); ));
return ( return (
<React.Fragment> <>
{/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */} {/* <MenuItem onClick={onShowAllMedia}>{i18n('viewAllMedia')}</MenuItem> */}
{disappearingMessagesMenuItem} {disappearingMessagesMenuItem}
{showMembersMenuItem} {showMembersMenuItem}
@ -517,7 +518,7 @@ export class ConversationHeader extends React.Component<Props> {
{/* {changeNicknameMenuItem} {/* {changeNicknameMenuItem}
{clearNicknameMenuItem} */} {clearNicknameMenuItem} */}
{archiveConversationMenuItem} {archiveConversationMenuItem}
</React.Fragment> </>
); );
} }
} }

Loading…
Cancel
Save