diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LayoutWithTabs.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LayoutWithTabs.js
index 8c61b8e9c0..5dca4afc3c 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LayoutWithTabs.js
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LayoutWithTabs.js
@@ -23,7 +23,7 @@ export default function LayoutWithTabs(props){
onSelect={setCurrentTab}
tabs={!props.disabledTabs ? props.tabs : props.tabs.filter(obj => !props.disabledTabs.includes(obj.id))}
>
- {loading ? : props.tabs[current].component }
+ {loading ? : (props.tabs[current]?.component || null) }
)
}
\ No newline at end of file
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/components/Details.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/components/Details.jsx
index 0acd7a73ba..75b12dd58e 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/components/Details.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/integrations/components/Details.jsx
@@ -1,4 +1,4 @@
-import { Button, HorizontalStack, LegacyCard, Link, Text, VerticalStack } from '@shopify/polaris'
+import { Button, HorizontalStack, LegacyCard, VerticalStack } from '@shopify/polaris'
import React from 'react'
import LineComponent from './LineComponent'
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunResultPage/TestRunResultFlyout.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunResultPage/TestRunResultFlyout.jsx
index f464553880..95c4690ccd 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunResultPage/TestRunResultFlyout.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunResultPage/TestRunResultFlyout.jsx
@@ -177,7 +177,7 @@ function TestRunResultFlyout(props) {
- {severity.length > 0 ? (issueDetails?.testRunIssueStatus === 'IGNORED' ? Ignored : {severity}) : null}
+ {(severity && severity?.length > 0) ? (issueDetails?.testRunIssueStatus === 'IGNORED' ? Ignored : {severity}) : null}
@@ -394,7 +394,7 @@ function TestRunResultFlyout(props) {
const tabsComponent = (
{}}
/>