Skip to content

Commit d627b2b

Browse files
committed
flytt sanityprovider lenger ut, så den ligger på samme sted som i ks-soknad
1 parent 930ae9f commit d627b2b

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

src/frontend/App.tsx

+26-31
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { AppNavigationProvider } from './context/AppNavigationContext';
1111
import { EøsProvider } from './context/EøsContext';
1212
import { useFeatureToggles } from './context/FeatureToggleContext';
1313
import { RoutesProvider } from './context/RoutesContext';
14-
import { SanityProvider } from './context/SanityContext';
1514
import { StegProvider } from './context/StegContext';
1615
import { GlobalStyle } from './Theme';
1716
import { EFeatureToggle } from './typer/feature-toggles';
@@ -21,36 +20,32 @@ function App() {
2120
const { toggles } = useFeatureToggles();
2221

2322
return (
24-
<SanityProvider>
25-
<AppProvider>
26-
<EøsProvider>
27-
<RoutesProvider>
28-
<Router
29-
basename={
30-
toggles[EFeatureToggle.KOMBINER_SOKNADER]
31-
? basePath
32-
: routerBasePath()
33-
}
34-
>
35-
<StegProvider>
36-
<GlobalStyle />
37-
{process.env.NODE_ENV !== 'production' && (
38-
<FamilieAlert variant={'warning'} inline={false}>
39-
{`Denne siden er under utvikling. `}
40-
<a href="https://www.nav.no/no/person/familie/barnetrygd-og-kontantstotte/barnetrygd">
41-
Klikk her for å gå til våre sider for barnetrygd
42-
</a>
43-
</FamilieAlert>
44-
)}
45-
<AppNavigationProvider>
46-
<AppContainer />
47-
</AppNavigationProvider>
48-
</StegProvider>
49-
</Router>
50-
</RoutesProvider>
51-
</EøsProvider>
52-
</AppProvider>
53-
</SanityProvider>
23+
<AppProvider>
24+
<EøsProvider>
25+
<RoutesProvider>
26+
<Router
27+
basename={
28+
toggles[EFeatureToggle.KOMBINER_SOKNADER] ? basePath : routerBasePath()
29+
}
30+
>
31+
<StegProvider>
32+
<GlobalStyle />
33+
{process.env.NODE_ENV !== 'production' && (
34+
<FamilieAlert variant={'warning'} inline={false}>
35+
{`Denne siden er under utvikling. `}
36+
<a href="https://www.nav.no/no/person/familie/barnetrygd-og-kontantstotte/barnetrygd">
37+
Klikk her for å gå til våre sider for barnetrygd
38+
</a>
39+
</FamilieAlert>
40+
)}
41+
<AppNavigationProvider>
42+
<AppContainer />
43+
</AppNavigationProvider>
44+
</StegProvider>
45+
</Router>
46+
</RoutesProvider>
47+
</EøsProvider>
48+
</AppProvider>
5449
);
5550
}
5651

src/frontend/MiljøProvider.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Feilside } from './components/Felleskomponenter/Feilside/Feilside';
1212
import { FeatureTogglesProvider } from './context/FeatureToggleContext';
1313
import { InnloggetProvider } from './context/InnloggetContext';
1414
import { LastRessurserProvider } from './context/LastRessurserContext';
15+
import { SanityProvider } from './context/SanityContext';
1516
import { logError } from './utils/amplitude';
1617

1718
const MiljøProvider: React.FC<PropsWithChildren> = ({ children }) => {
@@ -25,9 +26,11 @@ const MiljøProvider: React.FC<PropsWithChildren> = ({ children }) => {
2526
onError={logError}
2627
>
2728
<LastRessurserProvider>
28-
<InnloggetProvider>
29-
<FeatureTogglesProvider>{children}</FeatureTogglesProvider>
30-
</InnloggetProvider>
29+
<SanityProvider>
30+
<InnloggetProvider>
31+
<FeatureTogglesProvider>{children}</FeatureTogglesProvider>
32+
</InnloggetProvider>
33+
</SanityProvider>
3134
</LastRessurserProvider>
3235
</Sentry.ErrorBoundary>
3336
</HttpProvider>

0 commit comments

Comments
 (0)