Skip to content

Commit deff32a

Browse files
frodehansen2frodehansen2
committed
Merge branch 'main' into innsyn-status-i-sak
2 parents 02e4c79 + 6d7d0ca commit deff32a

File tree

47 files changed

+1653
-1218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1653
-1218
lines changed

‎apps/dine-pleiepenger/CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# @navikt/dine-pleiepenger
22

3+
## 0.5.23
4+
5+
### Patch Changes
6+
7+
- 6ff87ec: Pakkeroppdateringer - minor / patch
8+
- Updated dependencies [6ff87ec]
9+
- @navikt/sif-common-amplitude@2.24.26
10+
- @navikt/appstatus-react-ds@2.17.31
11+
- @navikt/sif-common-core-ds@9.15.16
12+
- @navikt/sif-common-sentry@0.25.24
13+
- @navikt/sif-common-utils@3.44.11
14+
15+
## 0.5.22
16+
17+
### Patch Changes
18+
19+
- Pakkeoppdateringer - patch og minor
20+
- Updated dependencies
21+
- @navikt/appstatus-react-ds@2.17.30
22+
- @navikt/sif-common-core-ds@9.15.15
23+
- @navikt/sif-common-utils@3.44.10
24+
- @navikt/sif-common-amplitude@2.24.25
25+
326
## 0.5.21
427

528
### Patch Changes

‎apps/dine-pleiepenger/package.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@navikt/dine-pleiepenger",
3-
"version": "0.5.21",
3+
"version": "0.5.23",
44
"private": true,
55
"scripts": {
66
"build-storybook": "storybook build",
@@ -39,20 +39,20 @@
3939
},
4040
"devDependencies": {
4141
"@axe-core/playwright": "4.8.5",
42-
"@navikt/ds-css": "6.3.2",
42+
"@navikt/ds-css": "6.3.3",
4343
"@navikt/ds-icons": "3.4.3",
44-
"@navikt/ds-react": "6.3.2",
45-
"@navikt/ds-tailwind": "6.3.2",
44+
"@navikt/ds-react": "6.3.3",
45+
"@navikt/ds-tailwind": "6.3.3",
4646
"@next/bundle-analyzer": "14.1.4",
4747
"@playwright/test": "1.42.1",
48-
"@storybook/addon-essentials": "8.0.2",
49-
"@storybook/addon-interactions": "8.0.2",
50-
"@storybook/addon-links": "8.0.2",
51-
"@storybook/addon-onboarding": "8.0.2",
52-
"@storybook/blocks": "8.0.2",
53-
"@storybook/nextjs": "8.0.2",
54-
"@storybook/react": "8.0.2",
55-
"@storybook/test": "8.0.2",
48+
"@storybook/addon-essentials": "8.0.4",
49+
"@storybook/addon-interactions": "8.0.4",
50+
"@storybook/addon-links": "8.0.4",
51+
"@storybook/addon-onboarding": "8.0.4",
52+
"@storybook/blocks": "8.0.4",
53+
"@storybook/nextjs": "8.0.4",
54+
"@storybook/react": "8.0.4",
55+
"@storybook/test": "8.0.4",
5656
"chromatic": "11.2.0",
5757
"classnames": "2.5.1",
5858
"dayjs": "1.11.10",
@@ -66,8 +66,8 @@
6666
"react": "18.2.0",
6767
"react-day-picker": "8.10.0",
6868
"react-dom": "18.2.0",
69-
"react-intl": "6.6.2",
70-
"storybook": "8.0.2",
69+
"react-intl": "6.6.3",
70+
"storybook": "8.0.4",
7171
"tailwindcss": "3.4.1",
7272
"uuid": "9.0.1"
7373
},

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md

+26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn
22

