fix: expiretimer now uses a ternary operator

pull/2971/head
William Grant 2 years ago
parent c73be8aecc
commit f9b0ead150

@ -3,13 +3,13 @@ import { useDispatch } from 'react-redux';
import { useInterval, useMount } from 'react-use'; import { useInterval, useMount } from 'react-use';
import styled from 'styled-components'; import styled from 'styled-components';
import { Data } from '../../../../data/data'; import { Data } from '../../../../data/data';
import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelector';
import { MessageModelType } from '../../../../models/messageType';
import { getConversationController } from '../../../../session/conversations'; import { getConversationController } from '../../../../session/conversations';
import { messagesExpired, PropsForExpiringMessage } from '../../../../state/ducks/conversations'; import { PropsForExpiringMessage, messagesExpired } from '../../../../state/ducks/conversations';
import { getIncrement } from '../../../../util/timer'; import { getIncrement } from '../../../../util/timer';
import { ExpireTimer } from '../../ExpireTimer'; import { ExpireTimer } from '../../ExpireTimer';
import { ReadableMessage, ReadableMessageProps } from './ReadableMessage'; import { ReadableMessage, ReadableMessageProps } from './ReadableMessage';
import { MessageModelType } from '../../../../models/messageType';
import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelector';
const EXPIRATION_CHECK_MINIMUM = 2000; const EXPIRATION_CHECK_MINIMUM = 2000;
@ -126,7 +126,7 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) =
key={`readable-message-${messageId}`} key={`readable-message-${messageId}`}
dataTestId={dataTestId} dataTestId={dataTestId}
> >
{expirationLength && expirationTimestamp && ( {expirationLength && expirationTimestamp ? (
<ExpireTimer <ExpireTimer
expirationLength={expirationLength} expirationLength={expirationLength}
expirationTimestamp={expirationTimestamp} expirationTimestamp={expirationTimestamp}
@ -136,9 +136,9 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) =
flexGrow: !isCentered ? 1 : undefined, flexGrow: !isCentered ? 1 : undefined,
}} }}
/> />
)} ) : null}
{props.children} {props.children}
{expirationLength && expirationTimestamp && ( {expirationLength && expirationTimestamp ? (
<ExpireTimer <ExpireTimer
expirationLength={expirationLength} expirationLength={expirationLength}
expirationTimestamp={expirationTimestamp} expirationTimestamp={expirationTimestamp}
@ -149,7 +149,7 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) =
textAlign: !isCentered ? 'end' : undefined, textAlign: !isCentered ? 'end' : undefined,
}} }}
/> />
)} ) : null}
</StyledReadableMessage> </StyledReadableMessage>
); );
}; };

Loading…
Cancel
Save