diff --git a/config/webpack.config.js b/config/webpack.config.js
index a517869ef..060ed2473 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -44,7 +44,7 @@ const commonConfig = ({ dev }) => {
       publicPath,
       chunkFilename: dev ? '[name].js' : '[name].[contenthash].js',
     },
-    devtool: process.env.SENTRY_AUTH_TOKEN ? 'source-map' : false,
+    devtool: process.env.SENTRY_AUTH_TOKEN ? 'hidden-source-map' : false,
     ...(dev
       ? {
           cache: {
diff --git a/package-lock.json b/package-lock.json
index 4e8310ba3..780ec4e29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,22 +31,14 @@
         "@redhat-cloud-services/host-inventory-client": "1.2.0",
         "@redhat-cloud-services/rbac-client": "1.2.0",
         "@scalprum/core": "^0.7.0",
-<<<<<<< HEAD
         "@scalprum/react-core": "^0.8.0",
         "@segment/analytics-next": "^1.70.0",
-        "@sentry/react": "^7.118.0",
-        "@sentry/tracing": "^7.118.0",
-        "@types/intercom-web": "^2.8.26",
-=======
-        "@scalprum/react-core": "^0.7.0",
-        "@segment/analytics-next": "^1.62.0",
         "@sentry/browser": "^8.2.0",
         "@sentry/core": "^8.2.0",
         "@sentry/react": "^8.2.0",
         "@sentry/tracing": "^7.91.0",
         "@sentry/webpack-plugin": "^2.20.1",
-        "@types/intercom-web": "^2.8.24",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+        "@types/intercom-web": "^2.8.26",
         "@unleash/proxy-client-react": "^3.6.0",
         "abortcontroller-polyfill": "^1.7.5",
         "axios": "^0.28.1",
@@ -4673,13 +4665,6 @@
         "react-router-dom": "^5.0.0 || ^6.0.0"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/@redhat-cloud-services/frontend-components-utilities/node_modules/@redhat-cloud-services/types": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/@redhat-cloud-services/types/-/types-0.0.24.tgz",
-      "integrity": "sha512-P50stc+mnWLycID46/AKmD/760r5N1eoam//O6MUVriqVorUdht7xkUL78aJZU1vw8WW6xlrDHwz3F6BM148qg=="
-    },
     "node_modules/@redhat-cloud-services/frontend-components-utilities/node_modules/@sentry/browser": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.30.0.tgz",
@@ -4729,13 +4714,16 @@
         "node": ">=6"
       }
     },
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
     "node_modules/@redhat-cloud-services/frontend-components-utilities/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
     },
-<<<<<<< HEAD
+    "node_modules/@redhat-cloud-services/frontend-components-utilities/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@redhat-cloud-services/frontend-components/node_modules/@scalprum/react-core": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/@scalprum/react-core/-/react-core-0.7.1.tgz",
@@ -4749,17 +4737,6 @@
         "react": ">=16.8.0 || >=17.0.0 || ^18.0.0",
         "react-dom": ">=16.8.0 || >=17.0.0 || ^18.0.0"
       }
-=======
-    "node_modules/@redhat-cloud-services/frontend-components-utilities/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@redhat-cloud-services/frontend-components/node_modules/@redhat-cloud-services/types": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/@redhat-cloud-services/types/-/types-0.0.24.tgz",
-      "integrity": "sha512-P50stc+mnWLycID46/AKmD/760r5N1eoam//O6MUVriqVorUdht7xkUL78aJZU1vw8WW6xlrDHwz3F6BM148qg=="
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
     },
     "node_modules/@redhat-cloud-services/host-inventory-client": {
       "version": "1.2.0",
@@ -4927,125 +4904,55 @@
         "tsub": "dist/index.js"
       }
     },
