diff --git a/apps/mail/components/connection/add.tsx b/apps/mail/components/connection/add.tsx index 5c0740dc6..864a69957 100644 --- a/apps/mail/components/connection/add.tsx +++ b/apps/mail/components/connection/add.tsx @@ -113,7 +113,11 @@ export const AddConnectionDialog = ({ onClick={async () => await authClient.linkSocial({ provider: provider.providerId, +<<<<<<< HEAD callbackURL: `${env.NEXT_PUBLIC_APP_URL}/${pathname}`, +======= + callbackURL: `${process.env.NEXT_PUBLIC_APP_URL}/${pathname}`, +>>>>>>> a9d1ae61 (feat: outlook driver) }) } > diff --git a/apps/mail/components/mail/mail.tsx b/apps/mail/components/mail/mail.tsx index 49151f737..846b727f7 100644 --- a/apps/mail/components/mail/mail.tsx +++ b/apps/mail/components/mail/mail.tsx @@ -36,7 +36,10 @@ import { handleUnsubscribe } from '@/lib/email-utils.client'; import { useMediaQuery } from '../../hooks/use-media-query'; import { useSearchValue } from '@/hooks/use-search-value'; import { useConnections } from '@/hooks/use-connections'; +<<<<<<< HEAD import { MailList } from '@/components/mail/mail-list'; +======= +>>>>>>> a9d1ae61 (feat: outlook driver) import { useHotkeysContext } from 'react-hotkeys-hook'; import { useParams, useRouter } from 'next/navigation'; import { useMail } from '@/components/mail/use-mail'; @@ -332,6 +335,13 @@ export function MailLayout() { ); }, [session?.activeConnection?.id, connections?.connections]); + const activeAccount = useMemo(() => { + if (!session?.activeConnection?.id || !connections?.connections) return null; + return connections.connections.find( + (connection) => connection.id === session.activeConnection?.id, + ); + }, [session?.activeConnection?.id, connections?.connections]); + useEffect(() => { if (prevFolderRef.current !== folder && mail.bulkSelected.length > 0) { clearBulkSelection(); @@ -447,7 +457,26 @@ export function MailLayout() { ) : null} +<<<<<<< HEAD +======= + {true ? : null} + +>>>>>>> a9d1ae61 (feat: outlook driver)