diff --git a/package-lock.json b/package-lock.json
index 0780b94b5..770115765 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "query-string": "^9.1.0",
         "react": "^18.1.0",
         "react-chartjs-2": "^5.2.0",
-        "react-datepicker": "^7.4.0",
+        "react-datepicker": "^8.0.0",
         "react-dom": "^18.1.0",
         "react-error-boundary": "^5.0.0",
         "react-gtm-module": "^2.0.11",
@@ -59,7 +59,7 @@
         "@babel/preset-typescript": "^7.26.0",
         "@mdi/react": "^1.5.0",
         "@svgr/webpack": "^8.0.1",
-        "@types/diff": "^6.0.0",
+        "@types/diff": "^7.0.1",
         "@types/file-saver": "^2.0.7",
         "@types/jquery": "^3.5.18",
         "@types/lodash": "^4.14.192",
@@ -80,13 +80,9 @@
         "compression-webpack-plugin": "^11.1.0",
         "copy-webpack-plugin": "^12.0.2",
         "css-loader": "^7.1.2",
-        "eslint": "^8.37.0",
-        "eslint-config-fbjs": "^4.0",
-        "eslint-config-prettier": "^9.1.0",
+        "eslint": "^9.19.0",
+        "eslint-config-prettier": "^10.0.1",
         "eslint-plugin-babel": "^5.3.1",
-        "eslint-plugin-eslint-plugin": "^6.3.1",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
         "eslint-plugin-no-for-of-loops": "^1.0.1",
         "eslint-plugin-no-function-declare-after-return": "^1.1.0",
         "eslint-plugin-prettier": "^5.0.0",
@@ -329,25 +325,6 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz",
-      "integrity": "sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
-      }
-    },
     "node_modules/@babel/generator": {
       "version": "7.26.2",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
@@ -2032,24 +2009,54 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
-      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/@eslint/config-array": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.6",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
+      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -2057,7 +2064,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -2068,6 +2075,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2080,15 +2088,13 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -2098,52 +2104,82 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "9.19.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz",
+      "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.10.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
-      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
+      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/utils": "^0.2.9"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
-      "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
+      "version": "1.6.13",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
+      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/utils": "^0.2.9"
       }
     },
     "node_modules/@floating-ui/react": {
-      "version": "0.26.24",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.24.tgz",
-      "integrity": "sha512-2ly0pCkZIGEQUq5H8bBK0XJmc1xIK/RM3tvVzY3GBER7IOD1UgmC2Y2tjj4AuS+TC+vTE1KJv2053290jua0Sw==",
+      "version": "0.27.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.3.tgz",
+      "integrity": "sha512-CLHnes3ixIFFKVQDdICjel8muhFLOBdQH7fgtHNPY8UbCNqbeKZ262G7K66lGQOUQWWnYocf7ZbUsLJgGfsLHg==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/react-dom": "^2.1.2",
-        "@floating-ui/utils": "^0.2.8",
+        "@floating-ui/utils": "^0.2.9",
         "tabbable": "^6.0.0"
       },
       "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
+        "react": ">=17.0.0",
+        "react-dom": ">=17.0.0"
       }
     },
     "node_modules/@floating-ui/react-dom": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
       "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.0.0"
       },
@@ -2153,9 +2189,10 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
+      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+      "license": "MIT"
     },
     "node_modules/@googlemaps/js-api-loader": {
       "version": "1.16.8",
@@ -2172,19 +2209,42 @@
         "supercluster": "^8.0.1"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -2200,12 +2260,19 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
+      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
@@ -2500,16 +2567,6 @@
       "resolved": "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz",
       "integrity": "sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw=="
     },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3130,10 +3187,11 @@
       }
     },
     "node_modules/@types/diff": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-6.0.0.tgz",
-      "integrity": "sha512-dhVCYGv3ZSbzmQaBSagrv1WJ6rXCdkyTcDyoNu1MD8JohI7pR7k8wdZEm+mvdxRKXyHVwckFzWU1vJc+Z29MlA==",
-      "dev": true
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-7.0.1.tgz",
+      "integrity": "sha512-R/BHQFripuhW6XPXy05hIvXJQdQ4540KnTvEFHSLjXfHYM41liOLKgIJEyYYiQe796xpaMHfe4Uj/p7Uvng2vA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/eslint": {
       "version": "8.56.12",
@@ -3146,9 +3204,10 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "license": "MIT"
     },
     "node_modules/@types/express": {
       "version": "4.17.21",
@@ -3506,18 +3565,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@typescript-eslint/parser": {
       "version": "8.8.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.1.tgz",
@@ -3651,18 +3698,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -3872,18 +3907,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
     "node_modules/@typescript-eslint/utils/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -3940,12 +3963,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
@@ -4151,9 +4168,10 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4174,6 +4192,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -4354,15 +4373,6 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/aria-query": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
-      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
-      "dev": true,
-      "dependencies": {
-        "deep-equal": "^2.0.5"
-      }
-    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
@@ -4549,12 +4559,6 @@
         "inherits": "2.0.3"
       }
     },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
-      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
-      "dev": true
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -4594,15 +4598,6 @@
         "web-vitals": "^3.0.2"
       }
     },
-    "node_modules/axe-core": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz",
-      "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/axios": {
       "version": "1.7.9",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
@@ -4628,15 +4623,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
-      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/babel-eslint": {
       "version": "10.1.0",
       "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
@@ -5937,12 +5923,6 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "dev": true
     },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
-      "dev": true
-    },
     "node_modules/dash-ast": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz",
@@ -6046,38 +6026,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/deep-equal": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.5",
-        "es-get-iterator": "^1.1.3",
-        "get-intrinsic": "^1.2.2",
-        "is-arguments": "^1.1.1",
-        "is-array-buffer": "^3.0.2",
-        "is-date-object": "^1.0.5",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.5",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "side-channel": "^1.0.4",
-        "which-boxed-primitive": "^1.0.2",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -6375,18 +6323,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/dom-converter": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
@@ -6534,12 +6470,6 @@
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
       "dev": true
     },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
     "node_modules/emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
@@ -6685,26 +6615,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
-      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "is-arguments": "^1.1.1",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.7",
-        "isarray": "^2.0.5",
-        "stop-iteration-iterator": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/es-iterator-helpers": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz",
@@ -6804,81 +6714,73 @@
       "dev": true
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "9.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz",
+      "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.0",
+        "@eslint/core": "^0.10.0",
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "9.19.0",
+        "@eslint/plugin-kit": "^0.2.5",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.1",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-fbjs": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-fbjs/-/eslint-config-fbjs-4.0.0.tgz",
-      "integrity": "sha512-GKXvVfpgVgXdxzmYeaqiBJFL58o+T9d5J8EMXYy3AsyD3AtEdsHzwd+4bEqSI2A0RbeF27CAj9+o2v9VhWSLIg==",
-      "dev": true,
+        "url": "https://eslint.org/donate"
+      },
       "peerDependencies": {
-        "eslint": "^8.0.0",
-        "eslint-plugin-babel": "^5.3.1",
-        "eslint-plugin-ft-flow": "^2.0.1",
-        "eslint-plugin-jsx-a11y": "^6.6.0",
-        "eslint-plugin-react": "^7.30.1",
-        "hermes-eslint": ">=0.8.0"
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
-      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz",
+      "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
-        "eslint-config-prettier": "bin/cli.js"
+        "eslint-config-prettier": "build/bin/cli.js"
       },
       "peerDependencies": {
         "eslint": ">=7.0.0"
@@ -6899,88 +6801,6 @@
         "eslint": ">=4.0.0"
       }
     },
-    "node_modules/eslint-plugin-eslint-plugin": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-6.3.1.tgz",
-      "integrity": "sha512-5OUvS+kzpfbX3Pyt7ULYLJBGdjM/tGPdjePGFE50Lqdqcn/dB0f9ifbRCrCGWBt10Ljk7O6ajj3BPOZ8vmD50g==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "estraverse": "^5.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "peerDependencies": {
-        "eslint": ">=8.23.0"
-      }
-    },
-    "node_modules/eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "dev": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@babel/plugin-syntax-flow": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.9",
-        "eslint": "^8.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-ft-flow": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-ft-flow/-/eslint-plugin-ft-flow-2.0.3.tgz",
-      "integrity": "sha512-Vbsd/b+LYA99jUbsL6viEUWShFaYQt2YQs3QN3f+aeszOhh2sgdcU0mjzDyD4yyBvMc8qy2uwvBBWfMzEX06tg==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "peerDependencies": {
-        "@babel/eslint-parser": "^7.12.0",
-        "eslint": "^8.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.0.tgz",
-      "integrity": "sha512-ySOHvXX8eSN6zz8Bywacm7CvGNhUtdjvqfQDVe6020TUK34Cywkw7m0KsCCk1Qtm9G1FayfTN1/7mMYnYO2Bhg==",
-      "dev": true,
-      "dependencies": {
-        "aria-query": "~5.1.3",
-        "array-includes": "^3.1.8",
-        "array.prototype.flatmap": "^1.3.2",
-        "ast-types-flow": "^0.0.8",
-        "axe-core": "^4.10.0",
-        "axobject-query": "^4.1.0",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "es-iterator-helpers": "^1.0.19",
-        "hasown": "^2.0.2",
-        "jsx-ast-utils": "^3.3.5",
-        "language-tags": "^1.0.9",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.8",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.includes": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
-      }
-    },
     "node_modules/eslint-plugin-no-for-of-loops": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/eslint-plugin-no-for-of-loops/-/eslint-plugin-no-for-of-loops-1.0.1.tgz",
