Merge pull request #639 from wri/release/rare-redwood-hotfix-2024-11-07

[RELEASE] Rare Redwood hotfix 2024 11 07
wri · Nov 7, 2024 · e78cda1 · e78cda1
2 parents 74a2dcb + 9dcfbdc
commit e78cda1
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -42,7 +42,10 @@ const _App = ({ Component, ...rest }: AppProps) => {
   const isAdmin = router.asPath.includes("/admin");
   const isOnDashboards = router.asPath.includes("/dashboard");
 
-  const { store, props } = wrapper.useWrappedStore(rest);
+  const {
+    store,
+    props: { props, pageProps }
+  } = wrapper.useWrappedStore(rest);
 
   setClientSideTranslations(props);
   setupYup(t);
@@ -55,7 +58,7 @@ const _App = ({ Component, ...rest }: AppProps) => {
             <NotificationProvider>
               <ModalProvider>
                 <ModalRoot />
-                <Component {...props.pageProps} />
+                <Component {...pageProps} />
               </ModalProvider>
             </NotificationProvider>
           </LoadingProvider>
@@ -67,7 +70,7 @@ const _App = ({ Component, ...rest }: AppProps) => {
       <ReduxProvider store={store}>
         <ToastProvider>
           <WrappedQueryClientProvider>
-            <Hydrate state={props.pageProps.dehydratedState}>
+            <Hydrate state={pageProps.dehydratedState}>
               <RouteHistoryProvider>
                 <LoadingProvider>
                   <NotificationProvider>
@@ -79,13 +82,13 @@ const _App = ({ Component, ...rest }: AppProps) => {
                           <Then>
                             <DashboardAnalyticsWrapper>
                               <DashboardLayout>
-                                <Component {...props.pageProps} />
+                                <Component {...pageProps} />
                               </DashboardLayout>
                             </DashboardAnalyticsWrapper>
                           </Then>
                           <Else>
                             <MainLayout>
-                              <Component {...props.pageProps} />
+                              <Component {...pageProps} />
                               <CookieBanner />
                             </MainLayout>
                           </Else>