diff --git a/src/view/com/notifications/FeedItem.tsx b/src/view/com/notifications/FeedItem.tsx
index 00e56e1cc1..ff5ec9f504 100644
--- a/src/view/com/notifications/FeedItem.tsx
+++ b/src/view/com/notifications/FeedItem.tsx
@@ -22,7 +22,7 @@ import {
import {NotificationsFeedItemModel} from 'state/models/feeds/notifications'
import {PostThreadModel} from 'state/models/content/post-thread'
import {s, colors} from 'lib/styles'
-import {ago} from 'lib/strings/time'
+import {niceDate} from 'lib/strings/time'
import {sanitizeDisplayName} from 'lib/strings/display-names'
import {sanitizeHandle} from 'lib/strings/handles'
import {pluralize} from 'lib/strings/helpers'
@@ -38,6 +38,7 @@ import {usePalette} from 'lib/hooks/usePalette'
import {useAnimatedValue} from 'lib/hooks/useAnimatedValue'
import {formatCount} from '../util/numeric/format'
import {makeProfileLink} from 'lib/routes/links'
+import {TimeElapsed} from '../util/TimeElapsed'
const MAX_AUTHORS = 5
@@ -88,7 +89,7 @@ export const FeedItem = observer(function FeedItemImpl({
}, [item])
const onToggleAuthorsExpanded = () => {
- setAuthorsExpanded(!isAuthorsExpanded)
+ setAuthorsExpanded(currentlyExpanded => !currentlyExpanded)
}
const authors: Author[] = useMemo(() => {
@@ -179,7 +180,6 @@ export const FeedItem = observer(function FeedItemImpl({
}
return (
- // eslint-disable-next-line react-native-a11y/no-nested-touchables
- 1 ? onToggleAuthorsExpanded : undefined}
- accessible={false}>
+ 1}
+ onToggleAuthorsExpanded={onToggleAuthorsExpanded}>
) : undefined}
{action}
- {ago(item.indexedAt)}
+
+ {({timeElapsed}) => (
+
+ {' ' + timeElapsed}
+
+ )}
+
-
+
{item.isLike || item.isRepost || item.isQuote ? (
) : null}
@@ -250,6 +256,29 @@ export const FeedItem = observer(function FeedItemImpl({
)
})
+function ExpandListPressable({
+ hasMultipleAuthors,
+ children,
+ onToggleAuthorsExpanded,
+}: {
+ hasMultipleAuthors: boolean
+ children: React.ReactNode
+ onToggleAuthorsExpanded: () => void
+}) {
+ if (hasMultipleAuthors) {
+ return (
+
+ {children}
+
+ )
+ } else {
+ return <>{children}>
+ }
+}
+
function CondensedAuthorsList({
visible,
authors,
@@ -466,7 +495,9 @@ const styles = StyleSheet.create({
paddingTop: 4,
paddingLeft: 36,
},
-
+ expandedAuthorsTrigger: {
+ zIndex: 1,
+ },
expandedAuthorsCloseBtn: {
flexDirection: 'row',
alignItems: 'center',