diff --git a/package-lock.json b/package-lock.json
index b2df74d04..b9825c9da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1670,6 +1670,15 @@
       "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
       "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
     },
+    "@entur/a11y": {
+      "version": "0.2.59",
+      "resolved": "https://registry.npmjs.org/@entur/a11y/-/a11y-0.2.59.tgz",
+      "integrity": "sha512-Rs2j5fc/jHClratA7hfCDctXr9QLFFkB+JHnl4Kcc42Ox9ImC4LoyJeFhptmk4Oaptz9TSMAvXlSb3/y29EImw==",
+      "requires": {
+        "@entur/tokens": "^3.8.0",
+        "@entur/utils": "^0.5.5"
+      }
+    },
     "@entur/auth-provider": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@entur/auth-provider/-/auth-provider-1.1.0.tgz",
@@ -1700,25 +1709,113 @@
       }
     },
     "@entur/datepicker": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@entur/datepicker/-/datepicker-3.0.10.tgz",
-      "integrity": "sha512-37x6ViINTxFOHCm95ssgdJBRHw4+nccZJT+7mlN5cBmuk6Fs89d4r2FMe67szmnw1ZF5dIKv3/r16SHu7HC/Yw==",
-      "requires": {
-        "@entur/button": "^2.10.8",
-        "@entur/form": "^5.4.13",
-        "@entur/icons": "^5.4.1",
-        "@entur/tokens": "^3.4.4",
-        "@entur/tooltip": "^2.6.0",
-        "@entur/typography": "^1.7.4",
-        "@entur/utils": "^0.4.9",
-        "@internationalized/date": "^3.0.1",
-        "@react-aria/datepicker": "^3.1.1",
-        "@react-aria/i18n": "^3.6.0",
-        "@react-stately/datepicker": "^3.0.2",
-        "@react-types/datepicker": "^3.1.1",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@entur/datepicker/-/datepicker-4.0.6.tgz",
+      "integrity": "sha512-uTqX8uDPjn3mqwyWNKD/OnFAAizuMALvCQUkOTq3d53EqX4S+6IwP8pX1+p1j4+Q4EYG4L2OHS1wxXIMdWa9Xw==",
+      "requires": {
+        "@entur/a11y": "^0.2.59",
+        "@entur/button": "^2.10.15",
+        "@entur/form": "^5.4.20",
+        "@entur/icons": "^5.8.1",
+        "@entur/modal": "^1.6.25",
+        "@entur/tokens": "^3.8.0",
+        "@entur/tooltip": "^2.6.7",
+        "@entur/typography": "^1.7.11",
+        "@entur/utils": "^0.5.5",
+        "@floating-ui/react-dom": "^1.0.0",
+        "@internationalized/date": "^3.0.2",
+        "@react-aria/button": "^3.6.4",
+        "@react-aria/calendar": "^3.0.5",
+        "@react-aria/datepicker": "^3.2.1",
+        "@react-aria/i18n": "^3.6.3",
+        "@react-stately/calendar": "^3.0.5",
+        "@react-stately/datepicker": "^3.2.1",
+        "@react-types/datepicker": "^3.1.4",
         "classnames": "^2.3.1",
-        "date-fns": "2.29.3",
-        "react-datepicker": "^4.7.0"
+        "react-focus-lock": "^2.9.1"
+      },
+      "dependencies": {
+        "@entur/button": {
+          "version": "2.10.15",
+          "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+          "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+          "requires": {
+            "@entur/loader": "^0.4.23",
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/form": {
+          "version": "5.4.20",
+          "resolved": "https://registry.npmjs.org/@entur/form/-/form-5.4.20.tgz",
+          "integrity": "sha512-GBlNgtGWCAWDugvOFowxSCwR/TelVIZoPaJgV91rOAdGV6G+nMsd6G30Km7w4PjhzbJ8HLHVHz0rrP3suPzyLA==",
+          "requires": {
+            "@entur/icons": "^5.8.1",
+            "@entur/tokens": "^3.8.0",
+            "@entur/tooltip": "^2.6.7",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/icons": {
+          "version": "5.8.1",
+          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-5.8.1.tgz",
+          "integrity": "sha512-6S49jeO5YTbRiw5tosn0zSBtt5y6M4FbaoTnK2RbeoeOTcqd3Xr7m8TpY18S/ekwzyjPiTm+28URpwjRVjjslg==",
+          "requires": {
+            "@entur/tokens": "^3.8.0"
+          }
+        },
+        "@entur/layout": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.1.22.tgz",
+          "integrity": "sha512-wEMriSFyAVvjf35YxCWZkp+t6ImbRYIN3Ts9DT1z0vk9IiHyYC+pRJs4PE48fzAF4ZjrmkbuyWSczpq1cwszUg==",
+          "requires": {
+            "@entur/icons": "^5.8.1",
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/loader": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.23.tgz",
+          "integrity": "sha512-A8UK0Q2xQddF7vuxqxkwicLfm0ldo7GeuFOJXe+oKw3ixQm467LCI8FK9u7ZsWET81m0LV08Sm5bU4CypEutnQ==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/tooltip": {
+          "version": "2.6.7",
+          "resolved": "https://registry.npmjs.org/@entur/tooltip/-/tooltip-2.6.7.tgz",
+          "integrity": "sha512-rMdJwMuzlaCqcnCUc0ooi2RQId1IL3g822nLYq7MYioLHnOFu9xmINLu2OPrQoVoricoxVRB9T+MP6krhMab4w==",
+          "requires": {
+            "@entur/button": "^2.10.15",
+            "@entur/icons": "^5.8.1",
+            "@entur/layout": "^2.1.22",
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "@popperjs/core": "^2.10.1",
+            "classnames": "^2.3.1",
+            "react-popper": "~2.2.5"
+          }
+        },
+        "@entur/typography": {
+          "version": "1.7.11",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.7.11.tgz",
+          "integrity": "sha512-YDQWMH2wDiV1LUp4bpDMsGJok0/AlOQDtXAW6XbIKLiBxKgslDcOZUXXrgSh71RI8ynuKwdkJ5IWssv529+YUw==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
+          }
+        }
       }
     },
     "@entur/form": {
@@ -1795,6 +1892,78 @@
         }
       }
     },
