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 #301

Browse Source
This commit is contained in:
Zhiyuan Zheng
2022-06-10 17:02:04 +02:00
parent be4fb53d03
commit 72eee3600f
4 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,11 @@
import Icon from '@components/Icon'
import RelativeTime from '@components/RelativeTime'
import CustomText from '@components/Text'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { useTranslation } from 'react-i18next'
import { FormattedDate, FormattedRelativeTime } from 'react-intl'
import { FormattedDate } from 'react-intl'
export interface Props {
created_at: Mastodon.Status['created_at'] | number
@ -31,12 +32,7 @@ const HeaderSharedCreated = React.memo(
/>
</>
) : (
<FormattedRelativeTime
value={
-(new Date().getTime() - new Date(actualTime).getTime()) / 1000
}
updateIntervalInSeconds={1}
/>
<RelativeTime type='past' time={actualTime} />
)}
</CustomText>
{edited_at ? (

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

@ -4,6 +4,7 @@ import haptics from '@components/haptics'
import Icon from '@components/Icon'
import { displayMessage } from '@components/Message'
import { ParseEmojis } from '@components/Parse'
import RelativeTime from '@components/RelativeTime'
import CustomText from '@components/Text'
import {
MutationVarsTimelineUpdateStatusProperty,
@ -16,8 +17,7 @@ import { useTheme } from '@utils/styles/ThemeManager'
import { maxBy } from 'lodash'
import React, { useCallback, useMemo, useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { FormattedRelativeTime } from 'react-intl'
import { Pressable, StyleSheet, Text, View } from 'react-native'
import { Pressable, View } from 'react-native'
import { useQueryClient } from 'react-query'
export interface Props {
@ -289,15 +289,7 @@ const TimelinePoll: React.FC<Props> = ({
return (
<Trans
i18nKey='componentTimeline:shared.poll.meta.expiration.until'
components={[
<FormattedRelativeTime
value={
(new Date(poll.expires_at).getTime() - new Date().getTime()) /
1000
}
updateIntervalInSeconds={1}
/>
]}
components={[<RelativeTime type='future' time={poll.expires_at} />]}
/>
)
}