Merge branch 'deploy/epic' of https://github.com/dappforce/grillchat …

…into deploy/epic
dappforce · Jul 15, 2024 · 6a3201e · 6a3201e
2 parents 5097c10 + 74f890d
commit 6a3201e
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 26 deletions.
diff --git a/src/components/chats/ChatItem/ChatItem.tsx b/src/components/chats/ChatItem/ChatItem.tsx
@@ -30,6 +30,7 @@ export type ChatItemProps = Omit<ComponentProps<'div'>, 'children'> & {
   hubId: string
   bg?: 'background-light' | 'background'
   showApproveButton?: boolean
+  disableSuperLike?: boolean
   menuIdPrefix?: string
 }
 
@@ -41,6 +42,7 @@ export default function ChatItem({
   enableChatMenu = true,
   chatId,
   hubId,
+  disableSuperLike,
   bg = 'background-light',
   showApproveButton,
   enableProfileModal = true,
@@ -99,6 +101,7 @@ export default function ChatItem({
                     config={config}
                     superLikeProps={props}
                     messageBubbleId={messageBubbleId}
+                    disableSuperLike={disableSuperLike}
                   >
                     {extensions && extensions.length > 0 ? (
                       <ChatItemWithExtension
@@ -107,6 +110,7 @@ export default function ChatItem({
                         isMyMessage={isMyMessage}
                         chatId={chatId}
                         hubId={hubId}
+                        disableSuperLike={disableSuperLike}
                         enableProfileModal={enableProfileModal}
                         bg={bg}
                         showApproveButton={showApproveButton}
@@ -116,6 +120,7 @@ export default function ChatItem({
                         message={message}
                         isMyMessage={isMyMessage}
                         scrollToMessage={scrollToMessage}
+                        disableSuperLike={disableSuperLike}
                         chatId={chatId}
                         enableProfileModal={enableProfileModal}
                         hubId={hubId}
@@ -154,6 +159,7 @@ type ChatItemMenuWrapperProps = {
     postRewards?: PostRewards | undefined | null
   }
   children: React.ReactNode
+  disableSuperLike?: boolean
   messageBubbleId?: string
 }
 
@@ -185,6 +191,7 @@ const ChatItemMenuWrapper = ({
   superLikeProps,
   children,
   messageBubbleId,
+  disableSuperLike,
 }: ChatItemMenuWrapperProps) => {
   const containerRef = useRef<HTMLDivElement>(null)
   const { toggleDisplay, referenceProps } = config || {}
@@ -238,7 +245,7 @@ const ChatItemMenuWrapper = ({
         e.preventDefault()
         e.stopPropagation()
 
-        if (!isDisabled && !hasILiked) {
+        if (!isDisabled && !disableSuperLike && !hasILiked) {
           haptic?.result?.impactOccurred('medium')
           handleClick()
           animateHeart(e.clientX, e.clientY)

diff --git a/src/components/chats/ChatItem/variants/DefaultChatItem.tsx b/src/components/chats/ChatItem/variants/DefaultChatItem.tsx
@@ -26,6 +26,7 @@ export default function DefaultChatItem({
   hubId,
   message,
   isMyMessage,
+  disableSuperLike,
   scrollToMessage,
   enableProfileModal = true,
   bg = 'background',
@@ -101,30 +102,6 @@ export default function DefaultChatItem({
           <Linkify
             options={{
               render: ({ content, attributes }) => {
-                // const href = attributes.href || ''
-                // const baseUrl = 'https://epicapp.net'
-                // if (href.startsWith(baseUrl)) {
-                //   content = content.replace(/(https?:\/\/)?(www\.)?/, '')
-                // }
-
-                // const messageLinkRegex =
-                //   /^(https?:\/\/)?(www\.)?epicapp\.net\/([^\/?#]+)\/([^\/?#]+)\/([^\/?#]+)\/?$/i
-                // const match = href.match(messageLinkRegex)
-                // const messageId = match?.[5]
-                // if (messageId) {
-                //   return (
-                //     <MessageLink
-                //       attributes={attributes as any}
-                //       isMyMessage={isMyMessage}
-                //       content={content}
-                //       chatId={chatId}
-                //       messageId={messageId}
-                //       hubId={hubId}
-                //       scrollToMessage={scrollToMessage}
-                //     />
-                //   )
-                // }
-
                 return (
                   <LinkRedirect
                     attributes={attributes as any}
@@ -171,6 +148,7 @@ export default function DefaultChatItem({
             isMyMessage={isMyMessage}
             withPostReward
             postId={message.id}
+            disabled={disableSuperLike}
           />
           <span className='pointer-events-none ml-4 select-none opacity-0'>
             {relativeTime()}

diff --git a/src/components/chats/ChatItem/variants/EmojiChatItem.tsx b/src/components/chats/ChatItem/variants/EmojiChatItem.tsx
@@ -30,6 +30,7 @@ export default function EmojiChatItem({
   isMyMessage,
   scrollToMessage,
   chatId,
+  disableSuperLike,
   enableProfileModal = true,
   hubId,
   ...props
@@ -132,6 +133,7 @@ export default function EmojiChatItem({
       <SuperLike
         isMyMessage={isMyMessage}
         withPostReward
+        disabled={disableSuperLike}
         className={cx(
           !isMyMessage && 'mt-1.5',
           isMyMessage && 'flex-row-reverse'

diff --git a/src/components/chats/ChatItem/variants/types.ts b/src/components/chats/ChatItem/variants/types.ts
@@ -6,6 +6,7 @@ export type ChatItemContentProps = ComponentProps<'div'> & {
   chatId: string
   hubId: string
   message: PostData
+  disableSuperLike?: boolean
   isMyMessage: boolean
   scrollToMessage?: ScrollToMessage
   bg?: 'background-light' | 'background'

diff --git a/src/components/chats/ChatList/ChatItemContainer.tsx b/src/components/chats/ChatList/ChatItemContainer.tsx
@@ -14,6 +14,7 @@ export type ChatItemContainerProps = Omit<ChatItemProps, 'isMyMessage'> & {
   enableProfileModal?: boolean
   showBlockedMessage?: boolean
   chatId: string
+  disableSuperLike?: boolean
   hubId: string
   showApproveButton?: boolean
 }
@@ -25,6 +26,7 @@ function ChatItemContainer(
     hubId,
     showBlockedMessage,
     enableProfileModal = true,
+    disableSuperLike,
     showApproveButton,
     ...props
   }: ChatItemContainerProps,
@@ -75,6 +77,7 @@ function ChatItemContainer(
         chatId={chatId}
         isMyMessage={isMyMessage}
         enableProfileModal={enableProfileModal}
+        disableSuperLike={disableSuperLike}
         hubId={hubId}
         showApproveButton={showApproveButton}
       />

diff --git a/src/components/chats/ChatList/ChatItemWithMenu.tsx b/src/components/chats/ChatList/ChatItemWithMenu.tsx
@@ -17,6 +17,7 @@ export type ChatItemWithMenuProps = {
   hubId: string
   enableProfileModal?: boolean
   showBlockedMessage?: boolean
+  disableSuperLike?: boolean
   scrollToMessage?: ScrollToMessage
   showApproveButton?: boolean
   menuIdPrefix?: string
@@ -28,6 +29,7 @@ function InnerChatItemWithMenu({
   hubId,
   enableProfileModal = true,
   showBlockedMessage,
+  disableSuperLike,
   scrollToMessage,
   showApproveButton,
   menuIdPrefix,
@@ -50,6 +52,7 @@ function InnerChatItemWithMenu({
             message={message}
             showBlockedMessage={showBlockedMessage}
             messageBubbleId={getMessageElementId(message.id)}
+            disableSuperLike={disableSuperLike}
             enableProfileModal={enableProfileModal}
             scrollToMessage={scrollToMessage}
             showApproveButton={showApproveButton}

diff --git a/src/components/chats/ChatList/ChatList.tsx b/src/components/chats/ChatList/ChatList.tsx
@@ -28,6 +28,7 @@ export type ChatListProps = ComponentProps<'div'> & {
   scrollContainerRef?: React.RefObject<HTMLDivElement>
   scrollableContainerClassName?: string
   hubId: string
+  disableSuperLike?: boolean
   chatId: string
   onlyDisplayUnapprovedMessages?: boolean
   newMessageNoticeClassName?: string
@@ -55,6 +56,7 @@ function ChatListContent({
   hubId,
   chatId,
   scrollContainerRef: _scrollContainerRef,
+  disableSuperLike,
   newMessageNoticeClassName,
   onlyDisplayUnapprovedMessages,
   ...props
@@ -210,6 +212,7 @@ function ChatListContent({
                         chatId={chatId}
                         hubId={hubId}
                         message={message}
+                        disableSuperLike={disableSuperLike}
                         scrollToMessage={scrollToMessage}
                         showApproveButton={onlyDisplayUnapprovedMessages}
                       />

diff --git a/src/components/chats/ChatRoom/ChatRoom.tsx b/src/components/chats/ChatRoom/ChatRoom.tsx
@@ -19,6 +19,7 @@ export type ChatRoomProps = ComponentProps<'div'> & {
   asContainer?: boolean
   scrollableContainerClassName?: string
   customAction?: ReactNode
+  disableSuperLike?: boolean
   chatId: string
   hubId: string
   topElement?: ReactNode
@@ -31,6 +32,7 @@ export default function ChatRoom({
   scrollableContainerClassName,
   customAction,
   chatId,
+  disableSuperLike,
   hubId,
   topElement,
   onlyDisplayUnapprovedMessages,
@@ -46,6 +48,7 @@ export default function ChatRoom({
         onlyDisplayUnapprovedMessages={onlyDisplayUnapprovedMessages}
         topElement={topElement}
         hubId={hubId}
+        disableSuperLike={disableSuperLike}
         newMessageNoticeClassName={cx(replyTo && 'bottom-2')}
         chatId={chatId}
         asContainer={asContainer}

diff --git a/src/components/content-staking/SuperLike.tsx b/src/components/content-staking/SuperLike.tsx
@@ -31,6 +31,7 @@ export type SuperLikeProps = ComponentProps<'div'> & {
   postRewardClassName?: string
   isMyMessage?: boolean
   showWhenZero?: boolean
+  disabled?: boolean
 }
 
 export function SuperLikeWrapper({
@@ -223,6 +224,7 @@ export default function SuperLike({
   isMyMessage,
   withPostReward,
   showWhenZero,
+  disabled,
   ...props
 }: SuperLikeProps) {
   const myAddress = useMyMainAddress()
@@ -263,7 +265,7 @@ export default function SuperLike({
                 ? { backgroundPosition: '-1px', backgroundSize: '105%' }
                 : {}
             }
-            disabled={isDisabled}
+            disabled={isDisabled || disabled}
           />
         )
         return (

diff --git a/src/components/extensions/common/CommonChatItem.tsx b/src/components/extensions/common/CommonChatItem.tsx
@@ -77,6 +77,7 @@ export default function CommonChatItem({
   hubId,
   bg = 'background',
   showApproveButton,
+  disableSuperLike,
   dummySuperLike,
 }: CommonChatItemProps) {
   const { inView, ref } = useInView({
@@ -381,6 +382,7 @@ export default function CommonChatItem({
             showWhenZero={showSuperLikeWhenZero}
             withPostReward
             postId={message.id}
+            disabled={disableSuperLike}
             className='mb-1.5 ml-2.5 mt-1 self-start'
           />
         ) : (

diff --git a/src/components/extensions/types.ts b/src/components/extensions/types.ts
@@ -7,6 +7,7 @@ export type ExtensionChatItemProps = {
   isMyMessage?: boolean
   scrollToMessage?: (messageId: string) => Promise<void>
   chatId: string
+  disableSuperLike?: boolean
   hubId: string
   enableProfileModal?: boolean
   bg?: 'background' | 'background-light' | 'background-lighter'

diff --git a/src/modules/chat/HomePage/ChatContent.tsx b/src/modules/chat/HomePage/ChatContent.tsx
@@ -89,6 +89,7 @@ export default function ChatContent({ className }: Props) {
         chatId={chatId}
         hubId={env.NEXT_PUBLIC_MAIN_SPACE_ID}
         className='overflow-hidden'
+        disableSuperLike={selectedTab === 'contest' && !!isContestEnded}
         onlyDisplayUnapprovedMessages={shouldShowUnapproved}
         customAction={
           isCannotPost ? (