Merge branch 'develop' into MED-157

app/home/[account]/_components/team-account-accounts-selector.tsx

@@ -5,11 +5,9 @@ import { useContext } from 'react';
 import { useRouter } from 'next/navigation';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
+import { featureFlagsConfig, pathsConfig } from '@kit/shared/config';
 import { SidebarContext } from '@kit/ui/shadcn-sidebar';
 
-import { pathsConfig, featureFlagsConfig } from '@kit/shared/config';
-
-
 const features = {
   enableTeamCreation: featureFlagsConfig.enableTeamCreation,
 };

app/home/[account]/_components/team-account-layout-mobile-navigation.tsx

@@ -1,12 +1,12 @@
 'use client';
 
-import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import { useRouter } from 'next/navigation';
 
-import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
 import { Home, Menu } from 'lucide-react';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
+import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
+import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import {
   featureFlagsConfig,
   getTeamAccountSidebarConfig,
@@ -93,8 +93,6 @@ export const TeamAccountLayoutMobileNavigation = (
   );
 };
 
-
-
 function TeamAccountsModal(props: {
   accounts: Accounts;
   userId: string;

app/home/[account]/_components/team-account-notifications.tsx

@@ -1,8 +1,6 @@
 import { NotificationsPopover } from '@kit/notifications/components';
-
 import { featureFlagsConfig } from '@kit/shared/config';
 
-
 export function TeamAccountNotifications(params: {
   userId: string;
   accountId: string;

app/home/[account]/_lib/server/team-account-workspace.loader.ts

@@ -4,11 +4,10 @@ import { cache } from 'react';
 
 import { redirect } from 'next/navigation';
 
+import { pathsConfig } from '@kit/shared/config';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 import { createTeamAccountsApi } from '@kit/team-accounts/api';
 
-import { pathsConfig } from '@kit/shared/config';
-
 import { requireUserInServerComponent } from '~/lib/server/require-user-in-server-component';
 
 export type TeamAccountWorkspace = Awaited<
@@ -29,7 +28,7 @@ export const loadTeamWorkspace = cache(workspaceLoader);
 async function workspaceLoader(accountSlug: string) {
   const client = getSupabaseServerClient();
   const api = createTeamAccountsApi(client);
-  const user  = await requireUserInServerComponent();
+  const user = await requireUserInServerComponent();
   const workspace = await api.getAccountWorkspace(accountSlug, user.id);
   // we cannot find any record for the selected account
   // so we redirect the user to the home page
@@ -39,7 +38,9 @@ async function workspaceLoader(accountSlug: string) {
 
   return {
     ...workspace.data,
-    accounts: workspace.data.accounts.map(({ user_accounts }) => ({...user_accounts})),
+    accounts: workspace.data.accounts.map(({ user_accounts }) => ({
+      ...user_accounts,
+    })),
     user,
   };
 }

app/home/[account]/billing/_components/team-account-checkout-form.tsx

@@ -6,6 +6,7 @@ import dynamic from 'next/dynamic';
 import { useParams } from 'next/navigation';
 
 import { PlanPicker } from '@kit/billing-gateway/components';
+import { billingConfig } from '@kit/shared/config';
 import { useAppEvents } from '@kit/shared/events';
 import {
   Card,
@@ -16,8 +17,6 @@ import {
 } from '@kit/ui/card';
 import { Trans } from '@kit/ui/trans';
 
-import { billingConfig } from '@kit/shared/config';
-
 import { createTeamAccountCheckoutSession } from '../_lib/server/server-actions';
 
 const EmbeddedCheckout = dynamic(

app/home/[account]/billing/page.tsx

@@ -6,7 +6,6 @@ import { PageBody } from '@kit/ui/page';
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-
 import HealthBenefitForm from './_components/health-benefit-form';
 
 interface TeamAccountBillingPageProps {

app/home/[account]/billing/return/page.tsx

@@ -5,10 +5,10 @@ import { BillingSessionStatus } from '@kit/billing-gateway/components';
 import { billingConfig } from '@kit/shared/config';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
+import { withI18n } from '~/lib/i18n/with-i18n';
 import { requireUserInServerComponent } from '~/lib/server/require-user-in-server-component';
 
 import { EmbeddedCheckoutForm } from '../_components/embedded-checkout-form';
-import { withI18n } from '~/lib/i18n/with-i18n';
 
 interface SessionPageProps {
   searchParams: Promise<{

app/home/[account]/members/page.tsx

@@ -22,7 +22,6 @@ import { Trans } from '@kit/ui/trans';
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-
 // local imports
 import { TeamAccountLayoutPageHeader } from '../_components/team-account-layout-page-header';
 import { loadMembersPageData } from './_lib/server/members-page.loader';

app/home/[account]/page.tsx

@@ -8,6 +8,7 @@ import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/ser
 import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
 
 import { PageBody } from '@kit/ui/page';
+import { createUserAnalysesApi } from '@kit/user-analyses/api';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';