+    "@entur/modal": {
+      "version": "1.6.25",
+      "resolved": "https://registry.npmjs.org/@entur/modal/-/modal-1.6.25.tgz",
+      "integrity": "sha512-hxoYKDxnctSupkM28GQB6gXZttsIs+dmB8Bbbvsizv4D2xi6CU89Kl8Llhsi2W8CEyIINGo0DwTu3pu8I5+zJw==",
+      "requires": {
+        "@entur/a11y": "^0.2.59",
+        "@entur/button": "^2.10.15",
+        "@entur/icons": "^5.8.1",
+        "@entur/layout": "^2.1.22",
+        "@entur/tokens": "^3.8.0",
+        "@entur/typography": "^1.7.11",
+        "@entur/utils": "^0.5.5",
+        "@reach/dialog": "^0.16.0",
+        "classnames": "^2.3.1",
+        "react-focus-lock": "^2.9.1"
+      },
+      "dependencies": {
+        "@entur/button": {
+          "version": "2.10.15",
+          "resolved": "https://registry.npmjs.org/@entur/button/-/button-2.10.15.tgz",
+          "integrity": "sha512-8FYfFz4P3ZTQZew5ndhNkSS8qBd/lIeM52bzoJarPLGA0FDIrehXcTZG842jWkouA+OTaPVp1x0+VcS4mKUftw==",
+          "requires": {
+            "@entur/loader": "^0.4.23",
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/icons": {
+          "version": "5.8.1",
+          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-5.8.1.tgz",
+          "integrity": "sha512-6S49jeO5YTbRiw5tosn0zSBtt5y6M4FbaoTnK2RbeoeOTcqd3Xr7m8TpY18S/ekwzyjPiTm+28URpwjRVjjslg==",
+          "requires": {
+            "@entur/tokens": "^3.8.0"
+          }
+        },
+        "@entur/layout": {
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.1.22.tgz",
+          "integrity": "sha512-wEMriSFyAVvjf35YxCWZkp+t6ImbRYIN3Ts9DT1z0vk9IiHyYC+pRJs4PE48fzAF4ZjrmkbuyWSczpq1cwszUg==",
+          "requires": {
+            "@entur/icons": "^5.8.1",
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/loader": {
+          "version": "0.4.23",
+          "resolved": "https://registry.npmjs.org/@entur/loader/-/loader-0.4.23.tgz",
+          "integrity": "sha512-A8UK0Q2xQddF7vuxqxkwicLfm0ldo7GeuFOJXe+oKw3ixQm467LCI8FK9u7ZsWET81m0LV08Sm5bU4CypEutnQ==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/typography": "^1.7.11",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1"
+          }
+        },
+        "@entur/typography": {
+          "version": "1.7.11",
+          "resolved": "https://registry.npmjs.org/@entur/typography/-/typography-1.7.11.tgz",
+          "integrity": "sha512-YDQWMH2wDiV1LUp4bpDMsGJok0/AlOQDtXAW6XbIKLiBxKgslDcOZUXXrgSh71RI8ynuKwdkJ5IWssv529+YUw==",
+          "requires": {
+            "@entur/tokens": "^3.8.0",
+            "@entur/utils": "^0.5.5",
+            "classnames": "^2.3.1",
+            "normalize-scss": "^7.0.1"
+          }
+        }
+      }
+    },
     "@entur/tab": {
       "version": "0.4.42",
       "resolved": "https://registry.npmjs.org/@entur/tab/-/tab-0.4.42.tgz",
@@ -1880,9 +2049,9 @@
       }
     },
     "@entur/utils": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.9.tgz",
-      "integrity": "sha512-dyXs26JzboR9TlV3gVRFi8HzAXEvvCMnTnGbRrK7RzujXcUqLO1QzzL7dh7iLtFGcvkSGNU36tmVsPXPqhkNIw==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.5.5.tgz",
+      "integrity": "sha512-Xj8O9mlSE1w6R+utl/fzm+E7kDXbsA+kg3Ci8xbUn+2tq/+OyKzTFzp4ACCpWQ6BIJHsaE4FGVoVrG0Pu5Nulg==",
       "requires": {
         "tiny-warning": "^1.0.3"
       }
@@ -2660,6 +2829,27 @@
       "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz",
       "integrity": "sha512-BpiZLBWdLFw+qFel9p3Zs1jD6QmH7Ii4aTDu6+vx8ShdidChZUXqDhYJly4ZjSgQh54miXbBgBrk0S+jTIh/Qg=="
     },
