From 613ff620d426c8f9f10cd2ba8865c3236e73160b Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sun, 28 Jan 2024 20:41:36 +0900
Subject: [PATCH] Show toast

---
 renderer/pages/_app.tsx  | 13 ++++++++-----
 renderer/utils/toast.tsx |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/renderer/pages/_app.tsx b/renderer/pages/_app.tsx
index 249920ce..692568b6 100644
--- a/renderer/pages/_app.tsx
+++ b/renderer/pages/_app.tsx
@@ -4,6 +4,7 @@ import AccountLayout from '@/components/layouts/account'
 import TimelineLayout from '@/components/layouts/timelines'
 import { IntlProviderWrapper } from '@/utils/i18n'
 import { ThemeProvider } from '@material-tailwind/react'
+import { ToastProvider } from '@/utils/toast'
 
 export default function MyApp({ Component, pageProps }: AppProps) {
   const customTheme = {
@@ -102,11 +103,13 @@ export default function MyApp({ Component, pageProps }: AppProps) {
   return (
     <ThemeProvider value={customTheme}>
       <IntlProviderWrapper>
-        <AccountLayout>
-          <TimelineLayout>
-            <Component {...pageProps} />
-          </TimelineLayout>
-        </AccountLayout>
+        <ToastProvider>
+          <AccountLayout>
+            <TimelineLayout>
+              <Component {...pageProps} />
+            </TimelineLayout>
+          </AccountLayout>
+        </ToastProvider>
       </IntlProviderWrapper>
     </ThemeProvider>
   )
diff --git a/renderer/utils/toast.tsx b/renderer/utils/toast.tsx
index 3ef4cc05..4f3b5584 100644
--- a/renderer/utils/toast.tsx
+++ b/renderer/utils/toast.tsx
@@ -43,12 +43,12 @@ export const ToastProvider: React.FC<Props> = ({ children }) => {
 
   return (
     <ToastContext.Provider value={showToast}>
-      {children}
       <div className={`${showable ? 'block' : 'hidden'} fixed top-2 -translate-x-1/2`} style={{ left: '50%' }}>
         <Alert color={color(toastType)} className="w96">
           <span>{toastText}</span>
         </Alert>
       </div>
+      {children}
     </ToastContext.Provider>
   )
 }