@@ -7133,13 +6953,16 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "peer": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint-webpack-plugin": {
@@ -7244,48 +7067,22 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -7314,29 +7111,18 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "eslint-visitor-keys": "^4.2.0"
       },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -7570,15 +7356,16 @@
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/file-saver": {
@@ -7684,40 +7471,25 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
+      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
@@ -8146,35 +7918,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/hermes-eslint": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-eslint/-/hermes-eslint-0.23.1.tgz",
-      "integrity": "sha512-DaEpbJobK1KwpTSXrPIKkHs2h+B+RTw2F1g9S70tjtJ14a3zM+2gPVUtc8xyffQqRJ6tPfs+/zRKwV17lwDvqA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "hermes-estree": "0.23.1",
-        "hermes-parser": "0.23.1"
-      }
-    },
-    "node_modules/hermes-estree": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
-      "integrity": "sha512-eT5MU3f5aVhTqsfIReZ6n41X5sYn4IdQL0nvz6yO+MMlPxw49aSARHLg/MSehQftyjnrE8X6bYregzSumqc6cg==",
-      "dev": true,
-      "peer": true
-    },
-    "node_modules/hermes-parser": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.23.1.tgz",
-      "integrity": "sha512-oxl5h2DkFW83hT4DAUJorpah8ou4yvmweUzLJmmr6YV2cezduCdlil1AvU/a/xSsAFo4WUcNA4GoV5Bvq6JffA==",
-      "dev": true,
-      "peer": true,
-      "dependencies": {
-        "hermes-estree": "0.23.1"
-      }
-    },
     "node_modules/hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -9096,15 +8839,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-obj": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
@@ -9474,7 +9208,8 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -9581,6 +9316,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -9604,24 +9340,6 @@
         "stream-splicer": "^2.0.0"
       }
     },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.23",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz",
-      "integrity": "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==",
-      "dev": true
-    },
-    "node_modules/language-tags": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
-      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
-      "dev": true,
-      "dependencies": {
-        "language-subtag-registry": "^0.3.20"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/launch-editor": {
       "version": "2.9.1",
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
@@ -10239,22 +9957,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
-      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -11004,6 +10706,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -11013,7 +10716,8 @@
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true
     },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
@@ -11209,27 +10913,18 @@
       }
     },
     "node_modules/react-datepicker": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-7.4.0.tgz",
-      "integrity": "sha512-vSSok4DTZ9/Os8O4HjZLxh4SZVFU6dQvoCX6mfbNdBqMsBBdzftrvMz0Nb4UUVVbgj9o8PfX84K3/31oPrTqmg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-8.0.0.tgz",
+      "integrity": "sha512-OmWkFx3BGPXQhBdhFCZyfqR6n2Z5T3WaEXQxz0tdTY6zNntklnIDkaDSYsbKwy7TcyBgeoneG5f4sCwmFPJ4eA==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/react": "^0.26.23",
+        "@floating-ui/react": "^0.27.3",
         "clsx": "^2.1.1",