+    "@floating-ui/core": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.2.tgz",
+      "integrity": "sha512-FaO9KVLFnxknZaGWGmNtjD2CVFuc0u4yeGEofoyXO2wgRA7fLtkngT6UB0vtWQWuhH3iMTZZ/Y89CMeyGfn8pA=="
+    },
+    "@floating-ui/dom": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.2.3.tgz",
+      "integrity": "sha512-lK9cZUrHSJLMVAdCvDqs6Ug8gr0wmqksYiaoj/bxj2gweRQkSuhg2/V6Jswz2KiQ0RAULbqw1oQDJIMpQ5GfGA==",
+      "requires": {
+        "@floating-ui/core": "^1.2.2"
+      }
+    },
+    "@floating-ui/react-dom": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-1.3.0.tgz",
+      "integrity": "sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==",
+      "requires": {
+        "@floating-ui/dom": "^1.2.1"
+      }
+    },
     "@formatjs/ecma402-abstract": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz",
@@ -2670,31 +2860,31 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
     "@formatjs/fast-memoize": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.7.tgz",
-      "integrity": "sha512-hPeM5LXUUjtCKPybWOUAWpv8lpja8Xz+uKprFPJcg5F2Rd+/bf1E0UUsLRpaAgOReAf5HMRtoIgv/UcyPICrTQ==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.8.tgz",
+      "integrity": "sha512-PemNUObyoIZcqdQ1ixTPugzAzhEj7j6AHIyrq/qR6x5BFTvOQeXHYsVZUqBEFduAIscUaDfou+U+xTqOiunJ3Q==",
       "requires": {
         "tslib": "^2.4.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
     "@formatjs/icu-messageformat-parser": {
-      "version": "2.1.14",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.14.tgz",
-      "integrity": "sha512-0KqeVOb72losEhUW+59vhZGGd14s1f35uThfEMVKZHKLEObvJdFTiI3ZQwvTMUCzLEMxnS6mtnYPmG4mTvwd3Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.3.0.tgz",
+      "integrity": "sha512-xqtlqYAbfJDF4b6e4O828LBNOWXrFcuYadqAbYORlDRwhyJ2bH+xpUBPldZbzRGUN2mxlZ4Ykhm7jvERtmI8NQ==",
       "requires": {
         "@formatjs/ecma402-abstract": "1.14.3",
         "@formatjs/icu-skeleton-parser": "1.3.18",
@@ -2702,9 +2892,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
@@ -2718,9 +2908,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
@@ -2733,9 +2923,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
@@ -2820,34 +3010,34 @@
       "dev": true
     },
     "@internationalized/date": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.0.2.tgz",
-      "integrity": "sha512-9V1IxesP6ASZj/hYyOXOC4yPJvidbbStyWQKLCQSqhhKACMOXoo+BddXZJy47ju9mqOMpWdrJ2rTx4yTxK9oag==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.1.0.tgz",
+      "integrity": "sha512-wjeur7K4AecT+YwoBmBXQ/+n5lP69tuZc34hw09s44EozZK7FZHSyfPvRp5/xEb2D6abLboskDY4jG+Nt0TNUQ==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
     },
     "@internationalized/message": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@internationalized/message/-/message-3.0.10.tgz",
-      "integrity": "sha512-vfLqEop/NH68IgqMcXJNSDqZ5Leg3EEgCxhuuSefU7vvdbptD3pwpUWXaK9igYPa+aZfUU0eqv86yqm76obtsw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@internationalized/message/-/message-3.1.0.tgz",
+      "integrity": "sha512-Oo5m70FcBdADf7G8NkUffVSfuCdeAYVfsvNjZDi9ELpjvkc4YNJVTHt/NyTI9K7FgAVoELxiP9YmN0sJ+HNHYQ==",
       "requires": {
         "@swc/helpers": "^0.4.14",
         "intl-messageformat": "^10.1.0"
       }
     },
     "@internationalized/number": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.1.2.tgz",
-      "integrity": "sha512-Mbys8SGsn0ApXz3hJLNU+d95B8luoUbwnmCpBwl7d63UmYAlcT6TRDyvaS/vwdbElXLcsQJjQCu0gox2cv/Tig==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@internationalized/number/-/number-3.2.0.tgz",
+      "integrity": "sha512-GUXkhXSX1Ee2RURnzl+47uvbOxnlMnvP9Er+QePTjDjOPWuunmLKlEkYkEcLiiJp7y4l9QxGDLOlVr8m69LS5w==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
     },
     "@internationalized/string": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@internationalized/string/-/string-3.0.1.tgz",
-      "integrity": "sha512-2+rHfXZ56YgsC6i3fKvBue/xatnSm0Jv+C/x4+n3wg5xAcLh4LPW3GvZ/9ifxNAz9+IWplgZHa1FRIbSuUvNWg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@internationalized/string/-/string-3.1.0.tgz",
+      "integrity": "sha512-TJQKiyUb+wyAfKF59UNeZ/kELMnkxyecnyPCnBI1ma4NaXReJW+7Cc2mObXAqraIBJUVv7rgI46RLKrLgi35ng==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
@@ -3530,6 +3720,61 @@
         }
       }
     },
