matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'voting-limit' into 'main'

Browse Source 
Support infinite voting time for remote polls

See merge request soapbox-pub/soapbox!2853
This commit is contained in:
marcin mikołajczak
2024-01-11 22:43:40 +00:00
parent 7304f28acc 3406ce043c
commit ab56851ea5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/polls/poll-footer.tsx
View File

@ -33,9 +33,11 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
e.preventDefault();
};
const timeRemaining = poll.expired ?
intl.formatMessage(messages.closed) :
<RelativeTimestamp weight='medium' timestamp={poll.expires_at} futureDate />;
const timeRemaining = poll.expires_at && (
poll.expired ?
intl.formatMessage(messages.closed) :
<RelativeTimestamp weight='medium' timestamp={poll.expires_at} futureDate />
);
let votesCount = null;
@ -82,7 +84,7 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
{votesCount}
</Text>
{poll.expires_at && (
{poll.expires_at !== null && (
<>
<Text theme='muted'>&middot;</Text>
<Text weight='medium' theme='muted' data-testid='poll-expiration'>{timeRemaining}</Text>