octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #337

Browse Source
This commit is contained in:
Zhiyuan Zheng
2022-06-14 23:43:11 +02:00
parent 04813cbc78
commit 7c0bcbeb06
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Timeline/Shared/HeaderShared/Created.tsx
View File

@ -32,7 +32,7 @@ const HeaderSharedCreated = React.memo(
/>
</>
) : (
<RelativeTime type='past' time={actualTime} />
<RelativeTime time={actualTime} />
)}
</CustomText>
{edited_at ? (

14
src/components/Timeline/Shared/Poll.tsx
View File

@ -269,7 +269,7 @@ const TimelinePoll: React.FC<Props> = ({
))
}, [theme, allOptions])
const pollVoteCounts = useMemo(() => {
const pollVoteCounts = () => {
if (poll.voters_count !== null) {
return (
t('shared.poll.meta.count.voters', { count: poll.voters_count }) + ' • '
@ -279,9 +279,9 @@ const TimelinePoll: React.FC<Props> = ({
t('shared.poll.meta.count.votes', { count: poll.votes_count }) + ' • '
)
}
}, [poll.voters_count, poll.votes_count])
}
const pollExpiration = useMemo(() => {
const pollExpiration = () => {
if (poll.expired) {
return t('shared.poll.meta.expiration.expired')
} else {
@ -289,12 +289,12 @@ const TimelinePoll: React.FC<Props> = ({
return (
<Trans
i18nKey='componentTimeline:shared.poll.meta.expiration.until'
components={[<RelativeTime type='future' time={poll.expires_at} />]}
components={[<RelativeTime time={poll.expires_at} />]}
/>
)
}
}
}, [theme, i18n.language, poll.expired, poll.expires_at])
}
return (
<View style={{ marginTop: StyleConstants.Spacing.M }}>
@ -312,8 +312,8 @@ const TimelinePoll: React.FC<Props> = ({
fontStyle='S'
style={{ flexShrink: 1, color: colors.secondary }}
>
{pollVoteCounts}
{pollExpiration}
{pollVoteCounts()}
{pollExpiration()}
</CustomText>
</View>
</View>