diff --git a/src/app/(auth)/layout.tsx b/src/app/(auth)/layout.tsx
index eaafd71740..2b4f153642 100644
--- a/src/app/(auth)/layout.tsx
+++ b/src/app/(auth)/layout.tsx
@@ -2,27 +2,25 @@
 
 import { enUS, frFR } from '@clerk/localizations';
 import { ClerkProvider } from '@clerk/nextjs';
+import { useLocale } from 'next-intl';
 
-export default function AuthLayout(props: {
+export default function AuthLayout({
+  children,
+}: {
   children: React.ReactNode;
-  params: { locale: string };
 }) {
-  let clerkLocale = enUS;
-
-  if (props.params.locale === 'fr') {
-    clerkLocale = frFR;
-  }
+  const locale = useLocale();
 
   return (
     <ClerkProvider
-      localization={clerkLocale}
+      localization={locale === 'fr' ? frFR : enUS}
       signInUrl="/sign-in"
       signUpUrl="/sign-up"
       signInFallbackRedirectUrl="/dashboard"
       signUpFallbackRedirectUrl="/dashboard"
       afterSignOutUrl="/"
     >
-      {props.children}
+      {children}
     </ClerkProvider>
   );
 }
diff --git a/src/components/landing/CenteredFooter.test.tsx b/src/components/landing/CenteredFooter.test.tsx
index 81eafb120d..e340d8c3bb 100644
--- a/src/components/landing/CenteredFooter.test.tsx
+++ b/src/components/landing/CenteredFooter.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { NextIntlClientProvider } from 'next-intl';
 
-import messages from '@/locales/en.json';
+import messages from '@/i18n/locales/en.json';
 
 import { CenteredFooter } from './CenteredFooter';
 
@@ -10,7 +10,7 @@ describe('CenteredFooter', () => {
     it('should have copyright information', () => {
       render(
         <NextIntlClientProvider locale="en" messages={messages}>
-          <CenteredFooter logo={null} name="" iconList={null} legalLinks={null}>
+          <CenteredFooter iconList={null} legalLinks={null}>
             Random children
           </CenteredFooter>
         </NextIntlClientProvider>,
diff --git a/src/components/landing/CenteredFooter.tsx b/src/components/landing/CenteredFooter.tsx
index 98f6b32dee..1bc94a3d49 100644
--- a/src/components/landing/CenteredFooter.tsx
+++ b/src/components/landing/CenteredFooter.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 
+import { APP_NAME } from '@/lib/constants';
+
 type CenteredFooterProps = {
-  name: string;
   iconList: React.ReactNode;
   legalLinks: React.ReactNode;
   children?: React.ReactNode;
 };
 
 export const CenteredFooter = ({
-  name,
   iconList,
   legalLinks,
   children,
@@ -24,7 +24,7 @@ export const CenteredFooter = ({
     </ul>
     <div className="mt-6 flex w-full items-center justify-between gap-y-2 border-t pt-3 text-sm text-muted-foreground max-md:flex-col">
       <div>
-        © Copyright {new Date().getFullYear()} {name}.
+        © Copyright {new Date().getFullYear()} {APP_NAME}.
       </div>
       <ul className="flex gap-x-4 font-medium [&_a:hover]:opacity-100 [&_a]:opacity-60">
         {legalLinks}
diff --git a/src/components/templates/Footer.tsx b/src/components/templates/Footer.tsx
index f9d399e200..d843a7229a 100644
--- a/src/components/templates/Footer.tsx
+++ b/src/components/templates/Footer.tsx
@@ -3,7 +3,6 @@ import { useTranslations } from 'next-intl';
 
 import { CenteredFooter } from '@/components/landing/CenteredFooter';
 import { Section } from '@/components/landing/Section';
-import { APP_CONFIG } from '@/lib/constants';
 
 export const Footer = () => {
   const t = useTranslations('Footer');
@@ -11,7 +10,6 @@ export const Footer = () => {
   return (
     <Section className="pb-16 pt-0">
       <CenteredFooter
-        name={APP_CONFIG.name}
         iconList={
           <>
             <li>
diff --git a/src/components/templates/Logo.tsx b/src/components/templates/Logo.tsx
index a06c40cd22..cfb2084921 100644
--- a/src/components/templates/Logo.tsx
+++ b/src/components/templates/Logo.tsx
@@ -1,7 +1,5 @@
-import { APP_CONFIG } from '@/lib/constants';
+import { APP_NAME } from '@/lib/constants';
 
 export const Logo = () => (
-  <div className="flex items-center text-xl font-semibold">
-    {APP_CONFIG.name}
-  </div>
+  <div className="flex items-center text-xl font-semibold">{APP_NAME}</div>
 );
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 781fa7b839..8264bede5f 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -1,3 +1 @@
-export const APP_CONFIG = {
-  name: 'Roo Code Cloud',
-};
+export const APP_NAME = 'Roo Code Cloud';