From a34b4b628cc1565017aacf3d6e893b29e4a0b514 Mon Sep 17 00:00:00 2001
From: Henrik Larsson <hankisch@gmail.com>
Date: Wed, 9 Aug 2023 14:40:45 +0200
Subject: [PATCH] Updated TypeScript to resolve async RSC error

---
 app/[locale]/[...slug]/page.tsx       | 11 +----------
 app/[locale]/category/[slug]/page.tsx |  5 -----
 app/[locale]/layout.tsx               |  2 ++
 app/[locale]/page.tsx                 |  5 -----
 app/[locale]/product/[slug]/page.tsx  |  7 +------
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/app/[locale]/[...slug]/page.tsx b/app/[locale]/[...slug]/page.tsx
index 69ea34b6d..6a621b175 100644
--- a/app/[locale]/[...slug]/page.tsx
+++ b/app/[locale]/[...slug]/page.tsx
@@ -1,10 +1,8 @@
-import Footer from '@/components/layout/footer/footer';
 import DynamicContentManager from 'components/layout/dynamic-content-manager';
 import { pageQuery } from 'lib/sanity/queries';
 import { clientFetch } from 'lib/sanity/sanity.client';
 import type { Metadata } from 'next';
 import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 
 export const runtime = 'edge';
 
@@ -75,12 +73,5 @@ export default async function Page({ params }: PageParams) {
 
   if (!page) return notFound();
 
-  return (
-    <>
-      <DynamicContentManager content={page?.content} />
-      <Suspense>
-        <Footer locale={params.locale} />
-      </Suspense>
-    </>
-  );
+  return <DynamicContentManager content={page?.content} />;
 }
diff --git a/app/[locale]/category/[slug]/page.tsx b/app/[locale]/category/[slug]/page.tsx
index 1583b7e4b..a069cb3e1 100644
--- a/app/[locale]/category/[slug]/page.tsx
+++ b/app/[locale]/category/[slug]/page.tsx
@@ -1,10 +1,8 @@
-import Footer from '@/components/layout/footer/footer';
 import Text from 'components/ui/text/text';
 import { categoryQuery } from 'lib/sanity/queries';
 import { clientFetch } from 'lib/sanity/sanity.client';
 import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 
 export async function generateMetadata({
   params
@@ -38,9 +36,6 @@ export default async function ProductPage({ params }: CategoryPageParams) {
   return (
     <div className="mb-8 flex w-full flex-col px-4 lg:my-16 lg:px-8 2xl:px-16">
       <Text variant={'pageHeading'}>{title}</Text>
-      <Suspense>
-        <Footer locale={params.locale} />
-      </Suspense>
     </div>
   );
 }
diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx
index 226f0571b..d49d8502a 100644
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -1,3 +1,4 @@
+import Footer from 'components/layout/footer/footer';
 import Header from 'components/layout/header/header';
 import { NextIntlClientProvider } from 'next-intl';
 import { Inter } from 'next/font/google';
@@ -59,6 +60,7 @@ export default async function LocaleLayout({ children, params: { locale } }: Loc
           <Header locale={locale} />
           <Suspense>
             <main className="flex-1">{children}</main>
+            <Footer locale={locale} />
           </Suspense>
         </NextIntlClientProvider>
       </body>
diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 9ac46819d..53c2e6fb8 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -1,10 +1,8 @@
-import Footer from '@/components/layout/footer/footer';
 import DynamicContentManager from 'components/layout/dynamic-content-manager/dynamic-content-manager';
 import { homePageQuery } from 'lib/sanity/queries';
 import { clientFetch } from 'lib/sanity/sanity.client';
 import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 export const runtime = 'edge';
 
 export async function generateMetadata({
@@ -34,9 +32,6 @@ export default async function HomePage({ params }: HomePageParams) {
   return (
     <>
       <DynamicContentManager content={data?.content} />
-      <Suspense>
-        <Footer locale={params.locale} />
-      </Suspense>
     </>
   );
 }
diff --git a/app/[locale]/product/[slug]/page.tsx b/app/[locale]/product/[slug]/page.tsx
index 7401bf3be..db6ebef81 100644
--- a/app/[locale]/product/[slug]/page.tsx
+++ b/app/[locale]/product/[slug]/page.tsx
@@ -1,10 +1,8 @@
-import Footer from '@/components/layout/footer/footer';
 import ProductView from 'components/product/product-view';
 import { productQuery } from 'lib/sanity/queries';
 import { clientFetch } from 'lib/sanity/sanity.client';
 import type { Metadata } from 'next';
 import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 
 interface ProductPageParams {
   params: {
@@ -85,10 +83,7 @@ export default async function ProductPage({ params }: ProductPageParams) {
           __html: JSON.stringify(productJsonLd)
         }}
       />
-      <ProductView product={product} relatedProducts={[]} />
-      <Suspense>
-        <Footer locale={params.locale} />
-      </Suspense>
+      <ProductView product={product} relatedProducts={[]} />;
     </>
   );
 }