From 9a8bdc7e29556ddfb325b1d18f6856dead2e6f72 Mon Sep 17 00:00:00 2001
From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 15:53:20 +0000
Subject: [PATCH 1/4] Updated app/mailbox/page.tsx

---
 app/mailbox/page.tsx | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/app/mailbox/page.tsx b/app/mailbox/page.tsx
index 4038907..047f523 100644
--- a/app/mailbox/page.tsx
+++ b/app/mailbox/page.tsx
@@ -66,35 +66,12 @@ export default function Mailbox() {
     getUser();
   }, [supabase, setUser]);
 
-  const [isTiptapOpen, setIsTiptapOpen] = React.useState(false);
-
-  console.log(isTiptapOpen);
-
-  const handleNewMessageClick = () => {
-    setIsTiptapOpen(true);
-  };
-
-  const handleSend = () => {
-    setIsTiptapOpen(false);
-  };
-
   return (
     <div className="flex-1 space-y-4 p-8 pt-6">
       <div className="flex items-center justify-between space-y-2">
         <h2 className="text-3xl font-bold tracking-tight">Mailbox</h2>
         <div className="flex items-center space-x-2"></div>
       </div>
-      <Dialog open={isTiptapOpen} onOpenChange={setIsTiptapOpen}>
-        <DialogTrigger asChild>
-          <Button onClick={handleNewMessageClick}>New Message</Button>
-        </DialogTrigger>
-
-        <EmailComposer
-          userEmail={email}
-          supabase={supabase}
-          onSend={handleSend}
-        />
-      </Dialog>
     </div>
   );
 }

From 564e9823c14ea8a9a8bd67a6147a0c3f11b34eec Mon Sep 17 00:00:00 2001
From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 15:54:41 +0000
Subject: [PATCH 2/4] Updated app/members/page.tsx

---
 app/members/page.tsx | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/app/members/page.tsx b/app/members/page.tsx
index 6cdd91c..5f47641 100644
--- a/app/members/page.tsx
+++ b/app/members/page.tsx
@@ -1,8 +1,15 @@
+import React, { useState } from "react";
 import AddMemberForm from "@/components/add-member";
 import { MembersTable } from "@/components/members-table";
 import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import EmailComposer from "@/components/email-composer";
 
 export default async function Members() {
   const supabase = createServerComponentClient({ cookies });
@@ -62,12 +69,32 @@ export default async function Members() {
 
   console.log("groupmappings", groupNamesData, groupMappings);
 
+  const [isTiptapOpen, setIsTiptapOpen] = useState(false);
+
+  const handleNewMessageClick = () => {
+    setIsTiptapOpen(true);
+  };
+
+  const handleSend = () => {
+    setIsTiptapOpen(false);
+  };
+
   return (
     <div className="flex-1 space-y-4 p-8 pt-6">
       <div className="flex items-center justify-between space-y-2">
         <h2 className="text-3xl font-bold tracking-tight">Members</h2>
         <div className="flex items-center space-x-2">
           <AddMemberForm user={user} />
+          <Dialog open={isTiptapOpen} onOpenChange={setIsTiptapOpen}>
+            <DialogTrigger asChild>
+              <Button onClick={handleNewMessageClick}>New Message</Button>
+            </DialogTrigger>
+            <EmailComposer
+              userEmail={user.email}
+              supabase={supabase}
+              onSend={handleSend}
+            />
+          </Dialog>
         </div>
       </div>
       <div className="flex">

From 8ef6df11328e135499f50a4b5967347a9d7c885b Mon Sep 17 00:00:00 2001
From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:01:52 +0000
Subject: [PATCH 3/4] Updated app/members/page.tsx

---
 app/members/page.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/members/page.tsx b/app/members/page.tsx
index 5f47641..808ac49 100644
--- a/app/members/page.tsx
+++ b/app/members/page.tsx
@@ -1,7 +1,7 @@
-import React, { useState } from "react";
+import React from "react";
 import AddMemberForm from "@/components/add-member";
 import { MembersTable } from "@/components/members-table";
-import { createServerComponentClient } from "@supabase/auth-helpers-nextjs";
+import { createServerComponentClient, withClientComponent } from "@supabase/auth-helpers-nextjs";
 import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { Button } from "@/components/ui/button";
@@ -11,7 +11,7 @@ import {
 } from "@/components/ui/dialog";
 import EmailComposer from "@/components/email-composer";
 
-export default async function Members() {
+export default withClientComponent(async function Members() {
   const supabase = createServerComponentClient({ cookies });
   const {
     data: { user },

From 82cf389e6d3cc0e5b63922f5e89b21bca3a35ebc Mon Sep 17 00:00:00 2001
From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:04:18 +0000
Subject: [PATCH 4/4] Updated app/members/page.tsx

---
 app/members/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/members/page.tsx b/app/members/page.tsx
index 808ac49..3c697ea 100644
--- a/app/members/page.tsx
+++ b/app/members/page.tsx
@@ -106,4 +106,4 @@ export default withClientComponent(async function Members() {
       </div>
     </div>
   );
-}
+});