Refactor Layout to conditionally render ModalAccount based on custom…

…er first name
jamalsoueidan · Jul 7, 2024 · 6b26581 · 6b26581
1 parent 66a3aae
commit 6b26581
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -176,24 +176,30 @@ export function Layout({children}: {children: ReactNode}) {
       <body>
         <DirectionProvider detectDirection>
           <MantineProvider>
-            <ModalAccount customer={data?.customer} />
-            <NavigationProgress />
-            <ModalsProvider>
-              {!path.includes('/book/') && data?.cart ? (
-                <Analytics.Provider
-                  cart={data.cart}
-                  shop={data.shop}
-                  consent={data.consent}
-                  customData={{foo: 'bar'}}
-                >
-                  <LayoutWrapper>{children}</LayoutWrapper>
-                  <CustomAnalytics />
-                </Analytics.Provider>
-              ) : (
-                children
-              )}
-              <LanguageDetector />
-            </ModalsProvider>
+            {data.customer && !data.customer.customer.firstName ? (
+              <ModalAccount customer={data?.customer} />
+            ) : (
+              <>
+                <NavigationProgress />
+                <ModalsProvider>
+                  {!path.includes('/book/') &&
+                  !path.includes('/account/business') ? (
+                    <Analytics.Provider
+                      cart={data.cart}
+                      shop={data.shop}
+                      consent={data.consent}
+                      customData={{foo: 'bar'}}
+                    >
+                      <LayoutWrapper>{children}</LayoutWrapper>
+                      <CustomAnalytics />
+                    </Analytics.Provider>
+                  ) : (
+                    children
+                  )}
+                  <LanguageDetector />
+                </ModalsProvider>
+              </>
+            )}
           </MantineProvider>
         </DirectionProvider>
         <ScrollRestoration nonce={nonce} />