Revert "Unify workspace dropdowns; Update layouts (#458)"

This reverts commit 4bc8448a1d.

apps/dev-tool/app/emails/[id]/page.tsx

@@ -67,10 +67,10 @@ export default async function EmailPage(props: EmailPageProps) {
           Remember that the below is an approximation of the email. Always test
           it in your inbox.{' '}
           <Dialog>
-            <DialogTrigger
-              render={<Button variant={'link'} className="p-0 underline" />}
-            >
-              Test Email
+            <DialogTrigger asChild>
+              <Button variant={'link'} className="p-0 underline">
+                Test Email
+              </Button>
             </DialogTrigger>
 
             <DialogContent>

apps/dev-tool/app/emails/lib/email-tester-form-schema.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod';
+import { z } from 'zod';
 
 export const EmailTesterFormSchema = z.object({
   username: z.string().min(1),

apps/dev-tool/app/emails/page.tsx

@@ -49,16 +49,13 @@ export default async function EmailsPage() {
 
               <div className={'grid grid-cols-1 gap-4 md:grid-cols-4'}>
                 {categoryTemplates.map((template) => (
-                  <CardButton
-                    key={template.id}
-                    render={
-                      <Link href={`/emails/${template.id}`}>
-                        <CardButtonHeader>
-                          <CardButtonTitle>{template.name}</CardButtonTitle>
-                        </CardButtonHeader>
-                      </Link>
-                    }
-                  />
+                  <CardButton key={template.id} asChild>
+                    <Link href={`/emails/${template.id}`}>
+                      <CardButtonHeader>
+                        <CardButtonTitle>{template.name}</CardButtonTitle>
+                      </CardButtonHeader>
+                    </Link>
+                  </CardButton>
                 ))}
               </div>
             </div>