From 85d6eff4bc3aa48e1681b3610a4f293b7bf26c6c Mon Sep 17 00:00:00 2001 From: pathwaynavigator <30211022+pathwaynavigator@users.noreply.github.com> Date: Mon, 22 Dec 2025 16:59:36 +0100 Subject: [PATCH 1/6] Add node_modules volume to docker-compose Added volume for node_modules and defined it in the volumes section. --- docker-compose.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6f0cb6099..eb94fc7b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - "5001:5000" volumes: - ./:/ng-app + - node_modules_data:/ng-app/node_modules networks: - forus-network @@ -32,4 +33,8 @@ services: networks: forus-network: name: forus-network - driver: bridge \ No newline at end of file + driver: bridge + +volumes: + node_modules_data: + driver: local From 220358b45a1584aac33c99878442f5d220a62610 Mon Sep 17 00:00:00 2001 From: Yaroslav Kosterin Date: Wed, 28 Jan 2026 13:07:39 +0200 Subject: [PATCH 2/6] fix product filter by fund id on fund and voucher pages --- .../components/pages/funds-show/elements/FundProductsBlock.tsx | 2 +- .../components/pages/vouchers-show/elements/VoucherProducts.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/react/src/webshop/components/pages/funds-show/elements/FundProductsBlock.tsx b/react/src/webshop/components/pages/funds-show/elements/FundProductsBlock.tsx index a7e87523f..1195a6a1f 100644 --- a/react/src/webshop/components/pages/funds-show/elements/FundProductsBlock.tsx +++ b/react/src/webshop/components/pages/funds-show/elements/FundProductsBlock.tsx @@ -31,7 +31,7 @@ export default function FundProductsBlock({ fund }: { fund: Fund }) { return ( {products && (!fund.description_html || fund.description_position !== 'replace') && ( - + )} ); diff --git a/react/src/webshop/components/pages/vouchers-show/elements/VoucherProducts.tsx b/react/src/webshop/components/pages/vouchers-show/elements/VoucherProducts.tsx index 4087c554b..e29f1cefd 100644 --- a/react/src/webshop/components/pages/vouchers-show/elements/VoucherProducts.tsx +++ b/react/src/webshop/components/pages/vouchers-show/elements/VoucherProducts.tsx @@ -46,5 +46,5 @@ export default function VoucherProducts({ voucher }: { voucher: Voucher }) { if (!showProducts || !products) { return; } - return ; + return ; } From ec8b7ff71145a106f7df61e8de4548865e5f6e20 Mon Sep 17 00:00:00 2001 From: Yaroslav Kosterin Date: Thu, 29 Jan 2026 18:42:32 +0200 Subject: [PATCH 3/6] refresh organization after update bank fields --- .../transaction-settings/TransactionSettings.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/react/src/dashboard/components/pages/transaction-settings/TransactionSettings.tsx b/react/src/dashboard/components/pages/transaction-settings/TransactionSettings.tsx index bba5460a4..0b84f8a97 100644 --- a/react/src/dashboard/components/pages/transaction-settings/TransactionSettings.tsx +++ b/react/src/dashboard/components/pages/transaction-settings/TransactionSettings.tsx @@ -1,4 +1,4 @@ -import React, { Fragment, useMemo, useState } from 'react'; +import React, { Fragment, useContext, useMemo, useState } from 'react'; import useActiveOrganization from '../../../hooks/useActiveOrganization'; import usePushSuccess from '../../../hooks/usePushSuccess'; import StateNavLink from '../../../modules/state_router/StateNavLink'; @@ -9,8 +9,10 @@ import SelectControl from '../../elements/select-control/SelectControl'; import Tooltip from '../../elements/tooltip/Tooltip'; import usePushApiError from '../../../hooks/usePushApiError'; import { DashboardRoutes } from '../../../modules/state_router/RouterBuilder'; +import { mainContext } from '../../../contexts/MainContext'; export default function TransactionSettings() { + const { setOrganizationData } = useContext(mainContext); const activeOrganization = useActiveOrganization(); const pushSuccess = usePushSuccess(); @@ -49,7 +51,13 @@ export default function TransactionSettings() { const form = useFormBuilder(activeOrganization.bank_statement_details, (values) => { organizationService .updateBankFields(activeOrganization.id, values) - .then(() => pushSuccess('Opgeslagen!')) + .then((res) => { + pushSuccess('Opgeslagen!'); + + setOrganizationData(activeOrganization.id, { + bank_statement_details: res.data.data.bank_statement_details, + }); + }) .catch(pushApiError) .finally(() => form.setIsLocked(false)); }); From 6913bbccddbff3514889ce32cebb38f0c80d2538 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 19:56:05 +0000 Subject: [PATCH 4/6] Bump aws-rum-web from 1.19.0 to 2.0.0 Bumps [aws-rum-web](https://github.com/aws-observability/aws-rum-web) from 1.19.0 to 2.0.0. - [Release notes](https://github.com/aws-observability/aws-rum-web/releases) - [Changelog](https://github.com/aws-observability/aws-rum-web/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws-observability/aws-rum-web/compare/v1.19.0...v2.0.0) --- updated-dependencies: - dependency-name: aws-rum-web dependency-version: 2.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 367 ++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 173 insertions(+), 196 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ad6f15e3..5892601c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@mdi/js": "^7.1.96", "@react-google-maps/api": "^2.20.3", "@uiw/react-color": "^2.4.1", - "aws-rum-web": "^1.19.0", + "aws-rum-web": "^2.0.0", "chart.js": "^4.4.1", "clean-webpack-plugin": "^4.0.0", "date-fns": "^4.1.0", @@ -139,52 +139,30 @@ "ajv": ">=8" } }, - "node_modules/@aws-crypto/crc32": { + "node_modules/@aws-crypto/sha256-js": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz", - "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz", + "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==", + "license": "Apache-2.0", "dependencies": { "@aws-crypto/util": "^3.0.0", "@aws-sdk/types": "^3.222.0", "tslib": "^1.11.1" } }, - "node_modules/@aws-crypto/crc32/node_modules/@aws-crypto/util": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", - "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", - "dependencies": { - "@aws-sdk/types": "^3.222.0", - "@aws-sdk/util-utf8-browser": "^3.0.0", - "tslib": "^1.11.1" - } - }, - "node_modules/@aws-crypto/crc32/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-crypto/sha256-js": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz", - "integrity": "sha512-iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ==", - "dependencies": { - "@aws-crypto/util": "^2.0.2", - "@aws-sdk/types": "^3.110.0", - "tslib": "^1.11.1" - } - }, "node_modules/@aws-crypto/sha256-js/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "license": "0BSD" }, "node_modules/@aws-crypto/util": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz", - "integrity": "sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz", + "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==", + "license": "Apache-2.0", "dependencies": { - "@aws-sdk/types": "^3.110.0", + "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-utf8-browser": "^3.0.0", "tslib": "^1.11.1" } @@ -192,30 +170,8 @@ "node_modules/@aws-crypto/util/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/@aws-sdk/fetch-http-handler": { - "version": "3.374.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.374.0.tgz", - "integrity": "sha512-Xt+4F6tGi/q9Z32kLo8SSm9krLlCY2oTLxCfP3/1SKY2wqWKHjAgpLmPD+GW7fdMjAwhDqzW5ZhcSmvHNvoD/w==", - "deprecated": "This package has moved to @smithy/fetch-http-handler", - "dependencies": { - "@smithy/fetch-http-handler": "^1.0.1", - "tslib": "^2.5.0" - } - }, - "node_modules/@aws-sdk/protocol-http": { - "version": "3.374.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.374.0.tgz", - "integrity": "sha512-9WpRUbINdGroV3HiZZIBoJvL2ndoWk39OfwxWs2otxByppJZNN14bg/lvCx5e8ggHUti7IBk5rb0nqQZ4m05pg==", - "deprecated": "This package has moved to @smithy/protocol-http", - "dependencies": { - "@smithy/protocol-http": "^1.1.0", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "license": "0BSD" }, "node_modules/@aws-sdk/querystring-builder": { "version": "3.374.0", @@ -230,48 +186,24 @@ "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/signature-v4": { - "version": "3.374.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.374.0.tgz", - "integrity": "sha512-2xLJvSdzcZZAg0lsDLUAuSQuihzK0dcxIK7WmfuJeF7DGKJFmp9czQmz5f3qiDz6IDQzvgK1M9vtJSVCslJbyQ==", - "deprecated": "This package has moved to @smithy/signature-v4", - "dependencies": { - "@smithy/signature-v4": "^1.0.1", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/types": { - "version": "3.649.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.649.0.tgz", - "integrity": "sha512-PuPw8RysbhJNlaD2d/PzOTf8sbf4Dsn2b7hwyGh7YVG3S75yTpxSAZxrnhKsz9fStgqFmnw/jUfV/G+uQAeTVw==", + "version": "3.973.1", + "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.1.tgz", + "integrity": "sha512-DwHBiMNOB468JiX6+i34c+THsKHErYUdNQ3HexeXZvVn4zouLjgaS4FejiGSi2HyBuzuyHg7SuOPmjSvoU9NRg==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^3.4.0", + "@smithy/types": "^4.12.0", "tslib": "^2.6.2" }, "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@aws-sdk/util-hex-encoding": { - "version": "3.374.0", - "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.374.0.tgz", - "integrity": "sha512-14X7MDYCFle2Cuq0/Hvz2CHQoYVeoKKBY2Uf+wn0lKnKU+f0K81xRObUM/A7bLmZX4jFRk83gyE8Rj3BOqBdfA==", - "deprecated": "This package has moved to @smithy/util-hex-encoding", - "dependencies": { - "@smithy/util-hex-encoding": "^1.0.1", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" + "node": ">=20.0.0" } }, "node_modules/@aws-sdk/util-utf8-browser": { "version": "3.259.0", "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz", "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.3.1" } @@ -2798,83 +2730,92 @@ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", "dev": true }, - "node_modules/@smithy/eventstream-codec": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-1.1.0.tgz", - "integrity": "sha512-3tEbUb8t8an226jKB6V/Q2XU/J53lCwCzULuBPEaF4JjSh+FlCMp7TmogE/Aij5J9DwlsZ4VAD/IRDuQ/0ZtMw==", + "node_modules/@smithy/fetch-http-handler": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.3.tgz", + "integrity": "sha512-6SxNltSncI8s689nvnzZQc/dPXcpHQ34KUj6gR/HBroytKOd/isMG3gJF/zBE1TBmTT18TXyzhg3O3SOOqGEhA==", + "license": "Apache-2.0", "dependencies": { - "@aws-crypto/crc32": "3.0.0", - "@smithy/types": "^1.2.0", - "@smithy/util-hex-encoding": "^1.1.0", - "tslib": "^2.5.0" + "@smithy/protocol-http": "^4.1.8", + "@smithy/querystring-builder": "^3.0.11", + "@smithy/types": "^3.7.2", + "@smithy/util-base64": "^3.0.0", + "tslib": "^2.6.2" } }, - "node_modules/@smithy/eventstream-codec/node_modules/@smithy/types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz", - "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==", + "node_modules/@smithy/fetch-http-handler/node_modules/@smithy/querystring-builder": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.11.tgz", + "integrity": "sha512-u+5HV/9uJaeLj5XTb6+IEF/dokWWkEqJ0XiaRRogyREmKGUgZnNecLucADLdauWFKUNbQfulHFEZEdjwEBjXRg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "@smithy/types": "^3.7.2", + "@smithy/util-uri-escape": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/fetch-http-handler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-1.1.0.tgz", - "integrity": "sha512-N22C9R44u5WGlcY+Wuv8EXmCAq62wWwriRAuoczMEwAIjPbvHSthyPSLqI4S7kAST1j6niWg8kwpeJ3ReAv3xg==", + "node_modules/@smithy/fetch-http-handler/node_modules/@smithy/types": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.2.tgz", + "integrity": "sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==", + "license": "Apache-2.0", "dependencies": { - "@smithy/protocol-http": "^1.2.0", - "@smithy/querystring-builder": "^1.1.0", - "@smithy/types": "^1.2.0", - "@smithy/util-base64": "^1.1.0", - "tslib": "^2.5.0" + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, - "node_modules/@smithy/fetch-http-handler/node_modules/@smithy/types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz", - "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==", + "node_modules/@smithy/fetch-http-handler/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/is-array-buffer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-1.1.0.tgz", - "integrity": "sha512-twpQ/n+3OWZJ7Z+xu43MJErmhB/WO/mMTnqR6PwWQShvSJ/emx5d1N59LQZk6ZpTAeuRWrc+eHhkzTp9NFjNRQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz", + "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/protocol-http": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.2.0.tgz", - "integrity": "sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.8.tgz", + "integrity": "sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==", + "license": "Apache-2.0", "dependencies": { - "@smithy/types": "^1.2.0", - "tslib": "^2.5.0" + "@smithy/types": "^3.7.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/protocol-http/node_modules/@smithy/types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz", - "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.2.tgz", + "integrity": "sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/querystring-builder": { @@ -2902,38 +2843,41 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-1.1.0.tgz", - "integrity": "sha512-fDo3m7YqXBs7neciOePPd/X9LPm5QLlDMdIC4m1H6dgNLnXfLMFNIxEfPyohGA8VW9Wn4X8lygnPSGxDZSmp0Q==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.2.4.tgz", + "integrity": "sha512-5JWeMQYg81TgU4cG+OexAWdvDTs5JDdbEZx+Qr1iPbvo91QFGzjy0IkXAKaXUHqmKUJgSHK0ZxnCkgZpzkeNTA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/eventstream-codec": "^1.1.0", - "@smithy/is-array-buffer": "^1.1.0", - "@smithy/types": "^1.2.0", - "@smithy/util-hex-encoding": "^1.1.0", - "@smithy/util-middleware": "^1.1.0", - "@smithy/util-uri-escape": "^1.1.0", - "@smithy/util-utf8": "^1.1.0", - "tslib": "^2.5.0" + "@smithy/is-array-buffer": "^3.0.0", + "@smithy/protocol-http": "^4.1.8", + "@smithy/types": "^3.7.2", + "@smithy/util-hex-encoding": "^3.0.0", + "@smithy/util-middleware": "^3.0.11", + "@smithy/util-uri-escape": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/signature-v4/node_modules/@smithy/types": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz", - "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.2.tgz", + "integrity": "sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, - "node_modules/@smithy/types": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.4.2.tgz", - "integrity": "sha512-tHiFcfcVedVBHpmHUEUHOCCih8iZbIAYn9NvPsNzaPm/237I3imdDdZoOC8c87H5HBAVEa06tTgb+OcSWV9g5w==", + "node_modules/@smithy/signature-v4/node_modules/@smithy/util-uri-escape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz", + "integrity": "sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==", + "license": "Apache-2.0", "dependencies": { "tslib": "^2.6.2" }, @@ -2941,50 +2885,80 @@ "node": ">=16.0.0" } }, + "node_modules/@smithy/types": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.12.0.tgz", + "integrity": "sha512-9YcuJVTOBDjg9LWo23Qp0lTQ3D7fQsQtwle0jVfpbUHy9qBwCEgKuVH4FqFB3VYu0nwdHKiEMA+oXz7oV8X1kw==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@smithy/util-base64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-1.1.0.tgz", - "integrity": "sha512-FpYmDmVbOXAxqvoVCwqehUN0zXS+lN8V7VS9O7I8MKeVHdSTsZzlwiMEvGoyTNOXWn8luF4CTDYgNHnZViR30g==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-3.0.0.tgz", + "integrity": "sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==", + "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^1.1.0", - "tslib": "^2.5.0" + "@smithy/util-buffer-from": "^3.0.0", + "@smithy/util-utf8": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-buffer-from": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-1.1.0.tgz", - "integrity": "sha512-9m6NXE0ww+ra5HKHCHig20T+FAwxBAm7DIdwc/767uGWbRcY720ybgPacQNB96JMOI7xVr/CDa3oMzKmW4a+kw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz", + "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/is-array-buffer": "^1.1.0", - "tslib": "^2.5.0" + "@smithy/is-array-buffer": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-hex-encoding": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-1.1.0.tgz", - "integrity": "sha512-7UtIE9eH0u41zpB60Jzr0oNCQ3hMJUabMcKRUVjmyHTXiWDE4vjSqN6qlih7rCNeKGbioS7f/y2Jgym4QZcKFg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz", + "integrity": "sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@smithy/util-middleware": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-1.1.0.tgz", - "integrity": "sha512-6hhckcBqVgjWAqLy2vqlPZ3rfxLDhFWEmM7oLh2POGvsi7j0tHkbN7w4DFhuBExVJAbJ/qqxqZdRY6Fu7/OezQ==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.11.tgz", + "integrity": "sha512-dWpyc1e1R6VoXrwLoLDd57U1z6CwNSdkM69Ie4+6uYh2GC7Vg51Qtan7ITzczuVpqezdDTKJGJB95fFvvjU/ow==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.5.0" + "@smithy/types": "^3.7.2", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" + } + }, + "node_modules/@smithy/util-middleware/node_modules/@smithy/types": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@smithy/types/-/types-3.7.2.tgz", + "integrity": "sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=16.0.0" } }, "node_modules/@smithy/util-uri-escape": { @@ -2999,15 +2973,16 @@ } }, "node_modules/@smithy/util-utf8": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-1.1.0.tgz", - "integrity": "sha512-p/MYV+JmqmPyjdgyN2UxAeYDj9cBqCjp0C/NsTWnnjoZUVqoeZ6IrW915L9CAKWVECgv9lVQGc4u/yz26/bI1A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz", + "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==", + "license": "Apache-2.0", "dependencies": { - "@smithy/util-buffer-from": "^1.1.0", - "tslib": "^2.5.0" + "@smithy/util-buffer-from": "^3.0.0", + "tslib": "^2.6.2" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" } }, "node_modules/@svgr/babel-plugin-add-jsx-attribute": { @@ -5085,21 +5060,22 @@ } }, "node_modules/aws-rum-web": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/aws-rum-web/-/aws-rum-web-1.19.0.tgz", - "integrity": "sha512-V3sUSC3U8IYsQS0vK/rmACjzFugG07Zd01SII6JMvEB1/axEQ+SxUTK+nCyJdpCFPB3TuhpFwcfq5PVkn/MJ7w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aws-rum-web/-/aws-rum-web-2.0.0.tgz", + "integrity": "sha512-5LqpIDkgUbg0Iu6jMEeYJ6AIHkAia1UTpF+dS7NLvgzdK3smdjXjp1aV/W6IWjQwRI7rO950BBtcJ+G9VoPKWQ==", + "license": "Apache-2.0", "dependencies": { - "@aws-crypto/sha256-js": "^2.0.2", - "@aws-sdk/fetch-http-handler": "^3.36.0", - "@aws-sdk/protocol-http": "^3.36.0", + "@aws-crypto/sha256-js": "^3.0.0", "@aws-sdk/querystring-builder": "^3.36.0", - "@aws-sdk/signature-v4": "^3.36.0", - "@aws-sdk/util-hex-encoding": "^3.36.0", "@babel/runtime": "^7.16.0", + "@smithy/fetch-http-handler": "^4.1.0", + "@smithy/protocol-http": "^4.1.6", + "@smithy/signature-v4": "^4.2.2", + "@smithy/util-hex-encoding": "^3.0.0", "shimmer": "^1.2.1", "ua-parser-js": "^1.0.33", "uuid": "^9.0.0", - "web-vitals": "^3.0.2" + "web-vitals": "^4.0.0" } }, "node_modules/axios": { @@ -13712,9 +13688,10 @@ } }, "node_modules/web-vitals": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-3.5.2.tgz", - "integrity": "sha512-c0rhqNcHXRkY/ogGDJQxZ9Im9D19hDihbzSQJrsioex+KnFgmMzBiy57Z1EjkhX/+OjyBpclDCzz2ITtjokFmg==" + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-4.2.4.tgz", + "integrity": "sha512-r4DIlprAGwJ7YM11VZp4R884m0Vmgr6EAKe3P+kO0PPj3Unqyvv59rczf6UiGcb9Z8QxZVcqKNwv/g0WNdWwsw==", + "license": "Apache-2.0" }, "node_modules/webpack": { "version": "5.94.0", diff --git a/package.json b/package.json index 2dd2fc7ae..cbc54d057 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@mdi/js": "^7.1.96", "@react-google-maps/api": "^2.20.3", "@uiw/react-color": "^2.4.1", - "aws-rum-web": "^1.19.0", + "aws-rum-web": "^2.0.0", "chart.js": "^4.4.1", "clean-webpack-plugin": "^4.0.0", "date-fns": "^4.1.0", From 41e1744835ede68983d54c765bee6d531a2d7717 Mon Sep 17 00:00:00 2001 From: dev-rminds Date: Mon, 2 Feb 2026 09:47:03 +0200 Subject: [PATCH 5/6] replace inline className ifs with classNames lib --- .prettierrc.js | 4 +-- .../includes/blocks/block-action-card.scss | 2 +- .../includes/blocks/block-reimbursements.scss | 9 ++--- .../elements/forms/elements/FormGroup.tsx | 2 +- .../forms/ui-controls/UIControlStep.tsx | 2 +- .../FundCriteriaEditorItem.tsx | 2 +- .../photo-selector/PhotoSelectorBanner.tsx | 2 +- .../resource-states/FundRequestStateLabel.tsx | 21 ++++++++++-- .../templates/SelectControlOptions.tsx | 2 +- .../SelectControlOptionsCountryCodes.tsx | 2 +- .../templates/SelectControlOptionsFD.tsx | 2 +- .../templates/SelectControlOptionsFund.tsx | 2 +- .../templates/SelectControlOptionsLang.tsx | 2 +- .../elements/table-config/TableConfig.tsx | 2 +- .../elements/tables/TableRowActions.tsx | 2 +- .../components/modals/ModalPayoutsUpload.tsx | 4 +-- .../ModalPrevalidationRequestsUpload.tsx | 4 +-- .../modals/ModalPrevalidationsUpload.tsx | 4 +-- .../modals/ModalReservationUpload.tsx | 2 +- .../modals/ModalVoucherTransactionsUpload.tsx | 2 +- .../components/modals/ModalVouchersUpload.tsx | 4 +-- .../modals/elements/ModalButton.tsx | 22 +++++++++++-- .../components/pages/auth/SignUpProvider.tsx | 17 +++++----- .../pages/auth/elements/EmailProviderLink.tsx | 6 +++- .../auth/elements/SignUpAvailableFunds.tsx | 10 ++++-- .../pages/auth/elements/SignUpProgress.tsx | 19 +++++++---- .../sign-up-steps/SignUpStepGeneralInfo.tsx | 8 +++-- .../SignUpStepOrganizationSelect.tsx | 8 +++-- .../sign-up-steps/SignUpStepProfileCreate.tsx | 10 ++++-- .../bank-connections/BankConnections.tsx | 6 +++- .../components/pages/employees/Employees.tsx | 6 +++- .../pages/feature/elements/FaqItem.tsx | 3 +- .../elements/FinancialFilters.tsx | 33 ++++++++++++------- .../elements/ProviderFinancialTable.tsx | 8 +++-- .../FundBackofficeEdit.tsx | 21 ++++++++---- .../fund-requests-view/FundRequestsView.tsx | 22 ++++++++----- .../elements/IdentityPerson.tsx | 16 +++++---- .../PreferencesEmails.tsx | 5 ++- .../elements/SystemNotificationEditor.tsx | 15 ++++++--- .../SystemNotificationTemplateEditor.tsx | 18 ++++++---- .../cards/PreCheckExclusionsCard.tsx | 4 +-- .../offices-edit/elements/OfficesForm.tsx | 31 ++++++++++++----- .../offices-edit/elements/ScheduleControl.tsx | 5 +-- .../components/pages/offices/Offices.tsx | 20 +++++++---- .../OrganizationsFundsEdit.tsx | 11 +++++-- .../OrganizationsFundsShowStatisticsCard.tsx | 17 +++++++--- .../OrganizationsFundsShowTopUpsCard.tsx | 3 +- .../OrganizationsNotifications.tsx | 3 +- .../pages/payment-methods/PaymentMethods.tsx | 5 ++- .../pages/products-view/ProductView.tsx | 10 +++--- .../components/pages/products/Products.tsx | 11 +++++-- .../elements/ProviderFundInvitationsTable.tsx | 5 +-- .../elements/ProviderFundsAvailableTable.tsx | 3 +- .../elements/ProviderFundsTable.tsx | 3 +- .../provider-overview/ProviderOverview.tsx | 9 +++-- .../ReimbursementsView.tsx | 17 +++++----- .../elements/ReimbursementsTable.tsx | 10 ++++-- .../panes/ReservationExtraInformationPane.tsx | 3 +- .../elements/FundProviderTableItem.tsx | 13 +++++--- .../elements/ProviderOrganizationOverview.tsx | 8 +++-- .../elements/SponsorProviderOffices.tsx | 5 +-- .../elements/ProvidersTableItemFunds.tsx | 16 ++++----- .../TransactionBulkTransactionsTable.tsx | 3 +- .../elements/PayoutTransactionDetails.tsx | 23 ++++++------- .../elements/panes/TransactionDetailsPane.tsx | 15 +++++---- .../pages/transactions/Transactions.tsx | 6 +++- .../elements/VoucherRecordsCard.tsx | 3 +- .../elements/VoucherTransactionsCard.tsx | 3 +- .../components/pages/vouchers/Vouchers.tsx | 2 +- .../vouchers/elements/VouchersTableRow.tsx | 11 +++++-- react/src/dashboard/layout/Layout.tsx | 11 ++++--- .../layout/elements/LayoutHeader.tsx | 16 +++++++-- .../aside/elements/LayoutAsideNavGroup.tsx | 4 +-- .../paginator/components/Paginator.tsx | 6 ++-- .../components/PushNotificationsGroup.tsx | 7 +++- react/src/props/elements/ButtonType.ts | 16 ++++++++- .../elements/announcements/Announcements.tsx | 10 ++++-- .../elements/app-links/AppLinks.tsx | 3 +- .../BlockCard2FAWarning.tsx | 8 ++++- .../elements/block-loader/BlockLoader.tsx | 3 +- .../BlockOrganizationOffices.tsx | 6 ++-- .../block-panel-group/PaneGroupPanel.tsx | 6 +++- .../BlockVoucherRecords.tsx | 10 ++++-- .../elements/empty-block/EmptyBlock.tsx | 18 +++++++++- .../components/elements/forms/FormGroup.tsx | 2 +- .../input-radio-control/InputRadioControl.tsx | 5 ++- .../templates/FundsListItemList.tsx | 7 +++- .../templates/FundsListItemPreCheck.tsx | 32 +++++++++--------- .../templates/ProductsListItemGrid.tsx | 3 +- .../templates/ProductsListItemList.tsx | 3 +- .../templates/ProvidersListItemList.tsx | 7 ++-- .../components/elements/markdown/Markdown.tsx | 9 ++++- .../elements/profile-menu/ProfileMenu.tsx | 3 +- .../SelectControlOptionsVouchers.tsx | 14 +++++--- .../components/elements/tooltip/Tooltip.tsx | 3 +- .../elements/top-navbar/TopNavbarSearch.tsx | 4 +-- .../desktop/TopNavbarDesktopMenuUser.tsx | 3 +- .../components/modals/Modal2FADeactivate.tsx | 9 +++-- .../components/modals/Modal2FASetup.tsx | 16 +++++++-- .../components/modals/ModalAuthPincode.tsx | 5 ++- .../modals/ModalDeactivateVoucher.tsx | 3 +- .../components/modals/ModalFundHelp.tsx | 3 +- .../ModalFundRequestClarificationResponse.tsx | 2 +- .../modals/ModalIdentityProxyExpired.tsx | 8 ++++- .../components/modals/ModalImagePreview.tsx | 3 +- .../components/modals/ModalNotification.tsx | 18 ++++++++-- .../components/modals/ModalOpenInMe.tsx | 5 ++- .../components/modals/ModalPdfPreview.tsx | 10 +++++- .../modals/ModalPhysicalCardType.tsx | 4 ++- .../modals/ModalPhysicalCardUnlink.tsx | 4 ++- .../modals/ModalProductReserveCancel.tsx | 3 +- .../modals/ModalReimbursementConfirm.tsx | 8 ++++- .../components/modals/ModalShareVoucher.tsx | 3 +- .../components/modals/ModalVoucherPayout.tsx | 3 +- .../modal-photo-cropper/ModalPhotoCropper.tsx | 15 ++++++--- .../ModalProductReserve.tsx | 30 ++++++++++------- .../webshop/components/pages/auth/Start.tsx | 26 +++++++++++---- .../BookmarkedProducts.tsx | 17 ++++++---- .../pages/cms-pages/Accessibility.tsx | 9 +++-- .../components/pages/cms-pages/Privacy.tsx | 9 +++-- .../pages/cms-pages/ProvidersSignUp.tsx | 9 +++-- .../fund-requests-show/FundRequestsShow.tsx | 4 +-- .../pages/fund-requests/FundRequests.tsx | 13 ++++++-- .../pages/funds-activate/FundActivate.tsx | 2 +- .../pages/funds-pre-check/FundsPreCheck.tsx | 2 +- .../elements/FundRequestProgress.tsx | 20 ++++++----- .../components/pages/funds-show/FundsShow.tsx | 10 ++++-- .../identity-emails/PreferencesEmails.tsx | 9 ++++- .../payouts/elements/PayoutCardOverview.tsx | 2 +- .../pages/physical_cards/PhysicalCards.tsx | 13 ++++++-- .../products-show/elements/ProductMedia.tsx | 2 +- .../components/pages/products/Products.tsx | 12 +++++-- .../providers-office/ProvidersOffice.tsx | 8 +++-- .../pages/providers-show/ProvidersShow.tsx | 6 +++- .../pages/reimbursements/Reimbursements.tsx | 12 +++++-- .../elements/ReimbursementCard.tsx | 9 ++++- .../elements/ReimbursementDetailsCard.tsx | 8 +++-- .../reservations-show/ReservationsShow.tsx | 14 ++++++-- .../pages/reservations/Reservations.tsx | 13 ++++++-- .../reservations/elements/ReservationCard.tsx | 10 +++++- .../hooks/useComposeStateAndExpires.tsx | 2 +- .../components/pages/search/Search.tsx | 13 ++++++-- .../pages/search/elements/SearchItemsList.tsx | 3 +- .../elements/VoucherTransactionsCard.tsx | 2 +- .../components/pages/vouchers/Vouchers.tsx | 13 ++++++-- .../pages/vouchers/elements/VoucherCard.tsx | 3 +- .../webshop/hooks/useMobileLangSelector.tsx | 2 +- .../webshop/layout/elements/LayoutFooter.tsx | 11 ++++--- 148 files changed, 883 insertions(+), 385 deletions(-) diff --git a/.prettierrc.js b/.prettierrc.js index f9345b376..076151234 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -6,10 +6,10 @@ module.exports = { singleQuote: true, trailingComma: 'all', bracketSpacing: true, - jsxBracketSameLine: true, + bracketSameLine: true, arrowParens: 'always', requirePragma: false, insertPragma: false, proseWrap: 'always', - endOfLine:"auto", + endOfLine: 'auto', }; diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss b/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss index 1d34e690f..ce00d7774 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-action-card.scss @@ -182,7 +182,7 @@ } } - &.bottom { + &.block-card-actions-bottom { width: 100%; padding: 8px 65px 0; diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-reimbursements.scss b/react/assets/forus-webshop/scss/includes/blocks/block-reimbursements.scss index 43f6d32af..0f82f7d70 100644 --- a/react/assets/forus-webshop/scss/includes/blocks/block-reimbursements.scss +++ b/react/assets/forus-webshop/scss/includes/blocks/block-reimbursements.scss @@ -66,13 +66,13 @@ } } - &.reimbursement-image-rejected { + &.reimbursement-image-declined { svg .fill-color-primary { fill: #d38c87; } } - &.reimbursement-image-accepted { + &.reimbursement-image-approved { svg .fill-color-primary { fill: #9bbfa1; } @@ -119,7 +119,7 @@ } .reimbursement-values { - padding: 0px 15px 15px 20px; + padding: 0 15px 15px 20px; display: flex; flex-direction: row; justify-content: flex-end; @@ -161,8 +161,6 @@ flex-direction: column; padding: 15px; position: relative; - display: flex; - flex-direction: column; justify-content: flex-end; white-space: nowrap; @@ -184,7 +182,6 @@ bottom: 25px; left: 25px; text-align: right; - flex-direction: column; justify-content: flex-end; margin: 0 0 5px; diff --git a/react/src/dashboard/components/elements/forms/elements/FormGroup.tsx b/react/src/dashboard/components/elements/forms/elements/FormGroup.tsx index 3a02bd77b..65cd77461 100644 --- a/react/src/dashboard/components/elements/forms/elements/FormGroup.tsx +++ b/react/src/dashboard/components/elements/forms/elements/FormGroup.tsx @@ -36,7 +36,7 @@ export default function FormGroup({ className, )}> {label && ( -