3+
## 1.21.37
4+
5+
### Patch Changes
6+
7+
- 6ff87ec: Pakkeroppdateringer - minor / patch
8+
- Updated dependencies [6ff87ec]
9+
- @navikt/sif-common-amplitude@2.24.26
10+
- @navikt/sif-common-formik-ds@1.7.24
11+
- @navikt/sif-common-soknad-ds@10.13.23
12+
- @navikt/sif-common-core-ds@9.15.16
13+
- @navikt/sif-common-sentry@0.25.24
14+
- @navikt/sif-common-utils@3.44.11
15+
16+
## 1.21.36
17+
18+
### Patch Changes
19+
20+
- Pakkeoppdateringer - patch og minor
21+
- Updated dependencies
22+
- @navikt/sif-common-formik-ds@1.7.23
23+
- @navikt/sif-common-soknad-ds@10.13.22
24+
- @navikt/sif-common-core-ds@9.15.15
25+
- @navikt/sif-common-hooks@0.1.7
26+
- @navikt/sif-common-utils@3.44.10
27+
- @navikt/sif-common-amplitude@2.24.25
28+
329
## 1.21.35
430

531
### Patch Changes

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
44
"license": "MIT",
55
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
6-
"version": "1.21.35",
6+
"version": "1.21.37",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
88
"private": true,
99
"type": "module",
@@ -23,9 +23,9 @@
2323
"test": "vitest run"
2424
},
2525
"dependencies": {
26-
"@navikt/ds-css": "6.3.2",
27-
"@navikt/ds-react": "6.3.2",
28-
"@navikt/ds-tailwind": "6.3.2",
26+
"@navikt/ds-css": "6.3.3",
27+
"@navikt/ds-react": "6.3.3",
28+
"@navikt/ds-tailwind": "6.3.3",
2929
"@navikt/sif-app-register": "workspace:*",
3030
"@navikt/sif-common-amplitude": "workspace:*",
3131
"@navikt/sif-common-core-ds": "workspace:*",
@@ -40,7 +40,7 @@
4040
"cookie-parser": "1.4.6",
4141
"dayjs": "1.11.10",
4242
"dotenv": "16.4.5",
43-
"express": "4.18.3",
43+
"express": "4.19.1",
4444
"formik": "2.4.5",
4545
"helmet": "7.1.0",
4646
"http-proxy-middleware": "2.0.6",
@@ -51,31 +51,31 @@
5151
"react": "18.2.0",
5252
"react-dom": "18.2.0",
5353
"react-fast-compare": "3.2.2",
54-
"react-intl": "6.6.2",
54+
"react-intl": "6.6.3",
5555
"react-router-dom": "6.22.3",
56-
"vite": "5.2.0",
56+
"vite": "5.2.6",
5757
"vite-plugin-checker": "0.6.4"
5858
},
5959
"devDependencies": {
6060
"@axe-core/playwright": "4.8.5",
61-
"@babel/core": "7.24.1",
61+
"@babel/core": "7.24.3",
6262
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
6363
"@babel/plugin-transform-modules-commonjs": "7.24.1",
64-
"@babel/preset-env": "7.24.1",
64+
"@babel/preset-env": "7.24.3",
6565
"@babel/preset-react": "7.24.1",
6666
"@playwright/test": "1.42.1",
67-
"@storybook/react-vite": "8.0.2",
67+
"@storybook/react-vite": "8.0.4",
6868
"@testing-library/react": "14.2.2",
6969
"@types/object-hash": "3.0.6",
70-
"@types/react": "18.2.67",
70+
"@types/react": "18.2.70",
7171
"@types/react-dom": "18.2.22",
7272
"@types/react-router-dom": "5.3.3",
7373
"babel-polyfill": "6.26.0",
7474
"cross-env": "7.0.3",
7575
"express-rate-limit": "7.2.0",
7676
"jsdom": "24.0.0",
7777
"rimraf": "5.0.5",
78-
"typescript": "5.4.2",
78+
"typescript": "5.4.3",
7979
"vitest": "1.4.0"
8080
},
8181
"eslintConfig": {

‎apps/endringsmelding-pleiepenger/CHANGELOG.md

+34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
11
# @navikt/endringsmelding-pleiepenger
22

3+
## 2.25.19
4+
5+
### Patch Changes
6+
7+
- 6ff87ec: Pakkeroppdateringer - minor / patch
8+
- Updated dependencies [6ff87ec]
9+
- @navikt/sif-common-amplitude@2.24.26
10+
- @navikt/sif-common-formik-ds@1.7.24
11+
- @navikt/sif-common-soknad-ds@10.13.23
12+
- @navikt/sif-common-forms-ds@8.19.12
13+
- @navikt/sif-common-core-ds@9.15.16
14+
- @navikt/sif-common-sentry@0.25.24
15+
- @navikt/sif-common-utils@3.44.11
16+
17+
## 2.25.18
18+
19+
### Patch Changes
20+
21+
- 8055943: Oppdatere tekst i melding som bruker får når vi ikke finner sak.
22+
23+
## 2.25.17
24+
25+
### Patch Changes
26+
27+
- Pakkeoppdateringer - patch og minor
28+
- Updated dependencies
29+
- @navikt/sif-common-formik-ds@1.7.23
30+
- @navikt/sif-common-soknad-ds@10.13.22
31+
- @navikt/sif-common-forms-ds@8.19.11
32+
- @navikt/sif-common-core-ds@9.15.15
33+
- @navikt/sif-common-hooks@0.1.7
34+
- @navikt/sif-common-utils@3.44.10
35+
- @navikt/sif-common-amplitude@2.24.25
36+
337
## 2.25.16
438

539
### Patch Changes

‎apps/endringsmelding-pleiepenger/package.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"license": "MIT",
66
"name": "@navikt/endringsmelding-pleiepenger",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
8-
"version": "2.25.16",
8+
"version": "2.25.19",
99
"private": true,
1010
"dependencies": {
11-
"@navikt/ds-css": "6.3.2",
11+
"@navikt/ds-css": "6.3.3",
1212
"@navikt/ds-icons": "3.4.3",
13-
"@navikt/ds-react": "6.3.2",
14-
"@navikt/ds-tailwind": "6.3.2",
13+
"@navikt/ds-react": "6.3.3",
14+
"@navikt/ds-tailwind": "6.3.3",
1515
"@navikt/sif-common-amplitude": "workspace:*",
1616
"@navikt/sif-common-core-ds": "workspace:*",
1717
"@navikt/sif-common-formik-ds": "workspace:*",
@@ -26,7 +26,7 @@
2626
"cookie-parser": "1.4.6",
2727
"dayjs": "1.11.10",
2828
"dotenv": "16.4.5",
29-
"express": "4.18.3",
29+
"express": "4.19.1",
3030
"express-rate-limit": "7.2.0",
3131
"flat": "6.0.1",
3232
"formik": "2.4.5",
@@ -40,33 +40,33 @@
4040
"react": "18.2.0",
4141
"react-day-picker": "8.10.0",
4242
"react-dom": "18.2.0",
43-
"react-intl": "6.6.2",
43+
"react-intl": "6.6.3",
4444
"react-modal": "3.16.1",
4545
"react-router-dom": "6.22.3"
4646
},
4747
"devDependencies": {
48-
"@babel/core": "7.24.1",
48+
"@babel/core": "7.24.3",
4949
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
5050
"@babel/plugin-transform-modules-commonjs": "7.24.1",
51-
"@babel/preset-env": "7.24.1",
51+
"@babel/preset-env": "7.24.3",
5252
"@babel/preset-react": "7.24.1",
5353
"@babel/preset-typescript": "7.24.1",
5454
"@mswjs/data": "0.16.1",
55-
"@navikt/ds-tailwind": "6.3.2",
55+
"@navikt/ds-tailwind": "6.3.3",
5656
"@sentry/vite-plugin": "2.16.0",
57-
"@storybook/addon-actions": "8.0.2",
58-
"@storybook/addon-essentials": "8.0.2",
59-
"@storybook/addon-interactions": "8.0.2",
60-
"@storybook/addon-links": "8.0.2",
61-
"@storybook/node-logger": "8.0.2",
62-
"@storybook/preset-create-react-app": "8.0.2",
63-
"@storybook/react": "8.0.2",
57+
"@storybook/addon-actions": "8.0.4",
58+
"@storybook/addon-essentials": "8.0.4",
59+
"@storybook/addon-interactions": "8.0.4",
60+
"@storybook/addon-links": "8.0.4",
61+
"@storybook/node-logger": "8.0.4",
62+
"@storybook/preset-create-react-app": "8.0.4",
63+
"@storybook/react": "8.0.4",
6464
"@storybook/testing-library": "0.2.2",
6565
"@types/flat": "5.0.5",
6666
"@types/intl": "1.2.2",
6767
"@types/js-cookie": "3.0.6",
6868
"@types/object-hash": "3.0.6",
69-
"@types/react": "18.2.67",
69+
"@types/react": "18.2.70",
7070
"@types/react-document-title": "2.0.9",
7171
"@types/react-dom": "18.2.22",
7272
"@types/react-modal": "3.16.3",
@@ -75,18 +75,18 @@
7575
"axe-core": "4.8.4",
7676
"babel-polyfill": "6.26.0",
7777
"cross-env": "7.0.3",
78-
"cypress": "13.7.0",
78+
"cypress": "13.7.1",
7979
"cypress-axe": "1.5.0",
8080
"cypress-file-upload": "5.0.8",
8181
"jsdom": "24.0.0",
82-
"msw": "2.2.9",
83-
"postcss": "8.4.37",
84-
"postcss-import": "16.0.1",
82+
"msw": "2.2.10",
83+
"postcss": "8.4.38",
84+
"postcss-import": "16.1.0",
8585
"react-responsive": "10.0.0",
86-
"storybook": "8.0.2",
86+
"storybook": "8.0.4",
8787
"tailwindcss": "3.4.1",
88-
"typescript": "5.4.2",
89-
"vite": "5.2.0",
88+
"typescript": "5.4.3",
89+
"vite": "5.2.6",
9090
"vite-plugin-checker": "0.6.4",
9191
"vitest": "1.4.0"
9292
},

‎apps/endringsmelding-pleiepenger/src/app/pages/ingen-tilgang/IngenTilgangPage.tsx

+10-5
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,18 @@ const getÅrsakMelding = (årsak: IngenTilgangÅrsak) => {
3737
return (
3838
<BodyLong as="div" data-testid="ingenSak">
3939
<p>
40-
Vi finner ingen sak om pleiepenger registrert på deg, derfor kan du heller ikke bruke denne
41-
tjenesten. Hvis du akkurat har sendt inn en søknad, tar det noen minutter før saken din kommer
42-
opp her.
40+
Vi finner ingen sak om pleiepenger for sykt barn registrert på deg, derfor kan du heller ikke
41+
bruke denne tjenesten. Hvis du akkurat har sendt inn en søknad, tar det noen minutter før saken
42+
din kommer opp her.
4343
</p>
4444
<p>
45-
Hvis du mener at dette ikke stemmer, er det fint at du sender en melding til oss{' '}
46-
<SkrivTilOssLink />.
45+
Hvis du har søkt om pleiepenger for en periode frem i tid, eller for barn som ikke er
46+
folkeregistrert på deg, kan det ta tid før du kan bruke endringsmeldingen. Du kan foreløpig
47+
melde endringer i pleiepengesaken din via <SkrivTilOssLink />.
48+
</p>
49+
<p>
50+
Hvis du ønsker at en av våre veiledere skal undersøke hvorfor du ikke kan bruke
51+
endringsmeldingen, kan du kontakte oss på telefon 55 55 33 33.
4752
</p>
4853
</BodyLong>
4954
);

‎apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# @navikt/omsorgsdager-aleneomsorg-dialog
22

3+
## 2.14.40
4+
5+
### Patch Changes
6+
7+
- 6ff87ec: Pakkeroppdateringer - minor / patch
8+
- Updated dependencies [6ff87ec]
9+
- @navikt/sif-common-amplitude@2.24.26
10+
- @navikt/sif-common-formik-ds@1.7.24
11+
- @navikt/sif-common-soknad-ds@10.13.23
12+
- @navikt/sif-common-forms-ds@8.19.12
13+
- @navikt/sif-common-core-ds@9.15.16
14+
- @navikt/sif-common-sentry@0.25.24
15+
- @navikt/sif-common-utils@3.44.11
16+
17+
## 2.14.39
18+
19+
### Patch Changes
20+
21+
- Pakkeoppdateringer - patch og minor
22+
- Updated dependencies
23+
- @navikt/sif-common-formik-ds@1.7.23
24+
- @navikt/sif-common-soknad-ds@10.13.22
25+
- @navikt/sif-common-forms-ds@8.19.11
26+
- @navikt/sif-common-core-ds@9.15.15
27+
- @navikt/sif-common-hooks@0.1.7
28+
- @navikt/sif-common-utils@3.44.10
29+
- @navikt/sif-common-amplitude@2.24.25
30+
331
## 2.14.38
432

533
### Patch Changes

0 commit comments

Comments
 (0)