Adding unstaged changed from last commit. (adding accept/decline to convo header menu and removal of disappearing messages menu item)

pull/2174/head
warrickct 3 years ago
parent 61cdae7622
commit 7315651c63

@ -61,9 +61,10 @@ function showTimerOptions(
isPublic: boolean, isPublic: boolean,
isKickedFromGroup: boolean, isKickedFromGroup: boolean,
left: boolean, left: boolean,
isBlocked: boolean isBlocked: boolean,
isRequest: boolean
): boolean { ): boolean {
return !isPublic && !left && !isKickedFromGroup && !isBlocked; return !isPublic && !left && !isKickedFromGroup && !isBlocked && !isRequest;
} }
function showNotificationConvo( function showNotificationConvo(
@ -426,13 +427,15 @@ export const DisappearingMessageMenuItem = (): JSX.Element | null => {
const isLeft = useIsLeft(convoId); const isLeft = useIsLeft(convoId);
const isKickedFromGroup = useIsKickedFromGroup(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId);
const timerOptions = useSelector(getTimerOptions).timerOptions; const timerOptions = useSelector(getTimerOptions).timerOptions;
const isRequest = useIsRequest(convoId);
if ( if (
showTimerOptions( showTimerOptions(
Boolean(isPublic), Boolean(isPublic),
Boolean(isKickedFromGroup), Boolean(isKickedFromGroup),
Boolean(isLeft), Boolean(isLeft),
Boolean(isBlocked) Boolean(isBlocked),
isRequest
) )
) { ) {
// const isRtlMode = isRtlBody(); // const isRtlMode = isRtlBody();

Loading…
Cancel
Save