Skip to content

Commit 70d6670

Browse files
authored
Merge pull request #81 from RipeSeed/fix/delete-icon
Fix/delete icon
2 parents 606aa29 + 228e5c3 commit 70d6670

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/app/_components/ChatMessages.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export function ChatMessages() {
3939
setClearChat,
4040
updateStateMetadata,
4141
resetStateMetadata,
42+
addedAskRSmsg,
4243
} = useStore()
4344

4445
const queryClient = useQueryClient()
@@ -165,6 +166,7 @@ export function ChatMessages() {
165166
}
166167

167168
const sendMessage = async () => {
169+
addedAskRSmsg()
168170
const newMessage = stateMetadata?.message.trim()
169171
if (!newMessage.trim() || isPending || stateMetadata.chatId !== -1) {
170172
return false

src/app/_utils/store/store.ts

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ interface State {
99
isDeleteDialogOpen: boolean
1010
openAIKey: string
1111
clearChat: boolean
12+
askRSmsg: boolean
1213

1314
stateMetadata: {
1415
chatId: number
@@ -20,6 +21,8 @@ interface State {
2021
setChats: (newChats: Chat[]) => void
2122
setSelectedChat: (chat: Chat | undefined) => void
2223
toggleConfigOpen: () => void
24+
addedAskRSmsg: () => void
25+
clearAskRSmsg: () => void
2326
toggleDeleteDialogOpen: () => void
2427
setOpenAIKey: (key: string) => void
2528
setClearChat: (value: boolean) => void
@@ -34,6 +37,7 @@ const useStore = create<State>((set) => ({
3437
isDeleteDialogOpen: false,
3538
openAIKey: '',
3639
clearChat: false,
40+
askRSmsg: false,
3741

3842
stateMetadata: {
3943
chatId: 0,
@@ -46,6 +50,8 @@ const useStore = create<State>((set) => ({
4650
setSelectedChat: (chat) => set({ selectedChat: chat }),
4751
toggleConfigOpen: () =>
4852
set((state) => ({ isConfigOpen: !state.isConfigOpen })),
53+
addedAskRSmsg: () => set((state) => ({ askRSmsg: true })),
54+
clearAskRSmsg: () => set((state) => ({ askRSmsg: false })),
4955
toggleDeleteDialogOpen: () =>
5056
set((state) => ({ isDeleteDialogOpen: !state.isDeleteDialogOpen })),
5157
setOpenAIKey: (key) => set({ openAIKey: key }),

src/components/common/_components/ChatButtonsHeader.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default function ChatHeader() {
2828
const router = useRouter()
2929
const generalPaths = ['/ask-anything', '/ask-anything/*']
3030
const askRSPaths = ['/']
31+
const askRSmsg = useStore((state) => state.askRSmsg)
3132

3233
return (
3334
<div className='top-0 flex items-center justify-center border-b border-[#ACACAC] bg-[#E8E8E8] py-3 dark:border-[#1B1B21] dark:bg-[#363639] md:py-6'>
@@ -47,7 +48,9 @@ export default function ChatHeader() {
4748
</div>
4849
<div className='absolute right-0 mr-[14px]'>
4950
{isPath(askRSPaths, pathname) ? (
50-
<DeleteConfirmationDialog />
51+
askRSmsg ? (
52+
<DeleteConfirmationDialog />
53+
) : null
5154
) : (
5255
<ConfigDialogue />
5356
)}
@@ -65,6 +68,7 @@ const DeleteConfirmationDialog = () => {
6568
setClearChat,
6669
toggleConfigOpen,
6770
setOpenAIKey,
71+
clearAskRSmsg,
6872
} = useStore()
6973

7074
useEffect(() => {
@@ -81,6 +85,7 @@ const DeleteConfirmationDialog = () => {
8185
await deleteAllMessages_aRS()
8286
setClearChat(true)
8387
closeRef.current?.click()
88+
clearAskRSmsg()
8489
}
8590

8691
return (

0 commit comments

Comments
 (0)