FO-2916: Committing merge conflicts

Author: sneha-d-desai

src/app.tsx

@@ -5,8 +5,8 @@ import { InternflateDecorator } from './components/internflate-decorator/internf
 import { Hovedside } from './hovedside/hovedside';
 import { DataFetcher } from './components/datafetcher';
 import { useDataFetcherStore } from './stores/data-fetcher-store';
-import { PRELANSERING_INFO_OM_LOSNING_TOGGLE } from './rest/feature';
-import { Prelansering } from './prelansering-side/prelansering';
+import { PTO_VEDTAKSSTOTTE_PILOT } from './rest/feature';
+import { PrelanseringInfoSide } from './prelansering-side/prelansering-side';
 
 function App() {
 	return (
@@ -21,10 +21,10 @@ function App() {
 
 function Innhold() {
 	const { featuresFetcher } = useDataFetcherStore();
-	const erPrelanseringPa = featuresFetcher.data[PRELANSERING_INFO_OM_LOSNING_TOGGLE];
+	const erPilotTogglePa = featuresFetcher.data[PTO_VEDTAKSSTOTTE_PILOT];
 
-	return erPrelanseringPa ? (
-		<Prelansering />
+	return !erPilotTogglePa ? (
+		<PrelanseringInfoSide />
 	) : (
 		<>
 			<Header />

src/hovedside/hovedside.tsx

@@ -8,14 +8,12 @@ import './hovedside.less';
 export const Hovedside = () => {
     return (
 	    <main className="hovedside">
-		    <DataFetcher>
 			    <Filters />
 			    {/*<FilterEtiketter/>*/}
 			    <div className="hovedside__table">
 				    <PaginationBar />
 				    <UserTable />
 			    </div>
-		    </DataFetcher>
 	    </main>
     );
 };

src/mock/data/features.ts

@@ -1,8 +1,8 @@
 import { JSONObject } from 'yet-another-fetch-mock';
-import { Features, PRELANSERING_INFO_OM_LOSNING_TOGGLE } from '../../rest/feature';
+import { Features, PTO_VEDTAKSSTOTTE_PILOT } from '../../rest/feature';
 
 const features: Features & JSONObject = {
-    [PRELANSERING_INFO_OM_LOSNING_TOGGLE]: true,
+    [PTO_VEDTAKSSTOTTE_PILOT]: true,
 };
 
 export default features;

src/prelansering-side/prelansering-sjekk.tsx

@@ -1,10 +1,9 @@
-export const PRELANSERING_INFO_OM_LOSNING_TOGGLE = 'pto.vedtaksstotte.pilot';
-
+export const PTO_VEDTAKSSTOTTE_PILOT = 'pto.vedtaksstotte.pilot';
 
 export const TOGGLES = [
-    PRELANSERING_INFO_OM_LOSNING_TOGGLE,
+    PTO_VEDTAKSSTOTTE_PILOT,
 ];
 
 export interface Features {
-    [PRELANSERING_INFO_OM_LOSNING_TOGGLE]: boolean;
+    [PTO_VEDTAKSSTOTTE_PILOT]: boolean;
 }