-<<<<<<< HEAD
-    "node_modules/@sentry-internal/feedback": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.118.0.tgz",
-      "integrity": "sha512-IYOGRcqIqKJJpMwBBv+0JTu0FPpXnakJYvOx/XEa/SNyF5+l7b9gGEjUVWh1ok50kTLW/XPnpnXNAGQcoKHg+w==",
-      "dependencies": {
-        "@sentry/core": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-=======
     "node_modules/@sentry-internal/browser-utils": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.2.0.tgz",
-      "integrity": "sha512-wrsocA9o4B+bM8wgb9HxcaXEE20ZvyBqo5rn95eLtQ4WO590WYPPQBdeTMK3I3OGycOcUwEDWv+WUWeoG3+W0Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.13.0.tgz",
+      "integrity": "sha512-lqq8BYbbs9KTlDuyB5NjdZB6P/llqQs32KUgaCQ/k5DFB4Zf56+BFHXObnMHxwx375X1uixtnEphagWZa+nsLQ==",
       "dependencies": {
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
       }
     },
-<<<<<<< HEAD
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/core": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.118.0.tgz",
-      "integrity": "sha512-ol0xBdp3/K11IMAYSQE0FMxBOOH9hMsb/rjxXWe0hfM5c72CqYWL3ol7voPci0GELJ5CZG+9ImEU1V9r6gK64g==",
-      "dependencies": {
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-=======
-    "node_modules/@sentry-internal/replay": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.2.0.tgz",
-      "integrity": "sha512-H3x4Vp+O8wI3w91LVcqYgKLNBUnyNlRRFSlXYR9u5l5z/RqjcoJkp2AoIsG1/ZBvAklz0rEtE++BgMuU6HdV2Q==",
+    "node_modules/@sentry-internal/feedback": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.13.0.tgz",
+      "integrity": "sha512-YyJ6SzpTonixvguAg0H9vkEp7Jq8ZeVY8M4n47ClR0+TtaAUp04ZhcJpHKF7PwBIAzc7DRr2XP112tmWgiVEcg==",
       "dependencies": {
-        "@sentry-internal/browser-utils": "8.2.0",
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
       }
     },