+    "@reach/dialog": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/dialog/-/dialog-0.16.2.tgz",
+      "integrity": "sha512-qq8oX0cROgTb8LjOKWzzNm4SqaN9b89lJHr7UyVo2aQ6WbeNzZBxqXhGywFP7dkR+hNqOJnrA59PXFWhfttA9A==",
+      "requires": {
+        "@reach/portal": "0.16.2",
+        "@reach/utils": "0.16.0",
+        "prop-types": "^15.7.2",
+        "react-focus-lock": "^2.5.2",
+        "react-remove-scroll": "^2.4.3",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "@reach/utils": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+          "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
+          "requires": {
+            "tiny-warning": "^1.0.3",
+            "tslib": "^2.3.0"
+          }
+        },
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
+    "@reach/portal": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.16.2.tgz",
+      "integrity": "sha512-9ur/yxNkuVYTIjAcfi46LdKUvH0uYZPfEp4usWcpt6PIp+WDF57F/5deMe/uGi/B/nfDweQu8VVwuMVrCb97JQ==",
+      "requires": {
+        "@reach/utils": "0.16.0",
+        "tiny-warning": "^1.0.3",
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "@reach/utils": {
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+          "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
+          "requires": {
+            "tiny-warning": "^1.0.3",
+            "tslib": "^2.3.0"
+          }
+        },
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "@reach/tabs": {
       "version": "0.15.3",
       "resolved": "https://registry.npmjs.org/@reach/tabs/-/tabs-0.15.3.tgz",
@@ -3565,206 +3810,269 @@
         }
       }
     },
+    "@react-aria/button": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/button/-/button-3.7.0.tgz",
+      "integrity": "sha512-4DSGXrAWflzT4cQe/x0KdrPzz7hv9vZgqYJuNXQkpmeIMs1EmUKuby2xC+W9GHuZ+8dMxjTWKy3XdwX2tCM42A==",
+      "requires": {
+        "@react-aria/focus": "^3.11.0",
+        "@react-aria/interactions": "^3.14.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-stately/toggle": "^3.5.0",
+        "@react-types/button": "^3.7.1",
+        "@react-types/shared": "^3.17.0",
+        "@swc/helpers": "^0.4.14"
+      }
+    },
+    "@react-aria/calendar": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/calendar/-/calendar-3.1.0.tgz",
+      "integrity": "sha512-XWtoGMBTYpj5De2yfboAv60SMXa/T2BjPd0uSkiaPXAC0vPjdB0VPhGbSi6LKCYIiTAMs98mMP0P4WYhWyW4jA==",
+      "requires": {
+        "@internationalized/date": "^3.1.0",
+        "@react-aria/i18n": "^3.7.0",
+        "@react-aria/interactions": "^3.14.0",
+        "@react-aria/live-announcer": "^3.2.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-stately/calendar": "^3.1.0",
+        "@react-types/button": "^3.7.1",
+        "@react-types/calendar": "^3.1.0",
+        "@react-types/shared": "^3.17.0",
+        "@swc/helpers": "^0.4.14"
+      }
+    },
     "@react-aria/datepicker": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@react-aria/datepicker/-/datepicker-3.2.1.tgz",
