Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable disappearing message before friend request accepted #1039

Merged
merged 1 commit into from
Apr 3, 2020
Merged

Disable disappearing message before friend request accepted #1039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 21 additions & 18 deletions ts/components/conversation/ConversationHeader.tsx
View file
Open in desktop
Expand Up @@ -419,6 +419,7 @@ export class ConversationHeader extends React.Component<Props> {
$('.session-search-input input').focus();
}

// tslint:disable-next-line: cyclomatic-complexity
private renderPublicMenuItems() {
const {
i18n,
Expand All @@ -438,9 +439,10 @@ export class ConversationHeader extends React.Component<Props> {
timerOptions,
onBlockUser,
onUnblockUser,
hasNickname,
onClearNickname,
onChangeNickname,
// hasNickname,
// onClearNickname,
// onChangeNickname,
isFriend,
} = this.props;

if (isPublic || isRss) {
Expand All @@ -452,7 +454,7 @@ export class ConversationHeader extends React.Component<Props> {
const blockTitle = isBlocked ? i18n('unblockUser') : i18n('blockUser');
const blockHandler = isBlocked ? onUnblockUser : onBlockUser;

const disappearingMessagesMenuItem = (
const disappearingMessagesMenuItem = isFriend && (
<SubMenu title={disappearingTitle}>
{(timerOptions || []).map(item => (
<MenuItem
Expand All @@ -475,21 +477,22 @@ export class ConversationHeader extends React.Component<Props> {
{i18n('showSafetyNumber')}
</MenuItem>
);
const resetSessionMenuItem = !isGroup && (
<MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
);
const blockHandlerMenuItem = !isMe &&
!isGroup &&
!isRss && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
const changeNicknameMenuItem = !isMe &&
const resetSessionMenuItem = isFriend &&
!isGroup && (
<MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
<MenuItem onClick={onResetSession}>{i18n('resetSession')}</MenuItem>
);
const clearNicknameMenuItem = !isMe &&
const blockHandlerMenuItem = !isMe &&
!isGroup &&
hasNickname && (
<MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
);
!isRss && <MenuItem onClick={blockHandler}>{blockTitle}</MenuItem>;
// const changeNicknameMenuItem = !isMe &&
// !isGroup && (
// <MenuItem onClick={onChangeNickname}>{i18n('changeNickname')}</MenuItem>
// );
// const clearNicknameMenuItem = !isMe &&
// !isGroup &&
// hasNickname && (
// <MenuItem onClick={onClearNickname}>{i18n('clearNickname')}</MenuItem>
// );
const archiveConversationMenuItem = isArchived ? (
<MenuItem onClick={onMoveToInbox}>
{i18n('moveConversationToInbox')}
Expand All @@ -506,8 +509,8 @@ export class ConversationHeader extends React.Component<Props> {
{showSafetyNumberMenuItem}
{resetSessionMenuItem}
{blockHandlerMenuItem}
{changeNicknameMenuItem}
{clearNicknameMenuItem}
{/* {changeNicknameMenuItem}
{clearNicknameMenuItem} */}
{archiveConversationMenuItem}
</React.Fragment>
);
Expand Down