From 90c786f48322084affeb8a6b097d6e4f472fecc1 Mon Sep 17 00:00:00 2001
From: Yaroslav Kosterin <ateamcms@gmail.com>
Date: Sat, 19 Apr 2025 14:32:34 +0300
Subject: [PATCH 01/17] add voucher transaction bulk autotest

---
 .../TransactionBulksView.tsx                    |  2 ++
 .../pages/transactions/Transactions.tsx         | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx b/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
index 607e43059..15943bbc6 100644
--- a/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
+++ b/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
@@ -336,6 +336,7 @@ export default function TransactionBulksView() {
                                                 {/* Export SEPA file */}
                                                 {activeOrganization.allow_manual_bulk_processing && (
                                                     <button
+                                                        data-dusk="exportSepaBtn"
                                                         className="button button-default button-sm"
                                                         onClick={() => exportSepa()}>
                                                         <em className="mdi mdi-download icon-start" />
@@ -360,6 +361,7 @@ export default function TransactionBulksView() {
                                                 {/* Set paid */}
                                                 {transactionBulk.is_exported && (
                                                     <button
+                                                        data-dusk="acceptManuallyBtn"
                                                         className="button button-danger button-sm"
                                                         onClick={() => acceptManually()}>
                                                         <em className="mdi mdi-alert-outline icon-start" />
diff --git a/react/src/dashboard/components/pages/transactions/Transactions.tsx b/react/src/dashboard/components/pages/transactions/Transactions.tsx
index 9250851d8..007f64066 100644
--- a/react/src/dashboard/components/pages/transactions/Transactions.tsx
+++ b/react/src/dashboard/components/pages/transactions/Transactions.tsx
@@ -398,6 +398,7 @@ export default function Transactions() {
                                             {viewTypes?.map((viewTypeItem) => (
                                                 <div
                                                     key={viewTypeItem.key}
+                                                    data-dusk={`transaction_view_${viewTypeItem.key}`}
                                                     onClick={() => setViewType(viewTypeItem)}
                                                     className={`label-tab label-tab-sm ${
                                                         viewType.key === viewTypeItem.key ? 'active' : ''
@@ -981,7 +982,7 @@ export default function Transactions() {
                 hasPermission(activeOrganization, 'manage_transaction_bulks') && (
                     <div className="card-section" hidden={viewType.key !== 'transactions'}>
                         <div className="flex flex-vertical">
-                            <div className="card-text">
+                            <div className="card-text" data-dusk="pendingBulkingMetaText">
                                 <TranslateHtml
                                     i18n={'transactions.labels.bulk_total_amount'}
                                     values={{
@@ -992,6 +993,7 @@ export default function Transactions() {
                             </div>
                             <button
                                 className="button button-primary"
+                                data-dusk="bulkPendingNow"
                                 onClick={() => bulkPendingNow()}
                                 disabled={buildingBulks}>
                                 {buildingBulks ? (
@@ -1045,7 +1047,16 @@ export default function Transactions() {
 
                                 <tbody>
                                     {transactionBulks.data?.map((transactionBulk) => (
-                                        <tr key={transactionBulk.id}>
+                                        <StateNavLink
+                                            customElement={'tr'}
+                                            className={'tr-clickable'}
+                                            name={'transaction-bulk'}
+                                            params={{
+                                                organizationId: activeOrganization.id,
+                                                id: transactionBulk.id,
+                                            }}
+                                            key={transactionBulk.id}
+                                            dataDusk={`transactionBulkRow${transactionBulk.id}`}>
                                             <td>{transactionBulk.id}</td>
                                             <td className="text-primary-light">
                                                 {transactionBulk.voucher_transactions_amount_locale}
@@ -1108,7 +1119,7 @@ export default function Transactions() {
                                                     )}
                                                 />
                                             </td>
-                                        </tr>
+                                        </StateNavLink>
                                     ))}
                                 </tbody>
                             </table>

From ddca5d19532e64181489363f107dc8f4c9b83d0a Mon Sep 17 00:00:00 2001
From: Yaroslav Kosterin <ateamcms@gmail.com>
Date: Sat, 19 Apr 2025 17:01:16 +0300
Subject: [PATCH 02/17] add filter transactions by selected fund in autotest

---
 .../components/elements/tables/elements/CardHeaderFilter.tsx | 1 +
 .../components/elements/tables/elements/FilterItemToggle.tsx | 3 +++
 .../dashboard/components/pages/transactions/Transactions.tsx | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/react/src/dashboard/components/elements/tables/elements/CardHeaderFilter.tsx b/react/src/dashboard/components/elements/tables/elements/CardHeaderFilter.tsx
index 0c8d097a4..c2d6e95f3 100644
--- a/react/src/dashboard/components/elements/tables/elements/CardHeaderFilter.tsx
+++ b/react/src/dashboard/components/elements/tables/elements/CardHeaderFilter.tsx
@@ -24,6 +24,7 @@ export default function CardHeaderFilter({
             )}
 
             <button
+                data-dusk="showFilters"
                 className="button button-default button-icon"
                 onClick={(e) => {
                     e.stopPropagation();
diff --git a/react/src/dashboard/components/elements/tables/elements/FilterItemToggle.tsx b/react/src/dashboard/components/elements/tables/elements/FilterItemToggle.tsx
index e0210a284..39cc59b9c 100644
--- a/react/src/dashboard/components/elements/tables/elements/FilterItemToggle.tsx
+++ b/react/src/dashboard/components/elements/tables/elements/FilterItemToggle.tsx
@@ -4,10 +4,12 @@ export default function FilterItemToggle({
     children,
     label,
     show = false,
+    dusk = null,
 }: {
     children: React.ReactElement | Array<React.ReactElement>;
     label: string;
     show?: boolean;
+    dusk?: string;
 }) {
     const [visible, setVisible] = useState(show);
 
@@ -16,6 +18,7 @@ export default function FilterItemToggle({
             <label
                 htmlFor=""
                 className={`form-label form-label-toggle ${visible ? 'active' : ''}`}
+                data-dusk={dusk}
                 onClick={() => setVisible(!visible)}>
                 <span>{label}</span>
                 <em className="mdi mdi-menu-right form-label-icon" />
diff --git a/react/src/dashboard/components/pages/transactions/Transactions.tsx b/react/src/dashboard/components/pages/transactions/Transactions.tsx
index 007f64066..07931c22a 100644
--- a/react/src/dashboard/components/pages/transactions/Transactions.tsx
+++ b/react/src/dashboard/components/pages/transactions/Transactions.tsx
@@ -505,13 +505,16 @@ export default function Transactions() {
                                     />
                                 </FilterItemToggle>
 
-                                <FilterItemToggle label={translate('transactions.labels.fund_name')}>
+                                <FilterItemToggle
+                                    dusk="fundSelectToggle"
+                                    label={translate('transactions.labels.fund_name')}>
                                     {funds && (
                                         <SelectControl
                                             className="form-control"
                                             propKey={'id'}
                                             allowSearch={false}
                                             options={funds}
+                                            dusk="fundSelect"
                                             onChange={(fund_id: number) => filter.update({ fund_id })}
                                         />
                                     )}

From b08de2fcc08f7e1306465d16e4c0a2ce42aea6c9 Mon Sep 17 00:00:00 2001
From: Yaroslav Kosterin <ateamcms@gmail.com>
Date: Sat, 19 Apr 2025 19:26:29 +0300
Subject: [PATCH 03/17] increase per_page for funds filter on transactions page

---
 .../dashboard/components/pages/transactions/Transactions.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/src/dashboard/components/pages/transactions/Transactions.tsx b/react/src/dashboard/components/pages/transactions/Transactions.tsx
index 07931c22a..d75ee4c49 100644
--- a/react/src/dashboard/components/pages/transactions/Transactions.tsx
+++ b/react/src/dashboard/components/pages/transactions/Transactions.tsx
@@ -351,7 +351,7 @@ export default function Transactions() {
     ]);
 
     useEffect(() => {
-        fetchFunds({}).then((funds) => setFunds([{ id: null, name: 'Selecteer fonds' }, ...funds]));
+        fetchFunds({ per_page: 100 }).then((funds) => setFunds([{ id: null, name: 'Selecteer fonds' }, ...funds]));
     }, [fetchFunds]);
 
     if (

From 3db9bc88e82406f2e995f909e0098e441201bab3 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Wed, 23 Apr 2025 07:26:12 +0300
Subject: [PATCH 04/17] add close button dusk selector to push notifications

---
 .../push_notifications/components/PushNotificationsGroup.tsx     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react/src/dashboard/modules/push_notifications/components/PushNotificationsGroup.tsx b/react/src/dashboard/modules/push_notifications/components/PushNotificationsGroup.tsx
index 283885286..c7cdd40b7 100644
--- a/react/src/dashboard/modules/push_notifications/components/PushNotificationsGroup.tsx
+++ b/react/src/dashboard/modules/push_notifications/components/PushNotificationsGroup.tsx
@@ -118,6 +118,7 @@ export default function PushNotificationsGroup({
                         <div
                             className="notification-close mdi mdi-close"
                             role="button"
+                            data-dusk="notificationCloseBtn"
                             tabIndex={0}
                             onKeyDown={clickOnKeyEnter}
                             onClick={() => popNotification(notification.id)}

From 820be0237a084bda215aeca9736335c72f869439 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Wed, 23 Apr 2025 10:01:53 +0300
Subject: [PATCH 05/17] make user profiles sortable

---
 .../dashboard/components/pages/identities/Identities.tsx  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/react/src/dashboard/components/pages/identities/Identities.tsx b/react/src/dashboard/components/pages/identities/Identities.tsx
index 01635589a..8bc7c83f1 100644
--- a/react/src/dashboard/components/pages/identities/Identities.tsx
+++ b/react/src/dashboard/components/pages/identities/Identities.tsx
@@ -75,6 +75,8 @@ export default function Identities() {
         last_login_from?: string;
         last_activity_to?: string;
         last_activity_from?: string;
+        order_by?: string;
+        order_dir?: string;
     }>(
         {
             q: '',
@@ -91,6 +93,8 @@ export default function Identities() {
             last_login_from: '',
             last_activity_to: '',
             last_activity_from: '',
+            order_by: 'created_at',
+            order_dir: 'desc',
             per_page: paginatorService.getPerPage(paginatorTransactionsKey),
         },
         {
@@ -111,13 +115,15 @@ export default function Identities() {
                 last_login_from: StringParam,
                 last_activity_to: StringParam,
                 last_activity_from: StringParam,
+                order_by: StringParam,
+                order_dir: StringParam,
             },
         },
     );
 
     const { headElement, configsElement } = useConfigurableTable(
         sponsorIdentitiesService.getColumns(activeOrganization),
-        { filter: filter, sortable: false, hasTooltips: true },
+        { filter: filter, sortable: true, hasTooltips: true },
     );
 
     const { resetFilters: resetFilters, setShow } = filter;

From 28316cad3589540654f936f22afc2619bdf0e98e Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Wed, 23 Apr 2025 21:48:01 +0300
Subject: [PATCH 06/17] tmp

---
 .../components/modals/ModalVoucherCreate.tsx  | 91 ++++++++++++++++---
 1 file changed, 76 insertions(+), 15 deletions(-)

diff --git a/react/src/dashboard/components/modals/ModalVoucherCreate.tsx b/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
index 0a5406eb8..7d7094767 100644
--- a/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
+++ b/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import { ModalState } from '../../modules/modals/context/ModalContext';
 import useFormBuilder from '../../hooks/useFormBuilder';
 import Fund from '../../props/models/Fund';
@@ -23,6 +23,7 @@ import SelectControlOptionsFund from '../elements/select-control/templates/Selec
 import FormGroupInfo from '../elements/forms/elements/FormGroupInfo';
 import TranslateHtml from '../elements/translate-html/TranslateHtml';
 import usePushApiError from '../../hooks/usePushApiError';
+import InfoBox from '../elements/info-box/InfoBox';
 
 export default function ModalVoucherCreate({
     funds,
@@ -468,6 +469,58 @@ export default function ModalVoucherCreate({
                                             </div>
                                         </div>
 
+                                        {fund?.backoffice?.backoffice_enabled && (
+                                            <div className="form-group form-group-inline form-group-inline-lg">
+                                                <div className={`form-label`}>&nbsp;</div>
+                                                <div className="form-offset">
+                                                    <InfoBox type={'warning'} iconPosition={'top'}>
+                                                        {assignType.key !== 'bsn' && (
+                                                            <Fragment>
+                                                                <p className={'text-strong'}>
+                                                                    No BSN - Back-office notifications may be skipped
+                                                                </p>
+                                                                <p>
+                                                                    For back-office notifications, the user must have a
+                                                                    BSN verified via DigiD.
+                                                                </p>
+                                                                <ul>
+                                                                    <li>
+                                                                        If the user does not have a verified BSN when
+                                                                        the voucher is assigned, our system cannot send
+                                                                        a <strong>received</strong> notification for the
+                                                                        voucher.
+                                                                    </li>
+                                                                    <li>
+                                                                        If the user does not have a verified BSN when
+                                                                        the voucher is first used, our system cannot
+                                                                        send a <strong>first use</strong> notification.
+                                                                    </li>
+                                                                </ul>
+                                                                <ul>
+                                                                    <li>
+                                                                        If the user verifies their BSN via DigiD between
+                                                                        the <strong>received</strong> and{' '}
+                                                                        <strong>first use</strong> calls, only the{' '}
+                                                                        <strong>first use</strong> notification will be
+                                                                        sent.
+                                                                    </li>
+                                                                    <li>
+                                                                        If the BSN is not verified at all, none of the
+                                                                        notifications will be sent.
+                                                                    </li>
+                                                                </ul>
+                                                            </Fragment>
+                                                        )}
+                                                        <p>
+                                                            <strong>Important!</strong> Manually created vouchers are
+                                                            not checked for eligibility and residency in the back
+                                                            office.
+                                                        </p>
+                                                    </InfoBox>
+                                                </div>
+                                            </div>
+                                        )}
+
                                         {assignType.hasInput && (
                                             <div className="form-group form-group-inline form-group-inline-lg">
                                                 <div
@@ -478,13 +531,17 @@ export default function ModalVoucherCreate({
                                                     }`}>
                                                     {assignType.inputLabel}
                                                 </div>
-                                                <input
-                                                    className="form-control"
-                                                    placeholder={assignType.inputLabel}
-                                                    value={form.values[assignType.key] || ''}
-                                                    onChange={(e) => form.update({ [assignType.key]: e.target.value })}
-                                                />
-                                                <FormError error={form.errors?.[assignType.key]} />
+                                                <div className="form-offset">
+                                                    <input
+                                                        className="form-control"
+                                                        placeholder={assignType.inputLabel}
+                                                        value={form.values[assignType.key] || ''}
+                                                        onChange={(e) =>
+                                                            form.update({ [assignType.key]: e.target.value })
+                                                        }
+                                                    />
+                                                    <FormError error={form.errors?.[assignType.key]} />
+                                                </div>
                                             </div>
                                         )}
 
@@ -492,13 +549,17 @@ export default function ModalVoucherCreate({
                                             <div className="form-label">
                                                 {translate('modals.modal_voucher_create.labels.client_uid')}
                                             </div>
-                                            <input
-                                                className="form-control"
-                                                placeholder={translate('modals.modal_voucher_create.labels.client_uid')}
-                                                value={form.values.client_uid || ''}
-                                                onChange={(e) => form.update({ client_uid: e.target.value })}
-                                            />
-                                            <FormError error={form.errors?.client_uid} />
+                                            <div className="form-offset">
+                                                <input
+                                                    className="form-control"
+                                                    placeholder={translate(
+                                                        'modals.modal_voucher_create.labels.client_uid',
+                                                    )}
+                                                    value={form.values.client_uid || ''}
+                                                    onChange={(e) => form.update({ client_uid: e.target.value })}
+                                                />
+                                                <FormError error={form.errors?.client_uid} />
+                                            </div>
                                         </div>
 
                                         <div className="form-group form-group-inline form-group-inline-lg">

From fafa639ebfe8ebcdcb0991dfb8b1abce50d26f81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Apr 2025 20:08:44 +0000
Subject: [PATCH 07/17] Bump http-proxy-middleware in the npm_and_yarn group
 across 1 directory

Bumps the npm_and_yarn group with 1 update in the / directory: [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware).


Updates `http-proxy-middleware` from 2.0.7 to 2.0.9
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.9/CHANGELOG.md)
- [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.7...v2.0.9)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-version: 2.0.9
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index befd0445d..e27c42c3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8491,10 +8491,11 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",

From ab552b3823007d9dce27f0e285a98a97cec77ee1 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Thu, 24 Apr 2025 05:30:24 +0300
Subject: [PATCH 08/17] add backoffice warning for voucher modal

---
 .../components/modals/ModalVoucherCreate.tsx  | 58 +++++--------------
 1 file changed, 15 insertions(+), 43 deletions(-)

diff --git a/react/src/dashboard/components/modals/ModalVoucherCreate.tsx b/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
index 7d7094767..2c7afea5d 100644
--- a/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
+++ b/react/src/dashboard/components/modals/ModalVoucherCreate.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { ModalState } from '../../modules/modals/context/ModalContext';
 import useFormBuilder from '../../hooks/useFormBuilder';
 import Fund from '../../props/models/Fund';
@@ -469,52 +469,24 @@ export default function ModalVoucherCreate({
                                             </div>
                                         </div>
 
-                                        {fund?.backoffice?.backoffice_enabled && (
+                                        {fund?.backoffice?.backoffice_enabled && assignType.key !== 'bsn' && (
                                             <div className="form-group form-group-inline form-group-inline-lg">
                                                 <div className={`form-label`}>&nbsp;</div>
                                                 <div className="form-offset">
-                                                    <InfoBox type={'warning'} iconPosition={'top'}>
-                                                        {assignType.key !== 'bsn' && (
-                                                            <Fragment>
-                                                                <p className={'text-strong'}>
-                                                                    No BSN - Back-office notifications may be skipped
-                                                                </p>
-                                                                <p>
-                                                                    For back-office notifications, the user must have a
-                                                                    BSN verified via DigiD.
-                                                                </p>
-                                                                <ul>
-                                                                    <li>
-                                                                        If the user does not have a verified BSN when
-                                                                        the voucher is assigned, our system cannot send
-                                                                        a <strong>received</strong> notification for the
-                                                                        voucher.
-                                                                    </li>
-                                                                    <li>
-                                                                        If the user does not have a verified BSN when
-                                                                        the voucher is first used, our system cannot
-                                                                        send a <strong>first use</strong> notification.
-                                                                    </li>
-                                                                </ul>
-                                                                <ul>
-                                                                    <li>
-                                                                        If the user verifies their BSN via DigiD between
-                                                                        the <strong>received</strong> and{' '}
-                                                                        <strong>first use</strong> calls, only the{' '}
-                                                                        <strong>first use</strong> notification will be
-                                                                        sent.
-                                                                    </li>
-                                                                    <li>
-                                                                        If the BSN is not verified at all, none of the
-                                                                        notifications will be sent.
-                                                                    </li>
-                                                                </ul>
-                                                            </Fragment>
-                                                        )}
+                                                    <InfoBox
+                                                        type={'warning'}
+                                                        iconPosition={'top'}
+                                                        iconColor={'warning'}>
+                                                        <p className={'text-strong'}>
+                                                            Let op! De backoffice integratie stuurt mogelijk geen data
+                                                        </p>
                                                         <p>
-                                                            <strong>Important!</strong> Manually created vouchers are
-                                                            not checked for eligibility and residency in the back
-                                                            office.
+                                                            Om data te laten versturen via de backoffice integratie, is
+                                                            het noodzakelijk dat de inwoner een BSN heeft geverifieerd
+                                                            door in te loggen met DigiD. Bij het aanmaken van een tegoed
+                                                            op basis van een activatiecode of e-mailadres, wordt deze
+                                                            stap overgeslagen en zal er mogelijk geen data vanuit het
+                                                            systeem worden verstuurd via de backoffice integratie.
                                                         </p>
                                                     </InfoBox>
                                                 </div>

From c8f22d77aac0ce7510822cfacd8f94c7cd845fae Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Fri, 25 Apr 2025 07:28:18 +0300
Subject: [PATCH 09/17] upgrade react-router-dom v6 to react-router v7

---
 package-lock.json                             | 77 ++++++++++++-------
 package.json                                  |  2 +-
 react/src/dashboard/Dashboard.tsx             |  2 +-
 .../elements/empty-card/EmptyCard.tsx         |  2 +-
 .../components/pages/auth/Auth2FA.tsx         |  2 +-
 .../components/pages/auth/IdentityRestore.tsx |  2 +-
 .../components/pages/auth/SignIn.tsx          |  2 +-
 .../components/pages/auth/SignOut.tsx         |  2 +-
 .../components/pages/auth/SignUpProvider.tsx  |  2 +-
 .../components/pages/auth/SignUpSponsor.tsx   |  2 +-
 .../components/pages/auth/SignUpValidator.tsx |  2 +-
 .../components/pages/employees/Employees.tsx  |  2 +-
 .../extra-payments-view/ExtraPaymentsView.tsx |  2 +-
 .../components/pages/feature/Feature.tsx      |  2 +-
 .../elements/AdditionalFeatureList.tsx        |  2 +-
 .../pages/features/elements/FeatureList.tsx   |  2 +-
 .../FundBackofficeEdit.tsx                    |  2 +-
 .../pages/fund-forms-view/FundFormsView.tsx   |  2 +-
 .../FundProviderProductSubsidyEdit.tsx        |  2 +-
 .../FundProviderProductView.tsx               |  2 +-
 .../pages/fund-provider/FundProvider.tsx      |  2 +-
 .../fund-requests-view/FundRequestsView.tsx   |  2 +-
 .../pages/fund-requests/FundRequests.tsx      |  2 +-
 .../dashboard/components/pages/home/Home.tsx  |  2 +-
 .../identitities-show/IdentitiesShow.tsx      |  2 +-
 .../PreferencesNotifications.tsx              |  2 +-
 .../identity-security/SecuritySessions.tsx    |  2 +-
 .../ImplementationsCmsPageCreate.tsx          |  2 +-
 .../ImplementationsCmsPageEdit.tsx            |  2 +-
 .../ImplementationsCms.tsx                    |  2 +-
 .../ImplementationsConfig.tsx                 |  2 +-
 .../ImplementationsCookies.tsx                |  2 +-
 .../ImplementationsTranslations.tsx           |  2 +-
 .../ImplementationsDigid.tsx                  |  2 +-
 .../ImplementationsEmail.tsx                  |  2 +-
 .../ImplementationsNotificationsBranding.tsx  |  2 +-
 .../ImplementationsNotificationsEdit.tsx      |  2 +-
 .../ImplementationsNotificationsSend.tsx      |  2 +-
 .../ImplementationsSocialMedia.tsx            |  2 +-
 .../ImplementationsView.tsx                   |  2 +-
 .../pages/offices-edit/OfficesEdit.tsx        |  2 +-
 .../offices-edit/elements/OfficesForm.tsx     |  2 +-
 .../components/pages/offices/Offices.tsx      |  2 +-
 .../elements/OrganizationForm.tsx             |  2 +-
 .../OrganizationsFundsEdit.tsx                |  2 +-
 .../OrganizationsFundsSecurity.tsx            |  2 +-
 .../OrganizationsFundsShow.tsx                |  2 +-
 .../organizations-view/OrganizationsView.tsx  |  2 +-
 .../pages/organizations/Organizations.tsx     |  2 +-
 .../pages/payouts-view/PayoutsView.tsx        |  2 +-
 .../pages/products-edit/ProductsEdit.tsx      |  2 +-
 .../pages/products-view/ProductView.tsx       |  2 +-
 .../components/pages/redirect/Redirect.tsx    |  2 +-
 .../ReimbursementsView.tsx                    |  2 +-
 .../reservations-view/ReservationsView.tsx    |  2 +-
 .../SponsorProductsCreate.tsx                 |  2 +-
 .../SponsorProductsEdit.tsx                   |  2 +-
 .../sponsor-product/SponsorProductView.tsx    |  2 +-
 .../SponsorProviderOrganization.tsx           |  2 +-
 .../TransactionBulksView.tsx                  |  2 +-
 .../transactions-view/TransactionsView.tsx    |  2 +-
 .../vouchers-view/VouchersViewComponent.tsx   |  2 +-
 react/src/dashboard/contexts/AuthContext.tsx  |  2 +-
 .../dashboard/hooks/useActiveOrganization.tsx |  2 +-
 .../layout/elements/LayoutHeader.tsx          |  8 +-
 .../dashboard/modules/state_router/Router.tsx |  2 +-
 .../modules/state_router/StateNavLink.tsx     |  2 +-
 react/src/webshop/Webshop.tsx                 |  2 +-
 .../Auth2FARestriction.tsx                    |  2 +-
 .../block-breadcrumbs/BlockBreadcrumbs.tsx    |  2 +-
 .../block-exception/BlockException.tsx        |  2 +-
 .../ModalProductReserve.tsx                   |  2 +-
 .../webshop/components/pages/auth/Auth2FA.tsx |  2 +-
 .../components/pages/auth/IdentityRestore.tsx | 15 ++--
 .../webshop/components/pages/error/Error.tsx  |  2 +-
 .../FundRequestsClarification.tsx             |  2 +-
 .../fund-requests-show/FundRequestsShow.tsx   |  2 +-
 .../pages/funds-activate/FundActivate.tsx     |  5 +-
 .../pages/funds-request/FundRequest.tsx       |  2 +-
 .../components/pages/funds-show/FundsShow.tsx |  2 +-
 .../PreferencesNotifications.tsx              |  2 +-
 .../pages/products-show/ProductsShow.tsx      |  2 +-
 .../providers-office/ProvidersOffice.tsx      |  2 +-
 .../pages/providers-show/ProvidersShow.tsx    |  2 +-
 .../ReimbursementsEdit.tsx                    |  2 +-
 .../ReimbursementsShow.tsx                    |  2 +-
 .../reservations-show/ReservationsShow.tsx    |  2 +-
 .../pages/vouchers-show/VouchersShow.tsx      |  2 +-
 react/src/webshop/contexts/MainContext.tsx    |  2 +-
 .../webshop/modules/state_router/Router.tsx   |  2 +-
 .../modules/state_router/RouterProps.tsx      |  2 +-
 .../modules/state_router/StateNavLink.tsx     |  2 +-
 92 files changed, 154 insertions(+), 127 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index befd0445d..7f652af0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "react-i18next": "^15.0.1",
         "react-image-crop": "^11.0.6",
         "react-range-slider-input": "^3.2.1",
-        "react-router-dom": "^6.27.0",
+        "react-router": "^7.5.2",
         "react-slider": "^2.0.6",
         "summernote": "^0.9.1",
         "terser-webpack-plugin": "^5.3.9",
@@ -2787,14 +2787,6 @@
       "integrity": "sha512-tieX9Va5w1yP88vMgfH1pHTacDQ9TgDTjox3tLlisKDXRQWdjw+QeVVghhf5XqqIxXHgPdcGwBvKY6UP+SIvLw==",
       "license": "MIT"
     },
-    "node_modules/@remix-run/router": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.21.0.tgz",
-      "integrity": "sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -8491,10 +8483,11 @@
       }
     },
     "node_modules/http-proxy-middleware": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
-      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -11095,33 +11088,53 @@
       }
     },
     "node_modules/react-router": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.28.0.tgz",
-      "integrity": "sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.2.tgz",
+      "integrity": "sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==",
+      "license": "MIT",
       "dependencies": {
-        "@remix-run/router": "1.21.0"
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8"
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.28.0.tgz",
-      "integrity": "sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.5.2.tgz",
+      "integrity": "sha512-yk1XW8Fj7gK7flpYBXF3yzd2NbX6P7Kxjvs2b5nu1M04rb5pg/Zc4fGdBNTeT4eDYL2bvzWNyKaIMJX/RKHTTg==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "@remix-run/router": "1.21.0",
-        "react-router": "6.28.0"
+        "react-router": "7.5.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=20.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
+        "react": ">=18",
+        "react-dom": ">=18"
+      }
+    },
+    "node_modules/react-router/node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/react-slider": {
@@ -11833,6 +11846,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "license": "MIT"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -12932,6 +12951,12 @@
       "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==",
       "dev": true
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+      "license": "ISC"
+    },
     "node_modules/turndown": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz",
diff --git a/package.json b/package.json
index d4a0b211b..0327cab8a 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "react-i18next": "^15.0.1",
     "react-image-crop": "^11.0.6",
     "react-range-slider-input": "^3.2.1",
-    "react-router-dom": "^6.27.0",
+    "react-router": "^7.5.2",
     "react-slider": "^2.0.6",
     "summernote": "^0.9.1",
     "terser-webpack-plugin": "^5.3.9",
diff --git a/react/src/dashboard/Dashboard.tsx b/react/src/dashboard/Dashboard.tsx
index 89fe200dd..c7c0cc1b8 100644
--- a/react/src/dashboard/Dashboard.tsx
+++ b/react/src/dashboard/Dashboard.tsx
@@ -2,7 +2,7 @@ import { ModalsProvider } from './modules/modals/context/ModalContext';
 import { AuthProvider } from './contexts/AuthContext';
 import React, { useContext, useEffect } from 'react';
 import { Layout } from './layout/Layout';
-import { HashRouter, Route, Routes, BrowserRouter } from 'react-router-dom';
+import { HashRouter, Route, Routes, BrowserRouter } from 'react-router';
 import EnvDataProp from '../props/EnvData';
 import { MainProvider, mainContext } from './contexts/MainContext';
 import i18n from 'i18next';
diff --git a/react/src/dashboard/components/elements/empty-card/EmptyCard.tsx b/react/src/dashboard/components/elements/empty-card/EmptyCard.tsx
index ab54cd8e4..40051847e 100644
--- a/react/src/dashboard/components/elements/empty-card/EmptyCard.tsx
+++ b/react/src/dashboard/components/elements/empty-card/EmptyCard.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, ReactNode, useMemo } from 'react';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 
 interface EmptyButtonType {
     to?: string;
diff --git a/react/src/dashboard/components/pages/auth/Auth2FA.tsx b/react/src/dashboard/components/pages/auth/Auth2FA.tsx
index c8eeaa788..dcabd6ee1 100644
--- a/react/src/dashboard/components/pages/auth/Auth2FA.tsx
+++ b/react/src/dashboard/components/pages/auth/Auth2FA.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import Auth2FAInfoBox from '../../elements/auth2fa-info-box/Auth2FAInfoBox';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import useOpenModal from '../../../hooks/useOpenModal';
 import Modal2FASetup from '../../modals/Modal2FASetup';
diff --git a/react/src/dashboard/components/pages/auth/IdentityRestore.tsx b/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
index 3536ff516..6508b6c55 100644
--- a/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
+++ b/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useContext, useEffect } from 'react';
 import { authContext } from '../../../contexts/AuthContext';
 import { useIdentityService } from '../../../services/IdentityService';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import { StringParam, useQueryParams } from 'use-query-params';
 import { pushNotificationContext } from '../../../modules/push_notifications/context/PushNotificationsContext';
diff --git a/react/src/dashboard/components/pages/auth/SignIn.tsx b/react/src/dashboard/components/pages/auth/SignIn.tsx
index 7a1ac9137..1a7fb18fe 100644
--- a/react/src/dashboard/components/pages/auth/SignIn.tsx
+++ b/react/src/dashboard/components/pages/auth/SignIn.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import useFormBuilder from '../../../hooks/useFormBuilder';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import { useIdentityService } from '../../../services/IdentityService';
 import QrCode from '../../elements/qr-code/QrCode';
 import { authContext } from '../../../contexts/AuthContext';
diff --git a/react/src/dashboard/components/pages/auth/SignOut.tsx b/react/src/dashboard/components/pages/auth/SignOut.tsx
index 2216d61dc..5bae4bccc 100644
--- a/react/src/dashboard/components/pages/auth/SignOut.tsx
+++ b/react/src/dashboard/components/pages/auth/SignOut.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useEffect } from 'react';
 import { authContext } from '../../../contexts/AuthContext';
 import { mainContext } from '../../../contexts/MainContext';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 
 export default function SignOut() {
diff --git a/react/src/dashboard/components/pages/auth/SignUpProvider.tsx b/react/src/dashboard/components/pages/auth/SignUpProvider.tsx
index 81dcd3d85..da6df7a8d 100644
--- a/react/src/dashboard/components/pages/auth/SignUpProvider.tsx
+++ b/react/src/dashboard/components/pages/auth/SignUpProvider.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import ProgressStorage from '../../../helpers/ProgressStorage';
 import useFormBuilder from '../../../hooks/useFormBuilder';
diff --git a/react/src/dashboard/components/pages/auth/SignUpSponsor.tsx b/react/src/dashboard/components/pages/auth/SignUpSponsor.tsx
index d7a7ab88a..667663acb 100644
--- a/react/src/dashboard/components/pages/auth/SignUpSponsor.tsx
+++ b/react/src/dashboard/components/pages/auth/SignUpSponsor.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import ProgressStorage from '../../../helpers/ProgressStorage';
 import Organization from '../../../props/models/Organization';
diff --git a/react/src/dashboard/components/pages/auth/SignUpValidator.tsx b/react/src/dashboard/components/pages/auth/SignUpValidator.tsx
index e2e849ef4..653e3a964 100644
--- a/react/src/dashboard/components/pages/auth/SignUpValidator.tsx
+++ b/react/src/dashboard/components/pages/auth/SignUpValidator.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import ProgressStorage from '../../../helpers/ProgressStorage';
 import { useOrganizationService } from '../../../services/OrganizationService';
diff --git a/react/src/dashboard/components/pages/employees/Employees.tsx b/react/src/dashboard/components/pages/employees/Employees.tsx
index f2091e528..a0769a20d 100644
--- a/react/src/dashboard/components/pages/employees/Employees.tsx
+++ b/react/src/dashboard/components/pages/employees/Employees.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, useCallback, useContext, useEffect, useState } from 'react';
 import { mainContext } from '../../../contexts/MainContext';
 import { useEmployeeService } from '../../../services/EmployeeService';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import { hasPermission } from '../../../helpers/utils';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import useFilter from '../../../hooks/useFilter';
diff --git a/react/src/dashboard/components/pages/extra-payments-view/ExtraPaymentsView.tsx b/react/src/dashboard/components/pages/extra-payments-view/ExtraPaymentsView.tsx
index ae2d83d7b..508de4ccb 100644
--- a/react/src/dashboard/components/pages/extra-payments-view/ExtraPaymentsView.tsx
+++ b/react/src/dashboard/components/pages/extra-payments-view/ExtraPaymentsView.tsx
@@ -4,7 +4,7 @@ import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import { hasPermission } from '../../../helpers/utils';
 import useSetProgress from '../../../hooks/useSetProgress';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useProductReservationService from '../../../services/ProductReservationService';
 import useTransactionService from '../../../services/TransactionService';
 import useEnvData from '../../../hooks/useEnvData';
diff --git a/react/src/dashboard/components/pages/feature/Feature.tsx b/react/src/dashboard/components/pages/feature/Feature.tsx
index b2dd009c8..8d8d9d4d0 100644
--- a/react/src/dashboard/components/pages/feature/Feature.tsx
+++ b/react/src/dashboard/components/pages/feature/Feature.tsx
@@ -6,7 +6,7 @@ import useAssetUrl from '../../../hooks/useAssetUrl';
 import ModalFeatureContact from '../../modals/ModalFeatureContact';
 import useOpenModal from '../../../hooks/useOpenModal';
 import { snakeCase } from 'lodash';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import BiTools from './items/BiTools';
diff --git a/react/src/dashboard/components/pages/feature/elements/AdditionalFeatureList.tsx b/react/src/dashboard/components/pages/feature/elements/AdditionalFeatureList.tsx
index 57a1a097a..e70028be1 100644
--- a/react/src/dashboard/components/pages/feature/elements/AdditionalFeatureList.tsx
+++ b/react/src/dashboard/components/pages/feature/elements/AdditionalFeatureList.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { kebabCase } from 'lodash';
 import { getStateRouteUrl } from '../../../../modules/state_router/Router';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import OrganizationFeature from '../../../../services/types/OrganizationFeature';
 import Organization from '../../../../props/models/Organization';
 import useAssetUrl from '../../../../hooks/useAssetUrl';
diff --git a/react/src/dashboard/components/pages/features/elements/FeatureList.tsx b/react/src/dashboard/components/pages/features/elements/FeatureList.tsx
index c4a55b226..747b5a4fc 100644
--- a/react/src/dashboard/components/pages/features/elements/FeatureList.tsx
+++ b/react/src/dashboard/components/pages/features/elements/FeatureList.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import { kebabCase } from 'lodash';
 import { getStateRouteUrl } from '../../../../modules/state_router/Router';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import OrganizationFeature from '../../../../services/types/OrganizationFeature';
 import Organization from '../../../../props/models/Organization';
 import useAssetUrl from '../../../../hooks/useAssetUrl';
diff --git a/react/src/dashboard/components/pages/fund-backoffice-edit/FundBackofficeEdit.tsx b/react/src/dashboard/components/pages/fund-backoffice-edit/FundBackofficeEdit.tsx
index e932bc258..bd7360e4f 100644
--- a/react/src/dashboard/components/pages/fund-backoffice-edit/FundBackofficeEdit.tsx
+++ b/react/src/dashboard/components/pages/fund-backoffice-edit/FundBackofficeEdit.tsx
@@ -8,7 +8,7 @@ import StateNavLink from '../../../modules/state_router/StateNavLink';
 import FormError from '../../elements/forms/errors/FormError';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { ResponseError } from '../../../props/ApiResponses';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useFundService } from '../../../services/FundService';
 import Fund from '../../../props/models/Fund';
 import Tooltip from '../../elements/tooltip/Tooltip';
diff --git a/react/src/dashboard/components/pages/fund-forms-view/FundFormsView.tsx b/react/src/dashboard/components/pages/fund-forms-view/FundFormsView.tsx
index 11f6d8a08..df21188ce 100644
--- a/react/src/dashboard/components/pages/fund-forms-view/FundFormsView.tsx
+++ b/react/src/dashboard/components/pages/fund-forms-view/FundFormsView.tsx
@@ -8,7 +8,7 @@ import { useRecordTypeService } from '../../../services/RecordTypeService';
 import RecordType from '../../../props/models/RecordType';
 import FundFormCriteriaCard from './elements/FundFormCriteriaCard';
 import FundFormConfigsCard from './elements/FundFormConfigsCard';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import OrganizationFundsShowOverviewCard from '../organizations-funds-show/elements/OrganizationFundsShowOverviewCard';
 
 export default function FundFormsView() {
diff --git a/react/src/dashboard/components/pages/fund-provider-product-subsidy-edit/FundProviderProductSubsidyEdit.tsx b/react/src/dashboard/components/pages/fund-provider-product-subsidy-edit/FundProviderProductSubsidyEdit.tsx
index f608351b0..fa3630b30 100644
--- a/react/src/dashboard/components/pages/fund-provider-product-subsidy-edit/FundProviderProductSubsidyEdit.tsx
+++ b/react/src/dashboard/components/pages/fund-provider-product-subsidy-edit/FundProviderProductSubsidyEdit.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import SponsorProduct, { DealHistory } from '../../../props/models/Sponsor/SponsorProduct';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/fund-provider-product-view/FundProviderProductView.tsx b/react/src/dashboard/components/pages/fund-provider-product-view/FundProviderProductView.tsx
index f98b89fcd..2f2346d0d 100644
--- a/react/src/dashboard/components/pages/fund-provider-product-view/FundProviderProductView.tsx
+++ b/react/src/dashboard/components/pages/fund-provider-product-view/FundProviderProductView.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import SponsorProduct, { DealHistory } from '../../../props/models/Sponsor/SponsorProduct';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/fund-provider/FundProvider.tsx b/react/src/dashboard/components/pages/fund-provider/FundProvider.tsx
index dccd979a2..670ed5a45 100644
--- a/react/src/dashboard/components/pages/fund-provider/FundProvider.tsx
+++ b/react/src/dashboard/components/pages/fund-provider/FundProvider.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useSetProgress from '../../../hooks/useSetProgress';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/fund-requests-view/FundRequestsView.tsx b/react/src/dashboard/components/pages/fund-requests-view/FundRequestsView.tsx
index fea8b504b..2f71f1ac2 100644
--- a/react/src/dashboard/components/pages/fund-requests-view/FundRequestsView.tsx
+++ b/react/src/dashboard/components/pages/fund-requests-view/FundRequestsView.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useFundRequestValidatorService } from '../../../services/FundRequestValidatorService';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import FundRequest from '../../../props/models/FundRequest';
diff --git a/react/src/dashboard/components/pages/fund-requests/FundRequests.tsx b/react/src/dashboard/components/pages/fund-requests/FundRequests.tsx
index f44f2932c..a3e98f905 100644
--- a/react/src/dashboard/components/pages/fund-requests/FundRequests.tsx
+++ b/react/src/dashboard/components/pages/fund-requests/FundRequests.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { FundRequestTotals, useFundRequestValidatorService } from '../../../services/FundRequestValidatorService';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import FundRequest from '../../../props/models/FundRequest';
 import FilterItemToggle from '../../elements/tables/elements/FilterItemToggle';
diff --git a/react/src/dashboard/components/pages/home/Home.tsx b/react/src/dashboard/components/pages/home/Home.tsx
index 4f1203051..3e10f83a3 100644
--- a/react/src/dashboard/components/pages/home/Home.tsx
+++ b/react/src/dashboard/components/pages/home/Home.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import useAuthIdentity from '../../../hooks/useAuthIdentity';
 
diff --git a/react/src/dashboard/components/pages/identitities-show/IdentitiesShow.tsx b/react/src/dashboard/components/pages/identitities-show/IdentitiesShow.tsx
index 8ab0e8530..6991a669c 100644
--- a/react/src/dashboard/components/pages/identitities-show/IdentitiesShow.tsx
+++ b/react/src/dashboard/components/pages/identitities-show/IdentitiesShow.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import useSetProgress from '../../../hooks/useSetProgress';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import SponsorIdentity, {
     ProfileRecord,
diff --git a/react/src/dashboard/components/pages/identity-preferences/PreferencesNotifications.tsx b/react/src/dashboard/components/pages/identity-preferences/PreferencesNotifications.tsx
index 16271d58e..14856dc7b 100644
--- a/react/src/dashboard/components/pages/identity-preferences/PreferencesNotifications.tsx
+++ b/react/src/dashboard/components/pages/identity-preferences/PreferencesNotifications.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import { useEmailPreferenceService } from '../../../services/EmailPreferenceService';
 import NotificationPreference, { PreferenceOption } from '../../../props/models/NotificationPreference';
diff --git a/react/src/dashboard/components/pages/identity-security/SecuritySessions.tsx b/react/src/dashboard/components/pages/identity-security/SecuritySessions.tsx
index 7c247dea1..111a0fcdd 100644
--- a/react/src/dashboard/components/pages/identity-security/SecuritySessions.tsx
+++ b/react/src/dashboard/components/pages/identity-security/SecuritySessions.tsx
@@ -6,7 +6,7 @@ import Session from '../../../props/models/Session';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import { ModalState } from '../../../modules/modals/context/ModalContext';
 import ModalNotification from '../../modals/ModalNotification';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import { authContext } from '../../../contexts/AuthContext';
 import { mainContext } from '../../../contexts/MainContext';
diff --git a/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageCreate.tsx b/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageCreate.tsx
index a5efc129d..2420945cd 100644
--- a/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageCreate.tsx
+++ b/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageCreate.tsx
@@ -6,7 +6,7 @@ import Implementation from '../../../props/models/Implementation';
 import ImplementationsCmsPageForm from './elements/ImplementationsCmsPageForm';
 import { StringParam, useQueryParam } from 'use-query-params';
 import { useNavigateState } from '../../../modules/state_router/Router';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import usePushApiError from '../../../hooks/usePushApiError';
 
 export default function ImplementationsCmsPageCreate() {
diff --git a/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageEdit.tsx b/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageEdit.tsx
index 83d276d4d..ab7fb7068 100644
--- a/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageEdit.tsx
+++ b/react/src/dashboard/components/pages/implementations-cms-page/ImplementationsCmsPageEdit.tsx
@@ -3,7 +3,7 @@ import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import ImplementationsCmsPageForm from './elements/ImplementationsCmsPageForm';
 import ImplementationPage from '../../../props/models/ImplementationPage';
diff --git a/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx b/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
index 881b5816a..5805ad549 100644
--- a/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
+++ b/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
@@ -8,7 +8,7 @@ import FormError from '../../elements/forms/errors/FormError';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { useMediaService } from '../../../services/MediaService';
 import ImplementationsCmsPages from './elements/ImplementationsCmsPages';
diff --git a/react/src/dashboard/components/pages/implementations-config/ImplementationsConfig.tsx b/react/src/dashboard/components/pages/implementations-config/ImplementationsConfig.tsx
index 775f21e88..c28f8be8f 100644
--- a/react/src/dashboard/components/pages/implementations-config/ImplementationsConfig.tsx
+++ b/react/src/dashboard/components/pages/implementations-config/ImplementationsConfig.tsx
@@ -8,7 +8,7 @@ import FormError from '../../elements/forms/errors/FormError';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import useTranslate from '../../../hooks/useTranslate';
diff --git a/react/src/dashboard/components/pages/implementations-cookies/ImplementationsCookies.tsx b/react/src/dashboard/components/pages/implementations-cookies/ImplementationsCookies.tsx
index d416ab744..715a5aa2c 100644
--- a/react/src/dashboard/components/pages/implementations-cookies/ImplementationsCookies.tsx
+++ b/react/src/dashboard/components/pages/implementations-cookies/ImplementationsCookies.tsx
@@ -4,7 +4,7 @@ import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { getStateRouteUrl, useNavigateState } from '../../../modules/state_router/Router';
 import usePushApiError from '../../../hooks/usePushApiError';
diff --git a/react/src/dashboard/components/pages/implementations-cookies/ImplementationsTranslations.tsx b/react/src/dashboard/components/pages/implementations-cookies/ImplementationsTranslations.tsx
index f222c562d..6e1743026 100644
--- a/react/src/dashboard/components/pages/implementations-cookies/ImplementationsTranslations.tsx
+++ b/react/src/dashboard/components/pages/implementations-cookies/ImplementationsTranslations.tsx
@@ -4,7 +4,7 @@ import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import FormGroup from '../../elements/forms/controls/FormGroup';
 import CheckboxControl from '../../elements/forms/controls/CheckboxControl';
diff --git a/react/src/dashboard/components/pages/implementations-digid/ImplementationsDigid.tsx b/react/src/dashboard/components/pages/implementations-digid/ImplementationsDigid.tsx
index f1b2933da..1664d699f 100644
--- a/react/src/dashboard/components/pages/implementations-digid/ImplementationsDigid.tsx
+++ b/react/src/dashboard/components/pages/implementations-digid/ImplementationsDigid.tsx
@@ -8,7 +8,7 @@ import FormError from '../../elements/forms/errors/FormError';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import useTranslate from '../../../hooks/useTranslate';
diff --git a/react/src/dashboard/components/pages/implementations-email/ImplementationsEmail.tsx b/react/src/dashboard/components/pages/implementations-email/ImplementationsEmail.tsx
index c5f8603b5..15721b734 100644
--- a/react/src/dashboard/components/pages/implementations-email/ImplementationsEmail.tsx
+++ b/react/src/dashboard/components/pages/implementations-email/ImplementationsEmail.tsx
@@ -8,7 +8,7 @@ import FormError from '../../elements/forms/errors/FormError';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { ResponseError } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { getStateRouteUrl, useNavigateState } from '../../../modules/state_router/Router';
 import useTranslate from '../../../hooks/useTranslate';
diff --git a/react/src/dashboard/components/pages/implementations-notifications-branding/ImplementationsNotificationsBranding.tsx b/react/src/dashboard/components/pages/implementations-notifications-branding/ImplementationsNotificationsBranding.tsx
index 703fc8fdb..1748a888c 100644
--- a/react/src/dashboard/components/pages/implementations-notifications-branding/ImplementationsNotificationsBranding.tsx
+++ b/react/src/dashboard/components/pages/implementations-notifications-branding/ImplementationsNotificationsBranding.tsx
@@ -14,7 +14,7 @@ import Media from '../../../props/models/Media';
 import { useMediaService } from '../../../services/MediaService';
 import useSetProgress from '../../../hooks/useSetProgress';
 import usePushSuccess from '../../../hooks/usePushSuccess';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import useTranslate from '../../../hooks/useTranslate';
 import usePushApiError from '../../../hooks/usePushApiError';
diff --git a/react/src/dashboard/components/pages/implementations-notifications-edit/ImplementationsNotificationsEdit.tsx b/react/src/dashboard/components/pages/implementations-notifications-edit/ImplementationsNotificationsEdit.tsx
index 98a978faa..8cfd78d2f 100644
--- a/react/src/dashboard/components/pages/implementations-notifications-edit/ImplementationsNotificationsEdit.tsx
+++ b/react/src/dashboard/components/pages/implementations-notifications-edit/ImplementationsNotificationsEdit.tsx
@@ -5,7 +5,7 @@ import useImplementationService from '../../../services/ImplementationService';
 import Implementation from '../../../props/models/Implementation';
 import useImplementationNotificationService from '../../../services/ImplementationNotificationService';
 import SystemNotification from '../../../props/models/SystemNotification';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import SystemNotificationEditor from './elements/SystemNotificationEditor';
 import { useFundService } from '../../../services/FundService';
diff --git a/react/src/dashboard/components/pages/implementations-notifications-send/ImplementationsNotificationsSend.tsx b/react/src/dashboard/components/pages/implementations-notifications-send/ImplementationsNotificationsSend.tsx
index 83c34c967..9e051df25 100644
--- a/react/src/dashboard/components/pages/implementations-notifications-send/ImplementationsNotificationsSend.tsx
+++ b/react/src/dashboard/components/pages/implementations-notifications-send/ImplementationsNotificationsSend.tsx
@@ -6,7 +6,7 @@ import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { PaginationData, ResponseError, ResponseErrorData } from '../../../props/ApiResponses';
 import useImplementationService from '../../../services/ImplementationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Implementation from '../../../props/models/Implementation';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import { hasPermission } from '../../../helpers/utils';
diff --git a/react/src/dashboard/components/pages/implementations-social-media/ImplementationsSocialMedia.tsx b/react/src/dashboard/components/pages/implementations-social-media/ImplementationsSocialMedia.tsx
index 233445d65..67961d77a 100644
--- a/react/src/dashboard/components/pages/implementations-social-media/ImplementationsSocialMedia.tsx
+++ b/react/src/dashboard/components/pages/implementations-social-media/ImplementationsSocialMedia.tsx
@@ -19,7 +19,7 @@ import { useNavigateState } from '../../../modules/state_router/Router';
 import useTranslate from '../../../hooks/useTranslate';
 import useFilterNext from '../../../modules/filter_next/useFilterNext';
 import { NumberParam } from 'use-query-params';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import EmptyCard from '../../elements/empty-card/EmptyCard';
 import usePushApiError from '../../../hooks/usePushApiError';
 
diff --git a/react/src/dashboard/components/pages/implementations-view/ImplementationsView.tsx b/react/src/dashboard/components/pages/implementations-view/ImplementationsView.tsx
index ce516eff0..010769b17 100644
--- a/react/src/dashboard/components/pages/implementations-view/ImplementationsView.tsx
+++ b/react/src/dashboard/components/pages/implementations-view/ImplementationsView.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import useImplementationService from '../../../services/ImplementationService';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import { PaginationData, ResponseError } from '../../../props/ApiResponses';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router';
 import useAssetUrl from '../../../hooks/useAssetUrl';
 import { hasPermission } from '../../../helpers/utils';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
diff --git a/react/src/dashboard/components/pages/offices-edit/OfficesEdit.tsx b/react/src/dashboard/components/pages/offices-edit/OfficesEdit.tsx
index fcb82eeeb..5755860e8 100644
--- a/react/src/dashboard/components/pages/offices-edit/OfficesEdit.tsx
+++ b/react/src/dashboard/components/pages/offices-edit/OfficesEdit.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import OfficesForm from './elements/OfficesForm';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 export default function OfficesEdit() {
     const { id } = useParams();
diff --git a/react/src/dashboard/components/pages/offices-edit/elements/OfficesForm.tsx b/react/src/dashboard/components/pages/offices-edit/elements/OfficesForm.tsx
index 73169f84c..690a4a694 100644
--- a/react/src/dashboard/components/pages/offices-edit/elements/OfficesForm.tsx
+++ b/react/src/dashboard/components/pages/offices-edit/elements/OfficesForm.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import PhotoSelector from '../../../elements/photo-selector/PhotoSelector';
 import useFormBuilder from '../../../../hooks/useFormBuilder';
 import FormError from '../../../elements/forms/errors/FormError';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import { getStateRouteUrl, useNavigateState } from '../../../../modules/state_router/Router';
 import { useMediaService } from '../../../../services/MediaService';
 import LoadingCard from '../../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/offices/Offices.tsx b/react/src/dashboard/components/pages/offices/Offices.tsx
index a601056ef..9a7ddf948 100644
--- a/react/src/dashboard/components/pages/offices/Offices.tsx
+++ b/react/src/dashboard/components/pages/offices/Offices.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import useFilter from '../../../hooks/useFilter';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import { hasPermission } from '../../../helpers/utils';
 import useAssetUrl from '../../../hooks/useAssetUrl';
diff --git a/react/src/dashboard/components/pages/organizations-edit/elements/OrganizationForm.tsx b/react/src/dashboard/components/pages/organizations-edit/elements/OrganizationForm.tsx
index 86907d781..dd7fb8176 100644
--- a/react/src/dashboard/components/pages/organizations-edit/elements/OrganizationForm.tsx
+++ b/react/src/dashboard/components/pages/organizations-edit/elements/OrganizationForm.tsx
@@ -9,7 +9,7 @@ import CheckboxControl from '../../../elements/forms/controls/CheckboxControl';
 import SelectControl from '../../../elements/select-control/SelectControl';
 import BusinessType from '../../../../props/models/BusinessType';
 import { useBusinessTypeService } from '../../../../services/BusinessTypeService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useNavigateState } from '../../../../modules/state_router/Router';
 import { useMediaService } from '../../../../services/MediaService';
 import LoadingCard from '../../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/organizations-funds-edit/OrganizationsFundsEdit.tsx b/react/src/dashboard/components/pages/organizations-funds-edit/OrganizationsFundsEdit.tsx
index 66dd0591c..3b3f187ea 100644
--- a/react/src/dashboard/components/pages/organizations-funds-edit/OrganizationsFundsEdit.tsx
+++ b/react/src/dashboard/components/pages/organizations-funds-edit/OrganizationsFundsEdit.tsx
@@ -3,7 +3,7 @@ import { useFundService } from '../../../services/FundService';
 import useSetProgress from '../../../hooks/useSetProgress';
 import Fund from '../../../props/models/Fund';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useFormBuilder from '../../../hooks/useFormBuilder';
 import { ResponseError, ResponseErrorData } from '../../../props/ApiResponses';
diff --git a/react/src/dashboard/components/pages/organizations-funds-security/OrganizationsFundsSecurity.tsx b/react/src/dashboard/components/pages/organizations-funds-security/OrganizationsFundsSecurity.tsx
index c3f49be81..f1d306bb4 100644
--- a/react/src/dashboard/components/pages/organizations-funds-security/OrganizationsFundsSecurity.tsx
+++ b/react/src/dashboard/components/pages/organizations-funds-security/OrganizationsFundsSecurity.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import useFormBuilder from '../../../hooks/useFormBuilder';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import Fund from '../../../props/models/Fund';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useSetProgress from '../../../hooks/useSetProgress';
 import usePushSuccess from '../../../hooks/usePushSuccess';
 import { useFundService } from '../../../services/FundService';
diff --git a/react/src/dashboard/components/pages/organizations-funds-show/OrganizationsFundsShow.tsx b/react/src/dashboard/components/pages/organizations-funds-show/OrganizationsFundsShow.tsx
index 9b1088dde..0eaa91441 100644
--- a/react/src/dashboard/components/pages/organizations-funds-show/OrganizationsFundsShow.tsx
+++ b/react/src/dashboard/components/pages/organizations-funds-show/OrganizationsFundsShow.tsx
@@ -3,7 +3,7 @@ import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import Fund from '../../../props/models/Fund';
 import { useFundService } from '../../../services/FundService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import useTranslate from '../../../hooks/useTranslate';
 import useSetProgress from '../../../hooks/useSetProgress';
diff --git a/react/src/dashboard/components/pages/organizations-view/OrganizationsView.tsx b/react/src/dashboard/components/pages/organizations-view/OrganizationsView.tsx
index 32ccaad7f..a1963c60a 100644
--- a/react/src/dashboard/components/pages/organizations-view/OrganizationsView.tsx
+++ b/react/src/dashboard/components/pages/organizations-view/OrganizationsView.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useEffect } from 'react';
 import { useOrganizationService } from '../../../services/OrganizationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import { mainContext } from '../../../contexts/MainContext';
 
diff --git a/react/src/dashboard/components/pages/organizations/Organizations.tsx b/react/src/dashboard/components/pages/organizations/Organizations.tsx
index d74073b35..6ef337447 100644
--- a/react/src/dashboard/components/pages/organizations/Organizations.tsx
+++ b/react/src/dashboard/components/pages/organizations/Organizations.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { mainContext } from '../../../contexts/MainContext';
 import { authContext } from '../../../contexts/AuthContext';
 import { useOrganizationService } from '../../../services/OrganizationService';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import Organization from '../../../props/models/Organization';
 
diff --git a/react/src/dashboard/components/pages/payouts-view/PayoutsView.tsx b/react/src/dashboard/components/pages/payouts-view/PayoutsView.tsx
index 1929bf0d2..62447d848 100644
--- a/react/src/dashboard/components/pages/payouts-view/PayoutsView.tsx
+++ b/react/src/dashboard/components/pages/payouts-view/PayoutsView.tsx
@@ -4,7 +4,7 @@ import useSetProgress from '../../../hooks/useSetProgress';
 import useEnvData from '../../../hooks/useEnvData';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useTranslate from '../../../hooks/useTranslate';
 import usePayoutTransactionService from '../../../services/PayoutTransactionService';
 import PayoutTransaction from '../../../props/models/PayoutTransaction';
diff --git a/react/src/dashboard/components/pages/products-edit/ProductsEdit.tsx b/react/src/dashboard/components/pages/products-edit/ProductsEdit.tsx
index 5f9976650..94f682694 100644
--- a/react/src/dashboard/components/pages/products-edit/ProductsEdit.tsx
+++ b/react/src/dashboard/components/pages/products-edit/ProductsEdit.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import ProductsForm from './elements/ProductsForm';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 export default function ProductsEdit() {
     const { id } = useParams();
diff --git a/react/src/dashboard/components/pages/products-view/ProductView.tsx b/react/src/dashboard/components/pages/products-view/ProductView.tsx
index 4c8f91184..118008e58 100644
--- a/react/src/dashboard/components/pages/products-view/ProductView.tsx
+++ b/react/src/dashboard/components/pages/products-view/ProductView.tsx
@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useTranslate from '../../../hooks/useTranslate';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import useAssetUrl from '../../../hooks/useAssetUrl';
diff --git a/react/src/dashboard/components/pages/redirect/Redirect.tsx b/react/src/dashboard/components/pages/redirect/Redirect.tsx
index 064a91811..09489d9cb 100644
--- a/react/src/dashboard/components/pages/redirect/Redirect.tsx
+++ b/react/src/dashboard/components/pages/redirect/Redirect.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router';
 import useAssetUrl from '../../../hooks/useAssetUrl';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 
diff --git a/react/src/dashboard/components/pages/reimbursements-view/ReimbursementsView.tsx b/react/src/dashboard/components/pages/reimbursements-view/ReimbursementsView.tsx
index 60b68c34f..c12f776f1 100644
--- a/react/src/dashboard/components/pages/reimbursements-view/ReimbursementsView.tsx
+++ b/react/src/dashboard/components/pages/reimbursements-view/ReimbursementsView.tsx
@@ -4,7 +4,7 @@ import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useSetProgress from '../../../hooks/useSetProgress';
 import useOpenModal from '../../../hooks/useOpenModal';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useReimbursementsService } from '../../../services/ReimbursementService';
 import Reimbursement from '../../../props/models/Reimbursement';
 import File from '../../../props/models/File';
diff --git a/react/src/dashboard/components/pages/reservations-view/ReservationsView.tsx b/react/src/dashboard/components/pages/reservations-view/ReservationsView.tsx
index b5b2cd516..a88fc4d8e 100644
--- a/react/src/dashboard/components/pages/reservations-view/ReservationsView.tsx
+++ b/react/src/dashboard/components/pages/reservations-view/ReservationsView.tsx
@@ -6,7 +6,7 @@ import StateNavLink from '../../../modules/state_router/StateNavLink';
 import { hasPermission } from '../../../helpers/utils';
 import useSetProgress from '../../../hooks/useSetProgress';
 import Reservation from '../../../props/models/Reservation';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useProductReservationService from '../../../services/ProductReservationService';
 import useConfirmReservationApproval from '../../../services/helpers/reservations/useConfirmReservationApproval';
 import useTransactionService from '../../../services/TransactionService';
diff --git a/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsCreate.tsx b/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsCreate.tsx
index 806534a67..59caf1173 100644
--- a/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsCreate.tsx
+++ b/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsCreate.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import ProductsForm from '../products-edit/elements/ProductsForm';
 import { useFundService } from '../../../services/FundService';
 import useSetProgress from '../../../hooks/useSetProgress';
diff --git a/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsEdit.tsx b/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsEdit.tsx
index 7905a7411..d2f48475f 100644
--- a/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsEdit.tsx
+++ b/react/src/dashboard/components/pages/sponsor-product-edit/SponsorProductsEdit.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { useFundService } from '../../../services/FundService';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
diff --git a/react/src/dashboard/components/pages/sponsor-product/SponsorProductView.tsx b/react/src/dashboard/components/pages/sponsor-product/SponsorProductView.tsx
index df78f551e..8ec9c01ff 100644
--- a/react/src/dashboard/components/pages/sponsor-product/SponsorProductView.tsx
+++ b/react/src/dashboard/components/pages/sponsor-product/SponsorProductView.tsx
@@ -3,7 +3,7 @@ import useSetProgress from '../../../hooks/useSetProgress';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useProductService from '../../../services/ProductService';
 import ProductDetailsBlock from '../products-view/elements/ProductDetailsBlock';
 import SponsorProduct from '../../../props/models/Sponsor/SponsorProduct';
diff --git a/react/src/dashboard/components/pages/sponsor-provider-organization/SponsorProviderOrganization.tsx b/react/src/dashboard/components/pages/sponsor-provider-organization/SponsorProviderOrganization.tsx
index fb8a888e1..3c79e03c4 100644
--- a/react/src/dashboard/components/pages/sponsor-provider-organization/SponsorProviderOrganization.tsx
+++ b/react/src/dashboard/components/pages/sponsor-provider-organization/SponsorProviderOrganization.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useEffect, useState } from 'react';
 import useActiveOrganization from '../../../hooks/useActiveOrganization';
 import useFilter from '../../../hooks/useFilter';
 import { PaginationData } from '../../../props/ApiResponses';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useSetProgress from '../../../hooks/useSetProgress';
 import { useOrganizationService } from '../../../services/OrganizationService';
 import FundProvider from '../../../props/models/FundProvider';
diff --git a/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx b/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
index 607e43059..343907799 100644
--- a/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
+++ b/react/src/dashboard/components/pages/transaction-bulks-view/TransactionBulksView.tsx
@@ -5,7 +5,7 @@ import useSetProgress from '../../../hooks/useSetProgress';
 import useEnvData from '../../../hooks/useEnvData';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import KeyValueItem from '../../elements/key-value/KeyValueItem';
 import Tooltip from '../../elements/tooltip/Tooltip';
 import TransactionBulk from '../../../props/models/TransactionBulk';
diff --git a/react/src/dashboard/components/pages/transactions-view/TransactionsView.tsx b/react/src/dashboard/components/pages/transactions-view/TransactionsView.tsx
index 8d8e40c17..ea9c49cf8 100644
--- a/react/src/dashboard/components/pages/transactions-view/TransactionsView.tsx
+++ b/react/src/dashboard/components/pages/transactions-view/TransactionsView.tsx
@@ -6,7 +6,7 @@ import useSetProgress from '../../../hooks/useSetProgress';
 import useEnvData from '../../../hooks/useEnvData';
 import LoadingCard from '../../elements/loading-card/LoadingCard';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import TransactionDetails from './elements/TransactionDetails';
 import ReservationExtraPaymentDetails from '../reservations-view/elements/ReservationExtraPaymentDetails';
 import useTranslate from '../../../hooks/useTranslate';
diff --git a/react/src/dashboard/components/pages/vouchers-view/VouchersViewComponent.tsx b/react/src/dashboard/components/pages/vouchers-view/VouchersViewComponent.tsx
index 935ec8980..9dde7f67d 100644
--- a/react/src/dashboard/components/pages/vouchers-view/VouchersViewComponent.tsx
+++ b/react/src/dashboard/components/pages/vouchers-view/VouchersViewComponent.tsx
@@ -8,7 +8,7 @@ import ModalVoucherTransaction from '../../modals/ModalVoucherTransaction/ModalV
 import Fund from '../../../props/models/Fund';
 import ModalVoucherDeactivation from '../../modals/ModalVoucherDeactivation';
 import ModalVoucherActivate from '../../modals/ModalVoucherActivate';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useVoucherService from '../../../services/VoucherService';
 import { useFundService } from '../../../services/FundService';
 import { hasPermission } from '../../../helpers/utils';
diff --git a/react/src/dashboard/contexts/AuthContext.tsx b/react/src/dashboard/contexts/AuthContext.tsx
index 21994062e..1b6b8e08e 100644
--- a/react/src/dashboard/contexts/AuthContext.tsx
+++ b/react/src/dashboard/contexts/AuthContext.tsx
@@ -4,7 +4,7 @@ import Identity from '../props/models/Identity';
 import Employee from '../props/models/Employee';
 import { useAuthService } from '../services/AuthService';
 import { getStateRouteUrl, useStateRoutes } from '../modules/state_router/Router';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import events from '../helpers/events';
 import { ResponseError } from '../props/ApiResponses';
 import Identity2FAState from '../props/models/Identity2FAState';
diff --git a/react/src/dashboard/hooks/useActiveOrganization.tsx b/react/src/dashboard/hooks/useActiveOrganization.tsx
index eb65dd51c..bac920974 100644
--- a/react/src/dashboard/hooks/useActiveOrganization.tsx
+++ b/react/src/dashboard/hooks/useActiveOrganization.tsx
@@ -1,6 +1,6 @@
 import { useContext, useEffect, useMemo } from 'react';
 import { mainContext } from '../contexts/MainContext';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useOrganizationService } from '../services/OrganizationService';
 
 export default function useActiveOrganization() {
diff --git a/react/src/dashboard/layout/elements/LayoutHeader.tsx b/react/src/dashboard/layout/elements/LayoutHeader.tsx
index 1b05b497b..d485511e1 100644
--- a/react/src/dashboard/layout/elements/LayoutHeader.tsx
+++ b/react/src/dashboard/layout/elements/LayoutHeader.tsx
@@ -18,7 +18,7 @@ import { Announcements } from '../../components/elements/announcements/Accouncem
 import { useOrganizationService } from '../../services/OrganizationService';
 import SelectControl from '../../components/elements/select-control/SelectControl';
 import { getStateRouteUrl, useStateRoutes } from '../../modules/state_router/Router';
-import { NavLink, useNavigate } from 'react-router-dom';
+import { NavLink, useNavigate } from 'react-router';
 import HeaderNotifications from './blocks/HeaderNotifications';
 import SelectControlOptionsOrganization from '../../components/elements/select-control/templates/SelectControlOptionsOrganization';
 import ModalAuthPincode from '../../components/modals/ModalAuthPincode';
@@ -68,7 +68,7 @@ export const LayoutHeader = () => {
     const assetUrl = useAssetUrl();
     const thumbnailUrl = useThumbnailUrl();
 
-    const { envData, organizations, activeOrganization, setActiveOrganization } = useContext(mainContext);
+    const { envData, organizations, activeOrganization } = useContext(mainContext);
     const { route } = useStateRoutes();
 
     const [showIdentityMenu, setShowIdentityMenu] = useState(false);
@@ -79,8 +79,8 @@ export const LayoutHeader = () => {
     const announcementService = useAnnouncementService();
 
     const [roles] = useState({
-        provider: 'Aanbieder',
         sponsor: 'Sponsor',
+        provider: 'Aanbieder',
         validator: 'Beoordelaar',
     });
 
@@ -130,7 +130,7 @@ export const LayoutHeader = () => {
                                 allowSearch={true}
                                 onChange={(value: Organization) => {
                                     organizationService.use(value.id);
-                                    setActiveOrganization(value);
+
                                     navigate(
                                         getStateRouteUrl(route.state.fallbackState || route.state.name, {
                                             ...route.params,
diff --git a/react/src/dashboard/modules/state_router/Router.tsx b/react/src/dashboard/modules/state_router/Router.tsx
index 50871249a..8dedb5062 100644
--- a/react/src/dashboard/modules/state_router/Router.tsx
+++ b/react/src/dashboard/modules/state_router/Router.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useState } from 'react';
-import { createSearchParams, generatePath, matchRoutes, useLocation, useNavigate } from 'react-router-dom';
+import { createSearchParams, generatePath, matchRoutes, useLocation, useNavigate } from 'react-router';
 import { CurrentRoute, RouteState } from './RouterProps';
 import router from '../../router/routes';
 import { NavigateOptions } from 'react-router';
diff --git a/react/src/dashboard/modules/state_router/StateNavLink.tsx b/react/src/dashboard/modules/state_router/StateNavLink.tsx
index 1f805ab3b..13d3fc9da 100644
--- a/react/src/dashboard/modules/state_router/StateNavLink.tsx
+++ b/react/src/dashboard/modules/state_router/StateNavLink.tsx
@@ -1,4 +1,4 @@
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import React, { HTMLAttributes, ReactElement } from 'react';
 import { getStateRouteUrl, useNavigateState } from './Router';
 import classNames from 'classnames';
diff --git a/react/src/webshop/Webshop.tsx b/react/src/webshop/Webshop.tsx
index 0f1be0aa5..89d0dedce 100644
--- a/react/src/webshop/Webshop.tsx
+++ b/react/src/webshop/Webshop.tsx
@@ -2,7 +2,7 @@ import { ModalsProvider } from '../dashboard/modules/modals/context/ModalContext
 import { AuthProvider } from './contexts/AuthContext';
 import React, { ReactNode, useContext, useEffect, useState } from 'react';
 import { Layout } from './layout/Layout';
-import { HashRouter, Route, Routes, BrowserRouter } from 'react-router-dom';
+import { HashRouter, Route, Routes, BrowserRouter } from 'react-router';
 import EnvDataProp from '../props/EnvData';
 import { MainProvider, mainContext } from './contexts/MainContext';
 import i18n from 'i18next';
diff --git a/react/src/webshop/components/elements/auth2fa-restriction/Auth2FARestriction.tsx b/react/src/webshop/components/elements/auth2fa-restriction/Auth2FARestriction.tsx
index aec078a48..f2d59ee91 100644
--- a/react/src/webshop/components/elements/auth2fa-restriction/Auth2FARestriction.tsx
+++ b/react/src/webshop/components/elements/auth2fa-restriction/Auth2FARestriction.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import useAssetUrl from '../../../hooks/useAssetUrl';
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import { get } from 'lodash';
 import Fund from '../../../props/models/Fund';
diff --git a/react/src/webshop/components/elements/block-breadcrumbs/BlockBreadcrumbs.tsx b/react/src/webshop/components/elements/block-breadcrumbs/BlockBreadcrumbs.tsx
index 5a0a2ebb1..5d08fc105 100644
--- a/react/src/webshop/components/elements/block-breadcrumbs/BlockBreadcrumbs.tsx
+++ b/react/src/webshop/components/elements/block-breadcrumbs/BlockBreadcrumbs.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, ReactNode, useMemo } from 'react';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import classNames from 'classnames';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import Section from '../sections/Section';
 
 export type Breadcrumb = {
diff --git a/react/src/webshop/components/elements/block-exception/BlockException.tsx b/react/src/webshop/components/elements/block-exception/BlockException.tsx
index e123cffb7..4c4bec54c 100644
--- a/react/src/webshop/components/elements/block-exception/BlockException.tsx
+++ b/react/src/webshop/components/elements/block-exception/BlockException.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useErrorBoundary } from 'react-error-boundary';
 import classNames from 'classnames';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router';
 import useTranslate from '../../../../dashboard/hooks/useTranslate';
 
 export default function BlockException({ front = 'webshop' }: { front?: 'dashboard' | 'webshop' }) {
diff --git a/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx b/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
index b8018abc8..18ec122af 100644
--- a/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
+++ b/react/src/webshop/components/modals/modal-product-reserve/ModalProductReserve.tsx
@@ -27,7 +27,7 @@ import Tooltip from '../../elements/tooltip/Tooltip';
 import { clickOnKeyEnter } from '../../../../dashboard/helpers/wcag';
 import BlockReservationAddress, { AddressType } from '../../elements/block-reservation-address/BlockReservationAddress';
 import { useProfileService } from '../../../../dashboard/services/ProfileService';
-import { ErrorResponse } from 'react-router-dom';
+import { ErrorResponse } from 'react-router';
 import usePushSuccess from '../../../../dashboard/hooks/usePushSuccess';
 import classNames from 'classnames';
 import SelectControl from '../../../../dashboard/components/elements/select-control/SelectControl';
diff --git a/react/src/webshop/components/pages/auth/Auth2FA.tsx b/react/src/webshop/components/pages/auth/Auth2FA.tsx
index 8f1fb2278..e5b8d6235 100644
--- a/react/src/webshop/components/pages/auth/Auth2FA.tsx
+++ b/react/src/webshop/components/pages/auth/Auth2FA.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import useAuthIdentity2FAState from '../../../hooks/useAuthIdentity2FAState';
 import useAssetUrl from '../../../hooks/useAssetUrl';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { getStateRouteUrl } from '../../../modules/state_router/Router';
 import BlockAuth2FAInfoBox from '../../elements/block-auth-2fa-info-box/BlockAuth2FAInfoBox';
 import Modal2FASetup from '../../modals/Modal2FASetup';
diff --git a/react/src/webshop/components/pages/auth/IdentityRestore.tsx b/react/src/webshop/components/pages/auth/IdentityRestore.tsx
index 11bb3ffe4..e14f46b33 100644
--- a/react/src/webshop/components/pages/auth/IdentityRestore.tsx
+++ b/react/src/webshop/components/pages/auth/IdentityRestore.tsx
@@ -1,6 +1,6 @@
-import React, { useCallback, useContext, useEffect } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { authContext } from '../../../contexts/AuthContext';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useNavigateState } from '../../../modules/state_router/Router';
 import { StringParam, useQueryParams } from 'use-query-params';
 import { useIdentityService } from '../../../../dashboard/services/IdentityService';
@@ -15,10 +15,13 @@ const targetRequestClarification = 'requestClarification';
 
 export default function IdentityRestore({ confirmation = false }: { confirmation: boolean }) {
     const tokenParam = useParams().token;
-    const [query] = useQueryParams({
-        token: StringParam,
-        target: StringParam,
-    });
+
+    const [query] = useState(
+        useQueryParams({
+            token: StringParam,
+            target: StringParam,
+        })[0],
+    );
 
     const { setToken } = useContext(authContext);
 
diff --git a/react/src/webshop/components/pages/error/Error.tsx b/react/src/webshop/components/pages/error/Error.tsx
index e05385c24..7867dd966 100644
--- a/react/src/webshop/components/pages/error/Error.tsx
+++ b/react/src/webshop/components/pages/error/Error.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import useTranslate from '../../../../dashboard/hooks/useTranslate';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { snakeCase } from 'lodash';
 import { getStateRouteUrl, useStateParams } from '../../../modules/state_router/Router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
diff --git a/react/src/webshop/components/pages/fund-requests-show/FundRequestsClarification.tsx b/react/src/webshop/components/pages/fund-requests-show/FundRequestsClarification.tsx
index b5597f79d..b01670b2e 100644
--- a/react/src/webshop/components/pages/fund-requests-show/FundRequestsClarification.tsx
+++ b/react/src/webshop/components/pages/fund-requests-show/FundRequestsClarification.tsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useNavigateState } from '../../../modules/state_router/Router';
 
 export default function FundRequestsClarification() {
diff --git a/react/src/webshop/components/pages/fund-requests-show/FundRequestsShow.tsx b/react/src/webshop/components/pages/fund-requests-show/FundRequestsShow.tsx
index 39b140955..7e2631611 100644
--- a/react/src/webshop/components/pages/fund-requests-show/FundRequestsShow.tsx
+++ b/react/src/webshop/components/pages/fund-requests-show/FundRequestsShow.tsx
@@ -2,7 +2,7 @@ import React, { Fragment, useCallback, useContext, useEffect, useState } from 'r
 import useTranslate from '../../../../dashboard/hooks/useTranslate';
 import FundRequest from '../../../../dashboard/props/models/FundRequest';
 import { useFundRequestService } from '../../../services/FundRequestService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import FundRequestRecordCard from './elements/FundRequestRecordCard';
 import BlockShowcaseProfile from '../../elements/block-showcase/BlockShowcaseProfile';
 import useSetProgress from '../../../../dashboard/hooks/useSetProgress';
diff --git a/react/src/webshop/components/pages/funds-activate/FundActivate.tsx b/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
index 6257868e9..8d522f573 100644
--- a/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
+++ b/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useTranslate from '../../../../dashboard/hooks/useTranslate';
 import useEnvData from '../../../hooks/useEnvData';
 import useAppConfigs from '../../../hooks/useAppConfigs';
@@ -162,8 +162,7 @@ export default function FundActivate() {
                 .catch((err: ResponseError) => {
                     pushDanger(translate('push.error'), err.data.message);
                     navigateState('fund', { id: fund.id });
-                })
-                .finally(() => setApplyingFund(false));
+                });
         },
         [applyingFund, fundService, navigateState, pushDanger, pushSuccess, translate],
     );
diff --git a/react/src/webshop/components/pages/funds-request/FundRequest.tsx b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
index ef714a2c3..c6cd5f47c 100644
--- a/react/src/webshop/components/pages/funds-request/FundRequest.tsx
+++ b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
@@ -13,7 +13,7 @@ import { useHelperService } from '../../../../dashboard/services/HelperService';
 import FundsListItemModel from '../../../services/types/FundsListItemModel';
 import { useVoucherService } from '../../../services/VoucherService';
 import useAuthIdentity from '../../../hooks/useAuthIdentity';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useAppConfigs from '../../../hooks/useAppConfigs';
 import type FundRequest from '../../../../dashboard/props/models/FundRequest';
 import RecordType from '../../../../dashboard/props/models/RecordType';
diff --git a/react/src/webshop/components/pages/funds-show/FundsShow.tsx b/react/src/webshop/components/pages/funds-show/FundsShow.tsx
index 3fa1b1a78..acfbf7558 100644
--- a/react/src/webshop/components/pages/funds-show/FundsShow.tsx
+++ b/react/src/webshop/components/pages/funds-show/FundsShow.tsx
@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import { useFundService } from '../../../services/FundService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import Fund from '../../../props/models/Fund';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useTranslate from '../../../../dashboard/hooks/useTranslate';
diff --git a/react/src/webshop/components/pages/preferences-notifications/PreferencesNotifications.tsx b/react/src/webshop/components/pages/preferences-notifications/PreferencesNotifications.tsx
index e600c0298..8f09490be 100644
--- a/react/src/webshop/components/pages/preferences-notifications/PreferencesNotifications.tsx
+++ b/react/src/webshop/components/pages/preferences-notifications/PreferencesNotifications.tsx
@@ -3,7 +3,7 @@ import useTranslate from '../../../../dashboard/hooks/useTranslate';
 import BlockShowcaseProfile from '../../elements/block-showcase/BlockShowcaseProfile';
 import NotificationPreferencesCards from './elements/NotificationPreferencesCards';
 import PushNotificationPreferencesCard from './elements/PushNotificationPreferencesCard';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 export default function PreferencesNotifications() {
     const { section = null } = useParams();
diff --git a/react/src/webshop/components/pages/products-show/ProductsShow.tsx b/react/src/webshop/components/pages/products-show/ProductsShow.tsx
index 308002a49..49d470a85 100644
--- a/react/src/webshop/components/pages/products-show/ProductsShow.tsx
+++ b/react/src/webshop/components/pages/products-show/ProductsShow.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useAppConfigs from '../../../hooks/useAppConfigs';
 import useAssetUrl from '../../../hooks/useAssetUrl';
 import { useNavigateState, useStateParams } from '../../../modules/state_router/Router';
diff --git a/react/src/webshop/components/pages/providers-office/ProvidersOffice.tsx b/react/src/webshop/components/pages/providers-office/ProvidersOffice.tsx
index 7fddb6b67..301ba8f2f 100644
--- a/react/src/webshop/components/pages/providers-office/ProvidersOffice.tsx
+++ b/react/src/webshop/components/pages/providers-office/ProvidersOffice.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useAppConfigs from '../../../hooks/useAppConfigs';
 import useAssetUrl from '../../../hooks/useAssetUrl';
diff --git a/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx b/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
index 8deae870a..81e341b7b 100644
--- a/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
+++ b/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import StateNavLink from '../../../modules/state_router/StateNavLink';
 import useAppConfigs from '../../../hooks/useAppConfigs';
 import useAssetUrl from '../../../hooks/useAssetUrl';
diff --git a/react/src/webshop/components/pages/reimbursements-edit/ReimbursementsEdit.tsx b/react/src/webshop/components/pages/reimbursements-edit/ReimbursementsEdit.tsx
index 3b78bf4d7..1257707c2 100644
--- a/react/src/webshop/components/pages/reimbursements-edit/ReimbursementsEdit.tsx
+++ b/react/src/webshop/components/pages/reimbursements-edit/ReimbursementsEdit.tsx
@@ -10,7 +10,7 @@ import Reimbursement from '../../../props/models/Reimbursement';
 import { useVoucherService } from '../../../services/VoucherService';
 import Voucher from '../../../../dashboard/props/models/Voucher';
 import { useReimbursementService } from '../../../services/ReimbursementService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useAuthIdentity from '../../../hooks/useAuthIdentity';
 import useFormBuilder from '../../../../dashboard/hooks/useFormBuilder';
 import FormError from '../../../../dashboard/components/elements/forms/errors/FormError';
diff --git a/react/src/webshop/components/pages/reimbursements-show/ReimbursementsShow.tsx b/react/src/webshop/components/pages/reimbursements-show/ReimbursementsShow.tsx
index 9913f823b..b63b8eece 100644
--- a/react/src/webshop/components/pages/reimbursements-show/ReimbursementsShow.tsx
+++ b/react/src/webshop/components/pages/reimbursements-show/ReimbursementsShow.tsx
@@ -4,7 +4,7 @@ import useSetProgress from '../../../../dashboard/hooks/useSetProgress';
 import BlockShowcaseProfile from '../../elements/block-showcase/BlockShowcaseProfile';
 import Reimbursement from '../../../props/models/Reimbursement';
 import { useReimbursementService } from '../../../services/ReimbursementService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import usePushSuccess from '../../../../dashboard/hooks/usePushSuccess';
 import usePushDanger from '../../../../dashboard/hooks/usePushDanger';
 import { useNavigateState } from '../../../modules/state_router/Router';
diff --git a/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx b/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
index dd5ece9e6..0acc91f1a 100644
--- a/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
+++ b/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
@@ -5,7 +5,7 @@ import useTranslate from '../../../../dashboard/hooks/useTranslate';
 import useSetProgress from '../../../../dashboard/hooks/useSetProgress';
 import Reservation from '../../../../dashboard/props/models/Reservation';
 import { useProductReservationService } from '../../../services/ProductReservationService';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import useAssetUrl from '../../../hooks/useAssetUrl';
 import useComposeStateAndExpires from '../reservations/hooks/useComposeStateAndExpires';
 import usePayReservationExtra from '../reservations/hooks/usePayReservationExtra';
diff --git a/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx b/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
index 432d1a10f..002b5ada3 100644
--- a/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
+++ b/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
@@ -7,7 +7,7 @@ import { useVoucherService } from '../../../services/VoucherService';
 import useSetProgress from '../../../../dashboard/hooks/useSetProgress';
 import useEnvData from '../../../hooks/useEnvData';
 import useComposeVoucherCardData from '../../../services/helpers/useComposeVoucherCardData';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { strLimit } from '../../../../dashboard/helpers/string';
 import QrCode from '../../../../dashboard/components/elements/qr-code/QrCode';
 import useAuthIdentity from '../../../hooks/useAuthIdentity';
diff --git a/react/src/webshop/contexts/MainContext.tsx b/react/src/webshop/contexts/MainContext.tsx
index f60b16baf..f0d0646b9 100644
--- a/react/src/webshop/contexts/MainContext.tsx
+++ b/react/src/webshop/contexts/MainContext.tsx
@@ -6,7 +6,7 @@ import useFilter from '../../dashboard/hooks/useFilter';
 import FilterScope from '../../dashboard/types/FilterScope';
 import { useStateRoutes } from '../modules/state_router/Router';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import Language from '../../dashboard/props/models/Language';
 
 interface AuthMemoProps {
diff --git a/react/src/webshop/modules/state_router/Router.tsx b/react/src/webshop/modules/state_router/Router.tsx
index 007f9f423..cfce6d521 100644
--- a/react/src/webshop/modules/state_router/Router.tsx
+++ b/react/src/webshop/modules/state_router/Router.tsx
@@ -1,5 +1,5 @@
 import { useCallback, useState } from 'react';
-import { generatePath, matchRoutes, useLocation, useNavigate, createSearchParams, useHref } from 'react-router-dom';
+import { generatePath, matchRoutes, useLocation, useNavigate, createSearchParams, useHref } from 'react-router';
 import { CurrentRoute, RouteState } from './RouterProps';
 import router from '../../router/routes';
 import { NavigateOptions } from 'react-router';
diff --git a/react/src/webshop/modules/state_router/RouterProps.tsx b/react/src/webshop/modules/state_router/RouterProps.tsx
index dcfdb8d65..ee4d4e0c3 100644
--- a/react/src/webshop/modules/state_router/RouterProps.tsx
+++ b/react/src/webshop/modules/state_router/RouterProps.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Location } from 'react-router-dom';
+import { Location } from 'react-router';
 
 export enum LayoutType {
     clear,
diff --git a/react/src/webshop/modules/state_router/StateNavLink.tsx b/react/src/webshop/modules/state_router/StateNavLink.tsx
index cfcc25f4a..f5ac2e611 100644
--- a/react/src/webshop/modules/state_router/StateNavLink.tsx
+++ b/react/src/webshop/modules/state_router/StateNavLink.tsx
@@ -1,4 +1,4 @@
-import { NavLink } from 'react-router-dom';
+import { NavLink } from 'react-router';
 import React, { HTMLAttributes, ReactElement } from 'react';
 import { getStateRouteUrl, useNavigateState } from './Router';
 import classNames from 'classnames';

From 02336c8758dfcb665fe1f74c9c984015966c1dda Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Thu, 1 May 2025 09:09:58 +0300
Subject: [PATCH 10/17] fix double readspeaker widget

---
 .../components/elements/block-showcase/BlockShowcase.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/react/src/webshop/components/elements/block-showcase/BlockShowcase.tsx b/react/src/webshop/components/elements/block-showcase/BlockShowcase.tsx
index 88d959ac7..fc88c48d2 100644
--- a/react/src/webshop/components/elements/block-showcase/BlockShowcase.tsx
+++ b/react/src/webshop/components/elements/block-showcase/BlockShowcase.tsx
@@ -3,7 +3,6 @@ import BlockLoader from '../block-loader/BlockLoader';
 import BlockLoaderBreadcrumbs from '../block-loader/BlockLoaderBreadcrumbs';
 import BlockBreadcrumbs, { Breadcrumb } from '../block-breadcrumbs/BlockBreadcrumbs';
 import ReadSpeakerButton from '../../../modules/read_speaker/ReadSpeakerButton';
-import useReadSpeakerHref from '../../../modules/read_speaker/hooks/useReadSpeakerHref';
 import classNames from 'classnames';
 
 export default function BlockShowcase({
@@ -19,26 +18,24 @@ export default function BlockShowcase({
     loaderElement?: React.ReactElement;
     breadcrumbLoaderElement?: React.ReactElement;
 }) {
-    const readSpeakerHref = useReadSpeakerHref('main-content');
-
     const breadcrumbs = useMemo(() => {
         if (!breadcrumbItems) {
             return null;
         }
 
-        if (breadcrumbItems?.length === 0 && !readSpeakerHref) {
+        if (breadcrumbItems?.length === 0) {
             return <Fragment></Fragment>;
         }
 
         return (
-            breadcrumbItems && (
+            breadcrumbItems.length > 0 && (
                 <BlockBreadcrumbs
                     items={breadcrumbItems}
                     after={<ReadSpeakerButton className={'breadcrumb-read-speaker'} targetId={'main-content'} />}
                 />
             )
         );
-    }, [breadcrumbItems, readSpeakerHref]);
+    }, [breadcrumbItems]);
 
     return (
         <div className={classNames('block', 'block-showcase', className)}>

From ddca242fbbace33ccf3ecd07fec6da0e8795d7a0 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Thu, 1 May 2025 11:33:28 +0300
Subject: [PATCH 11/17] fix provider sign-up redirect

---
 .../components/pages/auth/IdentityRestore.tsx       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/react/src/dashboard/components/pages/auth/IdentityRestore.tsx b/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
index 6508b6c55..ab56560a1 100644
--- a/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
+++ b/react/src/dashboard/components/pages/auth/IdentityRestore.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect } from 'react';
+import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { authContext } from '../../../contexts/AuthContext';
 import { useIdentityService } from '../../../services/IdentityService';
 import { useNavigate, useParams } from 'react-router';
@@ -11,10 +11,13 @@ const targetNewSignup = 'newSignup';
 
 export default function IdentityRestore({ confirmation = false }: { confirmation: boolean }) {
     const tokenParam = useParams().token;
-    const [query] = useQueryParams({
-        token: StringParam,
-        target: StringParam,
-    });
+
+    const [query] = useState(
+        useQueryParams({
+            token: StringParam,
+            target: StringParam,
+        })[0],
+    );
 
     const { setToken } = useContext(authContext);
     const { pushDanger } = useContext(pushNotificationContext);

From 92e9c59e0b333411dc4b98fc1d9b344d0af18223 Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:14:35 +0200
Subject: [PATCH 12/17] Update product.mjs

---
 react/src/webshop/i18n/nl/pages/product.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/src/webshop/i18n/nl/pages/product.mjs b/react/src/webshop/i18n/nl/pages/product.mjs
index 895a2d8de..527297408 100644
--- a/react/src/webshop/i18n/nl/pages/product.mjs
+++ b/react/src/webshop/i18n/nl/pages/product.mjs
@@ -51,7 +51,7 @@ export default {
         buy: 'Reserveren',
         buy_label: 'Open Reserveringsformulier',
         request: 'Activeren',
-        open_voucher: 'Open tegoed',
+        open_voucher: 'Betaal met QR-code',
         bookmark: 'Toevoegen aan verlanglijstje',
         groningen: {
             request: 'Aanvragen',

From 3b772d122a06b19c41a11f3c6f25d707d308cea3 Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:15:15 +0200
Subject: [PATCH 13/17] Update cache.json

---
 translations/cache/cache.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index e71156d52..e1cec23ce 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -6113,7 +6113,7 @@
     ],
     [
         "product.buttons.open_voucher",
-        "Open tegoed"
+        "Betaal met QR-code"
     ],
     [
         "product.buttons.potjeswijzer.request",

From ffd952c0fb76059c0a72768b366115b1b94a9987 Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:27:52 +0200
Subject: [PATCH 14/17] Update FundCriteriaCustomOverview.tsx

---
 .../pages/funds/elements/FundCriteriaCustomOverview.tsx   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx b/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
index 0063a1169..4d02f019e 100644
--- a/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
+++ b/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
@@ -20,7 +20,7 @@ export default function FundCriteriaCustomOverview({ fundKey }: { fundKey: strin
                         <li>
                             In de tabel hieronder vindt u wat uw maximale inkomen mag zijn. Gebruik ter controle uw
                             inkomen van de maand vóór de maand waarin u het abonnement aanvraagt. Voorbeeld: u vraagt op
-                            3 december 2024 het abonnement aan. Dan vergelijkt u uw inkomen van november 2024 met het
+                            3 december het abonnement aan. Dan vergelijkt u uw inkomen van november met het
                             maximale inkomen dat voor u geldt
                         </li>
                     </ul>
@@ -71,7 +71,7 @@ export default function FundCriteriaCustomOverview({ fundKey }: { fundKey: strin
                     <a href="https://www.nijmegen.nl/diensten/zorg-hulp-en-advies/sociaal-raadslieden-voor-juridische-hulp/">
                         sociaal raadslieden
                     </a>{' '}
-                    van de gemeente Nijmegen kunnen u hierbij helpen. Bel voor een afspraak 14 024. <br />
+                    van de gemeente Nijmegen kunnen u hierbij helpen. Bel voor een afspraak 024 329 90 00. <br />
                     <p />
                     <p className="sign_up-pane-text">
                         Door te verklaren dat u aan de voorwaarden voldoet, gaat u er mee akkoord dat uw aanvraag
@@ -91,7 +91,7 @@ export default function FundCriteriaCustomOverview({ fundKey }: { fundKey: strin
                         <li>U bent 18 jaar of ouder</li>
                         <li>U bent geen student</li>
                         <li>U woont in Nijmegen (en dit is geen opvanglocatie)</li>
-                        <li>U voldoet aan de maximale inkomensgrens (netto) voor de Meedoen-regeling 2024:</li>
+                        <li>U voldoet aan de maximale inkomensgrens (netto) voor de Meedoen-regeling 2025:</li>
                     </ul>
                     <table className="table collapse-sides">
                         <tbody>
@@ -138,7 +138,7 @@ export default function FundCriteriaCustomOverview({ fundKey }: { fundKey: strin
                     <a href="https://www.nijmegen.nl/diensten/zorg-hulp-en-advies/sociaal-raadslieden-voor-juridische-hulp/">
                         sociaal raadslieden
                     </a>{' '}
-                    van de gemeente Nijmegen kunnen u hierbij helpen. Bel voor een afspraak 14 024. <br />
+                    van de gemeente Nijmegen kunnen u hierbij helpen. Bel voor een afspraak 024 329 90 00. <br />
                     <p />
                     <p className="sign_up-pane-text">
                         Door te verklaren dat u aan de voorwaarden voldoet, gaat u er mee akkoord dat uw aanvraag

From 04abf667c12421d99d2f333479cd828da56f5fba Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:34:14 +0200
Subject: [PATCH 15/17] Update FundCriteriaCustomOverview.tsx

---
 .../pages/funds/elements/FundCriteriaCustomOverview.tsx       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx b/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
index 4d02f019e..dc2173cc4 100644
--- a/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
+++ b/react/src/webshop/components/pages/funds/elements/FundCriteriaCustomOverview.tsx
@@ -20,8 +20,8 @@ export default function FundCriteriaCustomOverview({ fundKey }: { fundKey: strin
                         <li>
                             In de tabel hieronder vindt u wat uw maximale inkomen mag zijn. Gebruik ter controle uw
                             inkomen van de maand vóór de maand waarin u het abonnement aanvraagt. Voorbeeld: u vraagt op
-                            3 december het abonnement aan. Dan vergelijkt u uw inkomen van november met het
-                            maximale inkomen dat voor u geldt
+                            3 december het abonnement aan. Dan vergelijkt u uw inkomen van november met het maximale
+                            inkomen dat voor u geldt
                         </li>
                     </ul>
                     <table className="table collapse-sides">

From 72a62a67181ef104e60cd466fa3ca0f528af33a1 Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:55:56 +0200
Subject: [PATCH 16/17] Update cache.json

---
 translations/cache/cache.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index e1cec23ce..e71156d52 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -6113,7 +6113,7 @@
     ],
     [
         "product.buttons.open_voucher",
-        "Betaal met QR-code"
+        "Open tegoed"
     ],
     [
         "product.buttons.potjeswijzer.request",

From b6f445c2ee41088d009ea68296629d60358f715f Mon Sep 17 00:00:00 2001
From: RobinMeles <robinmeles@gmail.com>
Date: Thu, 1 May 2025 11:56:19 +0200
Subject: [PATCH 17/17] Update product.mjs

---
 react/src/webshop/i18n/nl/pages/product.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react/src/webshop/i18n/nl/pages/product.mjs b/react/src/webshop/i18n/nl/pages/product.mjs
index 527297408..895a2d8de 100644
--- a/react/src/webshop/i18n/nl/pages/product.mjs
+++ b/react/src/webshop/i18n/nl/pages/product.mjs
@@ -51,7 +51,7 @@ export default {
         buy: 'Reserveren',
         buy_label: 'Open Reserveringsformulier',
         request: 'Activeren',
-        open_voucher: 'Betaal met QR-code',
+        open_voucher: 'Open tegoed',
         bookmark: 'Toevoegen aan verlanglijstje',
         groningen: {
             request: 'Aanvragen',