From 7f018f2fdd7dfbcc4aa158f19305a4af1868d881 Mon Sep 17 00:00:00 2001
From: Ruben van Leeuwen <ruben.vanleeuwen@surf.nl>
Date: Wed, 30 Oct 2024 20:41:29 +0100
Subject: [PATCH] 1500: Remove no-ssr

---
 package.json   | 10 ++--------
 pages/_app.tsx |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 57ac38a..293ab93 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,8 @@
         "next-query-params": "^5.0.0",
         "process": "0.11.10",
         "prop-types": "^15.8.1",
-        "react": "^18.2.0",
+        "react": "^18.3.1",
         "react-dom": "^18.2.0",
-        "react-no-ssr": "^1.1.0",
         "react-redux": "^9.1.2",
         "use-query-params": "2.2.1"
     },
@@ -39,16 +38,11 @@
         "@orchestrator-ui/tsconfig": "*",
         "@testing-library/jest-dom": "^6.6.2",
         "@types/node": "^22.7.5",
-        "@types/react": "^18.2.45",
+        "@types/react": "^18.3.1",
         "@types/react-dom": "^18.2.18",
         "@types/react-no-ssr": "^1.1.7",
         "babel-jest": "^29.7.0",
         "husky": "^9.0.11",
         "typescript": "^5.5.2"
-    },
-    "overrides": {
-        "react-no-ssr": {
-            "react": "^18.3.1"
-        }
     }
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 1263ec5..41806c0 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from 'react';
-import NoSSR from 'react-no-ssr';
 
 import { SessionProvider } from 'next-auth/react';
 import { NextAdapter } from 'next-query-params';
@@ -86,7 +85,6 @@ function CustomApp({
             >
                 <StoreProvider initialOrchestratorConfig={orchestratorConfig}>
                     <SessionProvider session={pageProps.session}>
-                        <NoSSR>
                             <WfoAuth>
                                 <EuiProvider
                                     colorMode={themeMode}
@@ -134,7 +132,7 @@ function CustomApp({
                                     </TranslationsProvider>
                                 </EuiProvider>
                             </WfoAuth>
-                        </NoSSR>
+
                     </SessionProvider>
                 </StoreProvider>
             </OrchestratorConfigProvider>