Merge branch 'main' into release

JinayJain · Apr 3, 2024 · a71b194 · a71b194
2 parents c80d355 + 2981e02
commit a71b194
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 412 deletions.
diff --git a/package.json b/package.json
@@ -28,9 +28,9 @@
     "react-icons": "^4.8.0",
     "react-markdown": "^8.0.x",
     "react-syntax-highlighter": "^15.5.0",
-    "rehype-katex": "^6.0.x",
-    "remark-breaks": "^4.0.0",
-    "remark-math": "^6.0.0",
+    "rehype-katex": "^6.0.2",
+    "remark-breaks": "^3.0.2",
+    "remark-math": "^5.1.1",
     "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store"
   },
   "devDependencies": {

diff --git a/src/components/ResponseBox.tsx b/src/components/ResponseBox.tsx
@@ -54,7 +54,7 @@ function ResponseBox({
   };
 
   return (
-    <Stack bg="blackAlpha.800" rounded="md" p={4} {...props}>
+    <Stack bg="blackAlpha.800" rounded="md" p={4} {...props} role="group">
       <Box>
         <ReactMarkdown
           remarkPlugins={[remarkBreaks, remarkMath]}

diff --git a/src/pages/App.tsx b/src/pages/App.tsx
@@ -71,6 +71,25 @@ function App() {
       />
 
       <Box overflowY="auto" maxH="100%">
+        {messages.length > 0 && (
+          <Center
+            as={motion.div}
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1 }}
+            exit={{ opacity: 0 }}
+            mb={2}
+          >
+            <Button
+              size="sm"
+              leftIcon={<NotAllowedIcon />}
+              onClick={reset}
+              colorScheme="red"
+            >
+              Reset Chat
+            </Button>
+          </Center>
+        )}
+
         {error && (
           <Box
             as={motion.div}
@@ -91,25 +110,6 @@ function App() {
         )}
 
         <Messages messages={messages} />
-
-        {/* {messages.length > 0 && (
-            <Center
-              as={motion.div}
-              initial={{ opacity: 0 }}
-              animate={{ opacity: 1 }}
-              exit={{ opacity: 0 }}
-              mt={2}
-            >
-              <Button
-                size="sm"
-                leftIcon={<NotAllowedIcon />}
-                onClick={reset}
-                colorScheme="red"
-              >
-                Reset Chat
-              </Button>
-            </Center>
-          )} */}
       </Box>
     </Box>
   );

diff --git a/src/util/ai.ts b/src/util/ai.ts
@@ -68,15 +68,7 @@ export function useChat() {
     [messages]
   );
 
-  const reset = useCallback(() => {
-    setMessages([
-      {
-        id: generateId(),
-        role: "system",
-        content: "You are a helpful assistant.",
-      },
-    ]);
-  }, []);
+  const reset = useCallback(() => setMessages([]), []);
 
   return {
     messages,