+
-
+
{name}
{dayjs(new Date(date).toString()).fromNow()}
-
{content}
+
{content}
{/* {media.length
? media.map((item) =>
)
: ''} */}
@@ -111,7 +111,7 @@ const UserCard = ({ profilePic, name, content, date, myMessage, id, reactions, c
{/* //reaction */}
- {isReact && (
+ {/*{isReact && (
{emojis.map((emoji) => (
reactToMessage({ data: { messageId: id, emoji } })}>
@@ -119,8 +119,8 @@ const UserCard = ({ profilePic, name, content, date, myMessage, id, reactions, c
))}
- )}
- {reactions && (
+ )}*/}
+ {/*{reactions && (
{reactions.map((emoji) => (
@@ -128,7 +128,7 @@ const UserCard = ({ profilePic, name, content, date, myMessage, id, reactions, c
))}
- )}
+ )}*/}
)
}
@@ -193,7 +193,6 @@ const UserMessages = ({ name, profileCover, chatId, users, isRequest, isGroupCha
{chatMessages?.map((item: Message, idx: number) => {
const currentDate = formatDate(item.createdAt)
-
// Check if the date has changed
const shouldShowDateDivider = !dayjs(item.createdAt).isSame(previousDate, 'day')
previousDate = dayjs(item.createdAt)
diff --git a/src/components/organisms/CommunityGroupPostContainer/index.tsx b/src/components/organisms/CommunityGroupPostContainer/index.tsx
index 0ddee19..bb4cad7 100644
--- a/src/components/organisms/CommunityGroupPostContainer/index.tsx
+++ b/src/components/organisms/CommunityGroupPostContainer/index.tsx
@@ -31,7 +31,7 @@ function CommunityGroupPostContainer({ containerRef }: { containerRef: any }) {
error,
isFetching,
dataUpdatedAt,
- } = useGetCommunityGroupPost(communityId, communityGroupId, true, 2)
+ } = useGetCommunityGroupPost(communityId, communityGroupId, true, 10)
const [communityGroupPostDatas, setCommunityGroupPostDatas] = useState([])
// const communityGroupPostData = communityGroupPost?.pages.flatMap((page) => page?.finalPost) || []
diff --git a/src/components/organisms/NotificationContainer/index.tsx b/src/components/organisms/NotificationContainer/index.tsx
index 77d59f8..6fb8342 100644
--- a/src/components/organisms/NotificationContainer/index.tsx
+++ b/src/components/organisms/NotificationContainer/index.tsx
@@ -3,11 +3,7 @@ import React from 'react'
import NotificationTab from '../NotificationTabs/NotificationTab'
const NotificationContainer = () => {
- return (
-
-
-
- )
+ return
}
export default NotificationContainer
diff --git a/src/components/organisms/NotificationTabs/NotificationTab.tsx b/src/components/organisms/NotificationTabs/NotificationTab.tsx
index 09ba735..df97b38 100644
--- a/src/components/organisms/NotificationTabs/NotificationTab.tsx
+++ b/src/components/organisms/NotificationTabs/NotificationTab.tsx
@@ -19,7 +19,7 @@ export const notificationRoleAccess = {
}
const NotificationTab = () => {
- const { data: notificationData, fetchNextPage, isFetchingNextPage, hasNextPage } = useGetUserNotification(5, true)
+ const { data: notificationData, fetchNextPage, isFetchingNextPage, hasNextPage } = useGetUserNotification(10, true)
const notifications = notificationData?.pages.flatMap((page) => page.notifications) || []
@@ -45,7 +45,7 @@ const NotificationTab = () => {
}, [fetchNextPage, hasNextPage, isFetchingNextPage])
return (
-
+
{notifications?.map((item) => {
if (item.type == notificationRoleAccess.GROUP_INVITE) {
return
diff --git a/src/components/organisms/UserChats/index.tsx b/src/components/organisms/UserChats/index.tsx
index 9b0d3ac..7ade28c 100644
--- a/src/components/organisms/UserChats/index.tsx
+++ b/src/components/organisms/UserChats/index.tsx
@@ -43,7 +43,7 @@ const UserChats = ({ setSelectedChat, selectedChat, setIsRequest, currTabb, chat
users={[item?.users]}
isSeen={item?.latestMessage?.readByUsers?.includes(userData?.id || ' ')}
lastMessage={item?.latestMessage?.content}
- date={item?.latestMessage?.createdAt && dayjs(new Date(item?.latestMessage?.createdAt).toString()).fromNow()}
+ date={item?.latestMessage?.createdAt}
YourID={userData?.id}
unRead={item?.unreadMessagesCount}
/>
@@ -69,7 +69,7 @@ const UserChats = ({ setSelectedChat, selectedChat, setIsRequest, currTabb, chat
users={[item?.users]}
isSeen={item?.latestMessage?.readByUsers?.includes(userData?.id || ' ')}
lastMessage={item?.latestMessage?.content}
- date={item?.latestMessage?.createdAt && dayjs(new Date(item?.latestMessage?.createdAt).toString()).fromNow()}
+ date={item?.latestMessage?.createdAt}
YourID={userData?.id}
unRead={item?.unreadMessagesCount}
/>
@@ -91,7 +91,7 @@ const UserChats = ({ setSelectedChat, selectedChat, setIsRequest, currTabb, chat
users={[item?.users]}
isSeen={item?.latestMessage?.readByUsers?.includes(userData?.id || ' ')}
lastMessage={item?.latestMessage?.content}
- date={item?.latestMessage?.createdAt && dayjs(new Date(item?.latestMessage?.createdAt).toString()).fromNow()}
+ date={item?.latestMessage?.createdAt}
YourID={userData?.id}
unRead={item?.unreadMessagesCount}
/>
diff --git a/src/types/CommuityGroup/index.ts b/src/types/CommuityGroup/index.ts
index 4c4b7af..92a6f4b 100644
--- a/src/types/CommuityGroup/index.ts
+++ b/src/types/CommuityGroup/index.ts
@@ -20,7 +20,7 @@ export interface CommunityGroupType {
memberCount: number
communityGroupType: string
communityGroupAccess: string
- communityGroupCategory: string
+ communityGroupCategory: any
__v: number
adminUserProfile: AdminUserProfile
communityGroupLogoCoverUrl?: {
diff --git a/tailwind.config.js b/tailwind.config.js
index 95fad8c..fc79733 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -40,7 +40,7 @@ module.exports = {
'xs': '320px', // Custom extra small screen
'sm': '480px', // Max Mobile Scren
'md': '769px', // Tab screen
- 'lg': '1024px', // Max Tab Screen
+ 'lg': '1025px', // Max Tab Screen
'xl': '1280px', // Desktop Screen
'2xl': '1536px', // Custom double extra large screen
},