From 55e7f4d0e8422cbb152ec6fe5a440f6366cf1ff7 Mon Sep 17 00:00:00 2001
From: joeldlin <jorgen.elden.lindgren@nav.no>
Date: Wed, 27 Nov 2024 15:16:33 +0100
Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'master'=20into=20kort-s=C3=B8?=
 =?UTF-8?q?knad=5Fbruker-kan-legge-kategorier-p=C3=A5-dokumenter-som-oppla?=
 =?UTF-8?q?stes-under-Annet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.tsx | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index ae3bf92c9..f5b17cee4 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -25,6 +25,7 @@ import {ReactQueryDevtools} from "@tanstack/react-query-devtools";
 import {onLanguageSelect, setParams} from "@navikt/nav-dekoratoren-moduler";
 import digisosConfig from "./lib/config.ts";
 import {useRouter} from "next/navigation";
+import {ValgtKategoriProvider} from "./KortKategorierContextProvider.tsx";
 
 const queryClient = new QueryClient();
 
@@ -87,33 +88,35 @@ export default function App() {
                             v7_startTransition: true,
                         }}
                     >
-                        <Routes>
-                            <Route path={"skjema"}>
-                                <Route path="kort/:behandlingsId">
-                                    <Route element={<SwitchSoknadType />}>
-                                        <Route path="1" element={<RedirectToStandard />} />
-                                        <Route path="2" element={<Behov />} />
-                                        <Route path="3" element={<ArbeidOgFamilie />} />
-                                        <Route path="4" element={<Inntekt />} />
-                                        <Route path="5" element={<Oppsummering />} />
+                        <ValgtKategoriProvider>
+                            <Routes>
+                                <Route path={"skjema"}>
+                                    <Route path="kort/:behandlingsId">
+                                        <Route element={<SwitchSoknadType />}>
+                                            <Route path="1" element={<RedirectToStandard />} />
+                                            <Route path="2" element={<Behov />} />
+                                            <Route path="3" element={<ArbeidOgFamilie />} />
+                                            <Route path="4" element={<Inntekt />} />
+                                            <Route path="5" element={<Oppsummering />} />
+                                        </Route>
                                     </Route>
-                                </Route>
-                                <Route path=":behandlingsId">
-                                    <Route index path="1" element={<Personopplysninger shortSpacing />} />
-                                    <Route element={<SwitchSoknadType />}>
-                                        <Route path="2" element={<Begrunnelse />} />
-                                        <Route path="3" element={<ArbeidOgUtdanning />} />
-                                        <Route path="4" element={<Familie />} />
-                                        <Route path="5" element={<Bosituasjon />} />
-                                        <Route path="6" element={<InntektFormue />} />
-                                        <Route path="7" element={<UtgifterGjeld />} />
-                                        <Route path="8" element={<OkonomiskeOpplysningerView />} />
-                                        <Route path="9" element={<Oppsummering />} />
+                                    <Route path=":behandlingsId">
+                                        <Route index path="1" element={<Personopplysninger shortSpacing />} />
+                                        <Route element={<SwitchSoknadType />}>
+                                            <Route path="2" element={<Begrunnelse />} />
+                                            <Route path="3" element={<ArbeidOgUtdanning />} />
+                                            <Route path="4" element={<Familie />} />
+                                            <Route path="5" element={<Bosituasjon />} />
+                                            <Route path="6" element={<InntektFormue />} />
+                                            <Route path="7" element={<UtgifterGjeld />} />
+                                            <Route path="8" element={<OkonomiskeOpplysningerView />} />
+                                            <Route path="9" element={<Oppsummering />} />
+                                        </Route>
                                     </Route>
+                                    <Route path="*" element={<IkkeFunnet />} />
                                 </Route>
-                                <Route path="*" element={<IkkeFunnet />} />
-                            </Route>
-                        </Routes>
+                            </Routes>
+                        </ValgtKategoriProvider>
                     </BrowserRouter>
                     <div aria-hidden={"true"}>
                         <ReactQueryDevtools initialIsOpen={false} />