Deploy/epic

src/components/chats/ChatItem/profilePosts/ProfileProstsListModal.tsx

@@ -1,27 +1,52 @@
 import AddressAvatar from '@/components/AddressAvatar'
 import Button from '@/components/Button'
 import Name from '@/components/Name'
+import { env } from '@/env.mjs'
 import useAuthorizedForModeration from '@/hooks/useAuthorizedForModeration'
+import { TabButton } from '@/modules/chat/HomePage/ChatTabs'
 import { getModerationReasonsQuery } from '@/services/datahub/moderation/query'
 import { getPaginatedPostIdsByPostIdAndAccount } from '@/services/datahub/posts/queryByAccount'
 import { useSendEvent } from '@/stores/analytics'
 import { useProfilePostsModal } from '@/stores/profile-posts-modal'
 import { cx } from '@/utils/class-names'
 import { Transition } from '@headlessui/react'
+import { useRouter } from 'next/router'
+import { useEffect, useState } from 'react'
 import { createPortal } from 'react-dom'
 import { HiOutlineChevronLeft } from 'react-icons/hi2'
 import SkeletonFallback from '../../../SkeletonFallback'
 import { useModerateWithSuccessToast } from '../ChatItemMenus'
 import ProfilePostsList from './ProfilePostsList'
 
