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

This reverts commit 4bc8448a1d.

packages/features/team-accounts/src/components/invitations/accept-invitation-container.tsx

@@ -1,16 +1,12 @@
-'use client';
-
 import Image from 'next/image';
 
-import { useAction } from 'next-safe-action/hooks';
-
-import { Button } from '@kit/ui/button';
 import { Heading } from '@kit/ui/heading';
 import { If } from '@kit/ui/if';
 import { Separator } from '@kit/ui/separator';
 import { Trans } from '@kit/ui/trans';
 
 import { acceptInvitationAction } from '../../server/actions/team-invitations-server-actions';
+import { InvitationSubmitButton } from './invitation-submit-button';
 import { SignOutInvitationButton } from './sign-out-invitation-button';
 
 export function AcceptInvitationContainer(props: {
@@ -32,13 +28,11 @@ export function AcceptInvitationContainer(props: {
     nextPath: string;
   };
 }) {
-  const { execute, isPending } = useAction(acceptInvitationAction);
-
   return (
     <div className={'flex flex-col items-center space-y-4'}>
       <Heading className={'text-center'} level={4}>
         <Trans
-          i18nKey={'teams.acceptInvitationHeading'}
+          i18nKey={'teams:acceptInvitationHeading'}
           values={{
             accountName: props.invitation.account.name,
           }}
@@ -59,7 +53,7 @@ export function AcceptInvitationContainer(props: {
 
       <div className={'text-muted-foreground text-center text-sm'}>
         <Trans
-          i18nKey={'teams.acceptInvitationDescription'}
+          i18nKey={'teams:acceptInvitationDescription'}
           values={{
             accountName: props.invitation.account.name,
           }}
@@ -70,24 +64,20 @@ export function AcceptInvitationContainer(props: {
         <form
           data-test={'join-team-form'}
           className={'w-full'}
-          onSubmit={(e) => {
-            e.preventDefault();
-
-            execute({
-              inviteToken: props.inviteToken,
-              nextPath: props.paths.nextPath,
-            });
-          }}
+          action={acceptInvitationAction}
         >
-          <Button type={'submit'} className={'w-full'} disabled={isPending}>
-            <Trans
-              i18nKey={isPending ? 'teams.joiningTeam' : 'teams.continueAs'}
-              values={{
-                accountName: props.invitation.account.name,
-                email: props.email,
-              }}
-            />
-          </Button>
+          <input type="hidden" name={'inviteToken'} value={props.inviteToken} />
+
+          <input
+            type={'hidden'}
+            name={'nextPath'}
+            value={props.paths.nextPath}
+          />
+
+          <InvitationSubmitButton
+            email={props.email}
+            accountName={props.invitation.account.name}
+          />
         </form>
 
         <Separator />
@@ -95,7 +85,7 @@ export function AcceptInvitationContainer(props: {
         <SignOutInvitationButton nextPath={props.paths.signOutNext} />
 
         <span className={'text-muted-foreground text-center text-xs'}>
-          <Trans i18nKey={'teams.signInWithDifferentAccountDescription'} />
+          <Trans i18nKey={'teams:signInWithDifferentAccountDescription'} />
         </span>
       </div>
     </div>