-        "date-fns": "^3.6.0",
-        "prop-types": "^15.8.1"
+        "date-fns": "^4.1.0"
       },
       "peerDependencies": {
-        "react": "^16.9.0 || ^17 || ^18",
-        "react-dom": "^16.9.0 || ^17 || ^18"
-      }
-    },
-    "node_modules/react-datepicker/node_modules/date-fns": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
-      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
+        "react": "^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc",
+        "react-dom": "^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc"
       }
     },
     "node_modules/react-dom": {
@@ -12323,18 +12018,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stop-iteration-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
-      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
-      "dev": true,
-      "dependencies": {
-        "internal-slot": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/stream-browserify": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
@@ -12414,12 +12097,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==",
-      "dev": true
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -12440,16 +12117,6 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "optional": true
     },
-    "node_modules/string.prototype.includes": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz",
-      "integrity": "sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-      }
-    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
@@ -12552,6 +12219,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -12776,7 +12444,8 @@
     "node_modules/tabbable": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
-      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew=="
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "license": "MIT"
     },
     "node_modules/tapable": {
       "version": "2.2.1",
@@ -12944,12 +12613,6 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
     "node_modules/thingies": {
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
@@ -13193,18 +12856,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
diff --git a/package.json b/package.json
index d90fe0816..828f6209b 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "@babel/preset-typescript": "^7.26.0",
     "@mdi/react": "^1.5.0",
     "@svgr/webpack": "^8.0.1",
-    "@types/diff": "^6.0.0",
+    "@types/diff": "^7.0.1",
     "@types/file-saver": "^2.0.7",
     "@types/jquery": "^3.5.18",
     "@types/lodash": "^4.14.192",
@@ -54,13 +54,9 @@
     "compression-webpack-plugin": "^11.1.0",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
-    "eslint": "^8.37.0",
-    "eslint-config-fbjs": "^4.0",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.19.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-eslint-plugin": "^6.3.1",
-    "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-no-for-of-loops": "^1.0.1",
     "eslint-plugin-no-function-declare-after-return": "^1.1.0",
     "eslint-plugin-prettier": "^5.0.0",
@@ -112,7 +108,7 @@
     "query-string": "^9.1.0",
     "react": "^18.1.0",
     "react-chartjs-2": "^5.2.0",
-    "react-datepicker": "^7.4.0",
+    "react-datepicker": "^8.0.0",
     "react-dom": "^18.1.0",
     "react-error-boundary": "^5.0.0",
     "react-gtm-module": "^2.0.11",
diff --git a/react/src/dashboard/components/elements/forms/controls/FormGroup.tsx b/react/src/dashboard/components/elements/forms/controls/FormGroup.tsx
index 440d50362..a81656d51 100644
--- a/react/src/dashboard/components/elements/forms/controls/FormGroup.tsx
+++ b/react/src/dashboard/components/elements/forms/controls/FormGroup.tsx
@@ -16,7 +16,7 @@ export default function FormGroup({
     id?: string;
     error?: string | Array<string>;
     inline?: boolean;
-    inlineSize?: 'sm' | 'md' | 'lg';
+    inlineSize?: 'sm' | 'md' | 'lg' | 'xl';
     label?: string | React.ReactElement | Array<React.ReactElement>;
     input?: (input_id: string) => React.ReactElement;
     required?: boolean;
@@ -32,6 +32,7 @@ export default function FormGroup({
                 inlineSize === 'sm' && 'form-group-inline-sm',
                 inlineSize === 'md' && 'form-group-inline-md',
                 inlineSize === 'lg' && 'form-group-inline-lg',
+                inlineSize === 'xl' && 'form-group-inline-xl',
                 error && 'form-group-error',
                 className,
             )}>
diff --git a/react/src/dashboard/components/elements/forms/ui-controls/UIControlCheckbox.tsx b/react/src/dashboard/components/elements/forms/ui-controls/UIControlCheckbox.tsx
index 96068bc75..ff4f25ac9 100644
--- a/react/src/dashboard/components/elements/forms/ui-controls/UIControlCheckbox.tsx
+++ b/react/src/dashboard/components/elements/forms/ui-controls/UIControlCheckbox.tsx
@@ -10,6 +10,7 @@ export default function UIControlCheckbox({
     slim = false,
     className = '',
     disabled = false,
+    dataDusk = null,
     onChange = null,
     onChangeValue = null,
 }: {
@@ -21,6 +22,7 @@ export default function UIControlCheckbox({
     checked?: boolean;
     className?: string;
     disabled?: boolean;
+    dataDusk?: string;
     onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
     onChangeValue?: (checked: boolean) => void;
 }) {
@@ -59,6 +61,7 @@ export default function UIControlCheckbox({
                 htmlFor={innerId}
                 tabIndex={0}
                 aria-checked={inputRef?.current?.checked}
+                data-dusk={dataDusk}
                 onKeyDown={toggleCheckbox}>
                 <span className="ui-checkbox-box">
                     <em className="mdi mdi-check" />
diff --git a/react/src/dashboard/components/elements/forms/ui-controls/UIControlDate.tsx b/react/src/dashboard/components/elements/forms/ui-controls/UIControlDate.tsx
index cc72f6d92..e393afdbb 100644
--- a/react/src/dashboard/components/elements/forms/ui-controls/UIControlDate.tsx
+++ b/react/src/dashboard/components/elements/forms/ui-controls/UIControlDate.tsx
@@ -10,6 +10,7 @@ export default function UIControlDate({
     onChange,
     placeholder = null,
     className,
+    dataDusk = null,
 }: {
     id?: string;
     dateMin?: Date;
@@ -19,13 +20,14 @@ export default function UIControlDate({
     onChange: (date?: Date) => void;
     placeholder?: string;
     className?: string;
+    dataDusk?: string;
 }) {
     const reset = useCallback(() => {
         onChange(null);
     }, [onChange]);
 
     return (
-        <div id={id} className={`ui-control ui-control-date ${className}`}>
+        <div id={id} className={`ui-control ui-control-date ${className}`} data-dusk={dataDusk}>
             <DatePickerControl
                 dateFormat={format || null}
                 value={value}
diff --git a/react/src/dashboard/components/elements/forms/ui-controls/UIControlStep.tsx b/react/src/dashboard/components/elements/forms/ui-controls/UIControlStep.tsx
index 20d350d8e..bed006ae8 100644
--- a/react/src/dashboard/components/elements/forms/ui-controls/UIControlStep.tsx
+++ b/react/src/dashboard/components/elements/forms/ui-controls/UIControlStep.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames';
 
 export default function UIControlStep({
     id,
+    dataDusk = null,
     min = null,
     max = null,
     name,
@@ -13,6 +14,7 @@ export default function UIControlStep({
     className,
 }: {
     id?: string;
+    dataDusk?: string;
     min?: number;
     max?: number;
     name?: string;
@@ -34,12 +36,14 @@ export default function UIControlStep({
         <div
             className={classNames(`ui-control ui-control-step`, className)}
             role={role}
+            data-dusk={dataDusk}
             aria-label="Aanpassen"
             aria-valuenow={value}
             aria-valuemin={min}
             aria-valuemax={max}>
             <input type="number" name={name} id={id} value={value} hidden={true} readOnly={true} />
             <div
+                data-dusk="decreaseStep"
                 className="ui-control-step-icon"
                 onKeyDown={(e) => (e.key == 'Enter' ? decrease() : null)}
                 onClick={decrease}
@@ -52,6 +56,7 @@ export default function UIControlStep({
             <div className="ui-control-step-value">{value?.toString()}</div>
 
             <div
+                data-dusk="increaseStep"
                 className="ui-control-step-icon"
                 onKeyDown={(e) => (e.key == 'Enter' ? increase() : null)}
                 onClick={increase}
diff --git a/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx b/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
index d31e484b4..7612ad2e5 100644
--- a/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
+++ b/react/src/dashboard/components/pages/implementations-cms/ImplementationsCms.tsx
@@ -25,6 +25,7 @@ import CheckboxControl from '../../elements/forms/controls/CheckboxControl';
 import PhotoSelectorData from '../../elements/photo-selector/types/PhotoSelectorData';
 import useTranslate from '../../../hooks/useTranslate';
 import FormGroupInfo from '../../elements/forms/elements/FormGroupInfo';
+import FormGroup from '../../elements/forms/controls/FormGroup';
 
 export default function ImplementationsCms() {
     const { id } = useParams();
@@ -77,6 +78,11 @@ export default function ImplementationsCms() {
         { value: true, label: 'Ja' },
     ]);
 
+    const [privacyAndTermsState] = useState([
+        { value: false, label: 'Nee' },
+        { value: true, label: 'Ja' },
+    ]);
+
     const [announcementTypes] = useState([
         { value: 'warning', label: 'Waarschuwing' },
         { value: 'success', label: 'Succes' },
@@ -113,6 +119,8 @@ export default function ImplementationsCms() {
         description_html?: string;
         description_alignment?: string;
         informal_communication?: boolean;
+        show_privacy_checkbox?: boolean;
+        show_terms_checkbox?: boolean;
         announcement?: {
             type?: string;
             title?: string;
@@ -264,6 +272,8 @@ export default function ImplementationsCms() {
                 page_title_suffix: implementation.page_title_suffix,
                 description_alignment: implementation.description_alignment,
                 informal_communication: implementation.informal_communication,
+                show_terms_checkbox: implementation.show_terms_checkbox,
+                show_privacy_checkbox: implementation.show_privacy_checkbox,
                 announcement: {
                     type: announcementTypes[0].value,
                     active: announcementState[0].value,
@@ -652,6 +662,86 @@ export default function ImplementationsCms() {
                         </div>
                     </div>
 
+                    <div className="card-section card-section-primary">
+                        <div className="row">
+                            <div className="col col-lg-9">
+                                <FormGroup
+                                    inline={true}
+                                    inlineSize={'xl'}
+                                    label={translate('implementation_edit.labels.show_privacy_checkbox')}
+                                    error={form.errors.show_privacy_checkbox}
+                                    input={(id) => (
+                                        <FormGroupInfo
+                                            info={
+                                                <Fragment>
+                                                    <p>
+                                                        Activeer deze instelling als de gebruiker akkoord moet gaan met
+                                                        de privacyvoorwaarden op de website. Op de aanmeldpagina
+                                                        verschijnt een checkbox.
+                                                    </p>
+                                                    <p>
+                                                        <strong>Belangrijk!</strong> Zorg ervoor dat de privacypagina is
+                                                        ingesteld in het CMS, zodat de link naar deze pagina goed werkt.
+                                                    </p>
+                                                </Fragment>
+                                            }>
+                                            <SelectControl
+                                                id={id}
+                                                className="form-control"
+                                                propKey="value"
+                                                propValue="label"
+                                                allowSearch={false}
+                                                options={privacyAndTermsState}
+                                                value={form.values?.show_privacy_checkbox}
+                                                onChange={(value?: boolean) => {
+                                                    form.update({ show_privacy_checkbox: value });
+                                                }}
+                                                optionsComponent={SelectControlOptions}
+                                            />
+                                        </FormGroupInfo>
+                                    )}
+                                />
+                                <FormGroup
+                                    inline={true}
+                                    inlineSize={'xl'}
+                                    label={translate('implementation_edit.labels.show_terms_checkbox')}
+                                    error={form.errors.show_terms_checkbox}
+                                    input={(id) => (
+                                        <FormGroupInfo
+                                            info={
+                                                <Fragment>
+                                                    <p>
+                                                        Activeer deze instelling als de gebruiker akkoord moet gaan met
+                                                        de voorwaarden van de website. Op de aanmeldpagina verschijnt
+                                                        een checkbox.
+                                                    </p>
+                                                    <p>
+                                                        <strong>Belangrijk!</strong> Zorg ervoor dat de voorwaarden
+                                                        pagina is ingesteld in het CMS, zodat de link naar deze pagina
+                                                        goed werkt.
+                                                    </p>
+                                                </Fragment>
+                                            }>
+                                            <SelectControl
+                                                id={id}
+                                                className="form-control"
+                                                propKey="value"
+                                                propValue="label"
+                                                allowSearch={false}
+                                                options={privacyAndTermsState}
+                                                value={form.values?.show_terms_checkbox}
+                                                onChange={(value?: boolean) => {
+                                                    form.update({ show_terms_checkbox: value });
+                                                }}
+                                                optionsComponent={SelectControlOptions}
+                                            />
+                                        </FormGroupInfo>
+                                    )}
+                                />
+                            </div>
+                        </div>
+                    </div>
+
                     <div className="card-section card-section-primary">
                         <div className="button-group flex-center">
                             <StateNavLink
diff --git a/react/src/dashboard/i18n/i18n-nl.js b/react/src/dashboard/i18n/i18n-nl.js
index 259092cff..d7400c406 100644
--- a/react/src/dashboard/i18n/i18n-nl.js
+++ b/react/src/dashboard/i18n/i18n-nl.js
@@ -440,6 +440,8 @@ export default {
             footer_opening_times: 'Footer openingstijden content',
             footer_app_info: 'Footer download de Me-app content',
             cms_media_links: 'Social media links',
+            show_terms_checkbox: 'Toon voorwaarden checkbox',
+            show_privacy_checkbox: 'Toon privacy checkbox',
         },
         implementations_table: {
             title: "Webshop pagina's",
diff --git a/react/src/dashboard/props/models/Implementation.tsx b/react/src/dashboard/props/models/Implementation.tsx
index 012d1c860..81a371a68 100644
--- a/react/src/dashboard/props/models/Implementation.tsx
+++ b/react/src/dashboard/props/models/Implementation.tsx
@@ -64,5 +64,7 @@ export default interface Implementation {
     pre_check_banner_title: string;
     allow_per_fund_notification_templates?: boolean;
     page_title_suffix?: string;
+    show_terms_checkbox?: boolean;
+    show_privacy_checkbox?: boolean;
     languages?: Array<Language>;
 }
diff --git a/react/src/dashboard/services/ConfigService.ts b/react/src/dashboard/services/ConfigService.ts
index 24c84f906..4d00ff61c 100644
--- a/react/src/dashboard/services/ConfigService.ts
+++ b/react/src/dashboard/services/ConfigService.ts
@@ -166,6 +166,7 @@ export type AppConfigProp = {
     pages: {
         home: ImplementationPage;
         funds: ImplementationPage;
+        privacy: ImplementationPage;
         products: ImplementationPage;
         provider: ImplementationPage;
         providers: ImplementationPage;
@@ -173,6 +174,7 @@ export type AppConfigProp = {
         block_home_products: ImplementationPage;
         footer_app_info: ImplementationPage;
         footer_opening_times: ImplementationPage;
+        terms_and_conditions: ImplementationPage;
         footer_contact_details: ImplementationPage;
     };
     has_productboard_integration: boolean;
@@ -197,6 +199,8 @@ export type AppConfigProp = {
     show_voucher_map: boolean;
     show_product_map: boolean;
     page_title_suffix?: string;
+    show_terms_checkbox?: boolean;
+    show_privacy_checkbox?: boolean;
     languages: Array<Language>;
 };
 
diff --git a/react/src/props/EnvDataWebshopProp.ts b/react/src/props/EnvDataWebshopProp.ts
index 720bff4e0..8f5e4a202 100644
--- a/react/src/props/EnvDataWebshopProp.ts
+++ b/react/src/props/EnvDataWebshopProp.ts
@@ -55,7 +55,6 @@ export default interface EnvDataWebshopProp {
             noPrintOption?: boolean;
             activateFirstFund?: boolean;
             accessibilityPage?: boolean;
-            privacyPage?: boolean;
 
             // home
             showStartButton?: boolean;
diff --git a/react/src/webshop/components/pages/auth/Start.tsx b/react/src/webshop/components/pages/auth/Start.tsx
index 1f2bce720..fe5610558 100644
--- a/react/src/webshop/components/pages/auth/Start.tsx
+++ b/react/src/webshop/components/pages/auth/Start.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { authContext } from '../../../contexts/AuthContext';
-import { getStateRouteUrl, useNavigateState, useStateParams } from '../../../modules/state_router/Router';
+import { useNavigateState, useStateHref, useStateParams } from '../../../modules/state_router/Router';
 import { useAuthService } from '../../../services/AuthService';
 import useFormBuilder from '../../../../dashboard/hooks/useFormBuilder';
 import { ResponseError } from '../../../../dashboard/props/ApiResponses';
@@ -37,6 +37,9 @@ export default function Start() {
     const setProgress = useSetProgress();
     const navigateState = useNavigateState();
 
+    const termsUrl = useStateHref('terms_and_conditions');
+    const privacyUrl = useStateHref('privacy');
+
     const { target } = useStateParams<{ target?: string }>();
     const [state, setState] = useState<string>('start');
     const [timer, setTimer] = useState(null);
@@ -56,26 +59,37 @@ export default function Start() {
     const digIdService = useDigiDService();
     const identityService = useIdentityService();
 
+    const [disableSubmitBtn, setDisableSubmitBtn] = useState(false);
     const [authEmailRestoreSent, setAuthEmailRestoreSent] = useState<boolean>(null);
     const [authEmailConfirmationSent, setAuthEmailConfirmationSent] = useState<boolean>(false);
 
     const signedIn = useMemo(() => !!token, [token]);
 
-    const hasPrivacy = useMemo(() => {
+    const showPrivacy = useMemo(() => {
+        return (
+            appConfigs?.show_privacy_checkbox &&
+            appConfigs?.pages.privacy &&
+            (!envData.config?.flags?.startPage?.combineColumns || state === 'email')
+        );
+    }, [appConfigs, envData, state]);
+
+    const showTerms = useMemo(() => {
         return (
-            envData.config?.flags?.privacyPage &&
+            appConfigs?.show_terms_checkbox &&
+            appConfigs?.pages.terms_and_conditions &&
             (!envData.config?.flags?.startPage?.combineColumns || state === 'email')
         );
-    }, [envData, state]);
+    }, [appConfigs, envData, state]);
 
     const authForm = useFormBuilder(
         {
             email: '',
             target: target || 'fundRequest',
             privacy: false,
+            terms: false,
         },
         async (values) => {
-            if (!values.privacy && hasPrivacy) {
+            if ((!values.privacy && showPrivacy) || (!values.terms && showTerms)) {
                 // prevent submit if policy exist and not checked
                 authForm.setIsLocked(false);
                 return;
@@ -208,8 +222,84 @@ export default function Start() {
         }
     }, [envData, setTitle, translate]);
 
+    useEffect(() => {
+        if ((!authForm?.values?.privacy && showPrivacy) || (!authForm?.values?.terms && showTerms)) {
+            setDisableSubmitBtn(true);
+        } else {
+            setDisableSubmitBtn(false);
+        }
+    }, [authForm?.values?.privacy, authForm?.values?.terms, showPrivacy, showTerms]);
+
+    const privacyCheckbox = useCallback(() => {
+        return showPrivacy ? (
+            <div className="row">
+                <div className="col col-lg-12">
+                    <br className="hidden-lg" />
+                    <label
+                        className="sign_up-pane-text sign_up-pane-text-sm sign_up-privacy"
+                        htmlFor="privacy"
+                        tabIndex={2}
+                        onKeyDown={(e) => {
+                            e.stopPropagation();
+                            clickOnKeyEnter(e);
+                        }}>
+                        <input
+                            type="checkbox"
+                            className={'sign_up-privacy-checkbox'}
+                            checked={authForm.values.privacy}
+                            onChange={(e) => {
+                                authForm.update({ privacy: e.target.checked });
+                                e.target?.parentElement?.focus();
+                            }}
+                            id="privacy"
+                        />
+                        <BindLinksInside onKeyDown={(e) => e.stopPropagation()}>
+                            <strong>
+                                <TranslateHtml i18n={'auth.privacy_link.text'} values={{ link_url: privacyUrl }} />
+                            </strong>
+                        </BindLinksInside>
+                    </label>
+                </div>
+            </div>
+        ) : null;
+    }, [authForm, showPrivacy, privacyUrl]);
+
+    const termsCheckbox = useCallback(() => {
+        return showTerms ? (
+            <div className="row">
+                <div className="col col-lg-12">
+                    <br className="hidden-lg" />
+                    <label
+                        className="sign_up-pane-text sign_up-pane-text-sm sign_up-privacy"
+                        htmlFor="terms"
+                        tabIndex={2}
+                        onKeyDown={(e) => {
+                            e.stopPropagation();
+                            clickOnKeyEnter(e);
+                        }}>
+                        <input
+                            type="checkbox"
+                            className={'sign_up-privacy-checkbox'}
+                            checked={authForm.values.terms}
+                            onChange={(e) => {
+                                authForm.update({ terms: e.target.checked });
+                                e.target?.parentElement?.focus();
+                            }}
+                            id="terms"
+                        />
+                        <BindLinksInside onKeyDown={(e) => e.stopPropagation()}>
+                            <strong>
+                                <TranslateHtml i18n={'auth.terms_link.text'} values={{ link_url: termsUrl }} />
+                            </strong>
+                        </BindLinksInside>
+                    </label>
+                </div>
+            </div>
+        ) : null;
+    }, [authForm, showTerms, termsUrl]);
+
     const inlineEmailForm = useCallback(
-        (showPolicy = true) => (
+        (showCheckboxes = true) => (
             <form className="form" onSubmit={authForm.submit} data-dusk="authEmailForm">
                 <div className="row">
                     <div className="form-group col col-lg-9">
@@ -242,7 +332,7 @@ export default function Start() {
                             id={'submit'}
                             className="button button-primary button-fill"
                             type="submit"
-                            disabled={showPolicy && !authForm.values.privacy && envData.config.flags.privacyPage}
+                            disabled={showCheckboxes && disableSubmitBtn}
                             data-dusk="authEmailFormSubmit"
                             tabIndex={4}>
                             {translate('popup_auth.buttons.submit')}
@@ -250,43 +340,11 @@ export default function Start() {
                     </div>
                 </div>
 
-                {showPolicy && envData.config.flags.privacyPage && (
-                    <div className="row">
-                        <div className="col col-lg-12">
-                            <br className="hidden-lg" />
-                            <label
-                                className="sign_up-pane-text sign_up-pane-text-sm sign_up-privacy"
-                                htmlFor="privacy"
-                                tabIndex={2}
-                                onKeyDown={(e) => {
-                                    e.stopPropagation();
-                                    clickOnKeyEnter(e);
-                                }}>
-                                <input
-                                    type="checkbox"
-                                    className={'sign_up-privacy-checkbox'}
-                                    checked={authForm.values.privacy}
-                                    onChange={(e) => {
-                                        authForm.update({ privacy: e.target.checked });
-                                        e.target?.parentElement?.focus();
-                                    }}
-                                    id="privacy"
-                                />
-                                <BindLinksInside onKeyDown={(e) => e.stopPropagation()}>
-                                    <strong>
-                                        <TranslateHtml
-                                            i18n={'auth.privacy_link.text'}
-                                            values={{ link_url: getStateRouteUrl('privacy') }}
-                                        />
-                                    </strong>
-                                </BindLinksInside>
-                            </label>
-                        </div>
-                    </div>
-                )}
+                {showCheckboxes && privacyCheckbox()}
+                {showCheckboxes && termsCheckbox()}
             </form>
         ),
-        [authForm, envData?.config?.flags?.privacyPage, translate],
+        [authForm, disableSubmitBtn, privacyCheckbox, termsCheckbox, translate],
     );
 
     const qrOption = (
diff --git a/react/src/webshop/components/pages/funds-activate/FundActivate.tsx b/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
index 7e7f1e96e..a49e9cd17 100644
--- a/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
+++ b/react/src/webshop/components/pages/funds-activate/FundActivate.tsx
@@ -396,22 +396,30 @@ export default function FundActivate() {
     );
 
     const fetchVouchers = useCallback(() => {
+        if (!authIdentity || !fund) {
+            return setVouchers(null);
+        }
+
         setProgress(0);
 
         voucherService
             .list()
             .then((res) => setVouchers(res.data.data))
             .finally(() => setProgress(100));
-    }, [voucherService, setProgress]);
+    }, [authIdentity, fund, setProgress, voucherService]);
 
     const fetchPayouts = useCallback(() => {
+        if (!authIdentity || !fund) {
+            return setPayouts(null);
+        }
+
         setProgress(0);
 
         payoutTransactionService
             .list()
             .then((res) => setPayouts(res.data.data))
             .finally(() => setProgress(100));
-    }, [setProgress, payoutTransactionService]);
+    }, [authIdentity, fund, setProgress, payoutTransactionService]);
 
     const fetchFundRequests = useCallback(() => {
         if (!authIdentity || !fund) {
@@ -598,6 +606,7 @@ export default function FundActivate() {
                                     <div className="sign_up-options" data-dusk={'fundRequestOptions'}>
                                         {options?.includes('code') && (
                                             <div
+                                                data-dusk="codeOption"
                                                 className="sign_up-option"
                                                 onClick={() => setState('code')}
                                                 onKeyDown={clickOnKeyEnter}
@@ -622,6 +631,7 @@ export default function FundActivate() {
 
                                         {options?.includes('digid') && (
                                             <div
+                                                data-dusk="digidOption"
                                                 className="sign_up-option"
                                                 onClick={() => selectDigiDOption(fund)}
                                                 onKeyDown={clickOnKeyEnter}
@@ -651,6 +661,7 @@ export default function FundActivate() {
                                                 state={{ from: 'fund-activate' }}
                                                 tabIndex={0}
                                                 onKeyDown={clickOnKeyEnter}
+                                                dataDusk="requestOption"
                                                 className="sign_up-option">
                                                 <div className="sign_up-option-media">
                                                     <img
@@ -700,6 +711,7 @@ export default function FundActivate() {
                                         <div className="form-group" />
                                         <div className="form-group text-center">
                                             <button
+                                                data-dusk="codeFormSubmit"
                                                 className={`button button-primary`}
                                                 disabled={codeForm.values.code.length != 8 || codeForm.isLoading}
                                                 type="submit">
@@ -771,6 +783,7 @@ export default function FundActivate() {
                                                 className="button button-text button-text-padless"
                                                 onClick={confirmCriteria}
                                                 role="button"
+                                                data-dusk="nextStepButton"
                                                 tabIndex={0}>
                                                 {translate('fund_request.sign_up.pane.footer.next')}
                                                 <em className="mdi mdi-chevron-right icon-right" />
@@ -883,7 +896,7 @@ export default function FundActivate() {
                                 <div className="sign_up-pane-body text-center">
                                     <p className="sign_up-pane-text">
                                         <TranslateHtml
-                                            i18n={'fund_activate.cards.taken_by_partner.description'}
+                                            i18n={'fund_activate.cards.backoffice_error_not_resident.description'}
                                             values={{ fund_name: fund.name }}
                                         />
                                     </p>
@@ -895,7 +908,7 @@ export default function FundActivate() {
                                     </div>
                                     <p className="sign_up-pane-text text-center">
                                         <TranslateHtml
-                                            i18n={'fund_activate.cards.taken_by_partner.contacts'}
+                                            i18n={'fund_activate.cards.backoffice_error_not_resident.contacts'}
                                             values={{
                                                 fund_name: fund.name,
                                                 email_value: 'inkomensondersteuning@nijmegen.nl',
diff --git a/react/src/webshop/components/pages/funds-request/FundRequest.tsx b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
index 900f6eeab..bbe0a6c0f 100644
--- a/react/src/webshop/components/pages/funds-request/FundRequest.tsx
+++ b/react/src/webshop/components/pages/funds-request/FundRequest.tsx
@@ -603,7 +603,7 @@ export default function FundRequest() {
     return (
         <BlockShowcase wrapper={true} breadcrumbItems={[]} loaderElement={<BlockLoader type={'full'} />}>
             {!digiExpired && (
-                <div className="block block-sign_up">
+                <div className="block block-sign_up" data-dusk="fundRequestForm">
                     <div className="block-wrapper form">
                         {steps[step] == 'email_setup' && (
                             <FundRequestStepEmailSetup
@@ -737,7 +737,7 @@ export default function FundRequest() {
             )}
 
             {digiExpired && (
-                <div className="block block-sign_up">
+                <div className="block block-sign_up" data-dusk="digidExpired">
                     <div className="block-wrapper form">
                         <FundRequestProgress step={step} steps={steps} criteriaSteps={criteriaStepKeys} />
 
diff --git a/react/src/webshop/components/pages/funds-request/elements/FundRequestBsnWarning.tsx b/react/src/webshop/components/pages/funds-request/elements/FundRequestBsnWarning.tsx
index 815b89082..2aeb148b6 100644
--- a/react/src/webshop/components/pages/funds-request/elements/FundRequestBsnWarning.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/FundRequestBsnWarning.tsx
@@ -49,7 +49,7 @@ export default function FundRequestBsnWarning({
     }, [appConfigs?.bsn_confirmation_offset, authIdentity.bsn_time, fund, setDigidExpired]);
 
     return bsnWarningShow ? (
-        <div className="sign_up-pane-warning">
+        <div className="sign_up-pane-warning" data-dusk="bsnWarning">
             <div className="warning-icon">
                 <div className="mdi mdi-alert-circle-outline" />
             </div>
diff --git a/react/src/webshop/components/pages/funds-request/elements/FundRequestGoBackButton.tsx b/react/src/webshop/components/pages/funds-request/elements/FundRequestGoBackButton.tsx
index 024f9bbce..75ff2fd47 100644
--- a/react/src/webshop/components/pages/funds-request/elements/FundRequestGoBackButton.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/FundRequestGoBackButton.tsx
@@ -24,6 +24,7 @@ export default function FundRequestGoBackButton({
                     name="fund-activate"
                     params={{ id: fund?.id }}
                     role="link"
+                    dataDusk="prevStepButton"
                     tabIndex={tabIndex}>
                     <em className="mdi mdi-chevron-left icon-left" />
                     {translate('fund_request.buttons.back')}
@@ -33,6 +34,7 @@ export default function FundRequestGoBackButton({
                     className="button button-text button-text-padless"
                     onClick={prevStep}
                     role="button"
+                    data-dusk="prevStepButton"
                     tabIndex={tabIndex}>
                     <div className="mdi mdi-chevron-left icon-left" />
                     {translate('fund_request.buttons.back')}
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepConfirmCriteria.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepConfirmCriteria.tsx
index 5fdf2e402..fc4c1e261 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepConfirmCriteria.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepConfirmCriteria.tsx
@@ -95,6 +95,7 @@ export default function FundRequestStepConfirmCriteria({
                             onClick={onSubmitConfirmCriteria}
                             tabIndex={0}
                             type="button"
+                            data-dusk="nextStepButton"
                             role="button">
                             {translate('fund_request.sign_up.pane.footer.next')}
                             <em className="mdi mdi-chevron-right icon-right" />
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
index 9b7ca4f7b..513ec294a 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteria.tsx
@@ -224,6 +224,7 @@ export default function FundRequestStepCriteria({
                                     onChange={(input_value?: string) => {
                                         setCriterion(criterion.id, { input_value: input_value });
                                     }}
+                                    dusk="selectControl"
                                     placeholder={translate(
                                         'fund_request.sign_up.fund_request_step_criteria.make_a_choice',
                                     )}
@@ -237,6 +238,7 @@ export default function FundRequestStepCriteria({
                                     id={`criterion_${criterion.id}`}
                                     label={criterion.label}
                                     slim={true}
+                                    dataDusk="controlCheckbox"
                                     onChangeValue={(checked) => {
                                         setCriterion(criterion.id, {
                                             is_checked: checked,
@@ -256,6 +258,7 @@ export default function FundRequestStepCriteria({
                                     name={criterion.record_type.key}
                                     min={0}
                                     max={32}
+                                    dataDusk="controlStep"
                                 />
                             )}
 
@@ -273,6 +276,7 @@ export default function FundRequestStepCriteria({
                                         });
                                     }}
                                     id={`criterion_${criterion.id}`}
+                                    dataDusk="controlDate"
                                 />
                             )}
 
@@ -282,6 +286,7 @@ export default function FundRequestStepCriteria({
                                     value={criterion.input_value ? parseFloat(criterion.input_value) : null}
                                     name={criterion.record_type.key}
                                     id={`criterion_${criterion.id}`}
+                                    dataDusk="controlNumber"
                                     onChangeValue={(value) => {
                                         setCriterion(criterion.id, { input_value: (value || '').toString() });
                                     }}
@@ -294,6 +299,7 @@ export default function FundRequestStepCriteria({
                                     value={criterion.input_value}
                                     name={criterion.record_type.key}
                                     id={`criterion_${criterion.id}`}
+                                    dataDusk="controlText"
                                     onChange={(e) => {
                                         setCriterion(criterion.id, { input_value: e.target.value });
                                     }}
@@ -307,6 +313,7 @@ export default function FundRequestStepCriteria({
                                     min={0}
                                     name={criterion.record_type.key}
                                     id={`criterion_${criterion.id}`}
+                                    dataDusk="controlCurrency"
                                     onChangeValue={(value) => {
                                         setCriterion(criterion.id, { input_value: (value || '').toString() });
                                     }}
@@ -342,6 +349,7 @@ export default function FundRequestStepCriteria({
                             role="button"
                             className="button button-text button-text-padless"
                             onClick={onPrevStep}
+                            data-dusk="prevStepButton"
                             tabIndex={0}>
                             <em className="mdi mdi-chevron-left icon-left" />
                             {translate('fund_request.sign_up.pane.footer.prev')}
@@ -353,12 +361,18 @@ export default function FundRequestStepCriteria({
                                 className="button button-text button-text-padless"
                                 type="submit"
                                 role="button"
+                                data-dusk="nextStepButton"
                                 tabIndex={0}>
                                 {translate('fund_request.sign_up.pane.footer.next')}
                                 <em className="mdi mdi-chevron-right icon-right" />
                             </button>
                         ) : (
-                            <button className="button button-primary" type="submit" role="button" tabIndex={0}>
+                            <button
+                                className="button button-primary"
+                                type="submit"
+                                role="button"
+                                data-dusk="submitButton"
+                                tabIndex={0}>
                                 {translate('fund_request.buttons.send')}
                             </button>
                         )
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
index bae934980..c72dfb1f5 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
@@ -28,7 +28,7 @@ export default function FundRequestStepCriteriaOverview({
         <Fragment>
             {progress}
 
-            <div className="sign_up-pane">
+            <div className="sign_up-pane" data-dusk="criteriaStepsOverview">
                 <h2 className="sign_up-pane-header" role="heading">
                     {translate('fund_request.sign_up.pane.header_title')}
                 </h2>
@@ -66,6 +66,7 @@ export default function FundRequestStepCriteriaOverview({
                             onClick={onNextStep}
                             role="button"
                             type="button"
+                            data-dusk="nextStepButton"
                             tabIndex={0}>
                             {translate('fund_request.sign_up.pane.footer.next')}
                             <em className="mdi mdi-chevron-right icon-right" />
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepDone.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepDone.tsx
index 8746ec788..2b34a7390 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepDone.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepDone.tsx
@@ -53,7 +53,7 @@ export default function FundRequestStepDone({
                     </div>
                 </div>
             ) : (
-                <div className="sign_up-pane">
+                <div className="sign_up-pane" data-dusk="fundRequestSuccess">
                     <h2 className="sign_up-pane-header">
                         {translate('fund_request.sign_up.fund_request_step_done.application_received')}
                     </h2>
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepEmailSetup.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepEmailSetup.tsx
index a8f7a64b0..8fbbee4a2 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepEmailSetup.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepEmailSetup.tsx
@@ -1,12 +1,10 @@
-import React, { Fragment, useMemo, useState } from 'react';
+import React, { Fragment, useEffect, useMemo, useState } from 'react';
 import UIControlText from '../../../../../../dashboard/components/elements/forms/ui-controls/UIControlText';
 import FormError from '../../../../../../dashboard/components/elements/forms/errors/FormError';
-import StateNavLink from '../../../../../modules/state_router/StateNavLink';
 import Fund from '../../../../../props/models/Fund';
 import useFormBuilder from '../../../../../../dashboard/hooks/useFormBuilder';
 import { useIdentityEmailsService } from '../../../../../../dashboard/services/IdentityEmailService';
 import useTranslate from '../../../../../../dashboard/hooks/useTranslate';
-import useEnvData from '../../../../../hooks/useEnvData';
 import FundRequestGoBackButton from '../FundRequestGoBackButton';
 import { clickOnKeyEnter } from '../../../../../../dashboard/helpers/wcag';
 import TranslateHtml from '../../../../../../dashboard/components/elements/translate-html/TranslateHtml';
@@ -14,6 +12,8 @@ import EmailProviderLink from '../../../../../../dashboard/components/pages/auth
 import useAssetUrl from '../../../../../hooks/useAssetUrl';
 import useAppConfigs from '../../../../../hooks/useAppConfigs';
 import SignUpFooter from '../../../../elements/sign-up/SignUpFooter';
+import BindLinksInside from '../../../../elements/bind-links-inside/BindLinksInside';
+import { useStateHref } from '../../../../../modules/state_router/Router';
 
 export default function FundRequestStepEmailSetup({
     fund,
@@ -30,20 +30,32 @@ export default function FundRequestStepEmailSetup({
     progress: React.ReactElement;
     bsnWarning: React.ReactElement;
 }) {
-    const envData = useEnvData();
     const assetUrl = useAssetUrl();
     const appConfigs = useAppConfigs();
 
     const translate = useTranslate();
     const identityEmailsService = useIdentityEmailsService();
 
+    const termsUrl = useStateHref('terms_and_conditions');
+    const privacyUrl = useStateHref('privacy');
+
+    const [disableSubmitBtn, setDisableSubmitBtn] = useState(false);
     const [emailSubmitted, setEmailSubmitted] = useState(false);
     const emailSetupRequired = useMemo(() => fund?.email_required, [fund?.email_required]);
 
-    const emailForm = useFormBuilder<{ email: string; privacy: boolean }>(
+    const hasPrivacy = useMemo(() => {
+        return appConfigs?.show_privacy_checkbox && appConfigs?.pages.privacy;
+    }, [appConfigs]);
+
+    const hasTerms = useMemo(() => {
+        return appConfigs?.show_terms_checkbox && appConfigs?.pages.terms_and_conditions;
+    }, [appConfigs]);
+
+    const emailForm = useFormBuilder<{ email: string; privacy: boolean; terms: boolean }>(
         {
             email: ``,
             privacy: false,
+            terms: false,
         },
         (values) => {
             identityEmailsService
@@ -56,6 +68,14 @@ export default function FundRequestStepEmailSetup({
         },
     );
 
+    useEffect(() => {
+        if ((!emailForm?.values?.privacy && hasPrivacy) || (!emailForm?.values?.terms && hasTerms)) {
+            setDisableSubmitBtn(true);
+        } else {
+            setDisableSubmitBtn(false);
+        }
+    }, [emailForm?.values?.privacy, emailForm?.values?.terms, hasPrivacy, hasTerms]);
+
     return (
         <Fragment>
             {progress}
@@ -126,7 +146,7 @@ export default function FundRequestStepEmailSetup({
                                         <div className="form-label hide-sm">&nbsp;</div>
                                         <button
                                             className="button button-primary button-fill"
-                                            disabled={!emailForm.values.privacy && envData.config?.flags?.privacyPage}
+                                            disabled={disableSubmitBtn}
                                             type="submit"
                                             tabIndex={0}>
                                             {translate('popup_auth.buttons.submit')}
@@ -154,12 +174,12 @@ export default function FundRequestStepEmailSetup({
                                 </div>
                             )}
 
-                            {envData.config?.flags?.privacyPage && (
+                            {hasPrivacy ? (
                                 <div className="row">
                                     <div className="col col-lg-12">
                                         <br className="hidden-lg" />
                                         <label
-                                            className="sign_up-pane-text"
+                                            className="sign_up-pane-text sign_up-pane-text-sm sign_up-privacy"
                                             htmlFor="privacy"
                                             tabIndex={0}
                                             onKeyDown={(e) => {
@@ -175,23 +195,52 @@ export default function FundRequestStepEmailSetup({
                                                 }}
                                                 id="privacy"
                                             />
-                                            Ik heb de{' '}
-                                            <StateNavLink
-                                                name={'privacy'}
-                                                tabIndex={0}
-                                                target={'_blank'}
-                                                onKeyDown={(e: React.KeyboardEvent<HTMLElement>) => {
-                                                    e.stopPropagation();
-                                                    clickOnKeyEnter(e);
+                                            <BindLinksInside onKeyDown={(e) => e.stopPropagation()}>
+                                                <strong>
+                                                    <TranslateHtml
+                                                        i18n={'auth.privacy_link.text'}
+                                                        values={{ link_url: privacyUrl }}
+                                                    />
+                                                </strong>
+                                            </BindLinksInside>
+                                        </label>
+                                    </div>
+                                </div>
+                            ) : null}
+
+                            {hasTerms ? (
+                                <div className="row">
+                                    <div className="col col-lg-12">
+                                        <br className="hidden-lg" />
+                                        <label
+                                            className="sign_up-pane-text sign_up-pane-text-sm sign_up-privacy"
+                                            htmlFor="terms"
+                                            tabIndex={0}
+                                            onKeyDown={(e) => {
+                                                e.stopPropagation();
+                                                clickOnKeyEnter(e);
+                                            }}>
+                                            <input
+                                                type="checkbox"
+                                                checked={emailForm.values.terms}
+                                                onChange={(e) => {
+                                                    emailForm.update({ terms: e.target.checked });
+                                                    e.target?.parentElement?.focus();
                                                 }}
-                                                className="text-primary-light sign_up-pane-link">
-                                                privacyverklaring
-                                            </StateNavLink>{' '}
-                                            gelezen
+                                                id="terms"
+                                            />
+                                            <BindLinksInside onKeyDown={(e) => e.stopPropagation()}>
+                                                <strong>
+                                                    <TranslateHtml
+                                                        i18n={'auth.terms_link.text'}
+                                                        values={{ link_url: termsUrl }}
+                                                    />
+                                                </strong>
+                                            </BindLinksInside>
                                         </label>
                                     </div>
                                 </div>
-                            )}
+                            ) : null}
                         </form>
                     </div>
 
@@ -203,7 +252,7 @@ export default function FundRequestStepEmailSetup({
                             !emailSetupRequired && (
                                 <button
                                     className="button button-text button-text-padless"
-                                    disabled={envData.config.flags.privacyPage && !emailForm.values.privacy}
+                                    disabled={disableSubmitBtn}
                                     onClick={nextStep}
                                     role="button"
                                     tabIndex={0}>
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
index c578e5904..0fc4accd2 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestValuesOverview.tsx
@@ -142,6 +142,7 @@ export default function FundRequestValuesOverview({
                             className="button button-primary button-sm"
                             onClick={onSubmitRequest}
                             role="button"
+                            data-dusk="submitButton"
                             tabIndex={0}>
                             {translate('fund_request.sign_up.pane.footer.apply')}
                             <em className="mdi mdi-chevron-right icon-right" />
diff --git a/react/src/webshop/i18n/nl/modals/modal_reserve_product.mjs b/react/src/webshop/i18n/nl/modals/modal_reserve_product.mjs
index f0d63c221..8c0978c5a 100644
--- a/react/src/webshop/i18n/nl/modals/modal_reserve_product.mjs
+++ b/react/src/webshop/i18n/nl/modals/modal_reserve_product.mjs
@@ -16,7 +16,7 @@ export default {
     ].join('<br/>'),
     description_informal: [
         'Je gebruikt jouw <strong>{{fund}}</strong> tegoed voor deze reservering.',
-        'Plaatst je een reservering? Dan gaat je ermee akkoord dat wij je persoonlijke gegevens delen met de aanbieder.',
+        'Plaats je een reservering? Dan ga je ermee akkoord dat wij je persoonlijke gegevens delen met de aanbieder.',
     ].join('<br/>'),
 
     description_formal_time: 'De reservering kunt u na bevestiging nog binnen {{ days_to_cancel }} dagen annuleren. ',
diff --git a/react/src/webshop/i18n/nl/pages/auth.mjs b/react/src/webshop/i18n/nl/pages/auth.mjs
index bb0a17a7d..650d24f80 100644
--- a/react/src/webshop/i18n/nl/pages/auth.mjs
+++ b/react/src/webshop/i18n/nl/pages/auth.mjs
@@ -27,7 +27,11 @@ export default {
     },
 
     privacy_link: {
-        text: 'Ik heb de <a tabIndex="3" class="text-primary-light sign_up-pane-link" name="privacy" target="_blank" href="{{ link_url }}">privacyverklaring</a> gelezen',
+        text: 'Ik heb de <a tabIndex="3" class="text-primary-light sign_up-pane-link" target="_blank" href="{{ link_url }}">privacyverklaring</a> gelezen',
+    },
+
+    terms_link: {
+        text: 'Ik ga akkoord met de <a tabIndex="3" class="text-primary-light sign_up-pane-link" target="_blank" href="{{ link_url }}">voorwaarden</a>',
     },
 
     qr: {
diff --git a/react/src/webshop/i18n/translated/ar.json b/react/src/webshop/i18n/translated/ar.json
index 41c9de7de..b8c9dd83f 100644
--- a/react/src/webshop/i18n/translated/ar.json
+++ b/react/src/webshop/i18n/translated/ar.json
@@ -22,9 +22,6 @@
                 "title": "تطبيقي"
             }
         },
-        "privacy_link": {
-            "text": "لقد قرأت <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">بيان الخصوصية</a> "
-        },
         "push": {
             "link_used": {
                 "title": "تم استخدام هذا الرابط بالفعل أو أنه غير صالح."
@@ -39,7 +36,13 @@
             "title": "استعادة الحساب"
         },
         "setup_2fa_title": "إعداد المصادقة الثنائية",
-        "sign_in_up_title": "إنشاء حساب أو بدء تطبيق؟"
+        "sign_in_up_title": "إنشاء حساب أو بدء تطبيق؟",
+        "privacy_link": {
+            "text": "لقد قرأت <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">بيان الخصوصية</a> "
+        },
+        "terms_link": {
+            "text": "أوافق على <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">الشروط والأحكام</a>"
+        }
     },
     "blocks": {
         "block_exception": {
diff --git a/react/src/webshop/i18n/translated/de.json b/react/src/webshop/i18n/translated/de.json
index 5f5119b3e..6018844d4 100644
--- a/react/src/webshop/i18n/translated/de.json
+++ b/react/src/webshop/i18n/translated/de.json
@@ -148,9 +148,6 @@
                 "title": "Ich-App"
             }
         },
-        "privacy_link": {
-            "text": "Ich habe die <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">Datenschutzbestimmungen</a> gelesen"
-        },
         "push": {
             "link_used": {
                 "title": "Dieser Link wurde bereits verwendet oder ist ungültig."
@@ -165,7 +162,13 @@
             "title": "Konto wiederherstellen"
         },
         "setup_2fa_title": "Einrichten der Zwei-Faktor-Authentifizierung",
-        "sign_in_up_title": "Ein Konto erstellen oder eine Bewerbung starten?"
+        "sign_in_up_title": "Ein Konto erstellen oder eine Bewerbung starten?",
+        "privacy_link": {
+            "text": "Ich habe die <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Datenschutzbestimmungen</a> gelesen"
+        },
+        "terms_link": {
+            "text": "Ich stimme den <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Bedingungen und Konditionen</a> zu"
+        }
     },
     "block_funds": {
         "labels": {
diff --git a/react/src/webshop/i18n/translated/en-US.json b/react/src/webshop/i18n/translated/en-US.json
index e2eab55cf..d682d365e 100644
--- a/react/src/webshop/i18n/translated/en-US.json
+++ b/react/src/webshop/i18n/translated/en-US.json
@@ -373,8 +373,8 @@
                 "title": "Me app"
             }
         },
-        "privacy_link": {
-            "text": "I have read the <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">privacy statement</a> "
+        "terms_link": {
+            "text": "I agree to the <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">terms and conditions</a>"
         },
         "push": {
             "link_used": {
@@ -390,7 +390,10 @@
             "title": "Restore account"
         },
         "setup_2fa_title": "Setting up two-factor authentication",
-        "sign_in_up_title": "Create an account or start an application?"
+        "sign_in_up_title": "Create an account or start an application?",
+        "privacy_link": {
+            "text": "I have read the <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">privacy statement</a> "
+        }
     },
     "bookmarked_products": {
         "empty": {
diff --git a/react/src/webshop/i18n/translated/fr.json b/react/src/webshop/i18n/translated/fr.json
index dbb575ec5..43494487e 100644
--- a/react/src/webshop/i18n/translated/fr.json
+++ b/react/src/webshop/i18n/translated/fr.json
@@ -148,9 +148,6 @@
                 "title": "Mon application"
             }
         },
-        "privacy_link": {
-            "text": "J'ai lu la <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">déclaration de confidentialité</a> "
-        },
         "push": {
             "link_used": {
                 "title": "Ce lien a déjà été utilisé ou n'est pas valide."
@@ -165,7 +162,13 @@
             "title": "Restaurer le compte"
         },
         "setup_2fa_title": "Mise en place de l'authentification à deux facteurs",
-        "sign_in_up_title": "Créer un compte ou lancer une candidature ?"
+        "sign_in_up_title": "Créer un compte ou lancer une candidature ?",
+        "privacy_link": {
+            "text": "J'ai lu la <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">déclaration de confidentialité</a> "
+        },
+        "terms_link": {
+            "text": "J'accepte les <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">termes et conditions</a>"
+        }
     },
     "block_funds": {
         "labels": {
diff --git a/react/src/webshop/i18n/translated/pl.json b/react/src/webshop/i18n/translated/pl.json
index 6924edb14..4f15f3542 100644
--- a/react/src/webshop/i18n/translated/pl.json
+++ b/react/src/webshop/i18n/translated/pl.json
@@ -148,9 +148,6 @@
                 "title": "Moja aplikacja"
             }
         },
-        "privacy_link": {
-            "text": "Zapoznałem się z <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">oświadczeniem</a> o ochronie prywatności"
-        },
         "push": {
             "link_used": {
                 "title": "Ten link został już użyty lub jest nieprawidłowy."
@@ -165,7 +162,13 @@
             "title": "Przywracanie konta"
         },
         "setup_2fa_title": "Konfigurowanie uwierzytelniania dwuskładnikowego",
-        "sign_in_up_title": "Założyć konto lub rozpocząć aplikację?"
+        "sign_in_up_title": "Założyć konto lub rozpocząć aplikację?",
+        "privacy_link": {
+            "text": "Zapoznałem się z <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">oświadczeniem</a> o ochronie prywatności"
+        },
+        "terms_link": {
+            "text": "Zgadzam się na <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">warunki i postanowienia</a>"
+        }
     },
     "block_funds": {
         "labels": {
diff --git a/react/src/webshop/i18n/translated/ru.json b/react/src/webshop/i18n/translated/ru.json
index 40fb47823..c1f4e4168 100644
--- a/react/src/webshop/i18n/translated/ru.json
+++ b/react/src/webshop/i18n/translated/ru.json
@@ -148,9 +148,6 @@
                 "title": "Приложение \"Я"
             }
         },
-        "privacy_link": {
-            "text": "Я прочитал <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">заявление о конфиденциальности</a> "
-        },
         "push": {
             "link_used": {
                 "title": "Эта ссылка уже использовалась или недействительна."
@@ -165,7 +162,13 @@
             "title": "Восстановление учетной записи"
         },
         "setup_2fa_title": "Настройка двухфакторной аутентификации",
-        "sign_in_up_title": "Создать учетную запись или подать заявку?"
+        "sign_in_up_title": "Создать учетную запись или подать заявку?",
+        "privacy_link": {
+            "text": "Я прочитал <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">заявление о конфиденциальности</a> "
+        },
+        "terms_link": {
+            "text": "Я согласен с <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">условиями и положениями</a>"
+        }
     },
     "block_funds": {
         "labels": {
diff --git a/react/src/webshop/i18n/translated/tr.json b/react/src/webshop/i18n/translated/tr.json
index c8210a608..cdfecf421 100644
--- a/react/src/webshop/i18n/translated/tr.json
+++ b/react/src/webshop/i18n/translated/tr.json
@@ -22,9 +22,6 @@
                 "title": "Benim uygulamam"
             }
         },
-        "privacy_link": {
-            "text": "<a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">Gizlilik bildirimini</a> okudum"
-        },
         "push": {
             "link_used": {
                 "title": "Bu bağlantı zaten kullanılmış veya geçersiz."
@@ -39,7 +36,13 @@
             "title": "Hesabı geri yükle"
         },
         "setup_2fa_title": "İki faktörlü kimlik doğrulamayı ayarlama",
-        "sign_in_up_title": "Bir hesap oluşturun veya bir başvuru başlatın?"
+        "sign_in_up_title": "Bir hesap oluşturun veya bir başvuru başlatın?",
+        "privacy_link": {
+            "text": "<a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Gizlilik bildirimini</a> okudum"
+        },
+        "terms_link": {
+            "text": "<a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Hüküm ve koşulları</a> kabul ediyorum"
+        }
     },
     "blocks": {
         "block_exception": {
diff --git a/react/src/webshop/i18n/translated/uk.json b/react/src/webshop/i18n/translated/uk.json
index 96f6b432f..7bcc02b0f 100644
--- a/react/src/webshop/i18n/translated/uk.json
+++ b/react/src/webshop/i18n/translated/uk.json
@@ -148,9 +148,6 @@
                 "title": "Мій додаток"
             }
         },
-        "privacy_link": {
-            "text": "Я прочитав <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">заяву про конфіденційність</a> "
-        },
         "push": {
             "link_used": {
                 "title": "Це посилання вже використовувалося або є недійсним."
@@ -165,7 +162,13 @@
             "title": "Відновити обліковий запис"
         },
         "setup_2fa_title": "Налаштування двофакторної автентифікації",
-        "sign_in_up_title": "Створити обліковий запис або запустити додаток?"
+        "sign_in_up_title": "Створити обліковий запис або запустити додаток?",
+        "privacy_link": {
+            "text": "Я прочитав <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">заяву про конфіденційність</a> "
+        },
+        "terms_link": {
+            "text": "Я погоджуюся з <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">умовами та положеннями</a>"
+        }
     },
     "block_funds": {
         "labels": {
diff --git a/react/src/webshop/modules/state_router/Router.tsx b/react/src/webshop/modules/state_router/Router.tsx
index eeeb9dfe8..007f9f423 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 } from 'react-router-dom';
+import { generatePath, matchRoutes, useLocation, useNavigate, createSearchParams, useHref } from 'react-router-dom';
 import { CurrentRoute, RouteState } from './RouterProps';
 import router from '../../router/routes';
 import { NavigateOptions } from 'react-router';
@@ -47,6 +47,10 @@ export const useNavigateState = () => {
     );
 };
 
+export const useStateHref = (name: string, params = {}, query = {}) => {
+    return useHref(getStateRouteUrl(name, params, query));
+};
+
 export const useStateRoutes = (): { routes: Array<RouteState>; route: CurrentRoute } => {
     const [routes] = useState(getRoutes());
     const route = useCurrentRoute(routes);
diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index 99b40143c..b1a3a8f27 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -449,7 +449,7 @@
     ],
     [
         "auth.privacy_link.text",
-        "Ik heb de <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" name=\"privacy\" target=\"_blank\" href=\"{{ link_url }}\">privacyverklaring</a> gelezen"
+        "Ik heb de <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">privacyverklaring</a> gelezen"
     ],
     [
         "auth.push.link_used.title",
@@ -479,6 +479,10 @@
         "auth.sign_in_up_title",
         "Account aanmaken of een aanvraag starten?"
     ],
+    [
+        "auth.terms_link.text",
+        "Ik ga akkoord met de <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">voorwaarden</a>"
+    ],
     [
         "block_funds.labels.subtitle",
         "Geen resultaten"