From cd6142eb55ee0dded3a7dcd936ad4762a10a91d6 Mon Sep 17 00:00:00 2001
From: Bernt Christian Egeland <bernt.christian.egeland@gmail.com>
Date: Tue, 28 Nov 2023 18:15:34 +0000
Subject: [PATCH] modal

---
 src/components/layouts/layout.tsx | 4 ++++
 src/pages/_app.tsx                | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/layouts/layout.tsx b/src/components/layouts/layout.tsx
index 38681fb9..6f4790da 100644
--- a/src/components/layouts/layout.tsx
+++ b/src/components/layouts/layout.tsx
@@ -11,6 +11,7 @@ import { api } from "~/utils/api";
 import { useSidebarStore, useAsideStore } from "~/utils/store";
 import ChatAside from "./chatAside";
 import { LogsFooter } from "./logFooter";
+import Modal from "../shared/modal";
 
 type TUser = {
 	user: User;
@@ -56,6 +57,7 @@ export const LayoutAuthenticated = ({ children }: Props): JSX.Element => {
 	const { open } = useSidebarStore();
 	return (
 		<div className="outer-content">
+			<Modal />
 			<Header />
 			<div className="flex">
 				<aside className={`duration-150 ${open ? "w-64" : "w-0 opacity-0"}`}>
@@ -81,6 +83,7 @@ export const LayoutOrganizationAuthenticated = ({ children }: Props): JSX.Elemen
 	return (
 		<div className="outer-content grid grid-rows-[auto_1fr] min-h-screen">
 			{/* Header */}
+			<Modal />
 			<Header />
 
 			{/* Main Content including Sidebar, Content, and Chat Aside */}
@@ -116,6 +119,7 @@ export const LayoutAdminAuthenticated = ({ children, props }: Props): JSX.Elemen
 	}
 	return (
 		<div className="outer-content">
+			<Modal />
 			<Header />
 			<div className="flex">
 				<aside className={`duration-150 ${open ? "w-64" : "w-0 opacity-0"}`}>
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index b9712687..3a5882bd 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -9,7 +9,6 @@ import { ThemeProvider } from "next-themes";
 import "~/styles/globals.css";
 import { Toaster } from "react-hot-toast";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import Modal from "~/components/shared/modal";
 import { useEffect } from "react";
 import { NextIntlClientProvider } from "next-intl";
 import { useRouter } from "next/router";
@@ -69,8 +68,11 @@ const App: AppType<{ session: Session | null }> = ({
 	}
 	return (
 		<ThemeProvider defaultTheme="system">
-			<NextIntlClientProvider locale={locale} messages={messages}>
-				<Modal />
+			<NextIntlClientProvider
+				locale={locale}
+				onError={(err) => console.warn(err)}
+				messages={messages}
+			>
 				<ReactQueryDevtools initialIsOpen={false} />
 				<Toaster
 					position="bottom-right"