From 28b9dc538cbdf97e4a749a2824499d9dad1d3b47 Mon Sep 17 00:00:00 2001
From: Marion Hauff <marion.hauff@nav.no>
Date: Thu, 19 Dec 2024 10:01:19 +0100
Subject: [PATCH 1/2] teknisk gjeld: renamer css selector med lite forbokstav

---
 .../RedigerAvansertBeregning.test.tsx.snap           |  2 +-
 src/components/common/Divider/Divider.module.scss    |  4 ++--
 .../common/Divider/Divider.module.scss.d.ts          | 12 ++++++------
 src/components/common/Divider/Divider.tsx            |  4 ++--
 .../__tests__/__snapshots__/Divider.test.tsx.snap    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/RedigerAvansertBeregning/__tests__/__snapshots__/RedigerAvansertBeregning.test.tsx.snap b/src/components/RedigerAvansertBeregning/__tests__/__snapshots__/RedigerAvansertBeregning.test.tsx.snap
index 9b7cc67d7..670d37eef 100644
--- a/src/components/RedigerAvansertBeregning/__tests__/__snapshots__/RedigerAvansertBeregning.test.tsx.snap
+++ b/src/components/RedigerAvansertBeregning/__tests__/__snapshots__/RedigerAvansertBeregning.test.tsx.snap
@@ -353,7 +353,7 @@ exports[`RedigerAvansertBeregning > Gitt at en bruker har vedtak om alderspensjo
         </div>
       </div>
       <hr
-        class="_divider_1adfb3 _divider__NoMargin_1adfb3"
+        class="_divider_1adfb3 _divider__noMargin_1adfb3"
       />
       <div>
         <div
diff --git a/src/components/common/Divider/Divider.module.scss b/src/components/common/Divider/Divider.module.scss
index 2d10f51cf..220c8ff2b 100644
--- a/src/components/common/Divider/Divider.module.scss
+++ b/src/components/common/Divider/Divider.module.scss
@@ -4,11 +4,11 @@
   border-bottom: 1px solid var(--a-border-divider);
   margin: var(--a-spacing-8) 0;
 
-  &__SmallMargin {
+  &__smallMargin {
     margin: var(--a-spacing-4) 0;
   }
 
-  &__NoMargin {
+  &__noMargin {
     margin: 0;
   }
 }
diff --git a/src/components/common/Divider/Divider.module.scss.d.ts b/src/components/common/Divider/Divider.module.scss.d.ts
index 0eab461d0..162c2f699 100644
--- a/src/components/common/Divider/Divider.module.scss.d.ts
+++ b/src/components/common/Divider/Divider.module.scss.d.ts
@@ -1,7 +1,7 @@
-import globalClassNames from "../../../style.d";
+import globalClassNames from '../../../style.d'
 declare const classNames: typeof globalClassNames & {
-  readonly divider: "divider";
-  readonly divider__SmallMargin: "divider__SmallMargin";
-  readonly divider__NoMargin: "divider__NoMargin";
-};
-export = classNames;
+  readonly divider: 'divider'
+  readonly divider__smallMargin: 'divider__smallMargin'
+  readonly divider__noMargin: 'divider__noMargin'
+}
+export = classNames
diff --git a/src/components/common/Divider/Divider.tsx b/src/components/common/Divider/Divider.tsx
index a2251429d..a5d7ed224 100644
--- a/src/components/common/Divider/Divider.tsx
+++ b/src/components/common/Divider/Divider.tsx
@@ -10,8 +10,8 @@ export const Divider: React.FC<Props> = ({ smallMargin, noMargin }) => {
   return (
     <hr
       className={clsx(styles.divider, {
-        [styles.divider__SmallMargin]: smallMargin,
-        [styles.divider__NoMargin]: noMargin,
+        [styles.divider__smallMargin]: smallMargin,
+        [styles.divider__noMargin]: noMargin,
       })}
     />
   )
diff --git a/src/components/common/Divider/__tests__/__snapshots__/Divider.test.tsx.snap b/src/components/common/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
index 9b89337bf..32d0ee6bf 100644
--- a/src/components/common/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
+++ b/src/components/common/Divider/__tests__/__snapshots__/Divider.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`Divider > rendrer riktig med default verdier 1`] = `
 exports[`Divider > rendrer riktig uten margin 1`] = `
 <DocumentFragment>
   <hr
-    class="_divider_1adfb3 _divider__NoMargin_1adfb3"
+    class="_divider_1adfb3 _divider__noMargin_1adfb3"
   />
 </DocumentFragment>
 `;

From ffcdce0a356348e42fd48ab41a65dac372a5690b Mon Sep 17 00:00:00 2001
From: martinstorvoll <martin.storvoll@nav.no>
Date: Thu, 19 Dec 2024 22:11:58 +0100
Subject: [PATCH 2/2] PEK-902 Del2: Fikset slik at felt tillater punktum og
 komma

---
 src/utils/__tests__/inntekt.test.ts | 8 +++-----
 src/utils/inntekt.ts                | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/utils/__tests__/inntekt.test.ts b/src/utils/__tests__/inntekt.test.ts
index 1ce99a2ea..7bd227aa2 100644
--- a/src/utils/__tests__/inntekt.test.ts
+++ b/src/utils/__tests__/inntekt.test.ts
@@ -276,13 +276,11 @@ describe('inntekt-utils', () => {
       ).toBeFalsy()
       expect(
         validateInntekt('-25', updateValidationErrorMessageMock)
-      ).toBeTruthy()
-      expect(
-        validateInntekt('-', updateValidationErrorMessageMock)
-      ).toBeTruthy()
+      ).toBeFalsy()
+      expect(validateInntekt('-', updateValidationErrorMessageMock)).toBeFalsy()
       expect(
         validateInntekt('123.43', updateValidationErrorMessageMock)
-      ).toBeTruthy()
+      ).toBeFalsy()
       expect(updateValidationErrorMessageMock).toHaveBeenNthCalledWith(
         1,
         'inntekt.endre_inntekt_modal.textfield.validation_error.type'
diff --git a/src/utils/inntekt.ts b/src/utils/inntekt.ts
index 07bacf48b..9b4d22b3b 100644
--- a/src/utils/inntekt.ts
+++ b/src/utils/inntekt.ts
@@ -47,7 +47,7 @@ export const validateInntekt = (
     return isValid
   }
 
-  if (!/^[0-9\s\-.]+$/.test(input)) {
+  if (!/^[0-9\s]+$/.test(input)) {
     isValid = false
     if (updateValidationErrorMessage) {
       updateValidationErrorMessage(