-const ProfilePostsListModal = () => {
+type Tab = 'all' | 'contest'
+
+type ProfilePostsListModalProps = {
+  tabsConfig?: {
+    defaultTab: Tab
+  }
+}
+
+const defaultHubId = env.NEXT_PUBLIC_MAIN_SPACE_ID
+const chatIdByTab = {
+  all: env.NEXT_PUBLIC_MAIN_CHAT_ID,
+  contest: env.NEXT_PUBLIC_CONTEST_CHAT_ID,
+}
+
+const ProfilePostsListModal = ({ tabsConfig }: ProfilePostsListModalProps) => {
+  const [selectedTab, setSelectedTab] = useState<Tab>(
+    tabsConfig?.defaultTab || 'all'
+  )
+
+  const router = useRouter()
+
   const {
     isOpen,
     closeModal,
     messageId = '',
-    chatId = '',
-    hubId = '',
+    chatId = tabsConfig ? chatIdByTab[tabsConfig.defaultTab] : '',
+    hubId = tabsConfig ? defaultHubId : '',
     address = '',
+    openModal,
   } = useProfilePostsModal()
 
   const { mutate: moderate } = useModerateWithSuccessToast(messageId, chatId)
@@ -52,6 +77,10 @@ const ProfilePostsListModal = () => {
     closeModal()
   }
 
+  useEffect(() => {
+    closeModal()
+  }, [closeModal, router.asPath])
+
   return createPortal(
     <>
       <Transition
@@ -119,6 +148,41 @@ const ProfilePostsListModal = () => {
             )}
           </div>
           <div className='relative mx-auto flex h-full max-h-full min-h-[400px] w-full flex-col items-center px-4'>
+            {tabsConfig && (
+              <div className='sticky top-14 mb-2 grid h-12 w-full grid-flow-col items-center gap-4 bg-background px-4'>
+                <TabButton
+                  tab='all'
+                  selectedTab={selectedTab}
+                  setSelectedTab={(tab) => {
+                    setSelectedTab(tab as any)
+                    openModal({
+                      address,
+                      chatId: chatIdByTab[tab as Tab],
+                      hubId: defaultHubId,
+                    })
+                  }}
+                  size={'md'}
+                >
+                  All memes
+                </TabButton>
+                <TabButton
+                  className='flex flex-col items-center justify-center text-center'
+                  tab='contest'
+                  selectedTab={selectedTab}
+                  setSelectedTab={(tab) => {
+                    setSelectedTab(tab as any)
+                    openModal({
+                      address,
+                      chatId: chatIdByTab[tab as Tab],
+                      hubId: defaultHubId,
+                    })
+                  }}
+                  size={'md'}
+                >
+                  Contest
+                </TabButton>
+              </div>
+            )}
             <ProfilePostsList address={address} chatId={chatId} hubId={hubId} />
           </div>
         </div>

src/components/chats/ChatList/ChatItemContainer.tsx

@@ -38,13 +38,7 @@ function ChatItemContainer(
     message,
     chatId
   )
-  const isMessageBlockedInOriginalHub = useIsMessageBlocked(
-    message.struct.spaceId ?? '',
-    message,
-    chatId
-  )
-  const isMessageBlocked =
-    isMessageBlockedInCurrentHub || isMessageBlockedInOriginalHub
+  const isMessageBlocked = isMessageBlockedInCurrentHub
 
   const { content } = message
   const { body, extensions } = content || {}

src/components/chats/hooks/usePaginatedMessageIds.ts

@@ -32,11 +32,16 @@ export default function usePaginatedMessageIds({
   const myAddress = useMyMainAddress() ?? ''
   // because from server it doesn't have access to myAddress, so we need to use the data without users' unapproved posts as placeholder
   const { data: placeholderData } =
-    getPaginatedPostIdsByPostId.useInfiniteQuery({
-      postId: chatId,
-      onlyDisplayUnapprovedMessages: !!onlyDisplayUnapprovedMessages,
-      myAddress: '',
-    })
+    getPaginatedPostIdsByPostId.useInfiniteQuery(
+      {
+        postId: chatId,
+        onlyDisplayUnapprovedMessages: !!onlyDisplayUnapprovedMessages,
+        myAddress: '',
+      },
+      {
+        enabled: false,
+      }
+    )
   const { data, fetchNextPage, isLoading } =
     getPaginatedPostIdsByPostId.useInfiniteQuery(
       {

src/components/content-staking/SuperLike.tsx

@@ -1,4 +1,5 @@
 import Thumbsup from '@/assets/emojis/thumbsup.png'
+import { env } from '@/env.mjs'
 import { useIsAddressBlockedInApp } from '@/hooks/useIsAddressBlockedInApp'
 import { getPostQuery, getServerTimeQuery } from '@/services/api/query'
 import { useCreateSuperLike } from '@/services/datahub/content-staking/mutation'
@@ -63,6 +64,13 @@ export function SuperLikeWrapper({
   const { mutate: createSuperLike } = useCreateSuperLike()
   const { data: superLikeCount } = getSuperLikeCountQuery.useQuery(postId)
 
+  const isInContest =
+    post?.struct.rootPostId === env.NEXT_PUBLIC_CONTEST_CHAT_ID
+  const isContestEnded = dayjs().isAfter(
+    dayjs(env.NEXT_PUBLIC_CONTEST_END_TIME)
+  )
+  const isInEndedContest = isInContest && isContestEnded
+
   const { canBeLiked: canBeSuperliked, isLoading: loadingCanBeLiked } =
     useClientValidationOfPostSuperLike(post?.struct.createdAtTime ?? 0)
 
@@ -94,7 +102,8 @@ export function SuperLikeWrapper({
       loadingTodayCount ||
       loadingCanBeLiked ||
       hasLikedMoreThanLimit ||
-      !message) &&
+      !message ||
+      isInEndedContest) &&
     !hasILiked
 
   let disabledCause = ''
@@ -106,6 +115,7 @@ export function SuperLikeWrapper({
     disabledCause = `You've liked 10 ${entity} today. Come back tomorrow for more fun!`
   else if (!canBeSuperliked)
     disabledCause = `You cannot like ${entity}s that are older than 7 days`
+  else if (isInEndedContest) disabledCause = `Contest has ended`
 
   const handleClick = async (e?: React.MouseEvent<HTMLButtonElement>) => {
     // prevent chat menu from opening when clicking this button

src/components/extensions/common/CommonChatItem.tsx

@@ -11,6 +11,7 @@ import { getRepliedMessageId } from '@/components/chats/utils'
 import SuperLike, {
   SuperLikeButton,
 } from '@/components/content-staking/SuperLike'
+import { env } from '@/env.mjs'
 import useAuthorizedForModeration from '@/hooks/useAuthorizedForModeration'
 import useIsMessageBlocked from '@/hooks/useIsMessageBlocked'
 import useIsModerationAdmin from '@/hooks/useIsModerationAdmin'
@@ -24,6 +25,7 @@ import { isMessageSent } from '@/services/subsocial/commentIds/optimistic'
 import { useMyMainAddress } from '@/stores/my-account'
 import { cx } from '@/utils/class-names'
 import { getTimeRelativeToNow } from '@/utils/date'
+import dayjs from 'dayjs'
 import Linkify from 'linkify-react'
 import { useInView } from 'react-intersection-observer'
 import { ExtensionChatItemProps } from '../types'
@@ -428,18 +430,24 @@ function ApproveUserButton({
 
 function ApproveMemeButton({
   messageId,
+  chatId,
 }: {
   chatId: string
   messageId: string
 }) {
   const { mutate, isLoading } = useApproveMessage()
+  const isInContest = chatId === env.NEXT_PUBLIC_CONTEST_CHAT_ID
+  const isContestEnded = dayjs().isAfter(env.NEXT_PUBLIC_CONTEST_END_TIME)
+  const isInEndedContest = isInContest && isContestEnded
+
   return (
     <Button
       variant='greenOutline'
       size='sm'
       className='whitespace-nowrap px-0 text-xs disabled:!border-text-muted disabled:!text-text-muted disabled:!ring-text-muted'
       loadingText='Approving...'
       isLoading={isLoading}
+      disabled={isInEndedContest}
       onClick={(e) => {
         e.stopPropagation()
         mutate({

src/components/layouts/MobileNavigation.tsx

@@ -195,8 +195,13 @@ function NewMemeNotice() {
   return null
 }
 
-const RedDot = () => (
-  <div className='absolute right-0 top-0 h-2 w-2 translate-x-[150%] rounded-full bg-red-500' />
+export const RedDot = ({ className }: { className?: string }) => (
+  <div
+    className={cx(
+      'absolute right-0 top-0 h-2 w-2 translate-x-[150%] rounded-full bg-red-500',
+      className
+    )}
+  />
 )
 
 export default MobileNavigation

src/components/modals/DailyRewardModal/index.tsx

@@ -62,14 +62,18 @@ export default function DailyRewardModal({
         enterTo='opacity-100'
         leaveFrom='h-auto'
         leaveTo='opacity-0 !duration-150'
-        onClick={close}
+        onClick={(e) => {
+          e.stopPropagation()
+          close()
+        }}
       />
       {isOpenAnimation && isOpen && selectedClaim && (
         <RewardAnimation claim={selectedClaim} close={closeModal} />
       )}
       <Transition
         show={isOpen && !isOpenAnimation}
         appear
+        onClick={(e) => e.stopPropagation()}
         className='fixed bottom-0 left-1/2 z-40 mx-auto flex h-auto w-full max-w-screen-md -translate-x-1/2 rounded-t-[10px] bg-background-light outline-none transition duration-300'
         enterFrom={cx('opacity-0 translate-y-48')}
         enterTo='opacity-100 translate-y-0'

src/components/referral/CustomLink.tsx

@@ -1,4 +1,5 @@
 import Link, { LinkProps } from 'next/link'
+import { useRouter } from 'next/router'
 import urlJoin from 'url-join'
 import { useReferralId } from './ReferralUrlChanger'
 
@@ -14,6 +15,7 @@ export default function ProfileLinkCustomLink({
 }) {
   const refId = useReferralId()
   const { href, as } = props
+  const { pathname } = useRouter()
 
   if (!href) {
     return <span {...props} />
@@ -31,7 +33,19 @@ export default function ProfileLinkCustomLink({
     return <a {...props} href={props.href} />
   }
 
-  return <Link {...props} href={href} />
+  return (
+    <Link
+      {...props}
+      onClick={(e) => {
+        if (pathname === href) {
+          e.stopPropagation()
+          e.preventDefault()
+        }
+        props.onClick?.(e)
+      }}
+      href={href}
+    />
+  )
 }
 
 function augmentLink(link: LinkProps['href'], refId: string) {