resolve merge conflicts

src/components/ChatWindow.tsx

@@ -24,6 +24,8 @@ import WindowButton from "./WindowButton";
 import PDFButton from "./pdf/PDFButton";
 import FadeIn from "./motions/FadeIn";
 import Combobox from "./Combobox";
+import type { Message } from "../types/agentTypes";
+import clsx from "clsx";
 
 interface ChatWindowProps extends HeaderProps {
   children?: ReactNode;
@@ -184,6 +186,17 @@ const MacWindowHeader = (props: HeaderProps) => {
     <PDFButton key="PDF" name="Save as PDF" messages={props.messages} />,
   ];
 
+  if (props.onSave) {
+    exportOptions.push(
+      <WindowButton
+        delay={0.25}
+        onClick={() => props.onSave?.("db")}
+        icon={<FaSave size={12} />}
+        name={"Save"}
+      />
+    );
+  }
+
   return (
     <div className="flex items-center gap-1 overflow-hidden rounded-t-3xl p-3">
       <PopIn delay={0.4}>
@@ -195,10 +208,12 @@ const MacWindowHeader = (props: HeaderProps) => {
       <PopIn delay={0.6}>
         <div className="h-3 w-3 rounded-full bg-green-500" />
       </PopIn>
-      <div className="invisible flex flex-grow font-mono text-sm font-bold text-gray-600 sm:ml-2 md:visible">
+      <Expand
+        delay={1}
+        className="invisible flex flex-grow font-mono text-sm font-bold text-gray-600 sm:ml-2 md:visible"
+      >
         {props.title}
-      </div>
-
+      </Expand>
       <Combobox
         value="Export"
         onChange={() => null}

src/components/pdf/PDFButton.tsx

@@ -2,7 +2,6 @@ import WindowButton from "../WindowButton";
 import { FaFilePdf, FaRegFilePdf, FaSave } from "react-icons/fa";
 import { pdf } from "@react-pdf/renderer";
 import React, { memo } from "react";
-import type { Message } from "../ChatWindow";
 import MyDocument from "./MyDocument";
 import type { Message } from "../../types/agentTypes";