From a0682371583cbea17581ebfc51f250d366f2da88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sindre=20Dahl=20L=C3=B8ken?= <sindre.loken@nav.no>
Date: Tue, 5 Mar 2024 10:40:54 +0100
Subject: [PATCH] ryddet i moment

---
 .../VarighetSteg/InfoArenaOppryddingAlert.tsx |  6 +++---
 .../steg/VarighetSteg/VarighetInputfelt.tsx   | 10 +++++-----
 .../steg/VarighetSteg/VarighetSteg.tsx        | 20 +++++++++----------
 src/utils/fnrUtils.ts                         |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert.tsx b/src/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert.tsx
index e0233a897..cdbe179c6 100644
--- a/src/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert.tsx
+++ b/src/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
-import moment from 'moment/moment';
-import { Alert, BodyShort } from '@navikt/ds-react';
 import { TiltaksType } from '@/types/avtale';
 import BEMHelper from '@/utils/bem';
+import { Alert, BodyShort } from '@navikt/ds-react';
+import moment from 'moment';
+import React from 'react';
 
 interface Props {
     tiltakstype: TiltaksType;
diff --git a/src/AvtaleSide/steg/VarighetSteg/VarighetInputfelt.tsx b/src/AvtaleSide/steg/VarighetSteg/VarighetInputfelt.tsx
index 1d8f2ff05..8608b2b02 100644
--- a/src/AvtaleSide/steg/VarighetSteg/VarighetInputfelt.tsx
+++ b/src/AvtaleSide/steg/VarighetSteg/VarighetInputfelt.tsx
@@ -1,12 +1,12 @@
-import React, { useContext } from 'react';
+import { AvtaleContext } from '@/AvtaleProvider';
+import InfoBoks from '@/AvtaleSide/steg/VarighetSteg/InfoBoks/InfoBoks';
 import StillingsprosentInput from '@/AvtaleSide/steg/VarighetSteg/StillingsprosentInput/StillingsprosentInput';
+import { Column, Row } from '@/komponenter/NavGrid/Grid';
 import PakrevdInput from '@/komponenter/PakrevdInput/PakrevdInput';
-import InfoBoks from '@/AvtaleSide/steg/VarighetSteg/InfoBoks/InfoBoks';
 import BEMHelper from '@/utils/bem';
-import { AvtaleContext } from '@/AvtaleProvider';
-import moment from 'moment/moment';
 import { accurateHumanize } from '@/utils/datoUtils';
-import { Column, Row } from '@/komponenter/NavGrid/Grid';
+import moment from 'moment';
+import React, { useContext } from 'react';
 
 interface Props {
     className: string;
diff --git a/src/AvtaleSide/steg/VarighetSteg/VarighetSteg.tsx b/src/AvtaleSide/steg/VarighetSteg/VarighetSteg.tsx
index 36b511f22..30a2696fe 100644
--- a/src/AvtaleSide/steg/VarighetSteg/VarighetSteg.tsx
+++ b/src/AvtaleSide/steg/VarighetSteg/VarighetSteg.tsx
@@ -1,20 +1,20 @@
 import { AvtaleContext } from '@/AvtaleProvider';
+import InfoArenaOppryddingAlert from '@/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert';
+import VarighetInfoVeileder from '@/AvtaleSide/steg/VarighetSteg/VarighetInfoVeileder';
+import VarighetIngress from '@/AvtaleSide/steg/VarighetSteg/VarighetIngress';
+import VarighetInputfelt from '@/AvtaleSide/steg/VarighetSteg/VarighetInputfelt';
+import VarighetTilbakeTidAlert from '@/AvtaleSide/steg/VarighetSteg/VarighetTilbakeTidAlert';
 import { InnloggetBrukerContext } from '@/InnloggingBoundary/InnloggingBoundary';
-import SkjemaTittel from '@/komponenter/form/SkjemaTittel';
 import Innholdsboks from '@/komponenter/Innholdsboks/Innholdsboks';
 import LagreKnapp from '@/komponenter/LagreKnapp/LagreKnapp';
 import { Column, Container, Row } from '@/komponenter/NavGrid/Grid';
-import { genererFnrdatostringFraFnr, VellykketGenerertIsoDatoString } from '@/utils/fnrUtils';
-import moment from 'moment';
-import 'moment/locale/nb';
-import { FunctionComponent, useContext, useEffect, useState } from 'react';
 import Datovelger from '@/komponenter/datovelger/Datovelger';
+import SkjemaTittel from '@/komponenter/form/SkjemaTittel';
 import BEMHelper from '@/utils/bem';
-import VarighetIngress from '@/AvtaleSide/steg/VarighetSteg/VarighetIngress';
-import VarighetInfoVeileder from '@/AvtaleSide/steg/VarighetSteg/VarighetInfoVeileder';
-import InfoArenaOppryddingAlert from '@/AvtaleSide/steg/VarighetSteg/InfoArenaOppryddingAlert';
-import VarighetTilbakeTidAlert from '@/AvtaleSide/steg/VarighetSteg/VarighetTilbakeTidAlert';
-import VarighetInputfelt from '@/AvtaleSide/steg/VarighetSteg/VarighetInputfelt';
+import { VellykketGenerertIsoDatoString, genererFnrdatostringFraFnr } from '@/utils/fnrUtils';
+import moment from 'moment';
+import 'moment/dist/locale/nb';
+import { FunctionComponent, useContext, useEffect, useState } from 'react';
 import './varighetSteg.less';
 
 const VarighetSteg: FunctionComponent = () => {
diff --git a/src/utils/fnrUtils.ts b/src/utils/fnrUtils.ts
index 933875b34..b90cefa9e 100644
--- a/src/utils/fnrUtils.ts
+++ b/src/utils/fnrUtils.ts
@@ -1,5 +1,5 @@
+import moment from 'moment';
 import { ChangeEvent, Dispatch, SetStateAction } from 'react';
-import moment from 'moment/moment';
 
 /** Beregner gyldighet av fødselsnr med utgangspunkt i mod11.
  * @link https://no.wikipedia.org/wiki/F%C3%B8dselsnummer
@@ -122,4 +122,4 @@ export const erUnder18 = (fnr: string): boolean => {
     return idag.diff(bursdagDatoMoment, 'years') < 18;
 };
 
-export { validerFnr, genererFnrdatostringFraFnr };
+export { genererFnrdatostringFraFnr, validerFnr };