diff --git a/ui/build.gradle b/ui/build.gradle
index 4ddb0fc06..70acfb104 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -10,6 +10,7 @@ node {
 }
 
 npmInstall.setNpmCommand('ci')
+npmInstall.args = ['--legacy-peer-deps']
 
 npm_run_build {
     inputs.dir 'src'
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 9328cf811..1731bb9b1 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -4570,7 +4570,7 @@
             "version": "18.0.9",
             "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.9.tgz",
             "integrity": "sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==",
-            "devOptional": true,
+            "dev": true,
             "dependencies": {
                 "@types/react": "*"
             }
@@ -20941,15 +20941,13 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
             "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "@csstools/selector-specificity": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
             "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "@eslint/eslintrc": {
             "version": "1.3.3",
@@ -22318,8 +22316,7 @@
             "version": "14.4.3",
             "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.4.3.tgz",
             "integrity": "sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "@tootallnate/once": {
             "version": "1.1.2",
@@ -22631,7 +22628,7 @@
             "version": "18.0.9",
             "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.9.tgz",
             "integrity": "sha512-qnVvHxASt/H7i+XG1U1xMiY5t+IHcPGUK7TDMDzom08xa7e86eCeKOiLZezwCKVxJn6NEiiy2ekgX8aQssjIKg==",
-            "devOptional": true,
+            "dev": true,
             "requires": {
                 "@types/react": "*"
             }
@@ -23080,15 +23077,13 @@
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
             "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "acorn-jsx": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
             "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "acorn-node": {
             "version": "1.8.2",
@@ -23184,8 +23179,7 @@
             "version": "3.5.2",
             "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
             "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "ansi-escapes": {
             "version": "4.3.2",
@@ -23490,8 +23484,7 @@
             "version": "0.3.8",
             "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
             "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "babel-plugin-polyfill-corejs2": {
             "version": "0.3.3",
@@ -23706,8 +23699,7 @@
         "bootstrap": {
             "version": "5.2.2",
             "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz",
-            "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==",
-            "requires": {}
+            "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="
         },
         "brace-expansion": {
             "version": "1.1.11",
@@ -24268,8 +24260,7 @@
             "version": "6.3.1",
             "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
             "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "css-has-pseudo": {
             "version": "3.0.4",
@@ -24361,8 +24352,7 @@
             "version": "6.0.3",
             "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
             "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "css-select": {
             "version": "4.3.0",
@@ -24477,8 +24467,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
             "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "csso": {
             "version": "4.2.0",
@@ -25438,8 +25427,7 @@
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
             "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "eslint-plugin-testing-library": {
             "version": "5.9.1",
@@ -26572,8 +26560,7 @@
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
             "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "idb": {
             "version": "7.1.1",
@@ -27670,8 +27657,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/jest-fast-check/-/jest-fast-check-1.0.2.tgz",
             "integrity": "sha512-XuPENBGUN2gaTdPxgPJwFsYp0oj+MieRLpBha0flMxfI01zPHgGkZjGSLThimmsU5XFTGhJYZGVnift7UmsSuw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "jest-get-type": {
             "version": "29.2.0",
@@ -28055,8 +28041,7 @@
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
             "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "jest-regex-util": {
             "version": "27.5.1",
@@ -29991,8 +29976,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
             "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-calc": {
             "version": "8.2.4",
@@ -30102,29 +30086,25 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
             "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-discard-duplicates": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
             "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-discard-empty": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
             "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-discard-overridden": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
             "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-double-position-gradients": {
             "version": "3.1.2",
@@ -30149,8 +30129,7 @@
             "version": "5.0.2",
             "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
             "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-focus-visible": {
             "version": "6.0.4",
@@ -30174,15 +30153,13 @@
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
             "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-gap-properties": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
             "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-image-set-function": {
             "version": "4.0.7",
@@ -30208,8 +30185,7 @@
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
             "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-js": {
             "version": "4.0.0",
@@ -30255,15 +30231,13 @@
             "version": "5.0.4",
             "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
             "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-media-minmax": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
             "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-merge-longhand": {
             "version": "5.1.7",
@@ -30331,8 +30305,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
             "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-modules-local-by-default": {
             "version": "4.0.0",
@@ -30397,8 +30370,7 @@
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
             "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-normalize-display-values": {
             "version": "5.1.0",
@@ -30503,8 +30475,7 @@
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
             "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-place": {
             "version": "7.0.5",
@@ -30604,8 +30575,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
             "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "postcss-selector-not": {
             "version": "6.0.1",
@@ -31053,8 +31023,7 @@
         "react-hook-form": {
             "version": "7.39.4",
             "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.39.4.tgz",
-            "integrity": "sha512-B0e78r9kR9L2M4A4AXGbHoA/vyv34sB/n8QWJAw33TFz8f5t9helBbYAeqnbvcQf1EYzJxKX/bGQQh9K+evCyQ==",
-            "requires": {}
+            "integrity": "sha512-B0e78r9kR9L2M4A4AXGbHoA/vyv34sB/n8QWJAw33TFz8f5t9helBbYAeqnbvcQf1EYzJxKX/bGQQh9K+evCyQ=="
         },
         "react-infinite-scroll-component": {
             "version": "6.1.0",
@@ -31242,8 +31211,7 @@
         "react-simple-code-editor": {
             "version": "0.11.3",
             "resolved": "https://registry.npmjs.org/react-simple-code-editor/-/react-simple-code-editor-0.11.3.tgz",
-            "integrity": "sha512-7bVI4Yd1aNCeuldErXUt8ksaAG5Fi+GZ6vp3mtFBnckKdzsQtrgkDvdwMFXIhwTGG+mUYmk5ZpMo0axSW9JBzA==",
-            "requires": {}
+            "integrity": "sha512-7bVI4Yd1aNCeuldErXUt8ksaAG5Fi+GZ6vp3mtFBnckKdzsQtrgkDvdwMFXIhwTGG+mUYmk5ZpMo0axSW9JBzA=="
         },
         "react-transition-group": {
             "version": "4.4.5",
@@ -31315,8 +31283,7 @@
         "redux-thunk": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz",
-            "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==",
-            "requires": {}
+            "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q=="
         },
         "regenerate": {
             "version": "1.4.2",
@@ -31769,8 +31736,7 @@
         "serialize-query-params": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/serialize-query-params/-/serialize-query-params-1.3.6.tgz",
-            "integrity": "sha512-VlH7sfWNyPVZClPkRacopn6sn5uQMXBsjPVz1+pBHX895VpcYVznfJtZ49e6jymcrz+l/vowkepCZn/7xEAEdw==",
-            "requires": {}
+            "integrity": "sha512-VlH7sfWNyPVZClPkRacopn6sn5uQMXBsjPVz1+pBHX895VpcYVznfJtZ49e6jymcrz+l/vowkepCZn/7xEAEdw=="
         },
         "serve-index": {
             "version": "1.9.1",
@@ -32189,8 +32155,7 @@
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
             "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "stylehacks": {
             "version": "5.1.1",
@@ -32797,8 +32762,7 @@
         "urs": {
             "version": "0.0.8",
             "resolved": "https://registry.npmjs.org/urs/-/urs-0.0.8.tgz",
-            "integrity": "sha512-LaSSPpr91XrVA3vW2zPupw4K6DSQEDKdL4yQZX1mO2fpljIMpB5zctrjRvxLurelWSgKsHsCmfHNCImscryirQ==",
-            "requires": {}
+            "integrity": "sha512-LaSSPpr91XrVA3vW2zPupw4K6DSQEDKdL4yQZX1mO2fpljIMpB5zctrjRvxLurelWSgKsHsCmfHNCImscryirQ=="
         },
         "use-http": {
             "version": "1.0.27",
@@ -32821,14 +32785,12 @@
         "use-ssr": {
             "version": "1.0.24",
             "resolved": "https://registry.npmjs.org/use-ssr/-/use-ssr-1.0.24.tgz",
-            "integrity": "sha512-0MFps7ezL57/3o0yl4CvrHLlp9z20n1rQZV/lSRz7if+TUoM6POU1XdOvEjIgjgKeIhTEye1U0khrIYWCTWw4g==",
-            "requires": {}
+            "integrity": "sha512-0MFps7ezL57/3o0yl4CvrHLlp9z20n1rQZV/lSRz7if+TUoM6POU1XdOvEjIgjgKeIhTEye1U0khrIYWCTWw4g=="
         },
         "use-sync-external-store": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-            "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-            "requires": {}
+            "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
         },
         "util-deprecate": {
             "version": "1.0.2",
@@ -33180,8 +33142,7 @@
                     "version": "8.11.0",
                     "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
                     "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-                    "dev": true,
-                    "requires": {}
+                    "dev": true
                 }
             }
         },
@@ -33652,8 +33613,7 @@
             "version": "7.5.9",
             "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
             "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-            "dev": true,
-            "requires": {}
+            "dev": true
         },
         "xml-name-validator": {
             "version": "3.0.0",
diff --git a/ui/src/app/admin/hoc/RolesProvider.test.js b/ui/src/app/admin/hoc/RolesProvider.test.js
index fe1119c82..6b7f4e6a8 100644
--- a/ui/src/app/admin/hoc/RolesProvider.test.js
+++ b/ui/src/app/admin/hoc/RolesProvider.test.js
@@ -15,6 +15,13 @@ jest.mock('../hooks');
 
 jest.mock('../../store/notifications/NotificationSlice');
 
+const mockDispatch = jest.fn();
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: () => mockDispatch
+}));
+
+
 describe('RolesProvider component', () => {
 
     beforeEach(() => {
diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
index 3a63a6429..82c4091b1 100644
--- a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
+++ b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
@@ -3,10 +3,10 @@ import { Link, useHistory, useParams } from 'react-router-dom';
 
 import Translate from '../../i18n/components/translate';
 import FormattedDate from '../../core/components/FormattedDate';
-import Button from 'react-bootstrap/esm/Button';
+import Button from 'react-bootstrap/Button';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faEdit, faHistory, faToggleOff, faToggleOn, faTrash } from '@fortawesome/free-solid-svg-icons';
-import Badge from 'react-bootstrap/esm/Badge';
+import { faToggleOff, faToggleOn, faTrash } from '@fortawesome/free-solid-svg-icons';
+import Badge from 'react-bootstrap/Badge';
 import { Configuration } from '../../metadata/hoc/Configuration';
 import { MetadataConfiguration } from '../../metadata/component/MetadataConfiguration';
 
@@ -27,7 +27,7 @@ export function DynamicRegistrationDetail () {
 
     const edit = (section) => {
         history.push(`/dynamic-registration/${id}/edit`);
-    }
+    };
 
     return (
         <div className="container-fluid p-3">
diff --git a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js
index 344350c15..3178dc805 100644
--- a/ui/src/app/metadata/domain/source/definition/SourceDefinition.js
+++ b/ui/src/app/metadata/domain/source/definition/SourceDefinition.js
@@ -72,7 +72,13 @@ export const SourceBase = {
         if (formData.assertionConsumerServices && formData.assertionConsumerServices.length) {
             const { updated, added } = detailedDiff(original.assertionConsumerServices, formData.assertionConsumerServices);
             const merged = merge(updated, added);
-            const changingDefault = Object.keys(merged).some(k => merged[k].hasOwnProperty('makeDefault'));
+            const changingDefault = Object.keys(merged).some(k => {
+                const obj = { ...merged[k] };
+                return obj.hasOwnProperty('makeDefault');
+            });
+
+
+            
             if (changingDefault) {
                 const settingToTrue = Object.keys(merged).some(k => merged[k].makeDefault === true);
                 if (settingToTrue) {
diff --git a/ui/src/app/notifications/component/NotificationList.test.js b/ui/src/app/notifications/component/NotificationList.test.js
index c65b7a007..b2562fba3 100644
--- a/ui/src/app/notifications/component/NotificationList.test.js
+++ b/ui/src/app/notifications/component/NotificationList.test.js
@@ -2,20 +2,25 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 
 import { NotificationList } from './NotificationList';
-import { NotificationContext } from '../hoc/Notifications';
+
+const mockDispatch = jest.fn();
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+  useDispatch: () => mockDispatch
+}));
 
 jest.mock('../../i18n/hooks', () => ({
     useTranslation: (value) => value
 }));
 
+jest.mock('../../store/notifications/NotificationSlice', () => ({
+    useNotifications: () => [{id: 'foo', body: 'foo', type: 'danger'}]
+}));
+
 describe('Notification List', () => {
     it('should render notifications', () => {
-        const dispatch = jest.fn();
-        const state = { notifications: [{id: 'foo', body: 'foo', type: 'danger'}] };
         render(
-        <NotificationContext.Provider value={{ state, dispatch }}>
             <NotificationList />
-        </NotificationContext.Provider>
         );
 
         expect(screen.getByText('foo')).toBeInTheDocument();
diff --git a/ui/src/app/notifications/hoc/Notifications.js b/ui/src/app/notifications/hoc/Notifications.js
deleted file mode 100644
index 8b6383211..000000000
--- a/ui/src/app/notifications/hoc/Notifications.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import React from "react";
-import { uuid } from '../../core/utility/uuid';
-
-const NotificationContext = React.createContext();
-
-const { Provider, Consumer } = NotificationContext;
-
-const initialState = {
-    notifications: []
-};
-
-export const NotificationActions = {
-    ADD_NOTIFICATION: 'add notification',
-    REMOVE_NOTIFICATION: 'remove notification'
-};
-
-export const NotificationTypes = {
-    SUCCESS: 'success',
-    DANGER: 'danger',
-    ERROR: 'danger',
-    WARNING: 'warn',
-    INFO: 'info'
-};
-
-export const createNotificationAction = (body, type = NotificationTypes.SUCCESS, timeout=5000) => {
-    return {
-        type: NotificationActions.ADD_NOTIFICATION,
-        payload: {
-            id: uuid(),
-            type,
-            body,
-            timeout
-        }
-    }
-}
-
-export const removeNotificationAction = (id) => {
-    return {
-        type: NotificationActions.REMOVE_NOTIFICATION,
-        payload: id
-    }
-}
-
-export function reducer(state, action) {
-    switch (action.type) {
-        case NotificationActions.ADD_NOTIFICATION:
-            return {
-                notifications: [
-                    ...state.notifications,
-                    {
-                        ...action.payload
-                    }
-                ]
-            };
-        case NotificationActions.REMOVE_NOTIFICATION:
-            return {
-                notifications: [
-                    ...state.notifications.filter(n => n.id !== action.payload)
-                ]
-            };
-        default:
-            throw new Error();
-    }
-}
-
-/*eslint-disable react-hooks/exhaustive-deps*/
-function Notifications ({ children }) {
-    const [state, dispatch] = React.useReducer(reducer, initialState);
-
-    const contextValue = React.useMemo(() => ({ state, dispatch }), [state, dispatch]);
-
-    return (
-        <Provider value={contextValue}>{children}</Provider>
-    );
-}
-
-function useNotificationDispatcher() {
-    const {dispatch} = React.useContext(NotificationContext);
-    return dispatch;
-}
-
-export {
-    Notifications,
-    NotificationContext,
-    useNotificationDispatcher,
-    Provider as NotificationProvider,
-    Consumer as NotificationConsumer
-};
\ No newline at end of file
diff --git a/ui/src/app/notifications/hoc/Notifications.test.js b/ui/src/app/notifications/hoc/Notifications.test.js
deleted file mode 100644
index 728378d7e..000000000
--- a/ui/src/app/notifications/hoc/Notifications.test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createNotificationAction, reducer, removeNotificationAction } from './Notifications';
-
-describe('Notifications HOC', () => {
-    describe('reducer', () => {
-        it('should add a notification to its state list', () => {
-            const state = reducer({
-                notifications: []
-            }, createNotificationAction('foo'));
-            expect(state.notifications.length).toBe(1);
-        })
-
-        it('should remove a notification to its state list', () => {
-            const state = reducer({
-                notifications: [
-                    {
-                        id: 'foo'
-                    }
-                ]
-            }, removeNotificationAction('foo'));
-            
-            expect(state.notifications.length).toBe(0);
-        })
-    });
-});
\ No newline at end of file