Merge branch '26919_chatscreen' into '1DEVT'
26919 chatscreen See merge request !31
Showing
2 changed files
with
6 additions
and
4 deletions
| ... | @@ -23,6 +23,8 @@ function App() { | ... | @@ -23,6 +23,8 @@ function App() { |
| 23 | // clear chats | 23 | // clear chats |
| 24 | function clearChat(){ | 24 | function clearChat(){ |
| 25 | setChatLog([]); | 25 | setChatLog([]); |
| 26 | setChatInput(""); | ||
| 27 | setStartedInteraction(false); | ||
| 26 | } | 28 | } |
| 27 | 29 | ||
| 28 | function getEngines(){ | 30 | function getEngines(){ |
| ... | @@ -111,7 +113,7 @@ function App() { | ... | @@ -111,7 +113,7 @@ function App() { |
| 111 | } | 113 | } |
| 112 | 114 | ||
| 113 | } | 115 | } |
| 114 | 116 | const [startedInteraction, setStartedInteraction] = useState(false); | |
| 115 | return ( | 117 | return ( |
| 116 | <div className="App"> | 118 | <div className="App"> |
| 117 | <SideMenu | 119 | <SideMenu |
| ... | @@ -127,6 +129,8 @@ function App() { | ... | @@ -127,6 +129,8 @@ function App() { |
| 127 | chatInput={chatInput} | 129 | chatInput={chatInput} |
| 128 | chatLog={chatLog} | 130 | chatLog={chatLog} |
| 129 | setChatInput={setChatInput} | 131 | setChatInput={setChatInput} |
| 132 | startedInteraction={startedInteraction} | ||
| 133 | setStartedInteraction={setStartedInteraction} | ||
| 130 | handleSubmit={handleSubmit} /> | 134 | handleSubmit={handleSubmit} /> |
| 131 | </div> | 135 | </div> |
| 132 | ); | 136 | ); | ... | ... |
| 1 | import React, { useState } from "react"; | 1 | import React, { useState } from "react"; |
| 2 | import SuggestedOptions from './suggestedOptions' | 2 | import SuggestedOptions from './suggestedOptions' |
| 3 | 3 | ||
| 4 | const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput}) => { | 4 | const ChatBox = ({chatLog, setChatInput, handleSubmit, chatInput, startedInteraction, setStartedInteraction}) => { |
| 5 | |||
| 6 | const [startedInteraction, setStartedInteraction] = useState(false); | ||
| 7 | 5 | ||
| 8 | return ( | 6 | return ( |
| 9 | <section className="chatbox"> | 7 | <section className="chatbox"> | ... | ... |
-
Please register or sign in to post a comment