From fdc2e3e06439eb4c8ee430547916a6a1bdd27595 Mon Sep 17 00:00:00 2001
From: Karli <projects@supa.ee>
Date: Fri, 26 Sep 2025 13:26:02 +0300
Subject: [PATCH] feat(MED-97): show person name instead of keycloak email in
 company invite form

---
 app/home/(user)/(dashboard)/cart/page.tsx                    | 2 +-
 app/join/page.tsx                                            | 5 +++--
 packages/features/medusa-storefront/src/lib/data/orders.ts   | 4 ++--
 .../components/invitations/accept-invitation-container.tsx   | 5 ++---
 .../src/components/invitations/invitation-submit-button.tsx  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/home/(user)/(dashboard)/cart/page.tsx b/app/home/(user)/(dashboard)/cart/page.tsx
index a514cad..86bc7c0 100644
--- a/app/home/(user)/(dashboard)/cart/page.tsx
+++ b/app/home/(user)/(dashboard)/cart/page.tsx
@@ -10,7 +10,7 @@ import { withI18n } from '~/lib/i18n/with-i18n';
 import Cart from '../../_components/cart';
 import CartTimer from '../../_components/cart/cart-timer';
 import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
-import { AccountBalanceService } from '~/lib/services/accountBalance.service';
+import { AccountBalanceService } from '@kit/accounts/services/account-balance.service';
 
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();
diff --git a/app/join/page.tsx b/app/join/page.tsx
index ec32148..72b6e2f 100644
--- a/app/join/page.tsx
+++ b/app/join/page.tsx
@@ -17,6 +17,7 @@ import { Trans } from '@kit/ui/trans';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
+import { toTitleCase } from '~/lib/utils';
 
 interface JoinTeamAccountPageProps {
   searchParams: Promise<{
@@ -110,12 +111,12 @@ async function JoinTeamAccountPage(props: JoinTeamAccountPageProps) {
   // once the user accepts the invitation, we redirect them to the account home page
   const membershipConfirmation = pathsConfig.auth.membershipConfirmation;
 
-  const email = auth.data.email ?? '';
+  const fullName = toTitleCase(auth.data.user_metadata.full_name ?? '');
 
   return (
     <AuthLayoutShell Logo={AppLogo}>
       <AcceptInvitationContainer
-        email={email}
+        fullName={fullName}
         inviteToken={token}
         invitation={invitation}
         paths={{
diff --git a/packages/features/medusa-storefront/src/lib/data/orders.ts b/packages/features/medusa-storefront/src/lib/data/orders.ts
index c79c579..e860a9f 100644
--- a/packages/features/medusa-storefront/src/lib/data/orders.ts
+++ b/packages/features/medusa-storefront/src/lib/data/orders.ts
@@ -6,7 +6,7 @@ import { HttpTypes } from '@medusajs/types';
 
 import { getAuthHeaders, getCacheOptions } from './cookies';
 
-export const retrieveOrder = async (id: string) => {
+export const retrieveOrder = async (id: string, allowCache = true) => {
   const headers = {
     ...(await getAuthHeaders()),
   };
@@ -24,7 +24,7 @@ export const retrieveOrder = async (id: string) => {
       },
       headers,
       next,
-      cache: 'force-cache',
+      ...(allowCache ? { cache: 'force-cache' } : {}),
     })
     .then(({ order }) => order)
     .catch((err) => medusaError(err));
diff --git a/packages/features/team-accounts/src/components/invitations/accept-invitation-container.tsx b/packages/features/team-accounts/src/components/invitations/accept-invitation-container.tsx
index 0af6042..bcfc4d4 100644
--- a/packages/features/team-accounts/src/components/invitations/accept-invitation-container.tsx
+++ b/packages/features/team-accounts/src/components/invitations/accept-invitation-container.tsx
@@ -1,6 +1,5 @@
 import Image from 'next/image';
 
-import { useDismissNotification } from '@kit/notifications/hooks';
 import { Heading } from '@kit/ui/heading';
 import { If } from '@kit/ui/if';
 import { Separator } from '@kit/ui/separator';
@@ -12,7 +11,7 @@ import { SignOutInvitationButton } from './sign-out-invitation-button';
 
 export function AcceptInvitationContainer(props: {
   inviteToken: string;
-  email: string;
+  fullName: string;
 
   invitation: {
     id: string;
@@ -76,7 +75,7 @@ export function AcceptInvitationContainer(props: {
           />
 
           <InvitationSubmitButton
-            email={props.email}
+            fullName={props.fullName}
             accountName={props.invitation.account.name}
           />
         </form>
diff --git a/packages/features/team-accounts/src/components/invitations/invitation-submit-button.tsx b/packages/features/team-accounts/src/components/invitations/invitation-submit-button.tsx
index 17a74c5..54ede8b 100644
--- a/packages/features/team-accounts/src/components/invitations/invitation-submit-button.tsx
+++ b/packages/features/team-accounts/src/components/invitations/invitation-submit-button.tsx
@@ -7,7 +7,7 @@ import { Trans } from '@kit/ui/trans';
 
 export function InvitationSubmitButton(props: {
   accountName: string;
-  email: string;
+  fullName: string;
 }) {
   const { pending } = useFormStatus();
 
@@ -17,7 +17,7 @@ export function InvitationSubmitButton(props: {
         i18nKey={pending ? 'teams:joiningTeam' : 'teams:continueAs'}
         values={{
           accountName: props.accountName,
-          email: props.email,
+          fullName: props.fullName,
         }}
       />
     </Button>