-<<<<<<< HEAD
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/types": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.118.0.tgz",
-      "integrity": "sha512-2drqrD2+6kgeg+W/ycmiti3G4lJrV3hGjY9PpJ3bJeXrh6T2+LxKPzlgSEnKFaeQWkXdZ4eaUbtTXVebMjb5JA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/feedback/node_modules/@sentry/utils": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.118.0.tgz",
-      "integrity": "sha512-43qItc/ydxZV1Zb3Kn2M54RwL9XXFa3IAYBO8S82Qvq5YUYmU2AmJ1jgg7DabXlVSWgMA1HntwqnOV3JLaEnTQ==",
-      "dependencies": {
-        "@sentry/types": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.118.0.tgz",
-      "integrity": "sha512-XxHlCClvrxmVKpiZetFYyiBaPQNiojoBGFFVgbbWBIAPc+fWeLJ2BMoQEBjn/0NA/8u8T6lErK5YQo/eIx9+XQ==",
-      "dependencies": {
-        "@sentry/core": "7.118.0",
-        "@sentry/replay": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/core": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.118.0.tgz",
-      "integrity": "sha512-ol0xBdp3/K11IMAYSQE0FMxBOOH9hMsb/rjxXWe0hfM5c72CqYWL3ol7voPci0GELJ5CZG+9ImEU1V9r6gK64g==",
+    "node_modules/@sentry-internal/replay": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.13.0.tgz",
+      "integrity": "sha512-DJ1jF/Pab0FH4SeCvSGCnGAu/s0wJvhBWM5VjQp7Jjmcfunp+R3vJibqU8gAVZU1nYRLaqprLdIXrSyP2Km8nQ==",
       "dependencies": {
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
+        "@sentry-internal/browser-utils": "8.13.0",
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/types": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.118.0.tgz",
-      "integrity": "sha512-2drqrD2+6kgeg+W/ycmiti3G4lJrV3hGjY9PpJ3bJeXrh6T2+LxKPzlgSEnKFaeQWkXdZ4eaUbtTXVebMjb5JA==",
-      "engines": {
-        "node": ">=8"
+        "node": ">=14.18"
       }
     },
-    "node_modules/@sentry-internal/replay-canvas/node_modules/@sentry/utils": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.118.0.tgz",
-      "integrity": "sha512-43qItc/ydxZV1Zb3Kn2M54RwL9XXFa3IAYBO8S82Qvq5YUYmU2AmJ1jgg7DabXlVSWgMA1HntwqnOV3JLaEnTQ==",
-      "dependencies": {
-        "@sentry/types": "7.118.0"
-=======
     "node_modules/@sentry-internal/replay-canvas": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.2.0.tgz",
-      "integrity": "sha512-naC29/+vH3MOxw25ZIgK+EXdtcDDYFrdU0bccA8rTeS57tchqMgwcc9rD0ziAFTq0ngIohXdsTmp8U1C12NzIQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.13.0.tgz",
+      "integrity": "sha512-lPlfWVIHX+gW4S8a/UOVutuqMyQhlkNUAay0W21MVhZJT5Mtj0p21D/Cz7nrOQRDIiLNq90KAGK2tLxx5NkiWA==",
       "dependencies": {
-        "@sentry-internal/replay": "8.2.0",
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+        "@sentry-internal/replay": "8.13.0",
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
@@ -5104,30 +5011,17 @@
       }
     },
     "node_modules/@sentry/browser": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.2.0.tgz",
-      "integrity": "sha512-0rUVTRSPGpDKCBpV1z+UIj8ejVKHH74k5y8lH+yp8XFiOxV0c8bY/okhYYZqgH1hM869InrP1Lc3kAJtQuTUqw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.13.0.tgz",
+      "integrity": "sha512-/tp7HZ5qjwDLtwooPMoexdAi2PG7gMNY0bHeMlwy20hs8mclC8RW8ZiJA6czXHfgnbmvxfrHaY53IJyz//JnlA==",
       "dependencies": {
-        "@sentry-internal/browser-utils": "8.2.0",
-        "@sentry-internal/feedback": "8.2.0",
-        "@sentry-internal/replay": "8.2.0",
-        "@sentry-internal/replay-canvas": "8.2.0",
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "node_modules/@sentry/browser/node_modules/@sentry-internal/feedback": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.2.0.tgz",
-      "integrity": "sha512-4s9aIZw7bLKGVUrzyQ1RD0ZhKPfTO+l72pxsXSrPjH5a2sgBTvyNcSGj8kT6wPeAftqU6yrQKDa95LT1NA9uGg==",
-      "dependencies": {
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
+        "@sentry-internal/browser-utils": "8.13.0",
+        "@sentry-internal/feedback": "8.13.0",
+        "@sentry-internal/replay": "8.13.0",
+        "@sentry-internal/replay-canvas": "8.13.0",
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
@@ -5230,114 +5124,18 @@
         "node": ">=10"
       }
     },
-    "node_modules/@sentry/cli-linux-arm": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.32.1.tgz",
-      "integrity": "sha512-m0lHkn+o4YKBq8KptGZvpT64FAwSl9mYvHZO9/ChnEGIJ/WyJwiN1X1r9JHVaW4iT5lD0Y5FAyq3JLkk0m0XHg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-arm64": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.32.1.tgz",
-      "integrity": "sha512-hsGqHYuecUl1Yhq4MhiRejfh1gNlmhyNPcQEoO/DDRBnGnJyEAdiDpKXJcc2e/lT9k40B55Ob2CP1SeY040T2w==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-i686": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.32.1.tgz",
-      "integrity": "sha512-SuMLN1/ceFd3Q/B0DVyh5igjetTAF423txiABAHASenEev0lG0vZkRDXFclfgDtDUKRPmOXW7VDMirM3yZWQHQ==",
-      "cpu": [
-        "x86",
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-linux-x64": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.32.1.tgz",
-      "integrity": "sha512-x4FGd6xgvFddz8V/dh6jii4wy9qjWyvYLBTz8Fhi9rIP+b8wQ3oxwHIdzntareetZP7C1ggx+hZheiYocNYVwA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux",
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-win32-i686": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.32.1.tgz",
-      "integrity": "sha512-i6aZma9mFzR+hqMY5VliQZEX6ypP/zUjPK0VtIMYWs5cC6PsQLRmuoeJmy3Z7d4nlh0CdK5NPC813Ej6RY6/vg==",
-      "cpu": [
-        "x86",
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@sentry/cli-win32-x64": {
-      "version": "2.32.1",
-      "resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.32.1.tgz",
-      "integrity": "sha512-B58w/lRHLb4MUSjJNfMMw2cQykfimDCMLMmeK+1EiT2RmSeNQliwhhBxYcKk82a8kszH6zg3wT2vCea7LyPUyA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@sentry/cli/node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/@sentry/core": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.2.0.tgz",
-      "integrity": "sha512-NY7I3F8T7sWxOEmHDZ+Kh0Wmz8cQ3AaAH7btS5DimwsdaGVd1j0cA/CPmzmpQAocZTv3U5po43PrsU2Pbn6Yeg==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.13.0.tgz",
+      "integrity": "sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==",
       "dependencies": {
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0"
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
@@ -5381,51 +5179,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
-    "node_modules/@sentry/integrations": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.118.0.tgz",
-      "integrity": "sha512-C2rR4NvIMjokF8jP5qzSf1o2zxDx7IeYnr8u15Kb2+HdZtX559owALR0hfgwnfeElqMhGlJBaKUWZ48lXJMzCQ==",
-      "dependencies": {
-        "@sentry/core": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0",
-        "localforage": "^1.8.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/integrations/node_modules/@sentry/core": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.118.0.tgz",
-      "integrity": "sha512-ol0xBdp3/K11IMAYSQE0FMxBOOH9hMsb/rjxXWe0hfM5c72CqYWL3ol7voPci0GELJ5CZG+9ImEU1V9r6gK64g==",
-      "dependencies": {
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/integrations/node_modules/@sentry/types": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.118.0.tgz",
-      "integrity": "sha512-2drqrD2+6kgeg+W/ycmiti3G4lJrV3hGjY9PpJ3bJeXrh6T2+LxKPzlgSEnKFaeQWkXdZ4eaUbtTXVebMjb5JA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/integrations/node_modules/@sentry/utils": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.118.0.tgz",
-      "integrity": "sha512-43qItc/ydxZV1Zb3Kn2M54RwL9XXFa3IAYBO8S82Qvq5YUYmU2AmJ1jgg7DabXlVSWgMA1HntwqnOV3JLaEnTQ==",
-      "dependencies": {
-        "@sentry/types": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@sentry/minimal": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
@@ -5453,130 +5206,21 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
     },
     "node_modules/@sentry/react": {
-<<<<<<< HEAD
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.118.0.tgz",
-      "integrity": "sha512-oEYe5TGk8S7YzPsFqDf4xDHjfzs35/QFE+dou3S2d24OYpso8Tq4C5f1VzYmnOOyy85T7JNicYLSo0n0NSJvQg==",
-      "dependencies": {
-        "@sentry/browser": "7.118.0",
-        "@sentry/core": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0",
-=======
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-8.2.0.tgz",
-      "integrity": "sha512-h1T0uGr9ULtnxNQu181AYv9CClH/YB4xibcomjNNIAIR4f0P2tiV/+RAOxTJfDE/YlKmoGcYmD5tgDaOAZC8Mw==",
-      "dependencies": {
-        "@sentry/browser": "8.2.0",
-        "@sentry/core": "8.2.0",
-        "@sentry/types": "8.2.0",
-        "@sentry/utils": "8.2.0",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-8.13.0.tgz",
+      "integrity": "sha512-gz+aHZMcl6uvHkmLBGzMGjJJ+Vpl+W0VXJsKB9fdjZDDF5vJpgXTR9mwMEXJ9lKi+cY6tDe0+af+DA8BGJgw0Q==",
+      "dependencies": {
+        "@sentry/browser": "8.13.0",
+        "@sentry/core": "8.13.0",
+        "@sentry/types": "8.13.0",
+        "@sentry/utils": "8.13.0",
         "hoist-non-react-statics": "^3.3.2"
       },
       "engines": {
         "node": ">=14.18"
       },
       "peerDependencies": {
-<<<<<<< HEAD
-        "react": "15.x || 16.x || 17.x || 18.x"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/browser": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.118.0.tgz",
-      "integrity": "sha512-8onDOFV1VLEoBuqA5yaJeR3FF1JNuxr5C7p1oN3OwY724iTVqQnOLmZKZaSnHV3RkY67wKDGQkQIie14sc+42g==",
-      "dependencies": {
-        "@sentry-internal/feedback": "7.118.0",
-        "@sentry-internal/replay-canvas": "7.118.0",
-        "@sentry-internal/tracing": "7.118.0",
-        "@sentry/core": "7.118.0",
-        "@sentry/integrations": "7.118.0",
-        "@sentry/replay": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/core": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.118.0.tgz",
-      "integrity": "sha512-ol0xBdp3/K11IMAYSQE0FMxBOOH9hMsb/rjxXWe0hfM5c72CqYWL3ol7voPci0GELJ5CZG+9ImEU1V9r6gK64g==",
-      "dependencies": {
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/types": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.118.0.tgz",
-      "integrity": "sha512-2drqrD2+6kgeg+W/ycmiti3G4lJrV3hGjY9PpJ3bJeXrh6T2+LxKPzlgSEnKFaeQWkXdZ4eaUbtTXVebMjb5JA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/react/node_modules/@sentry/utils": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.118.0.tgz",
-      "integrity": "sha512-43qItc/ydxZV1Zb3Kn2M54RwL9XXFa3IAYBO8S82Qvq5YUYmU2AmJ1jgg7DabXlVSWgMA1HntwqnOV3JLaEnTQ==",
-      "dependencies": {
-        "@sentry/types": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/replay": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.118.0.tgz",
-      "integrity": "sha512-boQfCL+1L/tSZ9Huwi00+VtU+Ih1Lcg8HtxBuAsBCJR9pQgUL5jp7ECYdTeeHyCh/RJO7JqV1CEoGTgohe10mA==",
-      "dependencies": {
-        "@sentry-internal/tracing": "7.118.0",
-        "@sentry/core": "7.118.0",
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@sentry/replay/node_modules/@sentry/core": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.118.0.tgz",
-      "integrity": "sha512-ol0xBdp3/K11IMAYSQE0FMxBOOH9hMsb/rjxXWe0hfM5c72CqYWL3ol7voPci0GELJ5CZG+9ImEU1V9r6gK64g==",
-      "dependencies": {
-        "@sentry/types": "7.118.0",
-        "@sentry/utils": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/replay/node_modules/@sentry/types": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.118.0.tgz",
-      "integrity": "sha512-2drqrD2+6kgeg+W/ycmiti3G4lJrV3hGjY9PpJ3bJeXrh6T2+LxKPzlgSEnKFaeQWkXdZ4eaUbtTXVebMjb5JA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@sentry/replay/node_modules/@sentry/utils": {
-      "version": "7.118.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.118.0.tgz",
-      "integrity": "sha512-43qItc/ydxZV1Zb3Kn2M54RwL9XXFa3IAYBO8S82Qvq5YUYmU2AmJ1jgg7DabXlVSWgMA1HntwqnOV3JLaEnTQ==",
-      "dependencies": {
-        "@sentry/types": "7.118.0"
-      },
-      "engines": {
-        "node": ">=8"
-=======
-        "react": "16.x || 17.x || 18.x"
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+        "react": "^16.14.0 || 17.x || 18.x || 19.x"
       }
     },
     "node_modules/@sentry/tracing": {
@@ -5591,19 +5235,19 @@
       }
     },
     "node_modules/@sentry/types": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.2.0.tgz",
-      "integrity": "sha512-DvfBZNsE6E/h8rz4ifIR5Zf1Eo/48Mo90rUpXMPegIy3u/nf6mAz1pbUj1m705s/FgDKjjGhc7pmVjQGIY7gxA==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.13.0.tgz",
+      "integrity": "sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==",
       "engines": {
         "node": ">=14.18"
       }
     },
     "node_modules/@sentry/utils": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.2.0.tgz",
-      "integrity": "sha512-yG502M3qUrRmEQpnJ6kWRqYuu/APLcLb8E2+t+4JZklLgKYaCbxUM1hktuG148uVJGLXbWFrHtb9GRDmuLBeVw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.13.0.tgz",
+      "integrity": "sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==",
       "dependencies": {
-        "@sentry/types": "8.2.0"
+        "@sentry/types": "8.13.0"
       },
       "engines": {
         "node": ">=14.18"
@@ -8679,22 +8323,6 @@
         }
       }
     },
-    "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.6.5.tgz",
-      "integrity": "sha512-RGQhMdni2v1/ANQ/2K+F+QYdzaucekYBewZcX1ogqJ8G5sbPaBdYdDN1qQ4kHLCIkPtGP6qC7c71qPEqL2RidQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/core-darwin-x64": {
       "version": "1.6.5",
       "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.6.5.tgz",
@@ -8711,134 +8339,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.6.5.tgz",
-      "integrity": "sha512-B0g/dROCE747RRegs/jPHuKJgwXLracDhnqQa80kFdgWEMjlcb7OMCgs5OX86yJGRS4qcYbiMGD0Pp7Kbqn3yw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.6.5.tgz",
-      "integrity": "sha512-W8meapgXTq8AOtSvDG4yKR8ant2WWD++yOjgzAleB5VAC+oC+aa8YJROGxj8HepurU8kurqzcialwoMeq5SZZQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.6.5.tgz",
-      "integrity": "sha512-jyCKqoX50Fg8rJUQqh4u5PqnE7nqYKXHjVH2WcYr114/MU21zlsI+YL6aOQU1XP8bJQ2gPQ1rnlnGJdEHiKS/w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.6.5.tgz",
-      "integrity": "sha512-G6HmUn/RRIlXC0YYFfBz2qh6OZkHS/KUPkhoG4X9ADcgWXXjOFh6JrefwsYj8VBAJEnr5iewzjNfj+nztwHaeA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.6.5.tgz",
-      "integrity": "sha512-AQpBjBnelQDSbeTJA50AXdS6+CP66LsXIMNTwhPSgUfE7Bx1ggZV11Fsi4Q5SGcs6a8Qw1cuYKN57ZfZC5QOuA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.6.5.tgz",
-      "integrity": "sha512-MZTWM8kUwS30pVrtbzSGEXtek46aXNb/mT9D6rsS7NvOuv2w+qZhjR1rzf4LNbbn5f8VnR4Nac1WIOYZmfC5ng==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.6.5.tgz",
-      "integrity": "sha512-WZdu4gISAr3yOm1fVwKhhk6+MrP7kVX0KMP7+ZQFTN5zXQEiDSDunEJKVgjMVj3vlR+6mnAqa/L0V9Qa8+zKlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.6.5.tgz",
-      "integrity": "sha512-ezXgucnMTzlFIxQZw7ls/5r2hseFaRoDL04cuXUOs97E8r+nJSmFsRQm/ygH5jBeXNo59nyZCalrjJAjwfgACA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/counter": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
@@ -10509,16 +10009,9 @@
       "integrity": "sha512-rIwlkkP1n4uKrRzivAKPZIEkHiuwY5mmhMJ2nZKCBLz8lTUlE73rQh4n1OnnMurXt1vcUNyH4ZPfdh8QweTjpQ=="
     },
     "node_modules/@webassemblyjs/ast": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
       "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
@@ -10535,16 +10028,9 @@
       "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
-      "dev": true
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
+      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
@@ -10562,16 +10048,9 @@
       "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
       "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -10601,16 +10080,9 @@
       "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
       "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -10623,16 +10095,9 @@
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
       "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
@@ -10642,16 +10107,9 @@
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
       "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-buffer": "1.12.1",
@@ -10660,16 +10118,9 @@
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
       "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@webassemblyjs/helper-api-error": "1.11.6",
@@ -10680,16 +10131,9 @@
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-<<<<<<< HEAD
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
       "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
-      "dev": true,
-=======
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@webassemblyjs/ast": "1.12.1",
         "@xtuc/long": "4.2.2"
@@ -10795,18 +10239,10 @@
         "acorn-walk": "^8.0.2"
       }
     },
-<<<<<<< HEAD
     "node_modules/acorn-import-attributes": {
       "version": "1.9.5",
       "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
       "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-=======
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -14681,16 +14117,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-<<<<<<< HEAD
       "version": "5.17.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
       "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
-      "dev": true,
-=======
-      "version": "5.15.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -16218,22 +15647,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-<<<<<<< HEAD
-=======
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -21989,9 +21402,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-autolink-literal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.0.0.tgz",
-      "integrity": "sha512-rTHfnpt/Q7dEAK1Y5ii0W8bhfJlVJFnJMHIPisfPK3gpVNuOP0VnRl96+YJ3RYWV/P4gFeQoGKNlT3RhuvpqAg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
+      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
       "dependencies": {
         "micromark-util-character": "^2.0.0",
         "micromark-util-sanitize-uri": "^2.0.0",
@@ -22004,9 +21417,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-footnote": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.0.0.tgz",
-      "integrity": "sha512-6Rzu0CYRKDv3BfLAUnZsSlzx3ak6HAoI85KTiijuKIz5UxZxbUI+pD6oHgw+6UtQuiRwnGRhzMmPRv4smcz0fg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
       "dependencies": {
         "devlop": "^1.0.0",
         "micromark-core-commonmark": "^2.0.0",
@@ -22023,9 +21436,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-strikethrough": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.0.0.tgz",
-      "integrity": "sha512-c3BR1ClMp5fxxmwP6AoOY2fXO9U8uFMKs4ADD66ahLTNcwzSCyRVU4k7LPV5Nxo/VJiR4TdzxRQY2v3qIUceCw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
+      "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
       "dependencies": {
         "devlop": "^1.0.0",
         "micromark-util-chunked": "^2.0.0",
@@ -22040,9 +21453,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-table": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.0.0.tgz",
-      "integrity": "sha512-PoHlhypg1ItIucOaHmKE8fbin3vTLpDOUg8KAr8gRCF1MOZI9Nquq2i/44wFvviM4WuxJzc3demT8Y3dkfvYrw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.0.tgz",
+      "integrity": "sha512-Ub2ncQv+fwD70/l4ou27b4YzfNaCJOvyX4HxXU15m7mpYY+rjuWzsLIPZHJL253Z643RpbcP1oeIJlQ/SKW67g==",
       "dependencies": {
         "devlop": "^1.0.0",
         "micromark-factory-space": "^2.0.0",
@@ -22068,9 +21481,9 @@
       }
     },
     "node_modules/micromark-extension-gfm-task-list-item": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.0.1.tgz",
-      "integrity": "sha512-cY5PzGcnULaN5O7T+cOzfMoHjBW7j+T9D2sucA5d/KbsBTPcYdebm9zUd9zzdgJGCwahV+/W78Z3nbulBYVbTw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
+      "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
       "dependencies": {
         "devlop": "^1.0.0",
         "micromark-factory-space": "^2.0.0",
@@ -29701,16 +29114,9 @@
       }
     },
     "node_modules/watchpack": {
-<<<<<<< HEAD
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
       "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
-      "dev": true,
-=======
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -29747,16 +29153,9 @@
       }
     },
     "node_modules/webpack": {
-<<<<<<< HEAD
       "version": "5.92.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
       "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
-      "dev": true,
-=======
-      "version": "5.89.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
-      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
->>>>>>> 8641097f (feat(sentry): Enable source map uploads to sentry)
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
diff --git a/src/utils/sentry.ts b/src/utils/sentry.ts
index c4ac05f9a..3a9911168 100644
--- a/src/utils/sentry.ts
+++ b/src/utils/sentry.ts
@@ -1,5 +1,4 @@
 import * as Sentry from '@sentry/react';
-// import { makeFetchTransport, Scope } from '@sentry/browser';
 import * as SentryBrowser from '@sentry/browser';
 import { makeFetchTransport, makeMultiplexedTransport } from '@sentry/browser';
 import { ChromeUser } from '@redhat-cloud-services/types';
diff --git a/tsconfig.json b/tsconfig.json
index 86b21fdd5..4a57c2389 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,5 +21,8 @@
     ]
   },
   "include": ["src/**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules", "cypress/**/*.ts", "**/*.cy.tsx"]
+  "exclude": ["node_modules", "cypress/**/*.ts", "**/*.cy.tsx"],
+   // Set `sourceRoot` to  "/" to strip the build path prefix from
+    // generated source code references. This will improve issue grouping in Sentry.
+    "sourceRoot": "/"
 }