Change displayed time based on approval

dappforce · Jul 12, 2024 · 04765a8 · 04765a8
1 parent 2f92b7e
commit 04765a8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/@types/subsocial.d.ts b/src/@types/subsocial.d.ts
@@ -102,7 +102,7 @@ declare module '@subsocial/api/types' {
         dataType?: 'persistent' | 'optimistic' | 'offChain'
         parentPostId?: string | null
         approvedInRootPost?: boolean
-        approvedInRootPostAtTime: string
+        approvedInRootPostAtTime: number
       },
     PostContent
   > & { requestedId?: string }

diff --git a/src/components/extensions/common/CommonChatItem.tsx b/src/components/extensions/common/CommonChatItem.tsx
@@ -90,7 +90,13 @@ export default function CommonChatItem({
   const firstReasonId = reasons?.[0].id
 
   const { struct, content } = message
-  const { ownerId, createdAtTime, dataType, isUpdated } = struct
+  const {
+    ownerId,
+    createdAtTime,
+    approvedInRootPostAtTime,
+    dataType,
+    isUpdated,
+  } = struct
   const { body } = content || {}
   const repliedMessageId = getRepliedMessageId(message)
   const { data: superLikeCount } = getSuperLikeCountQuery.useQuery(message.id)
@@ -118,10 +124,13 @@ export default function CommonChatItem({
       ? children({ isMyMessage, relativeTime, isSent })
       : children
 
+  const displayedTime = showApproveButton
+    ? createdAtTime
+    : approvedInRootPostAtTime
   const otherMessageCheckMarkElement = (className?: string) => (
     <ChatRelativeTime
       isUpdated={isUpdated}
-      createdAtTime={createdAtTime}
+      createdAtTime={displayedTime}
       className={cx(
         'text-xs text-text-muted',
         isMyMessage && 'text-text-muted-on-primary-light',
@@ -139,7 +148,7 @@ export default function CommonChatItem({
     <div className={cx('flex items-center gap-1 self-end', className)}>
       <ChatRelativeTime
         isUpdated={isUpdated}
-        createdAtTime={createdAtTime}
+        createdAtTime={displayedTime}
         className={cx(
           'text-xs text-text-muted-on-primary-light',
           isMyMessage && 'text-text-muted-on-primary-light',

diff --git a/src/components/modals/LikeIntroModal.tsx b/src/components/modals/LikeIntroModal.tsx
@@ -21,6 +21,7 @@ const DUMMY_MESSAGES: { message: PostData; superLikeCount: number }[] = [
     message: {
       id: '0x123',
       struct: {
+        approvedInRootPostAtTime: dayjs().subtract(1, 'day').toDate().getTime(),
         id: '0x123',
         createdAtBlock: 0,
         createdAtTime: dayjs().subtract(1, 'day').toDate().getTime(),
@@ -59,6 +60,7 @@ const DUMMY_MESSAGES: { message: PostData; superLikeCount: number }[] = [
     message: {
       id: '0x123',
       struct: {
+        approvedInRootPostAtTime: dayjs().subtract(1, 'day').toDate().getTime(),
         id: '0x123',
         createdAtBlock: 0,
         createdAtTime: dayjs().subtract(1, 'day').toDate().getTime(),

diff --git a/src/services/datahub/mappers.ts b/src/services/datahub/mappers.ts
@@ -52,7 +52,7 @@ export const mapDatahubPostFragment = (
     sharesCount: 0,
     spaceId: '',
     approvedInRootPost: post.approvedInRootPost ?? false,
-    approvedInRootPostAtTime: post.approvedInRootPostAtTime ?? '',
+    approvedInRootPostAtTime: new Date(post.approvedInRootPostAtTime).getTime(),
     isUpdated: false,
     rootPostId: post.rootPost?.persistentId ?? '',
     parentPostId: null,