-      "integrity": "sha512-NnW9VgX/YjxkgjcIaxmOhzpfiQmTQpCXjpPJ1+3nPhKzPKpcjtPxIYTDMkm/R+6i5FRukEGtjhg3QY9amLK6hQ==",
-      "requires": {
-        "@internationalized/date": "^3.0.2",
-        "@internationalized/number": "^3.1.2",
-        "@internationalized/string": "^3.0.1",
-        "@react-aria/focus": "^3.10.1",
-        "@react-aria/i18n": "^3.6.3",
-        "@react-aria/interactions": "^3.13.1",
-        "@react-aria/label": "^3.4.4",
-        "@react-aria/spinbutton": "^3.2.1",
-        "@react-aria/utils": "^3.14.2",
-        "@react-stately/datepicker": "^3.2.1",
-        "@react-types/button": "^3.7.0",
-        "@react-types/calendar": "^3.0.5",
-        "@react-types/datepicker": "^3.1.4",
-        "@react-types/dialog": "^3.4.5",
-        "@react-types/shared": "^3.16.0",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/datepicker/-/datepicker-3.3.0.tgz",
+      "integrity": "sha512-76/5a2Dfe/SCcW0j4hqeSTnlh6SSW/AYPKPr5fNaiGnLFJ3oLsc9SAuUgTsOBglR/J3N/hqtH+UO2U8X1QC6Ng==",
+      "requires": {
+        "@internationalized/date": "^3.1.0",
+        "@internationalized/number": "^3.2.0",
+        "@internationalized/string": "^3.1.0",
+        "@react-aria/focus": "^3.11.0",
+        "@react-aria/i18n": "^3.7.0",
+        "@react-aria/interactions": "^3.14.0",
+        "@react-aria/label": "^3.5.0",
+        "@react-aria/spinbutton": "^3.3.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-stately/datepicker": "^3.3.0",
+        "@react-types/button": "^3.7.1",
+        "@react-types/calendar": "^3.1.0",
+        "@react-types/datepicker": "^3.2.0",
+        "@react-types/dialog": "^3.5.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/focus": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.10.1.tgz",
-      "integrity": "sha512-HjgFUC1CznuYC7CxtBIFML6bOBxW3M3cSNtvmXU9QWlrPSwwOLkXCnfY6+UkjCc5huP4v7co4PoRDX8Vbe/cVQ==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.11.0.tgz",
+      "integrity": "sha512-yPuWs9bAR9CMfIwyOPm2oXLPF19gNkUqW+ozSPhWbLMTEa8Ma09eHW1br4xbN+4ONOm/dCJsIkxTNPUkiLdQoA==",
       "requires": {
-        "@react-aria/interactions": "^3.13.1",
-        "@react-aria/utils": "^3.14.2",
-        "@react-types/shared": "^3.16.0",
+        "@react-aria/interactions": "^3.14.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14",
         "clsx": "^1.1.1"
       }
     },
     "@react-aria/i18n": {
-      "version": "3.6.3",
-      "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.6.3.tgz",
-      "integrity": "sha512-cDWl8FXJIXsw/raWcThywBueCJ5ncoogq81wYVS6hfZVmSyncONIB3bwUL12cojmjX1VEP31sN0ujT/83QP95Q==",
-      "requires": {
-        "@internationalized/date": "^3.0.2",
-        "@internationalized/message": "^3.0.10",
-        "@internationalized/number": "^3.1.2",
-        "@internationalized/string": "^3.0.1",
-        "@react-aria/ssr": "^3.4.1",
-        "@react-aria/utils": "^3.14.2",
-        "@react-types/shared": "^3.16.0",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.7.0.tgz",
+      "integrity": "sha512-PZCWmhO9mJvelwiYlsXLY6W4L2o+oza3xnDx0cZDVqp/Hf+OwMAPHWtZsFRTKdjk4TaOPB/ISc9HknWn6UpY4w==",
+      "requires": {
+        "@internationalized/date": "^3.1.0",
+        "@internationalized/message": "^3.1.0",
+        "@internationalized/number": "^3.2.0",
+        "@internationalized/string": "^3.1.0",
+        "@react-aria/ssr": "^3.5.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/interactions": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.13.1.tgz",
-      "integrity": "sha512-WCvfZOi1hhussVTHxVq76OR48ry13Zvp9U5hmuQufyxIUlf4hOvDk4/cbK4o4JiCs8X7C7SRzcwFM34M4NHzmg==",
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.14.0.tgz",
+      "integrity": "sha512-e1Tkr0UTuYFpV21PJrXy7jEY542Vl+C2Fo70oukZ1fN+wtfQkzodsTIzyepXb7kVMGmC34wDisMJUrksVkfY2w==",
       "requires": {
-        "@react-aria/utils": "^3.14.2",
-        "@react-types/shared": "^3.16.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/label": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/@react-aria/label/-/label-3.4.4.tgz",
-      "integrity": "sha512-1fuYf2UctNhBy31uYN7OhdcrwzlB5GS0+C49gDkwWzccB7yr+CoOJ5UQUoVB7WBmzrc+CuzwWxSDd4OupSYIZQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/label/-/label-3.5.0.tgz",
+      "integrity": "sha512-sNiPYiFg06s1zGuifEUeUqRiYje0lfHem+GIUh0Y5ZxfpqIyxEmyV9Aw+C7TTjjo8BAG4NZ4bR7iF9ujf9QvKQ==",
       "requires": {
-        "@react-aria/utils": "^3.14.2",
-        "@react-types/label": "^3.7.1",
-        "@react-types/shared": "^3.16.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-types/label": "^3.7.2",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/live-announcer": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@react-aria/live-announcer/-/live-announcer-3.1.2.tgz",
-      "integrity": "sha512-BqtVLPWU10sZssoOJF1lJiRvZe5zqZ5BM39PsFyO7dWhVkR/9O9bZviqvKXnC1oXCnypfa+85gUshbK9unFcWA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/live-announcer/-/live-announcer-3.2.0.tgz",
+      "integrity": "sha512-uSqDDy+9CbmNTZh0Roi4dvWKWcbuMTYKh3RnUw3XBPw0aYxSkcFQeWGfxFoOwXCDcXez02cFJtAxpR2bShkrsw==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/spinbutton": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@react-aria/spinbutton/-/spinbutton-3.2.1.tgz",
-      "integrity": "sha512-y9QZ0VzWL7qzbWSPOCsAdvZhVlQrnHLRGc8bkRa2jmWrnCqS0iua/TRuLGgazIf2Rb7GmdbKBJJuPSScytVDUw==",
-      "requires": {
-        "@react-aria/i18n": "^3.6.3",
-        "@react-aria/live-announcer": "^3.1.2",
-        "@react-aria/utils": "^3.14.2",
-        "@react-types/button": "^3.7.0",
-        "@react-types/shared": "^3.16.0",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/spinbutton/-/spinbutton-3.3.0.tgz",
+      "integrity": "sha512-FXTFNz2RFClqGxQzMIHYdsjkm6fcWRObqelY+lXP5udk7Q8T9aQn+28QhqVpbOFXotLE2PltElbziJeuhkVgNA==",
+      "requires": {
+        "@react-aria/i18n": "^3.7.0",
+        "@react-aria/live-announcer": "^3.2.0",
+        "@react-aria/utils": "^3.15.0",
+        "@react-types/button": "^3.7.1",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/ssr": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.4.1.tgz",
-      "integrity": "sha512-NmhoilMDyIfQiOSdQgxpVH2tC2u85Y0mVijtBNbI9kcDYLEiW/r6vKYVKtkyU+C4qobXhGMPfZ70PTc0lysSVA==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.5.0.tgz",
+      "integrity": "sha512-h0MJdSWOd1qObLnJ8mprU31wI8tmKFJMuwT22MpWq6psisOOZaga6Ml4u6Ee6M6duWWISjXvqO4Sb/J0PBA+nQ==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-aria/utils": {
-      "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.14.2.tgz",
-      "integrity": "sha512-3nr5gsAf/J/W+6Tu4NF3Q7m+1mXjfpXESh7TPa6UR6v3tVDTsJVMrITg2BkHN1jM8xELcl2ZxyUffOWqOXzWuA==",
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.15.0.tgz",
+      "integrity": "sha512-aJZBG++iz1UwTW5gXFaHicKju4p0MPhAyBTcf2awHYWeTUUslDjJcEnNg7kjBYZBOrOSlA2rAt7/7C5CCURQPg==",
       "requires": {
-        "@react-aria/ssr": "^3.4.1",
-        "@react-stately/utils": "^3.5.2",
-        "@react-types/shared": "^3.16.0",
+        "@react-aria/ssr": "^3.5.0",
+        "@react-stately/utils": "^3.6.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14",
         "clsx": "^1.1.1"
       }
     },
+    "@react-stately/calendar": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@react-stately/calendar/-/calendar-3.1.0.tgz",
+      "integrity": "sha512-PZXXHyrLoYEUAUL8oFoxHNc7mKrQXLxnYQkY9v3a6SxgST3J4tYoqIXrie0uqpm1LI+1JfKb2lyRGlVPRTBuNQ==",
+      "requires": {
+        "@internationalized/date": "^3.1.0",
+        "@react-stately/utils": "^3.6.0",
+        "@react-types/calendar": "^3.1.0",
+        "@react-types/datepicker": "^3.2.0",
+        "@react-types/shared": "^3.17.0",
+        "@swc/helpers": "^0.4.14"
+      }
+    },
     "@react-stately/datepicker": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@react-stately/datepicker/-/datepicker-3.2.1.tgz",
-      "integrity": "sha512-nd6thX2Z+rOLDHduB3EgMKA0n5U83lrwn3IUfjRGrcE21zFaFmhTPsHyvol5jHy3eSyjWSN9kGpKFzOxES+uoA==",
-      "requires": {
-        "@internationalized/date": "^3.0.2",
-        "@internationalized/string": "^3.0.1",
-        "@react-stately/overlays": "^3.4.4",
-        "@react-stately/utils": "^3.5.2",
-        "@react-types/datepicker": "^3.1.4",
-        "@react-types/shared": "^3.16.0",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@react-stately/datepicker/-/datepicker-3.3.0.tgz",
+      "integrity": "sha512-HH/WPAMXwULyBKHICxTLGDk3cPGf9Yhf8sX2DES935aupd+6YqzQrh97buOedKsF5WKZfzMMtUVqy8uepo6S6g==",
+      "requires": {
+        "@internationalized/date": "^3.1.0",
+        "@internationalized/string": "^3.1.0",
+        "@react-stately/overlays": "^3.5.0",
+        "@react-stately/utils": "^3.6.0",
+        "@react-types/datepicker": "^3.2.0",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-stately/overlays": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.4.4.tgz",
-      "integrity": "sha512-IIlx+VXtXS4snDXrocUOls8QZ5XBQ4SNonaz1ox8/5W7Nsvq4VtdKsIaXsUP4agOudswaimlpj3pTDO/KuF5tQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.5.0.tgz",
+      "integrity": "sha512-r+U/G0Y4tCfI5wyBeIu+hmcZVRN8ChoK2zM1srPH9nDKsijQard2goX+9YmKng2LJ01Re/P6F8S8jYbpfEdLfQ==",
+      "requires": {
+        "@react-stately/utils": "^3.6.0",
+        "@react-types/overlays": "^3.7.0",
+        "@swc/helpers": "^0.4.14"
+      }
+    },
+    "@react-stately/toggle": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@react-stately/toggle/-/toggle-3.5.0.tgz",
+      "integrity": "sha512-vKwLLkFsiIve4pXIQC/dqLAz7Z+qtzJ8+D00EXXO1Nf8YHcyIMDkTmi3NTM8Qtvmt4xX2hbJFiPDF6WvF6mBIg==",
       "requires": {
-        "@react-stately/utils": "^3.5.2",
-        "@react-types/overlays": "^3.6.5",
+        "@react-stately/utils": "^3.6.0",
+        "@react-types/checkbox": "^3.4.2",
+        "@react-types/shared": "^3.17.0",
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-stately/utils": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.5.2.tgz",
-      "integrity": "sha512-639gSKqamPHIEPaApb9ahVJS0HgAqNdVF3tQRoh+Ky6759Mbk6i3HqG4zk4IGQ1tVlYSYZvCckwehF7b2zndMg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.6.0.tgz",
+      "integrity": "sha512-rptF7iUWDrquaYvBAS4QQhOBQyLBncDeHF03WnHXAxnuPJXNcr9cXJtjJPGCs036ZB8Q2hc9BGG5wNyMkF5v+Q==",
       "requires": {
         "@swc/helpers": "^0.4.14"
       }
     },
     "@react-types/button": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.7.0.tgz",
-      "integrity": "sha512-81BQO3QxSgF9PTXsVozNdNCKxBOB1lpbCWocV99dN1ws9s8uaYw8pmJJZ0LJKLiOsIECQ/3QrhQjmWTDW/qTug==",
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.7.1.tgz",
+      "integrity": "sha512-c+8xjmqWSjI5/mEHVLbVSp0eh/z2UU8Ga+wqjbEUZUjm8uopYj1PaCAwZ7YgcAebyQrL/21GyjK6tFHKzuUdJQ==",
       "requires": {
-        "@react-types/shared": "^3.16.0"
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/calendar": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@react-types/calendar/-/calendar-3.0.5.tgz",
-      "integrity": "sha512-Kx00132hFEVvqay/Ub7q2oZEA1AzksirAuCsjakamn4LAXvitlo3PZxqBdEsyRc3nP5NR48KJj8yo276mXY8kQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@react-types/calendar/-/calendar-3.1.0.tgz",
+      "integrity": "sha512-6VKBxG27cLKti8Ik+T2N1y6FqJSgIXuQPMehOA1ASqPQLtnRBEoSgLjuN5qj7RTWgmdTvQmofqVznVFoUe5ozQ==",
       "requires": {
-        "@internationalized/date": "^3.0.2",
-        "@react-types/shared": "^3.16.0"
+        "@internationalized/date": "^3.1.0",
+        "@react-types/shared": "^3.17.0"
+      }
+    },
+    "@react-types/checkbox": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/@react-types/checkbox/-/checkbox-3.4.2.tgz",
+      "integrity": "sha512-/NWFCEQLvVgo25afPt2jv4syxYvZeY/D/n2Y92IGtoNV4akdz4AuQ65+1X+JOhQc/ZbAblWw5fFWUZoQs3CLZg==",
+      "requires": {
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/datepicker": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@react-types/datepicker/-/datepicker-3.1.4.tgz",
-      "integrity": "sha512-NBCXBCe3YZqeA/JrVKy0IAvJ2XSnXaVpR9iAlUwKu7V8P81CtnXHsVCrd/0HSH8QZWsGdIV5E23z0TctvW8trA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@react-types/datepicker/-/datepicker-3.2.0.tgz",
+      "integrity": "sha512-wcxLI6aW+r6nO2bsypxMIaWJHG5YYAD7WtJmhR5n5GK5juUCu/hzKBhdwxE1qtD3kMvIKTDJkMXLVNGmJP0mFw==",
       "requires": {
-        "@internationalized/date": "^3.0.2",
-        "@react-types/overlays": "^3.6.5",
-        "@react-types/shared": "^3.16.0"
+        "@internationalized/date": "^3.1.0",
+        "@react-types/overlays": "^3.7.0",
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/dialog": {
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/@react-types/dialog/-/dialog-3.4.5.tgz",
-      "integrity": "sha512-FkxZAYNRWkZVH5rjlw6qyQ/SpoGcYtNI/JQvn1H/xtZy/OJh2b2ERxGWv5x0RItGSeyATdSwFO1Qnf1Kl2K02A==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@react-types/dialog/-/dialog-3.5.0.tgz",
+      "integrity": "sha512-QsHqAK8zE4QSCQTJcRm/e6vweSE8S62o4GGvm+e+crMro/doA4it1Y4udE94Yy3WyDQEMFxyfd2P1Q6bI9JuyQ==",
       "requires": {
-        "@react-types/overlays": "^3.6.5",
-        "@react-types/shared": "^3.16.0"
+        "@react-types/overlays": "^3.7.0",
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/label": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@react-types/label/-/label-3.7.1.tgz",
-      "integrity": "sha512-wFpdtjSDBWO4xQQGF57V3PqvVVyE9TPj9ELWLs1yzL09fpXosycuEl5d79RywVlC9aF9dQYUfES09q/DZhRhMQ==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/@react-types/label/-/label-3.7.2.tgz",
+      "integrity": "sha512-UlsIvxQjBMl9WwJw1bYoJMwiPvYwRsSLl2yoeeGfGr6IaYn5T/2kzBhDLwe5cpKrmi4Mehn1rbReFLGITOy8+g==",
       "requires": {
-        "@react-types/shared": "^3.16.0"
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/overlays": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.6.5.tgz",
-      "integrity": "sha512-IeWcF+YTucCYYHagNh8fZLH6R4YUONO1VHY57WJyIHwMy0qgEaKSQCwq72VO1fQJ0ySZgOgm31FniOyKkg6+eQ==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.7.0.tgz",
+      "integrity": "sha512-LstucncZ8dM+xJYEijI1V6jGH20w5XO/T60r7JTrgQElMC86phPeoWkMTN4c2lsRikybolDbvXL6XsF76YO56A==",
       "requires": {
-        "@react-types/shared": "^3.16.0"
+        "@react-types/shared": "^3.17.0"
       }
     },
     "@react-types/shared": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.16.0.tgz",
-      "integrity": "sha512-IQgU4oAEvMwylEvaTsr2XB1G/mAoMe1JFYLD6G78v++oAR9l8o9MQxZ0YSeANDkqTamb2gKezGoT1RxvSKjVxw=="
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.17.0.tgz",
+      "integrity": "sha512-1SNZ/RhVrrQ1e6yE0bPV7d5Sfp+Uv0dfUEhwF9MAu2v5msu7AMewnsiojKNA0QA6Ing1gpDLjHCxtayQfuxqcg=="
     },
     "@remix-run/router": {
       "version": "1.3.3",
@@ -3998,9 +4306,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
@@ -6558,6 +6866,11 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
+    "detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
+    },
     "detect-port-alt": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
@@ -7881,6 +8194,21 @@
       "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
+    "focus-lock": {
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-0.11.6.tgz",
+      "integrity": "sha512-KSuV3ur4gf2KqMNoZx3nXNVhqCkn42GuTYCX4tXPEwf0MjpFQmNMiN6m7dXaUXgIoivL6/65agoUMg4RLS0Vbg==",
+      "requires": {
+        "tslib": "^2.0.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "follow-redirects": {
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
@@ -8090,6 +8418,11 @@
         "has-symbols": "^1.0.3"
       }
     },
+    "get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q=="
+    },
     "get-own-enumerable-property-symbols": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
@@ -8601,23 +8934,31 @@
       }
     },
     "intl-messageformat": {
-      "version": "10.2.5",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.2.5.tgz",
-      "integrity": "sha512-AievYMN6WLLHwBeCTv4aRKG+w3ZNyZtkObwgsKk3Q7GNTq8zDRvDbJSBQkb2OPeVCcAKcIXvak9FF/bRNavoww==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.3.1.tgz",
+      "integrity": "sha512-mqHc6arhbogrdImIsEscdjWnJcg2bvg3MiyGXDsTSGmPbbM2KtRUe7oNgDUbkM3HMn4KbyOct2JyJScmwRgGSQ==",
       "requires": {
         "@formatjs/ecma402-abstract": "1.14.3",
-        "@formatjs/fast-memoize": "1.2.7",
-        "@formatjs/icu-messageformat-parser": "2.1.14",
+        "@formatjs/fast-memoize": "1.2.8",
+        "@formatjs/icu-messageformat-parser": "2.3.0",
         "tslib": "^2.4.0"
       },
       "dependencies": {
         "tslib": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
-          "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
         }
       }
     },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "ipaddr.js": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
@@ -12565,17 +12906,12 @@
         }
       }
     },
-    "react-datepicker": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.8.0.tgz",
-      "integrity": "sha512-u69zXGHMpxAa4LeYR83vucQoUCJQ6m/WBsSxmUMu/M8ahTSVMMyiyQzauHgZA2NUr9y0FUgOAix71hGYUb6tvg==",
+    "react-clientside-effect": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz",
+      "integrity": "sha512-XGGGRQAKY+q25Lz9a/4EPqom7WRjz3z9R2k4jhVKA/puQFH/5Nt27vFZYql4m4NVNdUvX8PS3O7r/Zzm7cjUlg==",
       "requires": {
-        "@popperjs/core": "^2.9.2",
-        "classnames": "^2.2.6",
-        "date-fns": "^2.24.0",
-        "prop-types": "^15.7.2",
-        "react-onclickoutside": "^6.12.0",
-        "react-popper": "^2.2.5"
+        "@babel/runtime": "^7.12.13"
       }
     },
     "react-dev-utils": {
@@ -12669,6 +13005,19 @@
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz",
       "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
     },
+    "react-focus-lock": {
+      "version": "2.9.4",
+      "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.9.4.tgz",
+      "integrity": "sha512-7pEdXyMseqm3kVjhdVH18sovparAzLg5h6WvIx7/Ck3ekjhrrDMEegHSa3swwC8wgfdd7DIdUVRGeiHT9/7Sgg==",
+      "requires": {
+        "@babel/runtime": "^7.0.0",
+        "focus-lock": "^0.11.6",
+        "prop-types": "^15.6.2",
+        "react-clientside-effect": "^1.2.6",
+        "use-callback-ref": "^1.3.0",
+        "use-sidecar": "^1.1.2"
+      }
+    },
     "react-input-autosize": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",
@@ -12682,15 +13031,10 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "react-onclickoutside": {
-      "version": "6.12.2",
-      "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.2.tgz",
-      "integrity": "sha512-NMXGa223OnsrGVp5dJHkuKxQ4czdLmXSp5jSV9OqiCky9LOpPATn3vLldc+q5fK3gKbEHvr7J1u0yhBh/xYkpA=="
-    },
     "react-popper": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz",
-      "integrity": "sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==",
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
+      "integrity": "sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw==",
       "requires": {
         "react-fast-compare": "^3.0.1",
         "warning": "^4.0.2"
@@ -12702,6 +13046,41 @@
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
       "dev": true
     },
+    "react-remove-scroll": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+      "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+      "requires": {
+        "react-remove-scroll-bar": "^2.3.3",
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.0",
+        "use-sidecar": "^1.1.2"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
+    "react-remove-scroll-bar": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz",
+      "integrity": "sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==",
+      "requires": {
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "react-router": {
       "version": "6.8.2",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.8.2.tgz",
@@ -12801,6 +13180,23 @@
         "react-transition-group": "^4.3.0"
       }
     },
+    "react-style-singleton": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
+      "integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
+      "requires": {
+        "get-nonce": "^1.0.0",
+        "invariant": "^2.2.4",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "react-super-responsive-table": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/react-super-responsive-table/-/react-super-responsive-table-5.2.1.tgz",
@@ -14471,6 +14867,37 @@
         "requires-port": "^1.0.0"
       }
     },
+    "use-callback-ref": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.0.tgz",
+      "integrity": "sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==",
+      "requires": {
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
+    "use-sidecar": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
+      "integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
+      "requires": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
diff --git a/package.json b/package.json
index a2a3ee69a..f9242288a 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@entur/auth-provider": "1.1.0",
     "@entur/button": "2.10.14",
-    "@entur/datepicker": "3.0.10",
+    "@entur/datepicker": "4.0.6",
     "@entur/form": "5.4.19",
     "@entur/icons": "5.8.0",
     "@entur/layout": "2.1.21",