diff --git a/Makefile b/Makefile
index 5c8c3580d..a7ff2cb55 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ gen-scan-api:
 gen-log-api:
 	npm run "apigen:log"
 
+.PHONY: gen-local-radix-log-api
+gen-local-radix-log-api:
+	OVERRIDE_RADIX_LOG_API_SWAGGER_URL=http://localhost:8003/swagger/doc.json npm run "apigen:log"
+
 .PHONY: gen-service-now-api
 gen-service-now-api:
 	npm run "apigen:service-now"
diff --git a/docker-compose.yml b/docker-compose.yml
index eaad12527..a4417ac0c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,6 +78,8 @@ services:
       - radix
     ports:
       - "8000:8000" # In prod, this is served on port 443
+    depends_on:
+      - auth-state
 
   # for use with development
   auth-state:
diff --git a/package-lock.json b/package-lock.json
index 7aca7a542..1783f3196 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,9 +19,8 @@
         "date-fns": "^4.1.0",
         "http-status-codes": "^2.3.0",
         "jdenticon": "^3.3.0",
-        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
         "nanoid": "^5.0.7",
-        "prop-types": "^15.8.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-google-charts": "^4.0.7",
@@ -42,7 +41,7 @@
         "@remix-run/web-fetch": "^4.4.2",
         "@rtk-query/codegen-openapi": "^1.2.0",
         "@testing-library/react": "^16.0.1",
-        "@types/lodash": "^4.17.9",
+        "@types/lodash-es": "^4.17.9",
         "@types/react": "^18.3.10",
         "@types/react-dom": "^18.3.0",
         "@types/react-router-dom": "^5.3.3",
@@ -3936,6 +3935,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/lodash-es": {
+      "version": "4.17.12",
+      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
+      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/mdast": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz",
@@ -7026,7 +7035,14 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
diff --git a/package.json b/package.json
index 6347f7b1e..a70e7ce13 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,11 @@
     "test": "vitest watch",
     "test:no-watch": "vitest run",
     "test:coverage": "vitest --coverage",
-    "lint": "biome check",
+    "lint": "biome check && tsc --noEmit  --skipLibCheck",
     "lint-fix": "biome check --write",
     "lint-ts": "tsc --noEmit  --skipLibCheck",
     "lint:watch": "watch --color -n 1 biome lint --colors=force",
     "lint-ts:watch": "tsc --noEmit  --skipLibCheck --watch",
-    "lint-strict": "tsc --noEmit  --skipLibCheck --strictNullChecks",
     "deps": "npm run deps:license && npm run deps:stale",
     "deps:license": "node scripts/deps-license-check.js",
     "deps:stale": "node scripts/deps-stale-check.js",
@@ -40,9 +39,8 @@
     "date-fns": "^4.1.0",
     "http-status-codes": "^2.3.0",
     "jdenticon": "^3.3.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "nanoid": "^5.0.7",
-    "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-google-charts": "^4.0.7",
@@ -63,7 +61,7 @@
     "@remix-run/web-fetch": "^4.4.2",
     "@rtk-query/codegen-openapi": "^1.2.0",
     "@testing-library/react": "^16.0.1",
-    "@types/lodash": "^4.17.9",
+    "@types/lodash-es": "^4.17.9",
     "@types/react": "^18.3.10",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
diff --git a/radixconfig.yaml b/radixconfig.yaml
index b9a4ca805..027b03fac 100644
--- a/radixconfig.yaml
+++ b/radixconfig.yaml
@@ -38,7 +38,7 @@ spec:
         CLUSTER_EGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         CLUSTER_INGRESS_IPS: undefined # Comma separated list of IPs of all Public IP Prefixes assigned to the ClusterType (production, playground, development)
         OAUTH2_AUTHORITY: "https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
-        SERVICENOW_PROXY_SCOPES: "1b4a22f1-d4a1-4b6a-81b2-fd936daf1786/Application.Read"
+        SERVICENOW_PROXY_SCOPES: "1b4a22f1-d4a1-4b6a-81b2-fd936daf1786/Application.Read" # scopes must be seperated by comma
         CLUSTER_OIDC_ISSUER_URL: ""
         CMDB_CI_URL: "https://equinor.service-now.com/selfservice?id=form&table=cmdb_ci_business_app&sys_id={CIID}"
       secrets:
diff --git a/src/components/alert/index.tsx b/src/components/alert/index.tsx
index a58560dee..d52f829fe 100644
--- a/src/components/alert/index.tsx
+++ b/src/components/alert/index.tsx
@@ -1,5 +1,4 @@
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent, PropsWithChildren, ReactNode } from 'react';
 
 import './style.css';
@@ -36,10 +35,3 @@ export const Alert: FunctionComponent<PropsWithChildren<AlertProps>> = ({
     )}
   </div>
 );
-
-Alert.propTypes = {
-  children: PropTypes.node,
-  actions: PropTypes.node,
-  className: PropTypes.string,
-  type: PropTypes.oneOf<AlertType>(['info', 'success', 'warning', 'danger']),
-};
diff --git a/src/components/alerting/alerting-actions.tsx b/src/components/alerting/alerting-actions.tsx
index 9007d0db7..945132a8c 100644
--- a/src/components/alerting/alerting-actions.tsx
+++ b/src/components/alerting/alerting-actions.tsx
@@ -1,6 +1,4 @@
 import { Button } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import './style.css';
 import type { AlertingConfig } from '../../store/radix-api';
 
@@ -66,15 +64,3 @@ export const AlertingActions = ({
     </div>
   );
 };
-
-AlertingActions.propTypes = {
-  isSaving: PropTypes.bool.isRequired,
-  isEdit: PropTypes.bool.isRequired,
-  config: PropTypes.object.isRequired as PropTypes.Validator<AlertingConfig>,
-
-  onSave: PropTypes.func.isRequired,
-  onCancel: PropTypes.func.isRequired,
-  onEdit: PropTypes.func.isRequired,
-  onEnable: PropTypes.func.isRequired,
-  onDisable: PropTypes.func.isRequired,
-};
diff --git a/src/components/alerting/alerting-overview.tsx b/src/components/alerting/alerting-overview.tsx
index edb5f953e..f2735ae0b 100644
--- a/src/components/alerting/alerting-overview.tsx
+++ b/src/components/alerting/alerting-overview.tsx
@@ -1,6 +1,5 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { check_circle_outlined, warning_outlined } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { Fragment, type FunctionComponent } from 'react';
 import type { AlertingConfig } from '../../store/radix-api';
 
@@ -34,7 +33,3 @@ export const AlertingConfigStatus: FunctionComponent<{
     </>
   );
 };
-
-AlertingConfigStatus.propTypes = {
-  config: PropTypes.object.isRequired as PropTypes.Validator<AlertingConfig>,
-};
diff --git a/src/components/alerting/buildEditConfig.ts b/src/components/alerting/buildEditConfig.ts
index 059c2ce97..d9b5c40c8 100644
--- a/src/components/alerting/buildEditConfig.ts
+++ b/src/components/alerting/buildEditConfig.ts
@@ -1,12 +1,13 @@
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import type {
   AlertingConfig,
   ReceiverConfigMap,
   UpdateAlertingConfig,
+  UpdateReceiverConfigSecretsMap,
 } from '../../store/radix-api';
 
 const buildReceiverSecrets = (receviers: ReceiverConfigMap) => {
-  const secretsConfig = {};
+  const secretsConfig: UpdateReceiverConfigSecretsMap = {};
   if (!receviers) {
     return secretsConfig;
   }
@@ -25,8 +26,10 @@ export const buildEditConfig = (
   config: AlertingConfig
 ): UpdateAlertingConfig => {
   return {
-    alerts: cloneDeep(config.alerts),
-    receivers: cloneDeep(config.receivers),
-    receiverSecrets: buildReceiverSecrets(config.receivers),
+    alerts: config.alerts ? cloneDeep(config.alerts) : [],
+    receivers: config.receivers ? cloneDeep(config.receivers) : {},
+    receiverSecrets: config.receivers
+      ? buildReceiverSecrets(config.receivers)
+      : {},
   };
 };
diff --git a/src/components/alerting/edit-alerting.tsx b/src/components/alerting/edit-alerting.tsx
index 4955741ef..5c8dca66a 100644
--- a/src/components/alerting/edit-alerting.tsx
+++ b/src/components/alerting/edit-alerting.tsx
@@ -1,5 +1,4 @@
 import { TextField } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type {
   ChangeEvent,
   Dispatch,
@@ -37,11 +36,3 @@ export const UpdateSlackReceivers: FunctionComponent<{
       ))}
   </>
 );
-
-UpdateSlackReceivers.propTypes = {
-  alertingConfig: PropTypes.object
-    .isRequired as PropTypes.Validator<AlertingConfig>,
-  changedReceivers: PropTypes.object
-    .isRequired as PropTypes.Validator<ChangedReceivers>,
-  setChangedReceivers: PropTypes.func.isRequired,
-};
diff --git a/src/components/alerting/index.tsx b/src/components/alerting/index.tsx
index ba37b152f..b1a6712fd 100644
--- a/src/components/alerting/index.tsx
+++ b/src/components/alerting/index.tsx
@@ -1,6 +1,5 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { info_circle } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import { AlertingActions } from './alerting-actions';
@@ -36,7 +35,7 @@ export const Alerting = ({
     {}
   );
   const onSave = async () => {
-    const config: UpdateAlertingConfig = buildEditConfig(alertingConfig);
+    const config = buildEditConfig(alertingConfig);
     Object.entries(changedReceivers).forEach(([receiver, url]) => {
       config.receiverSecrets[receiver] = { slackConfig: { webhookUrl: url } };
     });
@@ -88,11 +87,3 @@ export const Alerting = ({
     </div>
   );
 };
-
-Alerting.propTypes = {
-  isSaving: PropTypes.bool.isRequired,
-  alertingConfig: PropTypes.object.isRequired,
-  enableAlerting: PropTypes.func.isRequired,
-  updateAlerting: PropTypes.func.isRequired,
-  disableAlerting: PropTypes.func.isRequired,
-};
diff --git a/src/components/app-config-ad-groups/index.tsx b/src/components/app-config-ad-groups/index.tsx
index 6fd9253ce..5099a138c 100644
--- a/src/components/app-config-ad-groups/index.tsx
+++ b/src/components/app-config-ad-groups/index.tsx
@@ -1,9 +1,6 @@
 import { AuthenticatedTemplate } from '@azure/msal-react';
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import { ADGroups, type HandleAdGroupsChangeCB } from '../graph/adGroups';
-
 import './style.css';
 
 interface Props {
@@ -36,10 +33,3 @@ export const AppConfigAdGroups = ({
     </AuthenticatedTemplate>
   </div>
 );
-
-AppConfigAdGroups.propTypes = {
-  labeling: PropTypes.string.isRequired,
-  adGroups: PropTypes.arrayOf(PropTypes.string),
-  isDisabled: PropTypes.bool,
-  onChange: PropTypes.func.isRequired,
-};
diff --git a/src/components/app-config-ci/ci-popover.tsx b/src/components/app-config-ci/ci-popover.tsx
index a49fd7b90..bff4f71ec 100644
--- a/src/components/app-config-ci/ci-popover.tsx
+++ b/src/components/app-config-ci/ci-popover.tsx
@@ -1,14 +1,14 @@
 import { Popover, Typography } from '@equinor/eds-core-react';
-import { type FunctionComponent, useEffect } from 'react';
+import { useEffect } from 'react';
 
 import type { Application } from '../../store/service-now-api';
 import { configVariables } from '../../utils/config';
 import { ExternalLink } from '../link/external-link';
 
 export interface ConfigurationItemPopoverProps {
-  open?: boolean;
+  open: boolean;
   onClose: () => unknown;
-  anchorEl: HTMLElement;
+  anchorEl?: HTMLElement;
   configurationItem: Application;
 }
 
@@ -16,9 +16,12 @@ function urlStringForCI(id: string): string {
   return configVariables.CMDB_CI_URL.replace(/{CIID}/g, encodeURIComponent(id));
 }
 
-export const ConfigurationItemPopover: FunctionComponent<
-  ConfigurationItemPopoverProps
-> = ({ open, onClose, anchorEl, configurationItem }) => {
+export const ConfigurationItemPopover = ({
+  open,
+  onClose,
+  anchorEl,
+  configurationItem,
+}: ConfigurationItemPopoverProps) => {
   const externalUrl = urlStringForCI(configurationItem.id);
 
   useEffect(() => {
diff --git a/src/components/app-config-ci/ci-select.tsx b/src/components/app-config-ci/ci-select.tsx
deleted file mode 100644
index 044ea9350..000000000
--- a/src/components/app-config-ci/ci-select.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Icon } from '@equinor/eds-core-react';
-import { info_circle } from '@equinor/eds-icons';
-import type React from 'react';
-import type { MouseEvent, MutableRefObject } from 'react';
-import {
-  type GroupBase,
-  type IndicatorsContainerProps,
-  type PropsValue,
-  components,
-} from 'react-select';
-import AsyncSelect, { type AsyncProps } from 'react-select/async';
-
-type InfoIconProps<Option> = {
-  onInfoIconClick?: (
-    event: MouseEvent<SVGSVGElement>,
-    value: PropsValue<Option>
-  ) => void;
-  containerRef?: MutableRefObject<HTMLDivElement>;
-};
-
-const IndicatorsContainer: <Option>(
-  props: IndicatorsContainerProps<Option, boolean> & {
-    selectProps: InfoIconProps<Option>;
-  }
-) => React.JSX.Element = ({ children, ...props }) => (
-  <components.IndicatorsContainer {...props}>
-    {props.hasValue && props.selectProps.onInfoIconClick && (
-      <div ref={props.selectProps.containerRef}>
-        <Icon
-          style={{ cursor: 'pointer' }}
-          data={info_circle}
-          onClick={(event) =>
-            props.selectProps.onInfoIconClick(event, props.selectProps.value)
-          }
-        />
-      </div>
-    )}
-    {children}
-  </components.IndicatorsContainer>
-);
-
-export const ConfigurationItemSelect: <Option>(
-  props: AsyncProps<Option, boolean, GroupBase<Option>> & InfoIconProps<Option>
-) => React.JSX.Element = (props) => (
-  <AsyncSelect components={{ IndicatorsContainer }} {...props} />
-);
diff --git a/src/components/app-config-ci/index.tsx b/src/components/app-config-ci/index.tsx
index ab8c7e640..3e246e1a3 100644
--- a/src/components/app-config-ci/index.tsx
+++ b/src/components/app-config-ci/index.tsx
@@ -1,15 +1,19 @@
-import { Typography } from '@equinor/eds-core-react';
-import { debounce } from 'lodash';
-import * as PropTypes from 'prop-types';
-import { useEffect, useRef, useState } from 'react';
-import type { MultiValue, SingleValue } from 'react-select';
+import { Icon, Typography } from '@equinor/eds-core-react';
+import { debounce } from 'lodash-es';
+import { type MutableRefObject, useRef, useState } from 'react';
+import {
+  type IndicatorsContainerProps,
+  type PropsValue,
+  components,
+} from 'react-select';
 
 import { ConfigurationItemPopover } from './ci-popover';
-import { ConfigurationItemSelect } from './ci-select';
 
 import { Alert } from '../alert';
 
 import './style.css';
+import { info_circle } from '@equinor/eds-icons';
+import AsyncSelect from 'react-select/async';
 import {
   type Application,
   type GetApplicationsApiResponse,
@@ -18,7 +22,9 @@ import {
 } from '../../store/service-now-api';
 import { getFetchErrorMessage } from '../../store/utils';
 
-export type OnConfigurationItemChangeCallback = (ci?: Application) => void;
+export type OnConfigurationItemChangeCallback = (
+  ci: Application | null
+) => void;
 type GetApplicationsFunction = ReturnType<
   typeof serviceNowApi.endpoints.getApplications.useLazyQuery
 >[0];
@@ -49,67 +55,75 @@ export function AppConfigConfigurationItem({
   configurationItemChangeCallback,
   disabled,
 }: Props) {
-  const [selectedCI, setSelectedCI] = useState<Application | null>(null);
-  const [popoverCI, setPopoverCI] = useState<Application>();
+  const [selectedCI, setSelectedCI] = useState<Application | null | undefined>(
+    undefined
+  );
+  const [popoverCI, setPopoverCI] = useState<Application | null>(null);
   const [popoverOpen, setPopoverOpen] = useState(false);
   const [getApplications] =
     serviceNowApi.endpoints.getApplications.useLazyQuery();
 
   const { data: currentCI, ...currentCIState } = useGetApplicationQuery(
     {
-      appId: configurationItem,
+      appId: configurationItem!,
     },
     { skip: !configurationItem }
   );
 
-  useEffect(() => {
-    setSelectedCI(currentCI);
-  }, [currentCI]);
-  const containerRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>();
 
-  function onChange(newValue?: Application): void {
+  function onChange(newValue: Application | null): void {
     configurationItemChangeCallback(newValue);
     setSelectedCI(newValue);
     setPopoverOpen(false);
   }
 
+  const onLoad = (
+    inputValue: string | null,
+    callback: (apps: Application[]) => unknown
+  ) => {
+    if (inputValue == null || inputValue.length < 3) {
+      callback([]);
+      return;
+    }
+
+    loadOptions(callback, getApplications, inputValue);
+  };
+  const onInfoIconClick = (ci: Application) => {
+    setPopoverCI(ci);
+    setPopoverOpen(!popoverOpen);
+  };
+
+  if (currentCIState.isLoading) return <h1>loading...</h1>;
+
   return (
     <div className="configuration-item-select">
       <Typography className="label" group="input" variant="text">
         Configuration item
       </Typography>
-      <ConfigurationItemSelect<Application>
-        onInfoIconClick={(ev, ci) => {
-          ev.stopPropagation();
-          setPopoverCI(
-            Array.isArray(ci)
-              ? (ci as MultiValue<Application>)[0]
-              : (ci as SingleValue<Application>)
-          );
-          setPopoverOpen(!popoverOpen);
-        }}
+      <AsyncSelect<Application>
+        // @ts-expect-error onInfoIconClick is defined in IndicatorsContainer
+        components={{ IndicatorsContainer }}
+        onInfoIconClick={onInfoIconClick}
         containerRef={containerRef}
         name="ConfigurationItem"
         menuPosition="fixed"
         closeMenuOnScroll={({ target }: Event) =>
           !(target as HTMLElement)?.parentElement?.className?.match(/menu/)
         }
-        noOptionsMessage={() => null}
-        loadOptions={(inputValue, callback) => {
-          inputValue?.length < 3
-            ? callback([])
-            : loadOptions(callback, getApplications, inputValue);
-        }}
+        loadOptions={onLoad}
         onChange={onChange}
         getOptionLabel={({ name }) => name}
         getOptionValue={({ id }) => id}
-        isClearable
         closeMenuOnSelect={false}
         value={selectedCI}
+        defaultValue={currentCI}
+        isClearable
         isDisabled={disabled}
       />
       <Typography className="helpertext" group="input" variant="text">
-        Application from IT Software Inventory (type 3 characters to search)
+        Application from Business Applications Inventory (type 3 characters to
+        search)
       </Typography>
 
       {currentCIState.isError && (
@@ -134,8 +148,27 @@ export function AppConfigConfigurationItem({
   );
 }
 
-AppConfigConfigurationItem.propTypes = {
-  configurationItemChangeCallback: PropTypes.func.isRequired,
-  configurationItem: PropTypes.string,
-  disabled: PropTypes.bool,
+type InfoIconProps = IndicatorsContainerProps<Application, false> & {
+  selectProps: {
+    onInfoIconClick: (value: PropsValue<Application>) => void;
+    containerRef?: MutableRefObject<HTMLDivElement>;
+  };
 };
+
+const IndicatorsContainer = ({ children, ...props }: InfoIconProps) => (
+  <components.IndicatorsContainer {...props}>
+    {props.hasValue && props.selectProps.onInfoIconClick && (
+      <div ref={props.selectProps.containerRef}>
+        <Icon
+          style={{ cursor: 'pointer' }}
+          data={info_circle}
+          onClick={(event) => {
+            event.stopPropagation();
+            props.selectProps.onInfoIconClick(props.selectProps.value);
+          }}
+        />
+      </div>
+    )}
+    {children}
+  </components.IndicatorsContainer>
+);
diff --git a/src/components/app-list-item/index.tsx b/src/components/app-list-item/index.tsx
index 352c08081..a57a84822 100644
--- a/src/components/app-list-item/index.tsx
+++ b/src/components/app-list-item/index.tsx
@@ -8,25 +8,14 @@ import {
 import { error_outlined, star_filled, star_outlined } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
 import { formatDistanceToNow } from 'date-fns';
-import * as PropTypes from 'prop-types';
-import {
-  type FunctionComponent,
-  type HTMLAttributes,
-  type MouseEvent,
-  useEffect,
-} from 'react';
+import type { HTMLAttributes, MouseEvent } from 'react';
 import { Link } from 'react-router-dom';
 
 import { routes } from '../../routes';
-import type {
-  ApplicationSummary,
-  Component,
-  JobSummary,
-} from '../../store/radix-api';
+import type { ApplicationSummary, Component } from '../../store/radix-api';
 import {
-  type ImageScan,
   type Vulnerability,
-  scanApi,
+  useGetApplicationVulnerabilitySummariesQuery,
 } from '../../store/scan-api';
 import { filterFields } from '../../utils/filter-fields';
 import { routeWithParams } from '../../utils/string';
@@ -38,6 +27,7 @@ import {
 } from '../environments-summary/environment-card-status';
 import {
   EnvironmentStatus,
+  type VulnerabilitySummary,
   aggregateComponentEnvironmentStatus,
   aggregateComponentReplicaEnvironmentStatus,
   aggregateVulnerabilitySummaries,
@@ -61,19 +51,13 @@ export interface AppListItemProps {
   isLoaded: boolean;
 }
 
-const latestJobStatus: Partial<
-  Record<JobSummary['status'], EnvironmentStatus>
-> = {
-  Failed: EnvironmentStatus.Danger,
-};
-
 const visibleKeys: Array<Lowercase<Vulnerability['severity']>> = [
   'critical',
   'high',
 ];
 
 function aggregateEnvironmentStatus(
-  components: Readonly<Array<Component>>
+  components: Component[]
 ): EnvironmentStatus {
   return Math.max(
     aggregateComponentEnvironmentStatus(components),
@@ -81,22 +65,17 @@ function aggregateEnvironmentStatus(
   );
 }
 
-const AppItemStatus: FunctionComponent<ApplicationSummary> = ({
+const AppItemStatus = ({
   environmentActiveComponents,
   latestJob,
   name,
-}) => {
-  const [trigger, state] =
-    scanApi.endpoints.getApplicationVulnerabilitySummaries.useLazyQuery();
-
-  useEffect(() => {
-    const request = trigger({ appName: name });
-    return () => request?.abort();
-  }, [name, trigger]);
+}: ApplicationSummary) => {
+  const state = useGetApplicationVulnerabilitySummariesQuery(
+    { appName: name },
+    { pollingInterval: 0 }
+  );
 
-  const vulnerabilities = (state?.data ?? []).reduce<
-    ImageScan['vulnerabilitySummary']
-  >(
+  const vulnerabilities: VulnerabilitySummary = (state?.data ?? []).reduce(
     (obj, x) =>
       aggregateVulnerabilitySummaries([
         obj,
@@ -152,8 +131,9 @@ const AppItemStatus: FunctionComponent<ApplicationSummary> = ({
                 statusElements={{
                   ...(latestJob && {
                     'Latest Job':
-                      latestJobStatus[latestJob.status] ??
-                      EnvironmentStatus.Consistent,
+                      latestJob.status == 'Failed'
+                        ? EnvironmentStatus.Danger
+                        : EnvironmentStatus.Consistent,
                   }),
                   ...(environmentActiveComponents && {
                     Environments: aggregateEnvironmentStatus(
@@ -162,7 +142,7 @@ const AppItemStatus: FunctionComponent<ApplicationSummary> = ({
                           environmentActiveComponents[x]?.length > 0
                             ? [...obj, ...environmentActiveComponents[x]]
                             : obj,
-                        []
+                        [] as Component[]
                       )
                     ),
                   }),
@@ -176,21 +156,23 @@ const AppItemStatus: FunctionComponent<ApplicationSummary> = ({
   );
 };
 
-const WElement: FunctionComponent<
-  { appName: string; isPlaceholder?: boolean } & HTMLAttributes<
-    Pick<
-      HTMLAnchorElement | HTMLDivElement,
-      keyof HTMLAnchorElement & keyof HTMLDivElement
-    >
+type WElementProps = {
+  appName: string;
+  isPlaceholder?: boolean;
+} & HTMLAttributes<
+  Pick<
+    HTMLAnchorElement | HTMLDivElement,
+    keyof HTMLAnchorElement & keyof HTMLDivElement
   >
-> = ({ appName, isPlaceholder, ...rest }) =>
+>;
+const WElement = ({ appName, isPlaceholder, ...rest }: WElementProps) =>
   isPlaceholder ? (
     <div {...rest} />
   ) : (
     <Link to={routeWithParams(routes.app, { appName })} {...rest} />
   );
 
-export const AppListItem: FunctionComponent<AppListItemProps> = ({
+export const AppListItem = ({
   app,
   handler,
   isPlaceholder,
@@ -198,7 +180,7 @@ export const AppListItem: FunctionComponent<AppListItemProps> = ({
   showStatus,
   name,
   isLoaded,
-}) => (
+}: AppListItemProps) => (
   <WElement
     className={clsx('app-list-item', {
       'app-list-item--placeholder': isPlaceholder,
@@ -234,13 +216,3 @@ export const AppListItem: FunctionComponent<AppListItemProps> = ({
     </div>
   </WElement>
 );
-
-AppListItem.propTypes = {
-  app: PropTypes.object as PropTypes.Validator<ApplicationSummary>,
-  handler: PropTypes.func.isRequired,
-  isPlaceholder: PropTypes.bool,
-  isFavourite: PropTypes.bool,
-  showStatus: PropTypes.bool,
-  isLoaded: PropTypes.bool.isRequired,
-  name: PropTypes.string.isRequired,
-};
diff --git a/src/components/app-list/dev.tsx b/src/components/app-list/dev.tsx
index a1df3977b..64410c2b0 100644
--- a/src/components/app-list/dev.tsx
+++ b/src/components/app-list/dev.tsx
@@ -22,6 +22,8 @@ const testApps: ShowApplicationsApiResponse = [
       prod: [{ image: 'diem', name: 'web', type: 'component' }],
     },
     latestJob: {
+      name: 'latest job',
+      created: new Date('2023-12-01T11:27:17Z').toISOString(),
       status: 'Failed',
       started: new Date('2023-12-01T11:27:17Z').toISOString(),
       ended: new Date('2023-12-01T12:16:54Z').toISOString(),
@@ -38,6 +40,8 @@ const testApps: ShowApplicationsApiResponse = [
       ],
     },
     latestJob: {
+      name: 'latest job',
+      created: new Date('2023-12-01T11:27:17Z').toISOString(),
       status: 'Running',
       started: new Date('2023-12-01T12:27:17Z').toISOString(),
     },
@@ -46,16 +50,16 @@ const testApps: ShowApplicationsApiResponse = [
 
 const testVulns: GetApplicationVulnerabilitySummariesApiResponse = [
   {
-    name: testApps[0].name,
+    name: testApps[0].name!,
     components: {
       dev: {
-        image: testApps[0].environmentActiveComponents.dev[0].image,
+        image: testApps[0].environmentActiveComponents!.dev[0].image,
         scanSuccess: true,
         scanTime: new Date().toISOString(),
         vulnerabilitySummary: { high: 3 },
       },
       prod: {
-        image: testApps[0].environmentActiveComponents.prod[0].image,
+        image: testApps[0].environmentActiveComponents!.prod[0].image,
         scanSuccess: true,
         scanTime: new Date().toISOString(),
         vulnerabilitySummary: { critical: 17, high: 5 },
@@ -63,15 +67,15 @@ const testVulns: GetApplicationVulnerabilitySummariesApiResponse = [
     },
   },
   {
-    name: testApps[1].name,
+    name: testApps[1].name!,
     components: {
       dev: {
-        image: testApps[1].environmentActiveComponents.botnet[0].image,
+        image: testApps[1].environmentActiveComponents!.botnet[0].image,
         scanSuccess: true,
         scanTime: new Date().toISOString(),
       },
       prod: {
-        image: testApps[1].environmentActiveComponents.coinminer[0].image,
+        image: testApps[1].environmentActiveComponents!.coinminer[0].image,
         scanSuccess: true,
         scanTime: new Date().toISOString(),
         vulnerabilitySummary: { high: 1, medium: 1, low: 6 },
@@ -105,7 +109,7 @@ new Server({
           .filter(({ name }) =>
             (request.queryParams as GetSearchApplicationsApiArg)?.apps
               ?.split(',')
-              .includes(name)
+              .includes(name!)
           )
           .reduce<GetSearchApplicationsApiResponse>((obj, app) => {
             return [...obj, app];
@@ -122,7 +126,7 @@ new Server({
             name ===
             (request.params as GetApplicationVulnerabilitySummariesApiArg)
               ?.appName
-        ),
+        )!,
       ]
     );
   },
diff --git a/src/components/app-list/index.test.tsx b/src/components/app-list/index.test.tsx
index 207cc7ceb..c3dc30bed 100644
--- a/src/components/app-list/index.test.tsx
+++ b/src/components/app-list/index.test.tsx
@@ -27,6 +27,7 @@ describe('AppList component', () => {
             isSuccess: true,
             isUninitialized: false,
             status: QueryStatus.fulfilled,
+            // @ts-expect-error We dont care
             refetch: noop,
             data: [{ name: 'mock-app-1' }, { name: 'mock-app-2' }],
             currentData: [{ name: 'mock-app-1' }],
@@ -41,6 +42,7 @@ describe('AppList component', () => {
             isSuccess: false,
             isUninitialized: false,
             status: QueryStatus.pending,
+            // @ts-expect-error We dont care
             refetch: noop,
             data: undefined,
           }),
diff --git a/src/components/app-list/index.tsx b/src/components/app-list/index.tsx
index beb7adc31..4f286b212 100644
--- a/src/components/app-list/index.tsx
+++ b/src/components/app-list/index.tsx
@@ -14,7 +14,7 @@ import PageCreateApplication from '../page-create-application';
 
 import './style.css';
 import { refresh } from '@equinor/eds-icons';
-import { isEqual, uniq } from 'lodash';
+import { isEqual, uniq } from 'lodash-es';
 import useLocalStorage from '../../effects/use-local-storage';
 import { pollingInterval } from '../../store/defaults';
 import { getFetchErrorMessage } from '../../store/utils';
diff --git a/src/components/app-navbar/index.tsx b/src/components/app-navbar/index.tsx
index add9f58d5..4f348031a 100644
--- a/src/components/app-navbar/index.tsx
+++ b/src/components/app-navbar/index.tsx
@@ -28,7 +28,7 @@ import {
 import { AppBadge } from '../app-badge';
 
 import './style.css';
-import { uniq } from 'lodash';
+import { uniq } from 'lodash-es';
 import useLocalStorage from '../../effects/use-local-storage';
 import { ExternalLink } from '../link/external-link';
 
diff --git a/src/components/application-cost/index.tsx b/src/components/application-cost/index.tsx
index 5e2b9f62c..c12fdffce 100644
--- a/src/components/application-cost/index.tsx
+++ b/src/components/application-cost/index.tsx
@@ -1,6 +1,5 @@
 import { Typography } from '@equinor/eds-core-react';
 import { format } from 'date-fns';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { connect } from 'react-redux';
 
@@ -74,12 +73,6 @@ export const ApplicationCost: FunctionComponent<ApplicationCostProps> = ({
   );
 };
 
-ApplicationCost.propTypes = {
-  appName: PropTypes.string.isRequired,
-  from: PropTypes.string.isRequired,
-  to: PropTypes.string.isRequired,
-};
-
 export default connect<ApplicationCostDuration>(() => {
   const night = new Date();
   night.setUTCHours(0, 0, 0, 0);
diff --git a/src/components/application-future-cost/index.tsx b/src/components/application-future-cost/index.tsx
index d94655897..339f30085 100644
--- a/src/components/application-future-cost/index.tsx
+++ b/src/components/application-future-cost/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import {
@@ -62,7 +61,3 @@ export const FutureApplicationCost: FunctionComponent<
     </div>
   );
 };
-
-FutureApplicationCost.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/async-resource/async-resource.tsx b/src/components/async-resource/async-resource.tsx
index a105ce9a6..34cf88a63 100644
--- a/src/components/async-resource/async-resource.tsx
+++ b/src/components/async-resource/async-resource.tsx
@@ -36,7 +36,7 @@ export default function AsyncResource({
 
   if (
     asyncState.error &&
-    !nonErrorCodes?.includes(getFetchErrorCode(asyncState.error))
+    !nonErrorCodes?.includes(getFetchErrorCode(asyncState.error) || '')
   ) {
     const { code, message } = getFetchErrorData(asyncState.error);
 
diff --git a/src/components/breadcrumb/index.tsx b/src/components/breadcrumb/index.tsx
index fd4c48e1d..d4bb5340b 100644
--- a/src/components/breadcrumb/index.tsx
+++ b/src/components/breadcrumb/index.tsx
@@ -11,7 +11,12 @@ export const Breadcrumb: FunctionComponent<BreadcrumbProps> = ({ links }) => (
     {links.map(({ to, label }, i) => {
       return (
         label !== '' && (
-          <Breadcrumbs.Breadcrumb key={i} as={Link} to={to}>
+          <Breadcrumbs.Breadcrumb
+            key={i}
+            as={Link}
+            // @ts-expect-error EDS Breadcrumbs typescript doesnt reccognize Links props
+            to={to}
+          >
             {label}
           </Breadcrumbs.Breadcrumb>
         )
diff --git a/src/components/code/index.tsx b/src/components/code/index.tsx
index ac0715fa6..e1b2f73f3 100644
--- a/src/components/code/index.tsx
+++ b/src/components/code/index.tsx
@@ -27,10 +27,10 @@ function scrollToBottom(elementRef: Element): void {
   // HACK elementRef.scrollHeight is incorrect when called directly
   // the callback in setTimeout is scheduled as a task to run after
   // PageCreateApplication has rendered DOM... it seems
-  setTimeout(() => elementRef?.scrollTo?.(0, elementRef.scrollHeight), 0);
+  setTimeout(() => elementRef.scrollTo(0, elementRef.scrollHeight), 0);
 }
 
-export const Code: FunctionComponent<CodeProps & { children?: string }> = ({
+export const Code: FunctionComponent<CodeProps & { children: string }> = ({
   autoscroll,
   copy,
   download,
@@ -48,7 +48,7 @@ export const Code: FunctionComponent<CodeProps & { children?: string }> = ({
   }
 
   useEffect(() => {
-    if (autoscroll && scrollOffsetFromBottom === 0) {
+    if (containerRef.current && autoscroll && scrollOffsetFromBottom === 0) {
       scrollToBottom(containerRef.current);
     }
   });
diff --git a/src/components/commit-hash/index.tsx b/src/components/commit-hash/index.tsx
index ed05d8e5a..59ef1c197 100644
--- a/src/components/commit-hash/index.tsx
+++ b/src/components/commit-hash/index.tsx
@@ -5,11 +5,6 @@ import type { PropsWithChildren } from 'react';
 import { smallGithubCommitHash } from '../../utils/string';
 import { ExternalLink } from '../link/external-link';
 
-type CommitHashProps = {
-  commit: string;
-  repo?: string;
-};
-
 const ExternalLinkWrapper = ({
   repo,
   commit,
@@ -26,8 +21,12 @@ const ExternalLinkWrapper = ({
     <>{children}</>
   );
 
+type CommitHashProps = {
+  commit?: string;
+  repo?: string;
+};
 export const CommitHash = ({ repo, commit }: CommitHashProps) =>
-  commit?.length > 0 ? (
+  commit && commit.length > 0 ? (
     <ExternalLinkWrapper {...{ repo, commit }}>
       {repo && <Icon data={github} size={18} />} {smallGithubCommitHash(commit)}
     </ExternalLinkWrapper>
diff --git a/src/components/component/component-identity.tsx b/src/components/component/component-identity.tsx
index 4b37c3270..8c3942474 100644
--- a/src/components/component/component-identity.tsx
+++ b/src/components/component/component-identity.tsx
@@ -1,5 +1,4 @@
 import { List, Popover, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import {
   type FunctionComponent,
   type SyntheticEvent,
@@ -64,7 +63,7 @@ const AzureIdentityLink: FunctionComponent<{
               namespace={namespace}
               serviceAccountName={serviceAccountName}
             />
-            {azureKeyVaults?.length > 0 && (
+            {azureKeyVaults && azureKeyVaults.length > 0 && (
               <div className="grid grid--gap-small">
                 <Typography
                   className="whitespace-nowrap"
@@ -98,13 +97,3 @@ export const ComponentIdentity: FunctionComponent<{
     )}
   </Typography>
 );
-
-AzureIdentityLink.propTypes = {
-  namespace: PropTypes.string.isRequired,
-  azure: PropTypes.object.isRequired as PropTypes.Validator<AzureIdentityModel>,
-};
-
-ComponentIdentity.propTypes = {
-  identity: PropTypes.object.isRequired as PropTypes.Validator<Identity>,
-  deployment: PropTypes.object.isRequired as PropTypes.Validator<Deployment>,
-};
diff --git a/src/components/component/component-ports.tsx b/src/components/component/component-ports.tsx
index ca36e4bf5..07827526c 100644
--- a/src/components/component/component-ports.tsx
+++ b/src/components/component/component-ports.tsx
@@ -1,12 +1,7 @@
 import { List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import type { Port } from '../../store/radix-api';
 
-export const ComponentPorts: FunctionComponent<{ ports: Array<Port> }> = ({
-  ports,
-}) =>
+export const ComponentPorts = ({ ports }: { ports: Port[] }) =>
   ports.length > 0 ? (
     <div>
       <Typography>Open ports:</Typography>
@@ -21,8 +16,3 @@ export const ComponentPorts: FunctionComponent<{ ports: Array<Port> }> = ({
   ) : (
     <Typography>No open ports</Typography>
   );
-
-ComponentPorts.propTypes = {
-  ports: PropTypes.arrayOf(PropTypes.object as PropTypes.Validator<Port>)
-    .isRequired,
-};
diff --git a/src/components/component/component-scan-details.tsx b/src/components/component/component-scan-details.tsx
index 403cba818..6204f8387 100644
--- a/src/components/component/component-scan-details.tsx
+++ b/src/components/component/component-scan-details.tsx
@@ -1,8 +1,5 @@
 import { Typography } from '@equinor/eds-core-react';
-import { isNil } from 'lodash';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
+import { isNil } from 'lodash-es';
 import type { ImageWithLastScan } from '../../store/scan-api';
 import { RelativeToNow } from '../time/relative-to-now';
 import { VulnerabilityDetails } from '../vulnerability-details';
@@ -11,9 +8,12 @@ function getScanStatus(x: boolean): string {
   return isNil(x) ? 'not performed' : ['failed', 'succeeded'][+x];
 }
 
-export const ComponentScanDetails: FunctionComponent<{
+type Props = {
   scan: ImageWithLastScan;
-}> = ({ scan: { baseImage, scanSuccess, scanTime, vulnerabilities } }) => (
+};
+export const ComponentScanDetails = ({
+  scan: { baseImage, scanSuccess, scanTime, vulnerabilities },
+}: Props) => (
   <div className="grid grid--gap-large">
     <div className="grid grid--gap-medium">
       <Typography>
@@ -35,7 +35,3 @@ export const ComponentScanDetails: FunctionComponent<{
     </div>
   </div>
 );
-
-ComponentScanDetails.propTypes = {
-  scan: PropTypes.object.isRequired as PropTypes.Validator<ImageWithLastScan>,
-};
diff --git a/src/components/component/component-secrets.tsx b/src/components/component/component-secrets.tsx
index f0f9f8700..1c9ff200d 100644
--- a/src/components/component/component-secrets.tsx
+++ b/src/components/component/component-secrets.tsx
@@ -1,5 +1,4 @@
 import { List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import type { Component } from '../../store/radix-api';
@@ -10,7 +9,7 @@ export const ComponentSecrets: FunctionComponent<{ component: Component }> = ({
   <>
     <Typography variant="h4">Secrets</Typography>
     {component &&
-      (component.secrets?.length > 0 ? (
+      (component.secrets && component.secrets.length > 0 ? (
         <List className="o-indent-list secrets">
           {component.secrets.map((secret) => (
             <List.Item key={secret}>{secret}</List.Item>
@@ -21,7 +20,3 @@ export const ComponentSecrets: FunctionComponent<{ component: Component }> = ({
       ))}
   </>
 );
-
-ComponentSecrets.propTypes = {
-  component: PropTypes.object.isRequired as PropTypes.Validator<Component>,
-};
diff --git a/src/components/component/dns-aliases.tsx b/src/components/component/dns-aliases.tsx
index cfddf7ab3..cb171b0bc 100644
--- a/src/components/component/dns-aliases.tsx
+++ b/src/components/component/dns-aliases.tsx
@@ -17,7 +17,7 @@ export const DNSAliases: FunctionComponent<DefaultAppAliasProps> = ({
   title,
 }) => (
   <>
-    {dnsAliases?.length > 0 && (
+    {dnsAliases && dnsAliases.length > 0 && (
       <div className="grid grid--gap-small">
         <Typography variant="h4">{title}</Typography>
         {dnsAliases.length == 1 ? (
diff --git a/src/components/component/execution-state.tsx b/src/components/component/execution-state.tsx
index 00c7ff160..cc3548ad8 100644
--- a/src/components/component/execution-state.tsx
+++ b/src/components/component/execution-state.tsx
@@ -11,7 +11,7 @@ type PipelineRunReason = PipelineRun['status'];
 type JobReason = Job['status'];
 
 export function getJobExecutionState(status: JobReason): string {
-  switch (status as JobReason) {
+  switch (status) {
     case 'Waiting':
     case 'Queued':
       return 'Will execute';
@@ -24,6 +24,8 @@ export function getJobExecutionState(status: JobReason): string {
     case 'StoppedNoChanges':
     case 'Succeeded':
       return 'Executed';
+    case undefined:
+      return 'unknown';
   }
 }
 export function getPipelineRunExecutionState(
@@ -53,6 +55,8 @@ export function getPipelineRunExecutionState(
     case 'ResourceVerificationFailed':
     case 'FailureIgnored':
       return 'Failed';
+    case undefined:
+      return 'unknown';
   }
 }
 
@@ -98,6 +102,8 @@ export function getTaskRunExecutionState(status: TaskRunReason): string {
     case 'CELEvaluationFailed':
     case 'InvalidParamValue':
       return 'Failed';
+    case undefined:
+      return 'unknown';
   }
 }
 
@@ -126,5 +132,7 @@ export function getStepTaskRunExecutionState(status: StepRunReason): string {
     case 'ResourceVerificationFailed':
     case 'FailureIgnored':
       return status;
+    case undefined:
+      return 'unknown';
   }
 }
diff --git a/src/components/component/git-commit-tags.tsx b/src/components/component/git-commit-tags.tsx
index 8de7e687c..e6e96c1d0 100644
--- a/src/components/component/git-commit-tags.tsx
+++ b/src/components/component/git-commit-tags.tsx
@@ -1,13 +1,12 @@
 import { Icon } from '@equinor/eds-core-react';
 import { github } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { CommitHash } from '../commit-hash';
 import { GitTagLinks } from '../git-tags/git-tag-links';
 
 type Props = {
   commitID?: string;
   gitTags?: string;
-  repository: string;
+  repository?: string;
 };
 
 export const GitCommitTags = ({ commitID, gitTags, repository }: Props) => {
@@ -33,9 +32,3 @@ export const GitCommitTags = ({ commitID, gitTags, repository }: Props) => {
     </>
   );
 };
-
-GitCommitTags.propTypes = {
-  commitID: PropTypes.string,
-  gitTags: PropTypes.string,
-  repository: PropTypes.string,
-};
diff --git a/src/components/component/ingress-allow-list.tsx b/src/components/component/ingress-allow-list.tsx
index ad12c6835..1d90bbad4 100644
--- a/src/components/component/ingress-allow-list.tsx
+++ b/src/components/component/ingress-allow-list.tsx
@@ -1,11 +1,10 @@
 import { List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 export const IngressAllowList: FunctionComponent<{
   allowedIpRanges?: Array<string>;
 }> = ({ allowedIpRanges }) =>
-  allowedIpRanges?.length > 0 ? (
+  allowedIpRanges && allowedIpRanges.length > 0 ? (
     <div>
       <Typography>Accessible from public IP address ranges:</Typography>
       <List className="o-indent-list">
@@ -17,7 +16,3 @@ export const IngressAllowList: FunctionComponent<{
   ) : (
     <Typography>Accessible from all public IP addresses</Typography>
   );
-
-IngressAllowList.propTypes = {
-  allowedIpRanges: PropTypes.arrayOf(PropTypes.string),
-};
diff --git a/src/components/component/scheduled-job/job-context-menu.tsx b/src/components/component/scheduled-job/job-context-menu.tsx
index 6b40a8be9..1c2ba1cc1 100644
--- a/src/components/component/scheduled-job/job-context-menu.tsx
+++ b/src/components/component/scheduled-job/job-context-menu.tsx
@@ -8,7 +8,7 @@ export const JobContextMenu: FunctionComponent<{
   menuItems: Array<ReturnType<(typeof Menu)['Item']>>;
 }> = ({ menuItems }) => {
   const [isOpen, setIsOpen] = useState(false);
-  const [anchorEl, setAnchorEl] = useState<HTMLButtonElement>(null);
+  const [anchorEl, setAnchorEl] = useState<HTMLButtonElement>();
 
   return (
     <>
diff --git a/src/components/component/scheduled-job/job-deployment-link.tsx b/src/components/component/scheduled-job/job-deployment-link.tsx
index 118b2b99e..020d73b76 100644
--- a/src/components/component/scheduled-job/job-deployment-link.tsx
+++ b/src/components/component/scheduled-job/job-deployment-link.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -41,9 +40,3 @@ export const JobDeploymentLink: FunctionComponent<ScheduledJobListProps> = ({
     </Typography>
   </Typography>
 );
-
-JobDeploymentLink.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/component/scheduled-job/job-scheduler-details.tsx b/src/components/component/scheduled-job/job-scheduler-details.tsx
index 743625aa2..46e54d649 100644
--- a/src/components/component/scheduled-job/job-scheduler-details.tsx
+++ b/src/components/component/scheduled-job/job-scheduler-details.tsx
@@ -1,5 +1,4 @@
 import { List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import type { Component } from '../../../store/radix-api';
@@ -15,7 +14,7 @@ export const JobSchedulerDetails: FunctionComponent<{
       <List.Item key="status">
         <div className="grid grid--gap-small grid--auto-columns">
           <Typography>status</Typography>
-          <ComponentStatusBadge status={component.status} />
+          <ComponentStatusBadge status={component.status ?? 'Reconciling'} />
         </div>
       </List.Item>
       <List.Item key="port">
@@ -29,7 +28,8 @@ export const JobSchedulerDetails: FunctionComponent<{
       </List.Item>
       <List.Item key="payload-path">
         payload path{' '}
-        {component.scheduledJobPayloadPath?.length > 0 ? (
+        {component.scheduledJobPayloadPath &&
+        component.scheduledJobPayloadPath.length > 0 ? (
           <strong>{component.scheduledJobPayloadPath}</strong>
         ) : (
           <strong>is empty</strong>
@@ -41,7 +41,8 @@ export const JobSchedulerDetails: FunctionComponent<{
           <List className="o-indent-list">
             <List.Item key="webhook">
               webhook{' '}
-              {component.notifications.webhook?.length > 0 ? (
+              {component.notifications.webhook &&
+              component.notifications.webhook.length > 0 ? (
                 <strong>{component.notifications.webhook}</strong>
               ) : (
                 <strong>is empty</strong>
@@ -60,7 +61,3 @@ export const JobSchedulerDetails: FunctionComponent<{
     )}
   </>
 );
-
-JobSchedulerDetails.propTypes = {
-  component: PropTypes.object.isRequired as PropTypes.Validator<Component>,
-};
diff --git a/src/components/component/scheduled-job/payload.tsx b/src/components/component/scheduled-job/payload.tsx
index 63c5980e0..2e2ca41b5 100644
--- a/src/components/component/scheduled-job/payload.tsx
+++ b/src/components/component/scheduled-job/payload.tsx
@@ -1,8 +1,4 @@
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import { Code } from '../../code';
-
 import './style.css';
 import { pollingInterval } from '../../../store/defaults';
 import { useGetJobPayloadQuery } from '../../../store/radix-api';
@@ -14,12 +10,12 @@ export interface PayloadProps {
   jobName: string;
 }
 
-export const Payload: FunctionComponent<PayloadProps> = ({
+export const Payload = ({
   appName,
   envName,
   jobComponentName,
   jobName,
-}) => {
+}: PayloadProps) => {
   const { data } = useGetJobPayloadQuery(
     {
       appName,
@@ -38,10 +34,3 @@ export const Payload: FunctionComponent<PayloadProps> = ({
     </div>
   );
 };
-
-Payload.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-};
diff --git a/src/components/component/scheduled-job/restart-batch.tsx b/src/components/component/scheduled-job/restart-batch.tsx
index 5ba15aa5c..c07f75033 100644
--- a/src/components/component/scheduled-job/restart-batch.tsx
+++ b/src/components/component/scheduled-job/restart-batch.tsx
@@ -1,5 +1,4 @@
 import { Button, List, Radio, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import { formatDateTime } from '../../../utils/datetime';
@@ -20,8 +19,8 @@ interface Props {
   deploymentName: string;
   batchName: string;
   smallBatchName: string;
-  onSuccess: () => void;
-  onDone: () => void;
+  onSuccess?: () => unknown;
+  onDone?: () => unknown;
 }
 
 export function RestartBatch({
@@ -59,11 +58,11 @@ export function RestartBatch({
       }).unwrap();
 
       infoToast(`Batch '${smallBatchName}' successfully copied.`);
-      onSuccess();
+      onSuccess?.();
     } catch (e) {
       errorToast(`Error copying batch '${smallBatchName}'`);
     } finally {
-      onDone();
+      onDone?.();
     }
   }
 
@@ -76,83 +75,82 @@ export function RestartBatch({
         batchName,
       }).unwrap();
       infoToast(`Batch '${smallBatchName}' successfully restarted.`);
-      onSuccess();
+      onSuccess?.();
     } catch (e) {
       errorToast(`Error restarting batch '${smallBatchName}'`);
     } finally {
-      onDone();
+      onDone?.();
     }
   }
 
+  if (!batchDeployment) {
+    return null;
+  }
+
   return (
     <div className="restart-job-content">
-      {batchDeployment && activeDeployment && (
-        <div>
-          {batchDeployment.activeTo ? (
-            <List className="grid grid--gap-medium">
-              <List.Item key="current">
-                <div className="grid grid--auto-columns restart-job-deployment-options">
-                  <Radio
-                    name="deploymentOptions"
-                    value="restart"
-                    checked={shouldRestart}
-                    onChange={() => setShouldRestart(true)}
-                  />
-                  <div className="grid grid--gap-small restart-job-deployment-option">
-                    <Typography>
-                      Restart with current batch deployment{' '}
-                      {batchDeployment.name} (active between{' '}
-                      {formatDateTime(batchDeployment.activeFrom)} and{' '}
-                      {formatDateTime(batchDeployment.activeTo)}).
-                    </Typography>
-                    <Typography>
-                      Existing batch jobs <strong>{batchName}</strong> <br />
-                      will be deleted and started again.
-                    </Typography>
-                  </div>
-                </div>
-              </List.Item>
-              <List.Item key="active">
-                <div className="grid grid--auto-columns restart-job-deployment-options">
-                  <Radio
-                    name="deploymentOptions"
-                    value="copy"
-                    checked={!shouldRestart}
-                    onChange={() => setShouldRestart(false)}
-                  />
-                  <div className="grid grid--gap-small restart-job-deployment-option">
-                    <Typography className="restart-job-deployment-option">
-                      Create new batch with deployment {activeDeployment.name}{' '}
-                      (active from {formatDateTime(activeDeployment.activeFrom)}
-                      ).
-                    </Typography>
-                  </div>
-                </div>
-              </List.Item>
-            </List>
-          ) : (
-            <>
-              <Typography className="restart-job-deployment-item">
-                The batch deployment <strong>{batchDeployment.name}</strong> is{' '}
-                <strong>active</strong> (from:{' '}
-                {formatDateTime(activeDeployment.activeFrom)})
-              </Typography>
-              <Typography className="restart-job-deployment-item">
-                Existing batch jobs <strong>{batchName}</strong> <br />
-                will be deleted and started again.
-              </Typography>
-            </>
-          )}
-        </div>
+      {batchDeployment.activeTo && activeDeployment ? (
+        <List className="grid grid--gap-medium">
+          <List.Item key="current">
+            <div className="grid grid--auto-columns restart-job-deployment-options">
+              <Radio
+                name="deploymentOptions"
+                value="restart"
+                checked={shouldRestart}
+                onChange={() => setShouldRestart(true)}
+              />
+              <div className="grid grid--gap-small restart-job-deployment-option">
+                <Typography>
+                  Restart with current batch deployment {batchDeployment.name}{' '}
+                  (active between {formatDateTime(batchDeployment.activeFrom)}{' '}
+                  and {formatDateTime(batchDeployment.activeTo)}).
+                </Typography>
+                <Typography>
+                  Existing batch jobs <strong>{batchName}</strong> <br />
+                  will be deleted and started again.
+                </Typography>
+              </div>
+            </div>
+          </List.Item>
+          <List.Item key="active">
+            <div className="grid grid--auto-columns restart-job-deployment-options">
+              <Radio
+                name="deploymentOptions"
+                value="copy"
+                checked={!shouldRestart}
+                onChange={() => setShouldRestart(false)}
+              />
+              <div className="grid grid--gap-small restart-job-deployment-option">
+                <Typography className="restart-job-deployment-option">
+                  Create new batch with deployment {activeDeployment.name}{' '}
+                  (active from {formatDateTime(activeDeployment.activeFrom)}
+                  ).
+                </Typography>
+              </div>
+            </div>
+          </List.Item>
+        </List>
+      ) : (
+        <>
+          <Typography className="restart-job-deployment-item">
+            The batch deployment <strong>{batchDeployment.name}</strong> is{' '}
+            <strong>active</strong> (from:{' '}
+            {formatDateTime(batchDeployment.activeFrom)})
+          </Typography>
+          <Typography className="restart-job-deployment-item">
+            Existing batch jobs <strong>{batchName}</strong> <br />
+            will be deleted and started again.
+          </Typography>
+        </>
       )}
       <div className="grid grid--gap-medium">
         <Button.Group className="grid grid--gap-small grid--auto-columns restart-job-buttons">
           <Button
-            disabled={isLoading}
+            disabled={isLoading || (!shouldRestart && !activeDeployment)}
             onClick={() => {
               shouldRestart
                 ? onRestartBatch()
-                : onCopyBatch(activeDeployment.name);
+                : onCopyBatch(activeDeployment!.name);
             }}
           >
             Restart
@@ -163,14 +161,3 @@ export function RestartBatch({
     </div>
   );
 }
-
-RestartBatch.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-  batchName: PropTypes.string.isRequired,
-  smallBatchName: PropTypes.string.isRequired,
-  onSuccess: PropTypes.func.isRequired,
-  onDone: PropTypes.func.isRequired,
-};
diff --git a/src/components/component/scheduled-job/restart-job.tsx b/src/components/component/scheduled-job/restart-job.tsx
index 62e463da2..4f8726551 100644
--- a/src/components/component/scheduled-job/restart-job.tsx
+++ b/src/components/component/scheduled-job/restart-job.tsx
@@ -1,5 +1,4 @@
 import { Button, List, Radio, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import { formatDateTime } from '../../../utils/datetime';
@@ -85,72 +84,74 @@ export function RestartJob({
     }
   };
 
+  if (!jobDeployment) {
+    return null;
+  }
+
   return (
     <div className="restart-job-content">
-      {jobDeployment && activeDeployment && (
-        <div>
-          {jobDeployment.activeTo ? (
-            <List className="grid grid--gap-medium">
-              <List.Item key="current">
-                <div className="grid grid--auto-columns restart-job-deployment-options">
-                  <Radio
-                    name="deploymentOptions"
-                    value="restart"
-                    checked={shouldRestart}
-                    onChange={() => setShouldRestart(true)}
-                  />
-                  <div className="grid grid--gap-small restart-job-deployment-option">
-                    <Typography>
-                      Restart with current job deployment {jobDeployment.name}{' '}
-                      (active between {formatDateTime(jobDeployment.activeFrom)}{' '}
-                      and {formatDateTime(jobDeployment.activeTo)}).
-                    </Typography>
-                    <Typography>
-                      Existing job <strong>{jobName}</strong> <br />
-                      will be deleted and started again.
-                    </Typography>
-                  </div>
-                </div>
-              </List.Item>
-              <List.Item key="active">
-                <div className="grid grid--auto-columns restart-job-deployment-options">
-                  <Radio
-                    name="deploymentOptions"
-                    value="copy"
-                    checked={!shouldRestart}
-                    onChange={() => setShouldRestart(false)}
-                  />
-                  <div className="grid grid--gap-small restart-job-deployment-option">
-                    <Typography className="restart-job-deployment-option">
-                      Create new job with deployment {activeDeployment.name}{' '}
-                      (active from {formatDateTime(activeDeployment.activeFrom)}
-                      ).
-                    </Typography>
-                  </div>
-                </div>
-              </List.Item>
-            </List>
-          ) : (
-            <>
-              <Typography className="restart-job-deployment-item">
-                The job deployment <strong>{jobDeployment.name}</strong> is{' '}
-                <strong>active</strong> (from:{' '}
-                {formatDateTime(activeDeployment.activeFrom)})
-              </Typography>
-              <Typography className="restart-job-deployment-item">
-                Existing job <strong>{jobName}</strong> <br />
-                will be deleted and started again.
-              </Typography>
-            </>
-          )}
-        </div>
+      {jobDeployment.activeTo && activeDeployment ? (
+        <List className="grid grid--gap-medium">
+          <List.Item key="current">
+            <div className="grid grid--auto-columns restart-job-deployment-options">
+              <Radio
+                name="deploymentOptions"
+                value="restart"
+                checked={shouldRestart}
+                onChange={() => setShouldRestart(true)}
+              />
+              <div className="grid grid--gap-small restart-job-deployment-option">
+                <Typography>
+                  Restart with current job deployment {jobDeployment.name}{' '}
+                  (active between {formatDateTime(jobDeployment.activeFrom)} and{' '}
+                  {formatDateTime(jobDeployment.activeTo)}).
+                </Typography>
+                <Typography>
+                  Existing job <strong>{jobName}</strong> <br />
+                  will be deleted and started again.
+                </Typography>
+              </div>
+            </div>
+          </List.Item>
+          <List.Item key="active">
+            <div className="grid grid--auto-columns restart-job-deployment-options">
+              <Radio
+                name="deploymentOptions"
+                value="copy"
+                checked={!shouldRestart}
+                onChange={() => setShouldRestart(false)}
+              />
+              <div className="grid grid--gap-small restart-job-deployment-option">
+                <Typography className="restart-job-deployment-option">
+                  Create new job with deployment {activeDeployment.name} (active
+                  from {formatDateTime(activeDeployment.activeFrom)}
+                  ).
+                </Typography>
+              </div>
+            </div>
+          </List.Item>
+        </List>
+      ) : (
+        <>
+          <Typography className="restart-job-deployment-item">
+            The job deployment <strong>{jobDeployment.name}</strong> is{' '}
+            <strong>active</strong> (from:{' '}
+            {formatDateTime(jobDeployment.activeFrom)})
+          </Typography>
+          <Typography className="restart-job-deployment-item">
+            Existing job <strong>{jobName}</strong> <br />
+            will be deleted and started again.
+          </Typography>
+        </>
       )}
       <div className="grid grid--gap-medium">
         <Button.Group className="grid grid--gap-small grid--auto-columns restart-job-buttons">
           <Button
-            disabled={isLoading}
+            disabled={isLoading || (!shouldRestart && !activeDeployment)}
             onClick={() => {
-              shouldRestart ? onRestartJob() : onCopyJob(activeDeployment.name);
+              shouldRestart
+                ? onRestartJob()
+                : onCopyJob(activeDeployment!.name); //Button will be disabled if activeDeployment is undefined
             }}
           >
             Restart
@@ -161,14 +162,3 @@ export function RestartJob({
     </div>
   );
 }
-
-RestartJob.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  smallJobName: PropTypes.string.isRequired,
-  onSuccess: PropTypes.func,
-  onDone: PropTypes.func.isRequired,
-};
diff --git a/src/components/component/scheduled-job/scheduled-batch-list.tsx b/src/components/component/scheduled-job/scheduled-batch-list.tsx
index d53391482..1b763dd49 100644
--- a/src/components/component/scheduled-job/scheduled-batch-list.tsx
+++ b/src/components/component/scheduled-job/scheduled-batch-list.tsx
@@ -13,7 +13,6 @@ import {
   stop,
 } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import { Fragment, useCallback, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -29,10 +28,10 @@ import {
 import { promiseHandler } from '../../../utils/promise-handler';
 import { getScheduledBatchUrl } from '../../../utils/routing';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../../utils/sort-utils';
 import { smallScheduledBatchName } from '../../../utils/string';
 import { TableSortIcon, getNewSortDir } from '../../../utils/table-sort-utils';
@@ -54,7 +53,7 @@ type Props = {
   envName: string;
   jobComponentName: string;
   scheduledBatchList?: Array<ScheduledBatchSummary>;
-  fetchBatches?: () => void;
+  fetchBatches?: () => unknown;
 };
 
 export function ScheduledBatchList({
@@ -66,8 +65,8 @@ export function ScheduledBatchList({
 }: Props) {
   const [deleteBatch] = useDeleteBatchMutation();
   const [stopBatch] = useStopBatchMutation();
-  const [dateSort, setDateSort] = useState<sortDirection>();
-  const [statusSort, setStatusSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>();
+  const [statusSort, setStatusSort] = useState<SortDirection>();
   const [expandedRows, setExpandedRows] = useState<Record<string, boolean>>({});
   const [visibleRestartScrims, setVisibleRestartScrims] = useState<
     Record<string, boolean>
@@ -203,14 +202,11 @@ export function ScheduledBatchList({
                             <BatchJobStatuses jobs={batch.jobList} />
                           </Table.Cell>
                           <Table.Cell>
-                            <RelativeToNow
-                              time={new Date(batch.created)}
-                              capitalize
-                            />
+                            <RelativeToNow time={batch.created} capitalize />
                           </Table.Cell>
                           <Table.Cell>
                             <Duration
-                              start={new Date(batch.created)}
+                              start={batch.created}
                               end={
                                 batch.ended ? new Date(batch.ended) : new Date()
                               }
@@ -318,13 +314,3 @@ export function ScheduledBatchList({
     </Accordion>
   );
 }
-
-ScheduledBatchList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  scheduledBatchList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ScheduledBatchSummary>
-  ),
-  fetchBatches: PropTypes.func,
-};
diff --git a/src/components/component/scheduled-job/scheduled-job-list.tsx b/src/components/component/scheduled-job/scheduled-job-list.tsx
index 379ae01bd..7e2417463 100644
--- a/src/components/component/scheduled-job/scheduled-job-list.tsx
+++ b/src/components/component/scheduled-job/scheduled-job-list.tsx
@@ -14,7 +14,6 @@ import {
   stop,
 } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import {
   Fragment,
   type FunctionComponent,
@@ -41,10 +40,10 @@ import {
   getScheduledJobUrl,
 } from '../../../utils/routing';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../../utils/sort-utils';
 import { smallScheduledJobName } from '../../../utils/string';
 import { TableSortIcon, getNewSortDir } from '../../../utils/table-sort-utils';
@@ -61,9 +60,9 @@ function isJobStoppable(status: ScheduledJobSummary['status']): boolean {
 }
 
 const JobReplicaInfo: FunctionComponent<{
-  replicaList: Array<ReplicaSummary>;
+  replicaList?: Array<ReplicaSummary>;
 }> = ({ replicaList }) =>
-  replicaList?.length > 0 ? (
+  replicaList && replicaList.length > 0 ? (
     <ReplicaImage replica={replicaList[0]} />
   ) : (
     <Typography>
@@ -97,8 +96,8 @@ export const ScheduledJobList: FunctionComponent<{
 }) => {
   const [deleteJob] = useDeleteJobMutation();
   const [stopJob] = useStopJobMutation();
-  const [dateSort, setDateSort] = useState<sortDirection>();
-  const [statusSort, setStatusSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>(undefined);
+  const [statusSort, setStatusSort] = useState<SortDirection>(undefined);
   const [expandedRows, setExpandedRows] = useState<Record<string, boolean>>({});
   const [visiblePayloadScrims, setVisiblePayloadScrims] = useState<
     Record<string, boolean>
@@ -181,10 +180,10 @@ export const ScheduledJobList: FunctionComponent<{
                 </Table.Head>
                 <Table.Body>
                   {sortedData
-                    .map((x) => ({
-                      job: x,
-                      smallJobName: smallScheduledJobName(x.name),
-                      expanded: !!expandedRows[x.name],
+                    .map((job) => ({
+                      job,
+                      smallJobName: smallScheduledJobName(job.name),
+                      expanded: !!expandedRows[job.name],
                     }))
                     .map(({ job, smallJobName, expanded }, i) => (
                       <Fragment key={i}>
@@ -241,14 +240,11 @@ export const ScheduledJobList: FunctionComponent<{
                             <ProgressStatusBadge status={job.status} />
                           </Table.Cell>
                           <Table.Cell className="whitespace-nowrap">
-                            <RelativeToNow
-                              time={new Date(job.created)}
-                              capitalize
-                            />
+                            <RelativeToNow time={job.created} capitalize />
                           </Table.Cell>
                           <Table.Cell className="whitespace-nowrap">
                             <Duration
-                              start={new Date(job.created)}
+                              start={job.created}
                               end={job.ended ? new Date(job.ended) : new Date()}
                             />
                           </Table.Cell>
@@ -388,18 +384,3 @@ export const ScheduledJobList: FunctionComponent<{
     </Accordion>
   );
 };
-
-ScheduledJobList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  totalJobCount: PropTypes.number.isRequired,
-  scheduledJobList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ScheduledJobSummary>
-  ),
-  batchName: PropTypes.string,
-  isDeletable: PropTypes.bool,
-  fetchJobs: PropTypes.func,
-  isExpanded: PropTypes.bool,
-  onExpanded: PropTypes.func,
-};
diff --git a/src/components/component/secrets/active-component-secrets.tsx b/src/components/component/secrets/active-component-secrets.tsx
index 846f4bc85..ac3e27e18 100644
--- a/src/components/component/secrets/active-component-secrets.tsx
+++ b/src/components/component/secrets/active-component-secrets.tsx
@@ -1,5 +1,4 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useEffect, useState } from 'react';
 
 import {
@@ -156,10 +155,3 @@ export const ActiveComponentSecrets: FunctionComponent<{
     </Accordion>
   );
 };
-
-ActiveComponentSecrets.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  secretNames: PropTypes.arrayOf(PropTypes.string),
-};
diff --git a/src/components/component/secrets/dev.tsx b/src/components/component/secrets/dev.tsx
index 47619ce56..ffa7fe542 100644
--- a/src/components/component/secrets/dev.tsx
+++ b/src/components/component/secrets/dev.tsx
@@ -5,7 +5,6 @@ import { Fragment } from 'react';
 import { SecretOverview } from './secret-overview';
 
 import type {
-  ChangeComponentSecretApiResponse,
   GetEnvironmentApiArg,
   GetEnvironmentApiResponse,
 } from '../../../store/radix-api';
@@ -13,7 +12,13 @@ import type {
 const testData: Array<GetEnvironmentApiResponse> = [
   {
     name: 'env1',
-    activeDeployment: { namespace: 'any', repository: 'any' },
+    activeDeployment: {
+      environment: 'any',
+      name: 'alsdjflasj-asdfkljasdf',
+      namespace: 'any',
+      repository: 'any',
+      activeFrom: new Date('2023-12-01T11:27:17Z').toISOString(),
+    },
     secrets: [
       { name: 'secret_1', status: 'Consistent', component: 'component_1' },
       { name: 'secret_2', status: 'Pending', component: 'component_2' },
@@ -21,7 +26,13 @@ const testData: Array<GetEnvironmentApiResponse> = [
   },
   {
     name: 'env2',
-    activeDeployment: { namespace: 'any', repository: 'any' },
+    activeDeployment: {
+      environment: 'any',
+      name: 'alsdjflasj-asdfkljasdf',
+      namespace: 'any',
+      repository: 'any',
+      activeFrom: new Date('2023-12-01T11:27:17Z').toISOString(),
+    },
     secrets: [
       { name: 'pandora', status: 'Pending', component: 'component_1' },
       { name: 'ellipsis', status: 'NotAvailable', component: 'component_2' },
@@ -39,13 +50,14 @@ new Server({
         testData.find(
           ({ name }) =>
             name === (request.params as GetEnvironmentApiArg).envName
-        )
+        )!
     );
 
     // Mock response for ChangeComponentSecret
     this.put(
       '/api/v1/applications/:appName/environments/:envName/components/:componentName/secrets/:secretName',
-      (): ChangeComponentSecretApiResponse => void 0
+      // @ts-expect-error no idea what it should do
+      () => undefined
     );
   },
 });
@@ -61,12 +73,12 @@ export default (
       <Fragment key={i}>
         <Typography variant="h1_bold">TestData "{name}"</Typography>
         <div className="o-layout-constrained" style={{ margin: 'auto' }}>
-          {secrets.map(({ name: secretName, component }, j) => (
+          {secrets!.map(({ name: secretName, component }, j) => (
             <SecretOverview
               key={j}
               appName={`testData_${i}`}
-              envName={name}
-              componentName={component}
+              envName={name!}
+              componentName={component!}
               secretName={secretName}
             />
           ))}
diff --git a/src/components/component/secrets/secret-list-item-title-azure-key-vault-item.tsx b/src/components/component/secrets/secret-list-item-title-azure-key-vault-item.tsx
index b3c3ee0c0..b9000b77f 100644
--- a/src/components/component/secrets/secret-list-item-title-azure-key-vault-item.tsx
+++ b/src/components/component/secrets/secret-list-item-title-azure-key-vault-item.tsx
@@ -1,8 +1,6 @@
 import { Icon, Table, Typography } from '@equinor/eds-core-react';
 import { stop } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import { type FunctionComponent, useState } from 'react';
-
+import { useState } from 'react';
 import {
   type AzureKeyVaultSecretVersion,
   type Secret,
@@ -23,11 +21,11 @@ function consumerSecretName(
   batchName?: string,
   jobName?: string
 ): string {
-  if (batchName?.length > 0) {
+  if (batchName && batchName.length > 0) {
     // show only first secret-version entry for pods of this batch
     return `batch: ${smallScheduledBatchName(batchName)}`;
   }
-  if (jobName?.length > 0) {
+  if (jobName && jobName.length > 0) {
     return `job: ${smallScheduledJobName(jobName)}`;
   }
   if (replicaName.toLowerCase() === 'new jobs') {
@@ -36,19 +34,19 @@ function consumerSecretName(
   return `replica: ${smallReplicaName(replicaName)}`;
 }
 
-const ConsumerSecretCreated: FunctionComponent<AzureKeyVaultSecretVersion> = ({
+const ConsumerSecretCreated = ({
   replicaCreated,
   replicaName,
   batchCreated,
   batchName,
   jobCreated,
   jobName,
-}) => {
-  if (batchName?.length > 0) {
-    return <Duration start={new Date(batchCreated)} end={new Date()} />;
+}: AzureKeyVaultSecretVersion) => {
+  if (batchName && batchName.length > 0) {
+    return <Duration start={batchCreated} end={new Date()} />;
   }
-  if (jobName?.length > 0) {
-    return <Duration start={new Date(jobCreated)} end={new Date()} />;
+  if (jobName && jobName.length > 0) {
+    return <Duration start={jobCreated} end={new Date()} />;
   }
   if (replicaName.toLowerCase() === 'new jobs') {
     return <></>;
@@ -56,14 +54,22 @@ const ConsumerSecretCreated: FunctionComponent<AzureKeyVaultSecretVersion> = ({
   return <Duration start={new Date(replicaCreated)} end={new Date()} />;
 };
 
-export const SecretListItemTitleAzureKeyVaultItem: FunctionComponent<{
+type AzureKeyVaultItemProps = {
   appName: string;
   envName: string;
   componentName: string;
   title: string;
   scrimTitle?: string;
   secret: Pick<Secret, 'resource' | 'id'>;
-}> = ({ appName, envName, componentName, title, scrimTitle, secret }) => {
+};
+export const SecretListItemTitleAzureKeyVaultItem = ({
+  appName,
+  envName,
+  componentName,
+  title,
+  scrimTitle,
+  secret,
+}: AzureKeyVaultItemProps) => {
   const [visibleScrim, setVisibleScrim] = useState(false);
   const [pollingInterval, setPollingInterval] = useState(0);
 
@@ -72,7 +78,7 @@ export const SecretListItemTitleAzureKeyVaultItem: FunctionComponent<{
       appName,
       envName,
       componentName,
-      azureKeyVaultName: secret.resource,
+      azureKeyVaultName: secret.resource!,
       secretName: secret.id,
     },
     {
@@ -160,12 +166,3 @@ export const SecretListItemTitleAzureKeyVaultItem: FunctionComponent<{
     </>
   );
 };
-
-SecretListItemTitleAzureKeyVaultItem.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  title: PropTypes.string.isRequired,
-  scrimTitle: PropTypes.string,
-  secret: PropTypes.object.isRequired as PropTypes.Validator<Secret>,
-};
diff --git a/src/components/component/secrets/secret-overview.tsx b/src/components/component/secrets/secret-overview.tsx
index 602caab70..eca5be87b 100644
--- a/src/components/component/secrets/secret-overview.tsx
+++ b/src/components/component/secrets/secret-overview.tsx
@@ -1,6 +1,3 @@
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import { pollingInterval } from '../../../store/defaults';
 import { radixApi, useGetEnvironmentQuery } from '../../../store/radix-api';
 import { getFetchErrorMessage } from '../../../store/utils';
@@ -8,13 +5,20 @@ import AsyncResource from '../../async-resource/async-resource';
 import { errorToast, successToast } from '../../global-top-nav/styled-toaster';
 import { SecretForm } from '../../secret-form';
 
-export const SecretOverview: FunctionComponent<{
+type Props = {
   appName: string;
   componentName: string;
   envName: string;
   secretName: string;
   onSave?: () => void;
-}> = ({ appName, componentName, envName, secretName, onSave }) => {
+};
+export const SecretOverview = ({
+  appName,
+  componentName,
+  envName,
+  secretName,
+  onSave,
+}: Props) => {
   const { data, refetch, ...envState } = useGetEnvironmentQuery(
     { appName, envName },
     { skip: !appName || !envName, pollingInterval }
@@ -63,11 +67,3 @@ export const SecretOverview: FunctionComponent<{
     </AsyncResource>
   );
 };
-
-SecretOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  secretName: PropTypes.string.isRequired,
-  onSave: PropTypes.func,
-};
diff --git a/src/components/component/secrets/secret-tables.tsx b/src/components/component/secrets/secret-tables.tsx
index 19016ee26..1a8bb0977 100644
--- a/src/components/component/secrets/secret-tables.tsx
+++ b/src/components/component/secrets/secret-tables.tsx
@@ -1,5 +1,4 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import {
   type FunctionComponent,
   type ReactNode,
@@ -9,9 +8,9 @@ import {
 
 import type { Secret } from '../../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareString,
-  type sortDirection,
 } from '../../../utils/sort-utils';
 import { ScrimPopup } from '../../scrim-popup';
 import { ComponentSecretStatusBadge } from '../../status-badges';
@@ -29,22 +28,15 @@ export type SecretComponent<T extends object = object> = FunctionComponent<
   }
 >;
 
-const secretPropTypes = Object.freeze<SecretComponent['propTypes']>({
-  appName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  secrets: PropTypes.arrayOf(PropTypes.object as PropTypes.Validator<Secret>)
-    .isRequired,
-});
-
-const SecretLink: FunctionComponent<{
+type Props = {
   title: string;
   scrimTitle?: ReactNode;
   appName: string;
   componentName: string;
   envName: string;
   secretName: string;
-}> = ({ title, scrimTitle, ...rest }) => {
+};
+const SecretLink = ({ title, scrimTitle, ...rest }: Props) => {
   const [visibleScrim, setVisibleScrim] = useState(false);
 
   return (
@@ -81,8 +73,8 @@ function getDisplayName({
 
 function useGetSortedSecrets(
   secrets: Array<Secret>,
-  nameSort?: sortDirection | null,
-  resourceSort?: sortDirection | null
+  nameSort?: SortDirection,
+  resourceSort?: SortDirection
 ): Array<Secret> {
   const [sortedData, setSortedData] = useState(secrets);
 
@@ -150,15 +142,13 @@ export const GenericSecrets: SecretComponent = ({
   );
 };
 
-GenericSecrets.propTypes = { ...secretPropTypes };
-
 export const KeyVaultSecrets: SecretComponent = ({
   appName,
   envName,
   componentName,
   secrets,
 }) => {
-  const sortedSecrets = useGetSortedSecrets(secrets, null, 'ascending');
+  const sortedSecrets = useGetSortedSecrets(secrets, undefined, 'ascending');
 
   return (
     <Table className="secret-table">
@@ -202,8 +192,6 @@ export const KeyVaultSecrets: SecretComponent = ({
   );
 };
 
-KeyVaultSecrets.propTypes = { ...secretPropTypes };
-
 export const VolumeMountSecrets: SecretComponent = ({
   appName,
   envName,
@@ -244,5 +232,3 @@ export const VolumeMountSecrets: SecretComponent = ({
     </Table>
   );
 };
-
-VolumeMountSecrets.propTypes = { ...secretPropTypes };
diff --git a/src/components/component/unknown-ad-groups-alert.tsx b/src/components/component/unknown-ad-groups-alert.tsx
index 5a6733443..7630527e2 100644
--- a/src/components/component/unknown-ad-groups-alert.tsx
+++ b/src/components/component/unknown-ad-groups-alert.tsx
@@ -14,12 +14,12 @@ export function UnknownADGroupsAlert({
     <Alert type="danger">
       Unknown or deleted Entra object(s)
       <List className="o-indent-list">
-        {unknownADGroups.map((adGroup) => (
+        {unknownADGroups?.map((adGroup) => (
           <List.Item key={adGroup}>
             <Icon data={group} size={16} /> {adGroup}
           </List.Item>
         ))}
-        {unknownADUsers.map((adSp) => (
+        {unknownADUsers?.map((adSp) => (
           <List.Item key={adSp}>
             <Icon data={computer} size={16} /> {adSp}
           </List.Item>
diff --git a/src/components/config-list/index.tsx b/src/components/config-list/index.tsx
index 18470b43b..5010b43c5 100644
--- a/src/components/config-list/index.tsx
+++ b/src/components/config-list/index.tsx
@@ -3,9 +3,9 @@ import type { FunctionComponent } from 'react';
 
 import { configVariables } from '../../utils/config';
 
-const ConfigVariableTableCell: FunctionComponent<{ value: unknown }> = ({
-  value,
-}) => (
+const ConfigVariableTableCell: FunctionComponent<{
+  value: string[] | unknown;
+}> = ({ value }) => (
   <Table.Cell>
     <pre>
       <Typography>
@@ -34,7 +34,10 @@ export const ConfigList: FunctionComponent = () => (
               <Table.Cell>
                 <Typography>{key}</Typography>
               </Table.Cell>
-              <ConfigVariableTableCell value={configVariables[key]} />
+              <ConfigVariableTableCell
+                // @ts-expect-error key is mapped to string, even if its always keyof configVariable
+                value={configVariables[key]}
+              />
             </Table.Row>
           ))}
       </Table.Body>
diff --git a/src/components/configure-application-github/index.tsx b/src/components/configure-application-github/index.tsx
index 0b3226919..2e18ab366 100644
--- a/src/components/configure-application-github/index.tsx
+++ b/src/components/configure-application-github/index.tsx
@@ -7,7 +7,6 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { nanoid } from 'nanoid';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import imageDeployKey from './deploy-key02.png';
@@ -251,7 +250,9 @@ export const ConfigureApplicationGithub = ({
                       <List.Item>
                         The Shared Secret for this application is{' '}
                         <code>{secrets?.sharedSecret}</code>{' '}
-                        <CompactCopyButton content={secrets?.sharedSecret} />
+                        <CompactCopyButton
+                          content={secrets?.sharedSecret ?? ''}
+                        />
                       </List.Item>
                       <List.Item>Press "Add webhook"</List.Item>
                     </List>
@@ -265,14 +266,3 @@ export const ConfigureApplicationGithub = ({
     </div>
   );
 };
-
-ConfigureApplicationGithub.propTypes = {
-  app: PropTypes.object
-    .isRequired as PropTypes.Validator<ApplicationRegistration>,
-  onDeployKeyChange: PropTypes.func.isRequired,
-  startVisible: PropTypes.bool,
-  useOtherCiToolOptionVisible: PropTypes.bool,
-  deployKeyTitle: PropTypes.string,
-  webhookTitle: PropTypes.string,
-  initialSecretPollInterval: PropTypes.number,
-};
diff --git a/src/components/create-application-form/index.tsx b/src/components/create-application-form/index.tsx
index f3b81c769..205bbe359 100644
--- a/src/components/create-application-form/index.tsx
+++ b/src/components/create-application-form/index.tsx
@@ -111,8 +111,9 @@ export default function CreateApplicationForm({ onCreated }: Props) {
         },
       }).unwrap();
 
+      // the response will only contains an application if there are no warnings
       //Only call onCreated when created without warnings, or created with ack warnings
-      if (!response.warnings?.length || acknowledgeWarnings) {
+      if (response.applicationRegistration) {
         onCreated(response.applicationRegistration);
         addAppNameToLocalStorage(response.applicationRegistration.name);
         refreshApps({});
diff --git a/src/components/create-job-form/index.tsx b/src/components/create-job-form/index.tsx
index 99f059d05..43137322e 100644
--- a/src/components/create-job-form/index.tsx
+++ b/src/components/create-job-form/index.tsx
@@ -1,6 +1,5 @@
 import { NativeSelect, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import { type ComponentProps, type FunctionComponent, useMemo } from 'react';
+import { type FunctionComponent, useMemo } from 'react';
 
 import { useSearchParams } from 'react-router-dom';
 import { pollingInterval } from '../../store/defaults';
@@ -16,16 +15,6 @@ import { useGetApplicationBranches } from './use-get-application-branches';
 import './style.css';
 import AsyncResource from '../async-resource/async-resource';
 
-export interface CreateJobFormProps {
-  appName: string;
-  onSuccess: (jobName: string) => void;
-}
-
-type SupportedPipelineNames =
-  | ComponentProps<typeof PipelineFormBuildBranches>['pipelineName']
-  | ComponentProps<typeof PipelineFormPromote>['pipelineName']
-  | ComponentProps<typeof PipelineFormApplyConfig>['pipelineName'];
-
 export type FormProp = {
   application: Application;
   onSuccess: (jobName: string) => void;
@@ -38,10 +27,16 @@ const Pipelines = {
   promote: PipelineFormPromote,
   deploy: PipelineFormDeploy,
   'apply-config': PipelineFormApplyConfig,
-} satisfies Record<SupportedPipelineNames, FunctionComponent<FormProp>>;
+} satisfies Record<string, FunctionComponent<FormProp>>;
+
+type SupportedPipelineNames = keyof typeof Pipelines;
 
 const pipelineSearchParam = 'pipeline';
 
+export interface CreateJobFormProps {
+  appName: string;
+  onSuccess: (jobName: string) => void;
+}
 export default function CreateJobForm({
   appName,
   onSuccess,
@@ -62,15 +57,13 @@ export default function CreateJobForm({
 
   const pipeline = useMemo(() => {
     const urlPipeline = searchParams.get(pipelineSearchParam);
-    if (Object.keys(Pipelines).includes(urlPipeline)) {
-      return urlPipeline;
+    if (urlPipeline && Object.keys(Pipelines).includes(urlPipeline)) {
+      return urlPipeline as SupportedPipelineNames;
     }
 
-    return !hasEnvironments
-      ? 'apply-config'
-      : hasBuildBranches
-        ? 'build-deploy'
-        : '';
+    return (
+      !hasEnvironments ? 'apply-config' : hasBuildBranches ? 'build-deploy' : ''
+    ) as SupportedPipelineNames;
   }, [searchParams, hasEnvironments, hasBuildBranches]);
 
   const PipelineForm = Pipelines[pipeline];
@@ -99,7 +92,7 @@ export default function CreateJobForm({
           </option>
         ))}
       </NativeSelect>
-      {PipelineForm && (
+      {PipelineForm && application && (
         <PipelineForm
           onSuccess={onSuccess}
           application={application}
@@ -109,7 +102,3 @@ export default function CreateJobForm({
     </AsyncResource>
   );
 }
-CreateJobForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-  onSuccess: PropTypes.func.isRequired,
-};
diff --git a/src/components/create-job-form/missing-radix-config-alert.tsx b/src/components/create-job-form/missing-radix-config-alert.tsx
index 3fcf7868c..e3bbfbef0 100644
--- a/src/components/create-job-form/missing-radix-config-alert.tsx
+++ b/src/components/create-job-form/missing-radix-config-alert.tsx
@@ -12,8 +12,8 @@ export const MissingRadixConfigAlert = ({ application }: Props) => (
     <Icon data={info_circle} color="primary" />
     <span className="grid grid--gap-small">
       <Typography>
-        The <RadixConfigFileLink registration={application?.registration} />{' '}
-        file must be read by Radix before using this pipeline job.
+        The <RadixConfigFileLink registration={application.registration} /> file
+        must be read by Radix before using this pipeline job.
       </Typography>
       <Typography>
         Run the{' '}
diff --git a/src/components/create-job-form/pipeline-form-build-branches.tsx b/src/components/create-job-form/pipeline-form-build-branches.tsx
index ceacae98d..ac324f0ff 100644
--- a/src/components/create-job-form/pipeline-form-build-branches.tsx
+++ b/src/components/create-job-form/pipeline-form-build-branches.tsx
@@ -7,6 +7,7 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { info_circle } from '@equinor/eds-icons';
+import { uniq } from 'lodash-es';
 import { type ChangeEvent, type FormEvent, useState } from 'react';
 import {
   useTriggerPipelineBuildDeployMutation,
@@ -25,7 +26,8 @@ export function PipelineFormBuildBranches({
   application,
   pipelineName,
 }: FormProp) {
-  const hasEnvironments = application?.environments?.length > 0;
+  const hasEnvironments =
+    application.environments && application.environments.length > 0;
   const isBuildDeployPipeline = pipelineName === 'build-deploy';
   const [triggerBuild, buildState] = useTriggerPipelineBuildMutation();
   const [triggerBuildDeploy, buildDeployState] =
@@ -37,7 +39,7 @@ export function PipelineFormBuildBranches({
   const [toEnvironment, setToEnvironment] = useState('');
   const branches = useGetApplicationBranches(application);
   const hasBranches = Object.keys(branches).length > 0;
-  const [filteredBranches, setFilteredBranches] = useState([]);
+  const [filteredBranches, setFilteredBranches] = useState<string[]>([]);
 
   const handleOnTextChange = ({
     target: { value },
@@ -54,12 +56,10 @@ export function PipelineFormBuildBranches({
       }
       return val;
     };
-    const values = Array.from(
-      new Set(
-        Object.entries(branches)
-          .filter(([key]) => new RegExp(cleanRegex(key)).test(value))
-          .flatMap(([, commits]) => commits)
-      )
+    const values = uniq(
+      Object.entries(branches)
+        .filter(([key]) => new RegExp(cleanRegex(key)).test(value))
+        .flatMap(([, commits]) => commits)
     );
     setFilteredBranches(values);
   };
@@ -90,10 +90,10 @@ export function PipelineFormBuildBranches({
     `Created ${pipelineName} pipeline job`
   );
   const isAnyValidRegex = (pattern: string): boolean => {
-    return pattern && /[\^$.*+?()[\]{}|\\]/.test(pattern);
+    return pattern.length > 0 && /[\^$.*+?()[\]{}|\\]/.test(pattern);
   };
   const isValidBranchName = (branch: string): boolean => {
-    return branch && !/[\^$*+?()[\]{}|\\]/.test(branch);
+    return branch.length > 0 && !/[\^$*+?()[\]{}|\\]/.test(branch);
   };
   return (
     <form onSubmit={handleSubmit}>
diff --git a/src/components/create-job-form/pipeline-form-deploy.tsx b/src/components/create-job-form/pipeline-form-deploy.tsx
index ced4c862d..ea2043c44 100644
--- a/src/components/create-job-form/pipeline-form-deploy.tsx
+++ b/src/components/create-job-form/pipeline-form-deploy.tsx
@@ -14,7 +14,8 @@ import type { FormProp } from './index';
 import { MissingRadixConfigAlert } from './missing-radix-config-alert';
 
 export function PipelineFormDeploy({ application, onSuccess }: FormProp) {
-  const hasEnvironments = application?.environments?.length > 0;
+  const hasEnvironments =
+    application.environments && application.environments.length > 0;
   const [trigger, state] = useTriggerPipelineDeployMutation();
   const [toEnvironment, setToEnvironment] = useState('');
   const handleSubmit = handlePromiseWithToast(
diff --git a/src/components/create-job-form/pipeline-form-promote.tsx b/src/components/create-job-form/pipeline-form-promote.tsx
index 7193853ab..90c3cfc4b 100644
--- a/src/components/create-job-form/pipeline-form-promote.tsx
+++ b/src/components/create-job-form/pipeline-form-promote.tsx
@@ -24,7 +24,8 @@ import type { FormProp } from './index';
 import { MissingRadixConfigAlert } from './missing-radix-config-alert';
 
 export function PipelineFormPromote({ application, onSuccess }: FormProp) {
-  const hasEnvironments = application?.environments?.length > 0;
+  const hasEnvironments =
+    application.environments && application.environments.length > 0;
   const [searchParams] = useSearchParams();
   const [trigger, state] = useTriggerPipelinePromoteMutation();
   const { data: deployments } = useGetDeploymentsQuery(
diff --git a/src/components/create-job-form/use-get-application-branches.ts b/src/components/create-job-form/use-get-application-branches.ts
index 555d97d81..12954fc11 100644
--- a/src/components/create-job-form/use-get-application-branches.ts
+++ b/src/components/create-job-form/use-get-application-branches.ts
@@ -1,13 +1,13 @@
 import type { Application } from '../../store/radix-api';
 
-export function useGetApplicationBranches(application: Application) {
+export function useGetApplicationBranches(application?: Application) {
   return (
     application?.environments
       ?.filter(({ branchMapping }) => !!branchMapping)
       .reduce<Record<string, Array<string>>>(
         (obj, { branchMapping, name }) => ({
           ...obj,
-          [branchMapping]: [...(obj[branchMapping] || []), name],
+          [branchMapping!]: [...(obj[branchMapping!] || []), name],
         }),
         {}
       ) ?? {}
diff --git a/src/components/data-chart/index.tsx b/src/components/data-chart/index.tsx
index 4103a26f3..0817afaef 100644
--- a/src/components/data-chart/index.tsx
+++ b/src/components/data-chart/index.tsx
@@ -25,7 +25,7 @@ export const AvailabilityCharts = () => {
     );
   }
 
-  if (uptime.length === 0) {
+  if (!uptime || uptime.length === 0) {
     return (
       <Typography variant="body_short_bold">
         Not enough data to display charts
diff --git a/src/components/deployments-list/deployment-summary-table-row.tsx b/src/components/deployments-list/deployment-summary-table-row.tsx
index a70633d73..3a68e2435 100644
--- a/src/components/deployments-list/deployment-summary-table-row.tsx
+++ b/src/components/deployments-list/deployment-summary-table-row.tsx
@@ -1,13 +1,10 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 import { Link } from 'react-router-dom';
-
 import { routes } from '../../routes';
 import type { DeploymentSummary } from '../../store/radix-api';
 import { routeWithParams, smallDeploymentName } from '../../utils/string';
 import { CommitHash } from '../commit-hash';
-import { StatusBadge } from '../status-badges';
+import { GenericStatusBadge } from '../status-badges';
 import { RelativeToNow } from '../time/relative-to-now';
 
 export interface DeploymentSummaryTableRowProps {
@@ -17,9 +14,12 @@ export interface DeploymentSummaryTableRowProps {
   inEnv?: boolean;
 }
 
-export const DeploymentSummaryTableRow: FunctionComponent<
-  DeploymentSummaryTableRowProps
-> = ({ appName, deployment, repo, inEnv }) => {
+export const DeploymentSummaryTableRow = ({
+  appName,
+  deployment,
+  repo,
+  inEnv,
+}: DeploymentSummaryTableRowProps) => {
   const deploymentLink = routeWithParams(routes.appDeployment, {
     appName: appName,
     deploymentName: deployment.name,
@@ -28,10 +28,7 @@ export const DeploymentSummaryTableRow: FunctionComponent<
     appName: appName,
     envName: deployment.environment,
   });
-  const promotedFromLink = routeWithParams(routes.appEnvironment, {
-    appName: appName,
-    envName: deployment.promotedFromEnvironment,
-  });
+
   const commitHash = deployment.gitCommitHash || deployment.commitID;
   return (
     <Table.Row>
@@ -62,9 +59,11 @@ export const DeploymentSummaryTableRow: FunctionComponent<
           </Table.Cell>
           <Table.Cell>
             {deployment.activeTo ? (
-              <StatusBadge variant="default">Inactive</StatusBadge>
+              <GenericStatusBadge variant="default">
+                Inactive
+              </GenericStatusBadge>
             ) : (
-              <StatusBadge variant="active">Active</StatusBadge>
+              <GenericStatusBadge variant="active">Active</GenericStatusBadge>
             )}
           </Table.Cell>
         </>
@@ -74,18 +73,19 @@ export const DeploymentSummaryTableRow: FunctionComponent<
         <CommitHash commit={commitHash} repo={repo} />
       </Table.Cell>
       <Table.Cell>
-        <Typography as={Link} to={promotedFromLink} link>
-          {deployment.promotedFromEnvironment}
-        </Typography>
+        {deployment.promotedFromEnvironment && (
+          <Typography
+            as={Link}
+            to={routeWithParams(routes.appEnvironment, {
+              appName: appName,
+              envName: deployment.promotedFromEnvironment ?? '',
+            })}
+            link
+          >
+            {deployment.promotedFromEnvironment}
+          </Typography>
+        )}
       </Table.Cell>
     </Table.Row>
   );
 };
-
-DeploymentSummaryTableRow.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deployment: PropTypes.object
-    .isRequired as PropTypes.Validator<DeploymentSummary>,
-  repo: PropTypes.string,
-  inEnv: PropTypes.bool,
-};
diff --git a/src/components/deployments-list/index.tsx b/src/components/deployments-list/index.tsx
index 4048c143e..bfb2593f8 100644
--- a/src/components/deployments-list/index.tsx
+++ b/src/components/deployments-list/index.tsx
@@ -1,6 +1,5 @@
 import { Icon, Table, Typography } from '@equinor/eds-core-react';
 import { send } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useEffect, useState } from 'react';
 
 import { DeploymentSummaryTableRow } from './deployment-summary-table-row';
@@ -11,10 +10,10 @@ import {
   useGetApplicationQuery,
 } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
 
@@ -34,12 +33,12 @@ export const DeploymentsList: FunctionComponent<DeploymentsListProps> = ({
   inEnv,
 }) => {
   const { data } = useGetApplicationQuery({ appName }, { pollingInterval });
-  const repo = data?.registration.repository;
+  const repo = data?.registration?.repository;
 
   const [sortedData, setSortedData] = useState(deployments || []);
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
-  const [envSort, setEnvSort] = useState<sortDirection>();
-  const [pipelineSort, setPipelineSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
+  const [envSort, setEnvSort] = useState<SortDirection>();
+  const [pipelineSort, setPipelineSort] = useState<SortDirection>();
 
   useEffect(() => {
     setSortedData(
@@ -129,12 +128,3 @@ export const DeploymentsList: FunctionComponent<DeploymentsListProps> = ({
     </div>
   );
 };
-
-DeploymentsList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deployments: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<DeploymentSummary>
-  ),
-  limit: PropTypes.number,
-  inEnv: PropTypes.bool,
-};
diff --git a/src/components/environment-variables/environment-variable-table.tsx b/src/components/environment-variables/environment-variable-table.tsx
index 3a2574e61..6fb52589e 100644
--- a/src/components/environment-variables/environment-variable-table.tsx
+++ b/src/components/environment-variables/environment-variable-table.tsx
@@ -1,31 +1,29 @@
 import { Table, TextField, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { ChangeEvent, FunctionComponent, ReactNode } from 'react';
-
+import type { ChangeEvent, ReactNode } from 'react';
 import type { EnvVar } from '../../store/radix-api';
-
 import './style.css';
 
 export interface FormattedEnvVar {
-  value: string;
+  value?: string;
   original: EnvVar;
 }
 
-export const EnvironmentVariableTable: FunctionComponent<{
+type Props = {
   values: Array<FormattedEnvVar>;
   valuePrefix?: ReactNode;
   isTextfieldDisabled?: boolean;
   inEditMode?: boolean;
   showOriginal?: boolean;
   onValueChange?: (value: string, name: string) => void;
-}> = ({
+};
+export const EnvironmentVariableTable = ({
   values,
   valuePrefix,
   isTextfieldDisabled,
   inEditMode,
   showOriginal,
   onValueChange = () => void 0,
-}) => (
+}: Props) => (
   <Table className="env-vars-table">
     <Table.Head className="whitespace-nowrap">
       <Table.Row>
@@ -69,17 +67,3 @@ export const EnvironmentVariableTable: FunctionComponent<{
     </Table.Body>
   </Table>
 );
-
-EnvironmentVariableTable.propTypes = {
-  values: PropTypes.arrayOf<FormattedEnvVar>(
-    PropTypes.shape({
-      value: PropTypes.string.isRequired,
-      original: PropTypes.object.isRequired as PropTypes.Validator<EnvVar>,
-    }) as PropTypes.Validator<FormattedEnvVar>
-  ),
-  valuePrefix: PropTypes.node,
-  inEditMode: PropTypes.bool,
-  isTextfieldDisabled: PropTypes.bool,
-  showOriginal: PropTypes.bool,
-  onValueChange: PropTypes.func,
-};
diff --git a/src/components/environment-variables/index.tsx b/src/components/environment-variables/index.tsx
index b9f7aacb3..743be1777 100644
--- a/src/components/environment-variables/index.tsx
+++ b/src/components/environment-variables/index.tsx
@@ -6,14 +6,8 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { edit, restore_page, save } from '@equinor/eds-icons';
-import { isNil, isString } from 'lodash';
-import * as PropTypes from 'prop-types';
-import {
-  type FunctionComponent,
-  useCallback,
-  useEffect,
-  useState,
-} from 'react';
+import { isNil, isString } from 'lodash-es';
+import { useCallback, useEffect, useState } from 'react';
 
 import {
   EnvironmentVariableTable,
@@ -23,7 +17,6 @@ import {
 import {
   type Component,
   type EnvVar,
-  type EnvVarParameter,
   radixApi,
   useEnvVarsQuery,
 } from '../../store/radix-api';
@@ -50,7 +43,7 @@ function isRadixVariable({ name }: EnvVar): boolean {
   return isString(name) && !!name.match('(RADIX|RADIXOPERATOR)_*');
 }
 
-export const EnvironmentVariables: FunctionComponent<{
+type Props = {
   appName: string;
   envName: string;
   componentName: string;
@@ -59,7 +52,8 @@ export const EnvironmentVariables: FunctionComponent<{
   readonly?: boolean;
   isExpanded?: boolean;
   onExpanded?: (isExpanded: boolean) => void;
-}> = ({
+};
+export const EnvironmentVariables = ({
   appName,
   envName,
   componentName,
@@ -68,7 +62,7 @@ export const EnvironmentVariables: FunctionComponent<{
   readonly,
   isExpanded,
   onExpanded,
-}) => {
+}: Props) => {
   const [componentVars, setComponentVars] = useState<FormattedEnvVar[]>([]);
   const [radixVars, setRadixVars] = useState<FormattedEnvVar[]>([]);
   const [inEditMode, setInEditMode] = useState(false);
@@ -119,8 +113,8 @@ export const EnvironmentVariables: FunctionComponent<{
     if (readonly) return;
 
     const body = componentVars
-      .filter((x) => x.value !== x.original.value)
-      .map<EnvVarParameter>((x) => ({ name: x.original.name, value: x.value }));
+      .filter((x) => x.value != undefined && x.value !== x.original.value)
+      .map((x) => ({ name: x.original.name, value: x.value! }));
     if (body.length > 0) {
       try {
         await saveFunc({ appName, envName, componentName, body }).unwrap();
@@ -236,16 +230,3 @@ export const EnvironmentVariables: FunctionComponent<{
     </Accordion>
   );
 };
-
-EnvironmentVariables.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  componentType: PropTypes.string.isRequired as PropTypes.Validator<
-    Component['type']
-  >,
-  hideRadixVars: PropTypes.bool,
-  readonly: PropTypes.bool,
-  isExpanded: PropTypes.bool,
-  onExpanded: PropTypes.func,
-};
diff --git a/src/components/environments-summary/dev.tsx b/src/components/environments-summary/dev.tsx
index b3facfa8e..f7dd8d165 100644
--- a/src/components/environments-summary/dev.tsx
+++ b/src/components/environments-summary/dev.tsx
@@ -81,7 +81,23 @@ export default (
     {testData.map((x, i) => (
       <div key={i}>
         <EnvironmentsSummary
-          application={{ environments: x, userIsAdmin: true }}
+          application={{
+            environments: x,
+            userIsAdmin: true,
+            name: 'any-name',
+            registration: {
+              adGroups: [],
+              adUsers: [],
+              configBranch: '',
+              creator: '',
+              name: '',
+              owner: '',
+              readerAdGroups: [],
+              readerAdUsers: [],
+              repository: '',
+              sharedSecret: '',
+            },
+          }}
         />
         {i !== testData.length - 1 && <Divider />}
       </div>
diff --git a/src/components/environments-summary/environment-card-status.tsx b/src/components/environments-summary/environment-card-status.tsx
index 216f099b7..080478003 100644
--- a/src/components/environments-summary/environment-card-status.tsx
+++ b/src/components/environments-summary/environment-card-status.tsx
@@ -12,29 +12,21 @@ import {
   stop,
   warning_outlined,
 } from '@equinor/eds-icons';
-import { upperFirst } from 'lodash';
+import { upperFirst } from 'lodash-es';
 import type React from 'react';
-import { type FunctionComponent, useRef, useState } from 'react';
-
-import {
-  EnvironmentStatus,
-  getEnvironmentStatusType,
-} from './environment-status-utils';
-
+import { useRef, useState } from 'react';
 import type { ImageScan, Vulnerability } from '../../store/scan-api';
 import { StatusBadgeTemplate } from '../status-badges/status-badge-template';
 import { StatusPopover } from '../status-popover/status-popover';
 import { VulnerabilitySummary } from '../vulnerability-summary';
-
+import {
+  EnvironmentStatus,
+  getEnvironmentStatusType,
+} from './environment-status-utils';
 import './style.css';
 
 export type EnvironmentCardStatusMap = Record<string, EnvironmentStatus>;
 
-export interface EnvironmentCardStatusProps {
-  title?: string;
-  statusElements: EnvironmentCardStatusMap;
-}
-
 const StatusIconMap: Record<EnvironmentStatus, React.JSX.Element> = {
   [EnvironmentStatus.Consistent]: <Icon data={check} />,
   [EnvironmentStatus.Running]: <Icon data={run} />,
@@ -44,9 +36,7 @@ const StatusIconMap: Record<EnvironmentStatus, React.JSX.Element> = {
   [EnvironmentStatus.Danger]: <Icon data={error_outlined} />,
 };
 
-const EnvironmentStatusIcon: FunctionComponent<{
-  status: EnvironmentStatus;
-}> = ({ status }) => {
+const EnvironmentStatusIcon = ({ status }: { status: EnvironmentStatus }) => {
   switch (status) {
     case EnvironmentStatus.Warning:
       return (
@@ -63,12 +53,18 @@ const EnvironmentStatusIcon: FunctionComponent<{
   }
 };
 
-export const EnvironmentVulnerabilityIndicator: FunctionComponent<{
+type Props = {
   title?: string;
   size?: number;
   visibleKeys?: Array<Lowercase<Vulnerability['severity']>>;
-  summary: ImageScan['vulnerabilitySummary'];
-}> = ({ title, summary, size = 24, ...rest }) => {
+  summary: Required<ImageScan>['vulnerabilitySummary'];
+};
+export const EnvironmentVulnerabilityIndicator = ({
+  title,
+  summary,
+  size = 24,
+  ...rest
+}: Props) => {
   const [popoverOpen, setPopoverOpen] = useState(false);
   const containerRef = useRef<HTMLDivElement>(null);
 
@@ -111,9 +107,15 @@ export const EnvironmentVulnerabilityIndicator: FunctionComponent<{
   );
 };
 
-export const EnvironmentCardStatus: FunctionComponent<
-  EnvironmentCardStatusProps
-> = ({ title, statusElements }) => {
+export interface EnvironmentCardStatusProps {
+  title?: string;
+  statusElements: EnvironmentCardStatusMap;
+}
+
+export const EnvironmentCardStatus = ({
+  title,
+  statusElements,
+}: EnvironmentCardStatusProps) => {
   const keys = Object.keys(statusElements ?? {});
   const aggregatedStatus: EnvironmentStatus = keys.reduce(
     (obj, key) =>
diff --git a/src/components/environments-summary/environment-card.tsx b/src/components/environments-summary/environment-card.tsx
index 6128c4f6a..9ab13d124 100644
--- a/src/components/environments-summary/environment-card.tsx
+++ b/src/components/environments-summary/environment-card.tsx
@@ -1,8 +1,6 @@
 import { Divider, Icon, Typography } from '@equinor/eds-core-react';
 import { github, link, send } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type React from 'react';
-import { type FunctionComponent, useEffect } from 'react';
 import { Link } from 'react-router-dom';
 
 import {
@@ -25,7 +23,10 @@ import {
   type ReplicaSummary,
   useComponentsQuery,
 } from '../../store/radix-api';
-import { type Vulnerability, scanApi } from '../../store/scan-api';
+import {
+  type Vulnerability,
+  useGetEnvironmentVulnerabilitySummaryQuery,
+} from '../../store/scan-api';
 import { filterFields } from '../../utils/filter-fields';
 import { routeWithParams } from '../../utils/string';
 import AsyncResource from '../async-resource/async-resource';
@@ -37,21 +38,16 @@ import { getAppDeploymentUrl } from '../../utils/routing';
 
 type CardContent = { header: React.JSX.Element; body: React.JSX.Element };
 
-export interface EnvironmentCardProps {
-  appName: string;
-  env: Readonly<EnvironmentSummary>;
-  repository?: string;
-}
-
 const visibleKeys: Array<Lowercase<Vulnerability['severity']>> = [
   'critical',
   'high',
 ];
 
-const DeploymentDetails: FunctionComponent<{
+type Props = {
   appName: string;
-  deployment: Readonly<DeploymentSummary>;
-}> = ({ appName, deployment }) =>
+  deployment?: Readonly<DeploymentSummary>;
+};
+const DeploymentDetails = ({ appName, deployment }: Props) =>
   !deployment ? (
     <Typography color="disabled">
       <Icon data={link} style={{ marginRight: 'var(--eds_spacing_small)' }} />
@@ -86,13 +82,11 @@ function CardContentBuilder(
     },
     { pollingInterval }
   );
-  const [envScanTrigger, { data: envScan, ...envScanState }] =
-    scanApi.endpoints.getEnvironmentVulnerabilitySummary.useLazyQuery();
-
-  useEffect(() => {
-    const request = envScanTrigger({ appName, envName });
-    return () => request?.abort();
-  }, [appName, envScanTrigger, envName]);
+  const { data: envScan, ...envScanState } =
+    useGetEnvironmentVulnerabilitySummaryQuery(
+      { appName, envName },
+      { pollingInterval: 0 }
+    );
 
   const vulnerabilities = environmentVulnerabilitySummarizer(envScan);
   const replicas = (components ?? []).reduce<Array<ReplicaSummary>>(
@@ -101,15 +95,15 @@ function CardContentBuilder(
   );
 
   const elements: EnvironmentCardStatusMap = {
-    Components: aggregateComponentEnvironmentStatus(components),
+    Components: aggregateComponentEnvironmentStatus(components ?? []),
     ...(replicas.length > 0 && {
-      Replicas: aggregateComponentReplicaEnvironmentStatus(components),
+      Replicas: aggregateComponentReplicaEnvironmentStatus(components ?? []),
     }),
   };
 
   const statusElement = (
     <AsyncResource asyncState={componentsState} errorContent={false}>
-      {components?.length > 0 && (
+      {components && components.length > 0 && (
         <div className="grid grid--gap-x-small grid--auto-columns">
           {visibleKeys.some((key) => vulnerabilities[key] > 0) && (
             <EnvironmentVulnerabilityIndicator
@@ -138,7 +132,7 @@ function CardContentBuilder(
     ),
     body: (
       <AsyncResource asyncState={componentsState} errorContent={false}>
-        {components?.length > 0 && (
+        {components && components.length > 0 && (
           <EnvironmentIngress {...{ appName, envName, components }} />
         )}
       </AsyncResource>
@@ -146,11 +140,16 @@ function CardContentBuilder(
   };
 }
 
-export const EnvironmentCard: FunctionComponent<EnvironmentCardProps> = ({
+type EnvironmentCardProps = {
+  appName: string;
+  env: EnvironmentSummary;
+  repository?: string;
+};
+export const EnvironmentCard = ({
   appName,
   env,
   repository,
-}) => {
+}: EnvironmentCardProps) => {
   const deployment = env.activeDeployment;
   const { header, body }: CardContent = !deployment?.name
     ? {
@@ -224,9 +223,3 @@ export const EnvironmentCard: FunctionComponent<EnvironmentCardProps> = ({
     </div>
   );
 };
-
-EnvironmentCard.propTypes = {
-  appName: PropTypes.string.isRequired,
-  env: PropTypes.object.isRequired as PropTypes.Validator<EnvironmentSummary>,
-  repository: PropTypes.string,
-};
diff --git a/src/components/environments-summary/environment-ingress.tsx b/src/components/environments-summary/environment-ingress.tsx
index b6fe384e3..fef287ece 100644
--- a/src/components/environments-summary/environment-ingress.tsx
+++ b/src/components/environments-summary/environment-ingress.tsx
@@ -1,8 +1,5 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { type IconData, link, memory } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import { Link } from 'react-router-dom';
 import type { Component } from '../../store/radix-api';
 import {
@@ -30,10 +27,11 @@ function getComponentUrl(
     : getActiveComponentUrl(appName, environmentName, component.name);
 }
 
-const ComponentDetails: FunctionComponent<{
+type ComponentDetailsProps = {
   icon: IconData;
   component: Readonly<Component>;
-}> = ({ icon, component }) => (
+};
+const ComponentDetails = ({ icon, component }: ComponentDetailsProps) => (
   <>
     <Icon data={icon} style={{ marginRight: 'var(--eds_spacing_small)' }} />
     <Typography
@@ -49,17 +47,17 @@ const ComponentDetails: FunctionComponent<{
   </>
 );
 
-export const EnvironmentIngress: FunctionComponent<EnvironmentIngressProps> = ({
+export const EnvironmentIngress = ({
   appName,
   envName,
   components,
-}) => {
+}: EnvironmentIngressProps) => {
   const comps = components.reduce<{
     public: Array<Component>;
     passive: Array<Component>;
   }>(
     (obj, x) => {
-      obj[!x.variables[URL_VAR_NAME] ? 'passive' : 'public'].push(x);
+      obj[!x.variables?.[URL_VAR_NAME] ? 'passive' : 'public'].push(x);
       return obj;
     },
     { public: [], passive: [] }
@@ -81,7 +79,7 @@ export const EnvironmentIngress: FunctionComponent<EnvironmentIngressProps> = ({
         comps.public.map((component) => (
           <ExternalLink
             key={component.name}
-            href={`https://${component.variables[URL_VAR_NAME]}`}
+            href={`https://${component.variables?.[URL_VAR_NAME] ?? ''}`}
             className=""
           >
             <ComponentDetails icon={link} component={component} />
@@ -113,11 +111,3 @@ export const EnvironmentIngress: FunctionComponent<EnvironmentIngressProps> = ({
     </>
   );
 };
-
-EnvironmentIngress.propTypes = {
-  appName: PropTypes.string.isRequired,
-  components: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<Component>
-  ).isRequired,
-  envName: PropTypes.string.isRequired,
-};
diff --git a/src/components/environments-summary/environment-status-utils.ts b/src/components/environments-summary/environment-status-utils.ts
index 45e210275..8ce3ccd1d 100644
--- a/src/components/environments-summary/environment-status-utils.ts
+++ b/src/components/environments-summary/environment-status-utils.ts
@@ -1,8 +1,4 @@
-import type {
-  AuxiliaryResourceDeployment,
-  Component,
-  ReplicaStatus,
-} from '../../store/radix-api';
+import type { Component } from '../../store/radix-api';
 import type {
   EnvironmentVulnerabilities,
   ImageScan,
@@ -11,6 +7,7 @@ import type { StatusBadgeTemplateType } from '../status-badges/status-badge-temp
 import type { StatusPopoverType } from '../status-popover/status-popover';
 import type { StatusTooltipTemplateType } from '../status-tooltips/status-tooltip-template';
 
+export type VulnerabilitySummary = Required<ImageScan>['vulnerabilitySummary'];
 export enum EnvironmentStatus {
   Consistent = 0,
   Running = 1,
@@ -24,63 +21,59 @@ type EnvironmentStatusType = StatusBadgeTemplateType &
   StatusPopoverType &
   StatusTooltipTemplateType;
 
-const ComponentStatusMap = Object.freeze<
-  Partial<Record<Component['status'], EnvironmentStatus>>
->({
+const ComponentStatusMap = {
   Stopped: EnvironmentStatus.Stopped,
   Consistent: EnvironmentStatus.Consistent,
-});
+} as const;
 
-const AuxiliaryResourceDeploymentStatusMap = Object.freeze<
-  Partial<Record<AuxiliaryResourceDeployment['status'], EnvironmentStatus>>
->({
+const AuxiliaryResourceDeploymentStatusMap = {
   Stopped: EnvironmentStatus.Stopped,
   Consistent: EnvironmentStatus.Consistent,
-});
+} as const;
 
-const ReplicaStatusMap = Object.freeze<
-  Partial<Record<ReplicaStatus['status'], EnvironmentStatus>>
->({
+const ReplicaStatusMap = {
   Running: EnvironmentStatus.Running,
   Starting: EnvironmentStatus.Starting,
-});
+} as const;
 
 export function aggregateComponentEnvironmentStatus(
-  components: Readonly<Array<Component>>
+  components: Component[]
 ): EnvironmentStatus {
-  return (components ?? []).reduce<EnvironmentStatus>(
-    (obj, { status, oauth2 }) =>
-      Math.max(
-        ComponentStatusMap[status] ?? EnvironmentStatus.Warning,
-        AuxiliaryResourceDeploymentStatusMap[
-          oauth2?.deployment.status ?? 'Consistent'
-        ] ?? EnvironmentStatus.Warning,
-        obj
-      ),
-    EnvironmentStatus.Consistent
-  );
+  return components.reduce<EnvironmentStatus>((obj, { status, oauth2 }) => {
+    const compStatus = status ?? 'unknown';
+    const oauth2Status = oauth2?.deployment.status ?? 'Consistent';
+    return Math.max(
+      // @ts-expect-error ComponentStatusMap will fallback to Warning if undefined
+      ComponentStatusMap[compStatus] ?? EnvironmentStatus.Warning,
+      // @ts-expect-error ComponentStatusMap will fallback to Warning if undefined
+      AuxiliaryResourceDeploymentStatusMap[oauth2Status] ??
+        EnvironmentStatus.Warning,
+      obj
+    );
+  }, EnvironmentStatus.Consistent);
 }
 
 export function aggregateComponentReplicaEnvironmentStatus(
-  components: Readonly<Array<Component>>
+  components: Component[]
 ): EnvironmentStatus {
-  const replicas = (components ?? [])
+  const replicas = components
     .flatMap((c) => c.replicaList)
-    .concat(components.flatMap((c) => c.oauth2?.deployment.replicaList ?? []));
+    .concat(components?.flatMap((c) => c.oauth2?.deployment.replicaList ?? []))
+    .filter((x) => !!x);
 
-  return replicas.reduce<EnvironmentStatus>(
-    (obj, { replicaStatus }) =>
-      Math.max(
-        ReplicaStatusMap[replicaStatus?.status] ?? EnvironmentStatus.Warning,
-        obj
-      ),
-    EnvironmentStatus.Consistent
-  );
+  return replicas.reduce((obj, { replicaStatus }) => {
+    const status = replicaStatus?.status ?? 'Pending';
+    return Math.max(
+      // @ts-expect-error ComponentStatusMap will fallback to Warning if undefined
+      ReplicaStatusMap[status] ?? EnvironmentStatus.Warning,
+      obj
+    );
+  }, EnvironmentStatus.Consistent);
 }
 
 export function aggregateVulnerabilitySummaries(
-  summaries: Readonly<Array<ImageScan['vulnerabilitySummary']>>
-): ImageScan['vulnerabilitySummary'] {
+  summaries: VulnerabilitySummary[]
+): VulnerabilitySummary {
   return summaries
     .filter((x) => !!x)
     .reduce(
@@ -94,23 +87,20 @@ export function aggregateVulnerabilitySummaries(
 }
 
 export function environmentVulnerabilitySummarizer(
-  envScans: Readonly<EnvironmentVulnerabilities>
-): ImageScan['vulnerabilitySummary'] {
-  return Object.keys(envScans ?? {})
-    .filter(
-      (x: keyof Omit<EnvironmentVulnerabilities, 'name'>) =>
-        x === 'components' || x === 'jobs'
-    )
-    .reduce<ImageScan['vulnerabilitySummary']>(
-      (obj, key1) =>
-        aggregateVulnerabilitySummaries([
-          obj,
-          ...Object.keys(envScans[key1]).map<ImageScan['vulnerabilitySummary']>(
-            (key2) => envScans[key1][key2].vulnerabilitySummary
-          ),
-        ]),
-      {}
-    );
+  envScans?: EnvironmentVulnerabilities
+): VulnerabilitySummary {
+  const componentSummaries = Object.values(envScans?.components ?? {})
+    .map((c) => c.vulnerabilitySummary)
+    .filter((c) => !!c);
+
+  const jobSummaries = Object.values(envScans?.jobs ?? {})
+    .map((c) => c.vulnerabilitySummary)
+    .filter((c) => !!c);
+
+  return aggregateVulnerabilitySummaries([
+    ...componentSummaries,
+    ...jobSummaries,
+  ]);
 }
 
 export function getEnvironmentStatusType(
diff --git a/src/components/environments-summary/index.tsx b/src/components/environments-summary/index.tsx
index 56e233509..55b9f3822 100644
--- a/src/components/environments-summary/index.tsx
+++ b/src/components/environments-summary/index.tsx
@@ -16,7 +16,7 @@ export const EnvironmentsSummary = ({
 }: EnvironmentsSummaryProps) => {
   return (
     <>
-      {application.environments?.length > 0 ? (
+      {application.environments && application.environments.length > 0 ? (
         <div className="environments-summary">
           {application.environments?.map((env, i) => (
             <EnvironmentCard
diff --git a/src/components/events-list/event-summary.tsx b/src/components/events-list/event-summary.tsx
index 67d698a4c..7bb531305 100644
--- a/src/components/events-list/event-summary.tsx
+++ b/src/components/events-list/event-summary.tsx
@@ -1,5 +1,4 @@
 import { List, Table } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import type { Event } from '../../store/radix-api';
@@ -8,7 +7,7 @@ import {
   isEventResolved,
   isWarningEvent,
 } from '../../utils/event-model';
-import { StatusBadge } from '../status-badges';
+import { GenericStatusBadge } from '../status-badges';
 import { RelativeToNow } from '../time/relative-to-now';
 
 export interface EventSummaryProps {
@@ -19,9 +18,9 @@ const WarningState: FunctionComponent<{ event: Readonly<Event> }> = ({
   event,
 }) => {
   if (isEventObsolete(event)) {
-    return <StatusBadge type="success">Obsolete</StatusBadge>;
+    return <GenericStatusBadge type="success">Obsolete</GenericStatusBadge>;
   } else if (isEventResolved(event)) {
-    return <StatusBadge type="success">Resolved</StatusBadge>;
+    return <GenericStatusBadge type="success">Resolved</GenericStatusBadge>;
   }
 
   return null;
@@ -33,16 +32,18 @@ export const EventSummary: FunctionComponent<EventSummaryProps> = ({
   <Table.Row>
     <Table.Cell>
       <RelativeToNow
-        time={new Date(event.lastTimestamp)}
+        time={event.lastTimestamp}
         titlePrefix="Start"
         capitalize
       />
     </Table.Cell>
     <Table.Cell>
       <div className="type">
-        <StatusBadge type={isWarningEvent(event) ? 'warning' : 'success'}>
+        <GenericStatusBadge
+          type={isWarningEvent(event) ? 'warning' : 'success'}
+        >
           {event.type}
-        </StatusBadge>
+        </GenericStatusBadge>
         <WarningState event={event} />
       </div>
     </Table.Cell>
@@ -51,10 +52,9 @@ export const EventSummary: FunctionComponent<EventSummaryProps> = ({
     </Table.Cell>
     <Table.Cell className="wrap">
       {event.reason} - {event.message}
-      {event.involvedObjectState?.pod &&
-        event.involvedObjectState?.pod.restartCount > 0 && (
-          <>. Restarted {event.involvedObjectState.pod.restartCount} times</>
-        )}
+      {(event.involvedObjectState?.pod?.restartCount ?? 0) > 0 && (
+        <>. Restarted {event.involvedObjectState!.pod!.restartCount} times</>
+      )}
       {event.involvedObjectState?.ingressRules && (
         <>
           <List>
@@ -80,7 +80,3 @@ export const EventSummary: FunctionComponent<EventSummaryProps> = ({
     </Table.Cell>
   </Table.Row>
 );
-
-EventSummary.propTypes = {
-  event: PropTypes.object.isRequired as PropTypes.Validator<Event>,
-};
diff --git a/src/components/events-list/index.tsx b/src/components/events-list/index.tsx
index 0038facde..1b9239b3d 100644
--- a/src/components/events-list/index.tsx
+++ b/src/components/events-list/index.tsx
@@ -1,6 +1,5 @@
 import { Accordion, Icon, Table, Typography } from '@equinor/eds-core-react';
 import { settings } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import { EventSummary } from './event-summary';
@@ -58,10 +57,3 @@ export const EventsList: FunctionComponent<EventsListProps> = ({
     </Accordion.Item>
   </Accordion>
 );
-
-EventsList.propTypes = {
-  events: PropTypes.arrayOf(PropTypes.object as PropTypes.Validator<Event>)
-    .isRequired,
-  isExpanded: PropTypes.bool.isRequired,
-  onExpanded: PropTypes.func,
-};
diff --git a/src/components/external-dns-list/index.tsx b/src/components/external-dns-list/index.tsx
index 60158c38c..bb7de5eea 100644
--- a/src/components/external-dns-list/index.tsx
+++ b/src/components/external-dns-list/index.tsx
@@ -1,16 +1,8 @@
-import {
-  Fragment,
-  type FunctionComponent,
-  useCallback,
-  useMemo,
-  useState,
-} from 'react';
-
 import { Icon, Table, Typography } from '@equinor/eds-core-react';
 import { chevron_down, chevron_up } from '@equinor/eds-icons';
 import clsx from 'clsx';
 import { differenceInDays } from 'date-fns';
-import * as PropTypes from 'prop-types';
+import { Fragment, useCallback, useMemo, useState } from 'react';
 import type { ExternalDns, Tls, TlsAutomation } from '../../store/radix-api';
 import { dataSorter, sortCompareString } from '../../utils/sort-utils';
 import { pluraliser } from '../../utils/string';
@@ -73,10 +65,11 @@ function TlsAutomationStatusMessage({
 
 const dayPluraliser = pluraliser('day', 'days');
 
-export const ExternalDNSList: FunctionComponent<{
+type Props = {
   externalDnsList: Array<ExternalDns>;
   onItemClick?: (item: ExternalDns) => void;
-}> = ({ externalDnsList, onItemClick }) => {
+};
+export const ExternalDNSList = ({ externalDnsList, onItemClick }: Props) => {
   const sortedExternalDnsList = useMemo(
     () =>
       dataSorter(externalDnsList, [
@@ -104,128 +97,104 @@ export const ExternalDNSList: FunctionComponent<{
         </Table.Row>
       </Table.Head>
       <Table.Body>
-        {sortedExternalDnsList
-          ?.map((v) => ({
-            externalDns: v,
-            hasCertificates: v.tls.certificates?.length > 0,
-            certificateExpiry:
-              v.tls.certificates?.length > 0
-                ? v.tls.certificates[0].notAfter
-                : null,
-            hasMessages: v.tls.statusMessages?.length > 0,
-            hasAutomationMessage: v.tls.automation?.message?.length > 0,
-            expanded: !!expandedRows[v.fqdn],
-          }))
-          .map(
-            ({
-              externalDns,
-              hasCertificates,
-              certificateExpiry,
-              hasMessages,
-              hasAutomationMessage,
-              expanded,
-            }) => (
-              <Fragment key={externalDns.fqdn}>
-                <Table.Row
-                  className={clsx({
-                    'border-bottom-transparent': expanded,
-                  })}
-                >
-                  <Table.Cell className="fitwidth padding-right-0">
-                    {(hasCertificates ||
-                      hasMessages ||
-                      hasAutomationMessage) && (
-                      <Typography
-                        link
-                        as="span"
-                        onClick={() => expandRow(externalDns.fqdn)}
-                      >
-                        <Icon
-                          data={expanded ? chevron_up : chevron_down}
-                          role="button"
-                          title="Toggle more information"
-                        />
-                      </Typography>
-                    )}
-                  </Table.Cell>
-                  <Table.Cell>
+        {sortedExternalDnsList.map((externalDns) => {
+          const expanded = !!expandedRows[externalDns.fqdn];
+          const certificates = externalDns.tls.certificates ?? [];
+          const automationMessage = externalDns.tls.automation?.message;
+          const statusMessage = externalDns.tls.statusMessages;
+          const certificateExpiry = certificates[0]?.notAfter;
+
+          return (
+            <Fragment key={externalDns.fqdn}>
+              <Table.Row
+                className={clsx({
+                  'border-bottom-transparent': expanded,
+                })}
+              >
+                <Table.Cell className="fitwidth padding-right-0">
+                  {(certificates.length > 0 ||
+                    statusMessage ||
+                    automationMessage) && (
                     <Typography
-                      link={!externalDns.tls.useAutomation && !!onItemClick}
-                      onClick={() => onItemClick?.(externalDns)}
-                      token={{ textDecoration: 'none' }}
+                      link
+                      as="span"
+                      onClick={() => expandRow(externalDns.fqdn)}
                     >
-                      {externalDns.fqdn}
+                      <Icon
+                        data={expanded ? chevron_up : chevron_down}
+                        role="button"
+                        title="Toggle more information"
+                      />
                     </Typography>
-                  </Table.Cell>
-                  <Table.Cell>
-                    {certificateExpiry && (
-                      <>
-                        {dayPluraliser(
-                          differenceInDays(
-                            new Date(certificateExpiry),
-                            new Date()
-                          )
-                        )}
-                      </>
-                    )}
-                  </Table.Cell>
-                  <Table.Cell>
-                    <ExternalDNSStatusBadge status={externalDns.tls.status} />
-                  </Table.Cell>
-                  <Table.Cell style={{ textAlign: 'center' }}>
-                    {externalDns.tls.useAutomation && (
-                      <Typography as="span" color="primary">
-                        <TLSAutomationStatusBadge
+                  )}
+                </Table.Cell>
+                <Table.Cell>
+                  <Typography
+                    link={!externalDns.tls.useAutomation && !!onItemClick}
+                    onClick={() => onItemClick?.(externalDns)}
+                    token={{ textDecoration: 'none' }}
+                  >
+                    {externalDns.fqdn}
+                  </Typography>
+                </Table.Cell>
+                <Table.Cell>
+                  {certificateExpiry && (
+                    <>
+                      {dayPluraliser(
+                        differenceInDays(
+                          new Date(certificateExpiry),
+                          new Date()
+                        )
+                      )}
+                    </>
+                  )}
+                </Table.Cell>
+                <Table.Cell>
+                  <ExternalDNSStatusBadge status={externalDns.tls.status} />
+                </Table.Cell>
+                <Table.Cell style={{ textAlign: 'center' }}>
+                  {externalDns.tls.useAutomation && (
+                    <Typography as="span" color="primary">
+                      <TLSAutomationStatusBadge
+                        status={externalDns.tls.automation?.status || 'Unknown'}
+                      />
+                    </Typography>
+                  )}
+                </Table.Cell>
+              </Table.Row>
+              {expanded && (
+                <Table.Row>
+                  <Table.Cell />
+                  <Table.Cell colSpan={4}>
+                    <div
+                      className="grid grid--gap-medium"
+                      style={{ margin: '16px 0' }}
+                    >
+                      {automationMessage && (
+                        <TlsAutomationStatusMessage
                           status={
                             externalDns.tls.automation?.status || 'Unknown'
                           }
+                          message={automationMessage}
                         />
-                      </Typography>
-                    )}
+                      )}
+                      {statusMessage && (
+                        <StatusMessages
+                          status={externalDns.tls.status}
+                          messages={statusMessage}
+                        />
+                      )}
+                      {certificates.length > 0 && (
+                        <TLSCertificateList tlsCertificates={certificates} />
+                      )}
+                    </div>
                   </Table.Cell>
                 </Table.Row>
-                {expanded && (
-                  <Table.Row>
-                    <Table.Cell />
-                    <Table.Cell colSpan={4}>
-                      <div
-                        className="grid grid--gap-medium"
-                        style={{ margin: '16px 0' }}
-                      >
-                        {hasAutomationMessage && (
-                          <TlsAutomationStatusMessage
-                            status={
-                              externalDns.tls.automation?.status || 'Unknown'
-                            }
-                            message={externalDns.tls.automation?.message}
-                          />
-                        )}
-                        {hasMessages && (
-                          <StatusMessages
-                            status={externalDns.tls.status}
-                            messages={externalDns.tls.statusMessages}
-                          />
-                        )}
-                        {hasCertificates && (
-                          <TLSCertificateList
-                            tlsCertificates={externalDns.tls.certificates}
-                          />
-                        )}
-                      </div>
-                    </Table.Cell>
-                  </Table.Row>
-                )}
-              </Fragment>
-            )
-          )}
+              )}
+            </Fragment>
+          );
+        })}
       </Table.Body>
     </Table>
   );
 };
-
-ExternalDNSList.propTypes = {
-  externalDnsList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ExternalDns>
-  ).isRequired,
-  onItemClick: PropTypes.func,
-};
diff --git a/src/components/git-tags/git-tag-links.tsx b/src/components/git-tags/git-tag-links.tsx
index 29aadf86a..c67ab3042 100644
--- a/src/components/git-tags/git-tag-links.tsx
+++ b/src/components/git-tags/git-tag-links.tsx
@@ -1,25 +1,23 @@
 import { List, Tooltip, Typography } from '@equinor/eds-core-react';
-import { type FunctionComponent, useState } from 'react';
+import { useState } from 'react';
 import { linkToGitHubTag } from '../../utils/string';
 import { ScrimPopup } from '../scrim-popup';
-
 import './style.css';
 import { ExternalLink } from '../link/external-link';
 
-const Tag: FunctionComponent<{
+type TagProps = {
   repository: string;
   tag: string;
   tagTitle: string;
-}> = ({ repository, tag, tagTitle }) => (
-  <ExternalLink href={linkToGitHubTag(repository, tag)} icon={null}>
+};
+const Tag = ({ repository, tag, tagTitle }: TagProps) => (
+  <ExternalLink href={linkToGitHubTag(repository, tag)} icon={undefined}>
     <div className="tags">{tagTitle}</div>
   </ExternalLink>
 );
 
-const ShortenedTag: FunctionComponent<{ repository: string; tag: string }> = ({
-  repository,
-  tag,
-}) => {
+type ShortenedTagProps = { repository: string; tag: string };
+const ShortenedTag = ({ repository, tag }: ShortenedTagProps) => {
   const tagTitle =
     tag?.length > 25 ? `${tag.substring(0, 8)}...${tag.slice(-12)}` : tag;
   return tag && tagTitle != tag ? (
@@ -33,10 +31,8 @@ const ShortenedTag: FunctionComponent<{ repository: string; tag: string }> = ({
   );
 };
 
-const TagList: FunctionComponent<{ repository: string; tags: string[] }> = ({
-  repository,
-  tags,
-}) => (
+type TagListProps = { repository: string; tags: string[] };
+const TagList = ({ repository, tags }: TagListProps) => (
   <List>
     {tags.map((tag) => (
       <List.Item key={tag}>
@@ -46,17 +42,19 @@ const TagList: FunctionComponent<{ repository: string; tags: string[] }> = ({
   </List>
 );
 
-export const GitTagLinks: FunctionComponent<{
-  gitTags: string;
+type Props = {
+  gitTags?: string;
   repository?: string;
-}> = ({ gitTags, repository }) => {
+};
+export const GitTagLinks = ({ gitTags, repository }: Props) => {
   const [visibleScrim, setVisibleScrim] = useState(false);
   const gitTagList = gitTags?.split(/[ ,]+/) || [];
+
+  if (!repository || !gitTags || gitTagList.length === 0) return null;
+
   return (
     <>
-      {!gitTagList.length ? (
-        <></>
-      ) : gitTagList.length == 1 ? (
+      {gitTagList.length == 1 ? (
         <ShortenedTag tag={gitTagList[0]} repository={repository} />
       ) : gitTags.length < 20 ? (
         gitTagList
diff --git a/src/components/global-top-nav/styled-toaster.tsx b/src/components/global-top-nav/styled-toaster.tsx
index 4a3d464c9..024ac9cd0 100644
--- a/src/components/global-top-nav/styled-toaster.tsx
+++ b/src/components/global-top-nav/styled-toaster.tsx
@@ -5,15 +5,9 @@ import {
   info_circle,
   warning_outlined,
 } from '@equinor/eds-icons';
-import { clsx } from 'clsx';
 import type { FunctionComponent } from 'react';
-import {
-  type Id,
-  ToastContainer,
-  type ToastContent,
-  type ToastOptions,
-  toast,
-} from 'react-toastify';
+import { type Id, ToastContainer, toast } from 'react-toastify';
+import type { ToastIcon, TypeOptions } from 'react-toastify/dist/types';
 
 import 'react-toastify/dist/ReactToastify.css';
 import './style.css';
@@ -26,56 +20,43 @@ export const StyledToastContainer: FunctionComponent = () => (
 );
 
 export function styledToaster<T>(
-  content: ToastContent<T>,
-  options?: ToastOptions
+  content: string,
+  options: {
+    type: TypeOptions;
+    icon: ToastIcon;
+  }
 ): Id {
   return toast(content, {
     ...options,
-    className: clsx('styled_toaster', options?.className),
+    className: 'styled_toaster',
     closeOnClick: false,
     draggable: false,
   });
 }
 
-export function infoToast<T>(
-  content: ToastContent<T>,
-  options?: Omit<ToastOptions, 'icon' | 'type'>
-): Id {
-  return styledToaster<T>(content, {
-    ...options,
+export function infoToast(content: string): Id {
+  return styledToaster(content, {
     type: 'info',
     icon: <Icon data={info_circle} />,
   });
 }
 
-export function errorToast<T>(
-  content: ToastContent<T>,
-  options?: Omit<ToastOptions, 'icon' | 'type'>
-): Id {
-  return styledToaster<T>(content, {
-    ...options,
+export function errorToast(content: string): Id {
+  return styledToaster(content, {
     type: 'error',
     icon: <Icon data={error_outlined} />,
   });
 }
 
-export function warningToast<T>(
-  content: ToastContent<T>,
-  options?: Omit<ToastOptions, 'icon' | 'type'>
-): Id {
-  return styledToaster<T>(content, {
-    ...options,
+export function warningToast(content: string): Id {
+  return styledToaster(content, {
     type: 'warning',
     icon: <Icon data={warning_outlined} />,
   });
 }
 
-export function successToast<T>(
-  content: ToastContent<T>,
-  options?: Omit<ToastOptions, 'icon' | 'type'>
-): Id {
-  return styledToaster<T>(content, {
-    ...options,
+export function successToast(content: string): Id {
+  return styledToaster(content, {
     type: 'success',
     icon: <Icon data={check_circle_outlined} />,
   });
diff --git a/src/components/graph/adGroups.tsx b/src/components/graph/adGroups.tsx
index 8e04f2a4c..064e52c3e 100644
--- a/src/components/graph/adGroups.tsx
+++ b/src/components/graph/adGroups.tsx
@@ -1,9 +1,7 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { computer, group, person } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import {
   type CSSObjectWithLabel,
-  type GroupBase,
   type MultiValue,
   type MultiValueGenericProps,
   type OptionsOrGroups,
@@ -33,7 +31,7 @@ type GroupedOption = {
 };
 
 type CallbackType = (
-  options: OptionsOrGroups<AdGroupItem, GroupBase<AdGroupItem>>
+  options: OptionsOrGroups<AdGroupItem, GroupedOption>
 ) => void;
 
 interface Props {
@@ -113,10 +111,9 @@ export function ADGroups({ onChange, adGroups, adUsers, isDisabled }: Props) {
           menuPosition="fixed"
           closeMenuOnScroll={(e: Event) => {
             const target = e.target as HTMLInputElement;
-            return (
-              target?.parentElement?.className &&
-              !target.parentElement.className.match(/menu/)
-            );
+            return target?.parentElement?.className
+              ? !target.parentElement.className.match(/menu/)
+              : false;
           }}
           noOptionsMessage={() => null}
           loadOptions={(inputValue, callback) => {
@@ -156,12 +153,6 @@ export function ADGroups({ onChange, adGroups, adUsers, isDisabled }: Props) {
   );
 }
 
-ADGroups.propTypes = {
-  onChange: PropTypes.func.isRequired,
-  adGroups: PropTypes.arrayOf(PropTypes.string),
-  isDisabled: PropTypes.bool,
-};
-
 function selectValueStyle(
   base: CSSObjectWithLabel,
   props: { data: AdGroupItem }
@@ -172,7 +163,9 @@ function selectValueStyle(
   return base;
 }
 
-function MultiValueLabel(props: MultiValueGenericProps<AdGroupItem>) {
+const MultiValueLabel = (
+  props: MultiValueGenericProps<AdGroupItem, true, GroupedOption>
+) => {
   let icon = computer;
   if (props.data.type === 'Group') icon = group;
   if (props.data.type === 'User') icon = person;
@@ -192,4 +185,4 @@ function MultiValueLabel(props: MultiValueGenericProps<AdGroupItem>) {
       <components.MultiValueLabel {...props} />
     </div>
   );
-}
+};
diff --git a/src/components/identity/azure-identity.tsx b/src/components/identity/azure-identity.tsx
index 775ece050..e2a75c75f 100644
--- a/src/components/identity/azure-identity.tsx
+++ b/src/components/identity/azure-identity.tsx
@@ -1,6 +1,5 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { info_circle } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import { externalUrls } from '../../externalUrls';
@@ -78,10 +77,3 @@ export const AzureIdentity: FunctionComponent<AzureIdentityProps> = ({
     <WorkloadIdentityHelp />
   </div>
 );
-
-AzureIdentity.propTypes = {
-  oidcIssuerUrl: PropTypes.string.isRequired,
-  namespace: PropTypes.string.isRequired,
-  serviceAccountName: PropTypes.string.isRequired,
-  clientId: PropTypes.string.isRequired,
-};
diff --git a/src/components/job-overview/component-list.tsx b/src/components/job-overview/component-list.tsx
index 70693f602..37e6b68a7 100644
--- a/src/components/job-overview/component-list.tsx
+++ b/src/components/job-overview/component-list.tsx
@@ -1,5 +1,3 @@
-import * as PropTypes from 'prop-types';
-
 import { List, Typography } from '@equinor/eds-core-react';
 import { Link } from 'react-router-dom';
 import { routes } from '../../routes';
@@ -11,13 +9,15 @@ import { DockerImage } from '../docker-image';
 type Props = {
   appName: string;
   deployments: DeploymentSummary[];
-  repository: string;
+  repository?: string;
 };
 
 export const ComponentList = ({ appName, deployments, repository }: Props) => {
   return (
     <>
-      {deployments.some((value) => value.components?.length > 0) && (
+      {deployments.some(
+        (value) => value.components && value.components.length > 0
+      ) && (
         <>
           <Typography variant="h4">Components</Typography>
           <List>
@@ -71,9 +71,3 @@ export const ComponentList = ({ appName, deployments, repository }: Props) => {
     </>
   );
 };
-
-ComponentList.propTypes = {
-  deployments: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<Array<DeploymentSummary>>
-  ).isRequired,
-};
diff --git a/src/components/job-overview/dev.tsx b/src/components/job-overview/dev.tsx
index 9bff94f17..e7d472ab9 100644
--- a/src/components/job-overview/dev.tsx
+++ b/src/components/job-overview/dev.tsx
@@ -218,7 +218,7 @@ export default (
             padding: 'var(--eds_spacing_large)',
           }}
         >
-          <JobOverview appName="MyApp" jobName={name} />
+          <JobOverview appName="MyApp" jobName={name!} />
         </div>
         <div>{i < length - 1 && <Divider />}</div>
       </Fragment>
diff --git a/src/components/job-overview/index.tsx b/src/components/job-overview/index.tsx
index dc5ec7406..876a43663 100644
--- a/src/components/job-overview/index.tsx
+++ b/src/components/job-overview/index.tsx
@@ -4,7 +4,6 @@ import {
   CircularProgress,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -188,7 +187,7 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                 <div className="grid grid--gap-medium grid--overview-columns">
                   <div className="grid grid--gap-medium">
                     <Typography>
-                      Pipeline Job {job.status.toLowerCase()};{' '}
+                      Pipeline Job {job.status?.toLowerCase()};{' '}
                       {getJobExecutionState(job.status)} pipeline{' '}
                       <strong>{job.pipeline}</strong>
                     </Typography>
@@ -215,18 +214,18 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                           as={Link}
                           to={routeWithParams(routes.appDeployment, {
                             appName,
-                            deploymentName: job.promotedFromDeployment,
+                            deploymentName: job.promotedFromDeployment!,
                           })}
                           link
                         >
-                          {smallDeploymentName(job?.promotedFromDeployment)}
+                          {smallDeploymentName(job.promotedFromDeployment!)}
                         </Typography>{' '}
                         <strong>promoted</strong> from{' '}
                         <Typography
                           as={Link}
                           to={routeWithParams(routes.appEnvironment, {
                             appName,
-                            envName: job.promotedFromEnvironment,
+                            envName: job.promotedFromEnvironment!,
                           })}
                           link
                         >
@@ -237,7 +236,7 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                           as={Link}
                           to={routeWithParams(routes.appEnvironment, {
                             appName,
-                            envName: job.promotedToEnvironment,
+                            envName: job.promotedToEnvironment!,
                           })}
                           link
                         >
@@ -247,7 +246,7 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                     )}
                     {(job.pipeline === 'build-deploy' ||
                       job.pipeline === 'build') &&
-                      job.overrideUseBuildCache !== undefined && (
+                      typeof job.overrideUseBuildCache === 'boolean' && (
                         <Checkbox
                           label="Override use build cache"
                           name="overrideUseBuildCache"
@@ -294,7 +293,7 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                           , commit{' '}
                           <CommitHash
                             commit={job.commitID}
-                            repo={application?.registration.repository}
+                            repo={application?.registration?.repository}
                           />
                         </>
                       )}
@@ -365,8 +364,8 @@ export const JobOverview = ({ appName, jobName }: Props) => {
                       {job.components && (
                         <ComponentList
                           appName={appName}
-                          deployments={job.deployments}
-                          repository={application?.registration.repository}
+                          deployments={job.deployments ?? []}
+                          repository={application?.registration?.repository}
                         />
                       )}
                     </div>
@@ -390,8 +389,3 @@ export const JobOverview = ({ appName, jobName }: Props) => {
     </>
   );
 };
-
-JobOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-};
diff --git a/src/components/job-overview/step-summary.tsx b/src/components/job-overview/step-summary.tsx
index 4bf63b5df..e68ef3897 100644
--- a/src/components/job-overview/step-summary.tsx
+++ b/src/components/job-overview/step-summary.tsx
@@ -1,6 +1,5 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -44,10 +43,8 @@ const StepDuration: FunctionComponent<Pick<Step, 'started' | 'ended'>> = ({
     <>Not yet started</>
   );
 
-const StepDescription: FunctionComponent<Pick<Step, 'name' | 'components'>> = ({
-  name,
-  components,
-}) => {
+type StepDescriptionProps = { name?: string; components: Step['components'] };
+const StepDescription = ({ name, components }: StepDescriptionProps) => {
   const stepDescription = getPipelineStepDescription(name);
   if (stepDescription) {
     return <>{stepDescription}</>;
@@ -67,21 +64,23 @@ const StepDescription: FunctionComponent<Pick<Step, 'name' | 'components'>> = ({
     );
   }
 
-  const buildComponent = name.match(/^build-(.+)$/);
+  const buildComponent = name?.match(/^build-(.+)$/);
   if (buildComponent) {
     return (
       <>
-        Building <strong>{getComponents(buildComponent[1], components)}</strong>{' '}
+        Building{' '}
+        <strong>{getComponents(buildComponent[1], components ?? [])}</strong>{' '}
         component
       </>
     );
   }
 
-  const scanComponent = name.match(/^scan-(.+)$/);
+  const scanComponent = name?.match(/^scan-(.+)$/);
   if (scanComponent) {
     return (
       <>
-        Scanning <strong>{getComponents(scanComponent[1], components)}</strong>{' '}
+        Scanning{' '}
+        <strong>{getComponents(scanComponent[1], components ?? [])}</strong>{' '}
         component
       </>
     );
@@ -102,7 +101,7 @@ export const StepSummary: FunctionComponent<{
         to={routeWithParams(routes.appJobStep, {
           appName,
           jobName,
-          stepName: step.name,
+          stepName: step.name ?? '',
         })}
         link
         token={{ textDecoration: 'none', textTransform: 'capitalize' }}
@@ -110,7 +109,7 @@ export const StepSummary: FunctionComponent<{
         <StepDescription name={step.name} components={step.components} />
       </Typography>
 
-      <RadixJobConditionBadge status={step.status} />
+      <RadixJobConditionBadge status={step.status ?? 'Waiting'} />
     </div>
 
     <div className="step-summary__time">
@@ -121,9 +120,3 @@ export const StepSummary: FunctionComponent<{
     </div>
   </div>
 );
-
-StepSummary.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  step: PropTypes.object.isRequired as PropTypes.Validator<Step>,
-};
diff --git a/src/components/job-overview/steps-list.tsx b/src/components/job-overview/steps-list.tsx
index 1528c49e4..7518b2874 100644
--- a/src/components/job-overview/steps-list.tsx
+++ b/src/components/job-overview/steps-list.tsx
@@ -8,7 +8,6 @@ import {
   record,
   track_changes,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import { StepSummary } from './step-summary';
@@ -17,7 +16,7 @@ import type { Step } from '../../store/radix-api';
 import { PipelineStep } from '../../utils/pipeline';
 import { sortCompareDate } from '../../utils/sort-utils';
 
-function getStepIcon({ name }: Step): IconData {
+function getStepIcon(name: string): IconData {
   switch (name) {
     case PipelineStep.CloneConfig:
     case PipelineStep.CloneRepository:
@@ -65,12 +64,15 @@ export const StepsList: FunctionComponent<{
                 sortCompareDate(
                   a.started ?? new Date('9999-01-01T00:00:00Z'),
                   b.started ?? new Date('9999-01-01T00:00:00Z')
-                ) ?? a.name.localeCompare(b.name)
+                ) ?? a.name?.localeCompare(b.name ?? '')
             )
             .map((step) => (
               <div key={getStepKey(step)} className="steps-list__step">
                 <div className="grid steps-list__divider">
-                  <Icon className="step__icon" data={getStepIcon(step)} />
+                  <Icon
+                    className="step__icon"
+                    data={getStepIcon(step.name ?? '')}
+                  />
                   <span className="steps-list__divider-line" />
                 </div>
                 <StepSummary appName={appName} jobName={jobName} step={step} />
@@ -83,9 +85,3 @@ export const StepsList: FunctionComponent<{
     </>
   );
 };
-
-StepsList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  steps: PropTypes.arrayOf(PropTypes.object as PropTypes.Validator<Step>),
-};
diff --git a/src/components/jobs-list/index.tsx b/src/components/jobs-list/index.tsx
index eb9ecf076..75e06fadb 100644
--- a/src/components/jobs-list/index.tsx
+++ b/src/components/jobs-list/index.tsx
@@ -1,15 +1,14 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useEffect, useState } from 'react';
 
 import { JobSummaryTableRow } from './job-summary-table-row';
 
 import type { JobSummary } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
 
@@ -28,9 +27,9 @@ export const JobsList: FunctionComponent<JobsListProps> = ({
 }) => {
   const [sortedData, setSortedData] = useState([...(jobs ?? [])]);
 
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
-  const [envSort, setEnvSort] = useState<sortDirection>();
-  const [pipelineSort, setPipelineSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
+  const [envSort, setEnvSort] = useState<SortDirection>();
+  const [pipelineSort, setPipelineSort] = useState<SortDirection>();
   useEffect(() => {
     setSortedData(
       dataSorter(jobs?.slice(0, limit || jobs.length), [
@@ -106,9 +105,3 @@ export const JobsList: FunctionComponent<JobsListProps> = ({
     </span>
   );
 };
-
-JobsList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobs: PropTypes.arrayOf(PropTypes.object as PropTypes.Validator<JobSummary>),
-  limit: PropTypes.number,
-};
diff --git a/src/components/jobs-list/job-summary-table-row.tsx b/src/components/jobs-list/job-summary-table-row.tsx
index 02574ff90..8c6dac761 100644
--- a/src/components/jobs-list/job-summary-table-row.tsx
+++ b/src/components/jobs-list/job-summary-table-row.tsx
@@ -1,5 +1,4 @@
 import { Table, Tooltip } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { Link } from 'react-router-dom';
 
@@ -21,7 +20,7 @@ export const JobSummaryTableRow: FunctionComponent<{
         className="job-summary__id-section"
         to={routeWithParams(routes.appJob, { appName, jobName: job.name })}
       >
-        {job.triggeredBy?.length > 25 ? (
+        {job.triggeredBy && job.triggeredBy.length > 25 ? (
           <Tooltip placement="top" title={job.triggeredBy}>
             <div>
               {`${job.triggeredBy.substring(0, 8)}...${job.triggeredBy.slice(
@@ -32,7 +31,7 @@ export const JobSummaryTableRow: FunctionComponent<{
         ) : (
           <div>{job.triggeredBy || 'N/A'}</div>
         )}
-        <CommitHash commit={job.commitID} />
+        <CommitHash commit={job.commitID ?? ''} />
       </Link>
     </Table.Cell>
     <Table.Cell>
@@ -66,13 +65,8 @@ export const JobSummaryTableRow: FunctionComponent<{
       </div>
     </Table.Cell>
     <Table.Cell variant="icon">
-      <RadixJobConditionBadge status={job.status} />
+      <RadixJobConditionBadge status={job.status ?? 'Waiting'} />
     </Table.Cell>
     <Table.Cell>{job.pipeline}</Table.Cell>
   </Table.Row>
 );
-
-JobSummaryTableRow.propTypes = {
-  appName: PropTypes.string.isRequired,
-  job: PropTypes.object.isRequired as PropTypes.Validator<JobSummary>,
-};
diff --git a/src/components/link/external-link.tsx b/src/components/link/external-link.tsx
index 481dde492..49a11dc50 100644
--- a/src/components/link/external-link.tsx
+++ b/src/components/link/external-link.tsx
@@ -1,6 +1,6 @@
 import { Icon, Tooltip, Typography } from '@equinor/eds-core-react';
 import { type IconData, external_link } from '@equinor/eds-icons';
-import type { PropsWithChildren } from 'react';
+import { type PropsWithChildren, forwardRef } from 'react';
 
 type ToolTipWrapperProps = { toolTip?: string };
 
@@ -18,33 +18,39 @@ const ToolTipWrapper = ({
 
 type ExternalLinkProps = {
   href: string;
-  icon?: IconData;
+  icon?: IconData | null | undefined; // null = no icon, undefined = external_link (default), or custom icon
   color?: string;
   className?: string;
   toolTip?: string;
   title?: string;
 };
 
-export const ExternalLink = ({
-  href,
-  children,
-  icon = external_link,
-  className = 'whitespace-nowrap',
-  color,
-  toolTip,
-  title,
-}: PropsWithChildren<ExternalLinkProps>) => (
-  <ToolTipWrapper toolTip={toolTip}>
-    <Typography
-      link
-      href={href}
-      rel="noopener noreferrer"
-      target="_blank"
-      color={color}
-      className={className}
-      title={title}
-    >
-      {children} {icon && <Icon data={icon} size={16} />}
-    </Typography>
-  </ToolTipWrapper>
+export const ExternalLink = forwardRef(
+  (
+    {
+      href,
+      children,
+      icon = external_link,
+      className = 'whitespace-nowrap',
+      color,
+      toolTip,
+      title,
+    }: PropsWithChildren<ExternalLinkProps>,
+    ref
+  ) => (
+    <ToolTipWrapper toolTip={toolTip}>
+      <Typography
+        ref={ref}
+        link
+        href={href}
+        rel="noopener noreferrer"
+        target="_blank"
+        color={color}
+        className={className}
+        title={title}
+      >
+        {children} {icon && <Icon data={icon} size={16} />}
+      </Typography>
+    </ToolTipWrapper>
+  )
 );
diff --git a/src/components/link/radix-config-file-link.tsx b/src/components/link/radix-config-file-link.tsx
index f33abb6db..3c12baa93 100644
--- a/src/components/link/radix-config-file-link.tsx
+++ b/src/components/link/radix-config-file-link.tsx
@@ -1,9 +1,7 @@
 import type { ApplicationRegistration } from '../../store/radix-api';
 import { ExternalLink } from './external-link';
 
-type Props = { registration?: ApplicationRegistration };
-
-function configFileFullName(radixConfigFullName: string): string {
+function configFileFullName(radixConfigFullName?: string): string {
   return radixConfigFullName || 'radixconfig.yaml';
 }
 
@@ -17,6 +15,7 @@ function configFileUrl({
   )}`;
 }
 
+type Props = { registration: ApplicationRegistration };
 export const RadixConfigFileLink = ({ registration }: Props) => (
   <ExternalLink href={configFileUrl(registration)}>
     {configFileFullName(registration.radixConfigFullName)}
diff --git a/src/components/msal-auth-context/config.ts b/src/components/msal-auth-context/config.ts
index 436e250e7..f1feee6e4 100644
--- a/src/components/msal-auth-context/config.ts
+++ b/src/components/msal-auth-context/config.ts
@@ -6,7 +6,7 @@ export const msGraphConfig = {
 };
 
 export const serviceNowApiConfig = {
-  scopes: configVariables.SERVICENOW_PROXY_SCOPES,
+  scopes: configVariables.SERVICENOW_PROXY_SCOPES.split(','),
 };
 
 export const msalConfig: Configuration = {
diff --git a/src/components/msal-auth-context/msal-auth-provider.tsx b/src/components/msal-auth-context/msal-auth-provider.tsx
index 3c1789ce8..580d6e317 100644
--- a/src/components/msal-auth-context/msal-auth-provider.tsx
+++ b/src/components/msal-auth-context/msal-auth-provider.tsx
@@ -63,6 +63,7 @@ export function MsalAuthProvider({ children }: PropsWithChildren) {
 
     const callbackId = msal.addEventCallback(callback);
 
+    // @ts-expect-error callbackId can be null if running on Node / Serverside
     return () => msal.removeEventCallback(callbackId);
   }, [dispatch, msal]);
 
diff --git a/src/components/page-active-component/active-component-overview.tsx b/src/components/page-active-component/active-component-overview.tsx
index 5c642eac5..594768af7 100644
--- a/src/components/page-active-component/active-component-overview.tsx
+++ b/src/components/page-active-component/active-component-overview.tsx
@@ -1,14 +1,4 @@
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
-
-import { ComponentReplicaList } from './component-replica-list';
-import { ComponentReplicaLogAccordion } from './component-replica-log-accordion';
-import { ComponentVulnerabilityDetails } from './component-vulnerability-details';
-import { ExternalDNSAccordion } from './external-dns';
-import { HorizontalScalingSummary } from './horizontal-scaling-summary';
-import { OAuthService } from './oauth-service';
-import { Overview } from './overview';
-
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
 import {
@@ -21,6 +11,13 @@ import AsyncResource from '../async-resource/async-resource';
 import { Breadcrumb } from '../breadcrumb';
 import { ActiveComponentSecrets } from '../component/secrets/active-component-secrets';
 import { EnvironmentVariables } from '../environment-variables';
+import { ComponentReplicaList } from './component-replica-list';
+import { ComponentReplicaLogAccordion } from './component-replica-log-accordion';
+import { ComponentVulnerabilityDetails } from './component-vulnerability-details';
+import { ExternalDNSAccordion } from './external-dns';
+import { HorizontalScalingSummary } from './horizontal-scaling-summary';
+import { OAuthService } from './oauth-service';
+import { Overview } from './overview';
 
 import { routeWithParams } from '../../utils/string';
 import './style.css';
@@ -142,7 +139,7 @@ export const ActiveComponentOverview: FunctionComponent<{
                 envName={envName}
                 componentName={componentName}
               />
-              {component.externalDNS?.length > 0 && (
+              {component.externalDNS && component.externalDNS.length > 0 && (
                 <ExternalDNSAccordion
                   appName={appName}
                   envName={envName}
@@ -184,9 +181,3 @@ export const ActiveComponentOverview: FunctionComponent<{
     </>
   );
 };
-
-ActiveComponentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-active-component/active-component-toolbar.tsx b/src/components/page-active-component/active-component-toolbar.tsx
index f6f5028a9..ec336ae7c 100644
--- a/src/components/page-active-component/active-component-toolbar.tsx
+++ b/src/components/page-active-component/active-component-toolbar.tsx
@@ -89,7 +89,7 @@ export function ActiveComponentToolbar({
             onScale={onScale}
             disabled={scaleState.isLoading}
             currentReplicas={
-              component.replicasOverride ?? component.replicaList.length
+              component.replicasOverride ?? component.replicaList?.length ?? 0
             }
           />
           <Button
diff --git a/src/components/page-active-component/component-replica-list.tsx b/src/components/page-active-component/component-replica-list.tsx
index 58b551373..36a5af3a7 100644
--- a/src/components/page-active-component/component-replica-list.tsx
+++ b/src/components/page-active-component/component-replica-list.tsx
@@ -1,19 +1,24 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import type { ReplicaSummary } from '../../store/radix-api';
 import { getReplicaUrl } from '../../utils/routing';
 import { ReplicaList } from '../replica-list';
 
-export const ComponentReplicaList: FunctionComponent<{
+type Props = {
   title: string;
   appName: string;
   envName: string;
   componentName: string;
   replicaList?: Array<ReplicaSummary>;
   isExpanded?: boolean;
-}> = ({ title, appName, envName, componentName, replicaList, isExpanded }) => (
+};
+export const ComponentReplicaList = ({
+  title,
+  appName,
+  envName,
+  componentName,
+  replicaList,
+  isExpanded,
+}: Props) => (
   <Accordion className="accordion elevated" chevronPosition="right">
     <Accordion.Item isExpanded={isExpanded}>
       <Accordion.Header>
@@ -25,7 +30,7 @@ export const ComponentReplicaList: FunctionComponent<{
       </Accordion.Header>
       <Accordion.Panel>
         <div className="grid">
-          {replicaList?.length > 0 ? (
+          {replicaList && replicaList.length > 0 ? (
             <ReplicaList
               replicaList={replicaList}
               replicaUrlFunc={(name) =>
@@ -40,14 +45,3 @@ export const ComponentReplicaList: FunctionComponent<{
     </Accordion.Item>
   </Accordion>
 );
-
-ComponentReplicaList.propTypes = {
-  title: PropTypes.string.isRequired,
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  replicaList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ReplicaSummary>
-  ),
-  isExpanded: PropTypes.bool,
-};
diff --git a/src/components/page-active-component/component-replica-log-accordion.tsx b/src/components/page-active-component/component-replica-log-accordion.tsx
index 842dc8827..089600e03 100644
--- a/src/components/page-active-component/component-replica-log-accordion.tsx
+++ b/src/components/page-active-component/component-replica-log-accordion.tsx
@@ -8,7 +8,6 @@ import {
 } from '@equinor/eds-core-react';
 import { chevron_down, chevron_up, download, invert } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import { Fragment, useCallback, useMemo, useState } from 'react';
 
 import { addMinutes } from 'date-fns';
@@ -20,9 +19,9 @@ import {
   useGetComponentInventoryQuery,
 } from '../../store/log-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { smallGithubCommitHash, smallReplicaName } from '../../utils/string';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
@@ -70,7 +69,7 @@ export function ComponentReplicaLogAccordion({
     { skip: !appName || !envName || !componentName, pollingInterval }
   );
 
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
   const [expandedRows, setExpandedRows] = useState<Record<string, boolean>>({});
 
   const expandRow = useCallback<(name: string) => void>(
@@ -177,9 +176,6 @@ function ReplicaLogTableRow({
   const [getLog, { isFetching }] =
     logApi.endpoints.getComponentReplicaLog.useLazyQuery();
 
-  const created = new Date(creationTimestamp);
-  const ended = new Date(lastKnown);
-
   return (
     <Table.Row className={clsx({ 'border-bottom-transparent': isExpanded })}>
       <Table.Cell className={'fitwidth padding-right-0'} variant="icon">
@@ -197,10 +193,10 @@ function ReplicaLogTableRow({
       </Table.Cell>
       <Table.Cell variant="numeric">{containers?.length || 0}</Table.Cell>
       <Table.Cell>
-        <RelativeToNow time={created} capitalize includeSeconds />
+        <RelativeToNow time={creationTimestamp} capitalize includeSeconds />
       </Table.Cell>
       <Table.Cell>
-        {Duration({ start: created, end: ended }) || 'N/A'}
+        {Duration({ start: creationTimestamp, end: lastKnown }) || 'N/A'}
       </Table.Cell>
       <Table.Cell className={'fitwidth padding-right-0'} variant="icon">
         <LogDownloadButton
@@ -214,12 +210,13 @@ function ReplicaLogTableRow({
                   envName,
                   componentName,
                   replicaName: name,
-                  start: created.toISOString(),
-                  end: addMinutes(ended, 10).toISOString(),
+                  start: creationTimestamp,
+                  // @ts-expect-error lastKnown is set, button is disabled when not
+                  end: addMinutes(lastKnown, 10).toISOString(),
                 }).unwrap() as Promise<string>
             )
           }
-          disabled={isFetching}
+          disabled={isFetching || !lastKnown}
         />
       </Table.Cell>
     </Table.Row>
@@ -242,9 +239,6 @@ function ReplicaContainerTableRow({
   const [getLog, { isFetching }] =
     logApi.endpoints.getComponentContainerLog.useLazyQuery();
 
-  const created = new Date(creationTimestamp);
-  const ended = new Date(lastKnown);
-
   return (
     <Table.Row className={className}>
       <Table.Cell className={'fitwidth padding-right-0'} variant="icon">
@@ -261,10 +255,10 @@ function ReplicaContainerTableRow({
       </Table.Cell>
       <Table.Cell />
       <Table.Cell>
-        <RelativeToNow time={created} capitalize includeSeconds />
+        <RelativeToNow time={creationTimestamp} capitalize includeSeconds />
       </Table.Cell>
       <Table.Cell>
-        <Duration start={created} end={ended} />
+        <Duration start={creationTimestamp} end={lastKnown} />
       </Table.Cell>
       <Table.Cell className={'fitwidth padding-right-0'} variant="icon">
         <LogDownloadButton
@@ -279,22 +273,15 @@ function ReplicaContainerTableRow({
                   componentName,
                   replicaName,
                   containerId: id,
-                  start: created.toISOString(),
-                  end: addMinutes(ended, 10).toISOString(),
+                  start: creationTimestamp,
+                  // @ts-expect-error last known is set, button is disabled when not
+                  end: addMinutes(lastKnown, 10).toISOString(),
                 }).unwrap() as Promise<string>
             )
           }
-          disabled={isFetching}
+          disabled={isFetching || !lastKnown}
         />
       </Table.Cell>
     </Table.Row>
   );
 }
-
-ComponentReplicaLogAccordion.propTypes = {
-  title: PropTypes.string.isRequired,
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  isExpanded: PropTypes.bool,
-};
diff --git a/src/components/page-active-component/default-alias.tsx b/src/components/page-active-component/default-alias.tsx
index d80da41ac..c839a0aaf 100644
--- a/src/components/page-active-component/default-alias.tsx
+++ b/src/components/page-active-component/default-alias.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { ApplicationAlias } from '../../store/radix-api';
 import { ExternalLink } from '../link/external-link';
 
@@ -25,9 +24,3 @@ export function DefaultAlias({ appAlias, envName, componentName }: Props) {
     </>
   );
 }
-
-DefaultAlias.propTypes = {
-  appAlias: PropTypes.object as PropTypes.Validator<ApplicationAlias>,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-active-component/dns-aliases.tsx b/src/components/page-active-component/dns-aliases.tsx
index 06910bc08..3fb3ff169 100644
--- a/src/components/page-active-component/dns-aliases.tsx
+++ b/src/components/page-active-component/dns-aliases.tsx
@@ -3,7 +3,7 @@ import type { FunctionComponent } from 'react';
 import { DNSAlias } from './dns-alias';
 
 export interface DefaultAppAliasProps {
-  urls?: string[];
+  urls: string[];
   title: string;
 }
 
diff --git a/src/components/page-active-component/external-dns.tsx b/src/components/page-active-component/external-dns.tsx
index bbdba3395..5cab31542 100644
--- a/src/components/page-active-component/external-dns.tsx
+++ b/src/components/page-active-component/external-dns.tsx
@@ -5,13 +5,7 @@ import {
   TextField,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import {
-  type ChangeEvent,
-  type FunctionComponent,
-  useMemo,
-  useState,
-} from 'react';
+import { type ChangeEvent, type FunctionComponent, useState } from 'react';
 
 import { pollingInterval } from '../../store/defaults';
 import {
@@ -40,10 +34,7 @@ const TlsEditForm: FunctionComponent<{
 }> = ({ appName, envName, componentName, fqdn, onSaveSuccess }) => {
   const [{ certificate, privateKey }, setTlsData] = useState<TlsData>({});
   const [skipValidation, setSkipValidation] = useState(false);
-  const tlsDataIsValid = useMemo(
-    () => certificate?.length > 0 && privateKey?.length > 0,
-    [certificate, privateKey]
-  );
+  const tlsDataIsValid = certificate && privateKey;
   const { refetch } = useGetEnvironmentQuery(
     { appName, envName },
     { skip: !appName || !envName, pollingInterval }
@@ -59,8 +50,8 @@ const TlsEditForm: FunctionComponent<{
       componentName,
       fqdn: fqdn,
       updateExternalDnsTlsRequest: {
-        certificate,
-        privateKey,
+        certificate: certificate!, // submit button is disabled if not set
+        privateKey: privateKey!, // submit button is disabled if not set
         skipValidation,
       },
     }).unwrap();
@@ -186,12 +177,3 @@ export const ExternalDNSAccordion: FunctionComponent<{
     </>
   );
 };
-
-ExternalDNSAccordion.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  externalDNSList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ExternalDns>
-  ),
-};
diff --git a/src/components/page-active-component/horizontal-scaling-summary.tsx b/src/components/page-active-component/horizontal-scaling-summary.tsx
index e38d2b8da..fee11b648 100644
--- a/src/components/page-active-component/horizontal-scaling-summary.tsx
+++ b/src/components/page-active-component/horizontal-scaling-summary.tsx
@@ -1,7 +1,5 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import { isNil } from 'lodash';
-import * as PropTypes from 'prop-types';
-
+import { isNil } from 'lodash-es';
 import type {
   HorizontalScalingSummary as HorizontalScalingSummaryModel,
   HorizontalScalingSummaryTriggerStatus,
@@ -54,7 +52,7 @@ export const HorizontalScalingSummary = ({ summary }: Props) => (
               </>
             )}
 
-            {summary.pollingInterval > 0 && (
+            {summary.pollingInterval && summary.pollingInterval > 0 && (
               <>
                 <Typography as="dt">Polling interval:</Typography>
                 <Typography as="dd" variant="body_short_bold">
@@ -63,7 +61,7 @@ export const HorizontalScalingSummary = ({ summary }: Props) => (
               </>
             )}
 
-            {summary.cooldownPeriod > 0 && (
+            {summary.cooldownPeriod && summary.cooldownPeriod > 0 && (
               <>
                 <Typography as="dt">Cooldown period:</Typography>
                 <Typography as="dd" variant="body_short_bold">
@@ -73,7 +71,10 @@ export const HorizontalScalingSummary = ({ summary }: Props) => (
             )}
 
             {summary.triggers.map((trigger, i) => (
-              <TriggerStatus key={trigger.name + i} trigger={trigger} />
+              <TriggerStatus
+                key={(trigger.name ?? trigger.type ?? 'unknown') + i}
+                trigger={trigger}
+              />
             ))}
           </dl>
         </div>
@@ -82,15 +83,6 @@ export const HorizontalScalingSummary = ({ summary }: Props) => (
   </Accordion>
 );
 
-HorizontalScalingSummary.propTypes = {
-  currentCPUUtilizationPercentage: PropTypes.number,
-  currentMemoryUtilizationPercentage: PropTypes.number,
-  maxReplicas: PropTypes.number,
-  minReplicas: PropTypes.number,
-  targetCPUUtilizationPercentage: PropTypes.number,
-  targetMemoryUtilizationPercentage: PropTypes.number,
-};
-
 type TriggerStatusProps = {
   trigger: HorizontalScalingSummaryTriggerStatus;
 };
diff --git a/src/components/page-active-component/oauth-service.tsx b/src/components/page-active-component/oauth-service.tsx
index 958056f0e..fe39301ca 100644
--- a/src/components/page-active-component/oauth-service.tsx
+++ b/src/components/page-active-component/oauth-service.tsx
@@ -1,12 +1,9 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
-import { OAuthToolbar } from './oauth-toolbar';
-
 import type { OAuth2AuxiliaryResource } from '../../store/radix-api';
 import { getOAuthReplicaUrl } from '../../utils/routing';
 import { ReplicaList } from '../replica-list';
 import { ComponentStatusBadge } from '../status-badges';
+import { OAuthToolbar } from './oauth-toolbar';
 
 type Props = {
   appName: string;
@@ -49,7 +46,8 @@ export const OAuthService = ({
             </span>
           </div>
           <div className="grid">
-            {oauth2.deployment.replicaList?.length > 0 ? (
+            {oauth2.deployment.replicaList &&
+            oauth2.deployment.replicaList.length > 0 ? (
               <ReplicaList
                 replicaList={oauth2.deployment.replicaList}
                 replicaUrlFunc={(name) =>
@@ -65,11 +63,3 @@ export const OAuthService = ({
     </Accordion.Item>
   </Accordion>
 );
-
-OAuthService.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  oauth2: PropTypes.object
-    .isRequired as PropTypes.Validator<OAuth2AuxiliaryResource>,
-};
diff --git a/src/components/page-active-component/oauth-toolbar.tsx b/src/components/page-active-component/oauth-toolbar.tsx
index 24f373256..7f496532d 100644
--- a/src/components/page-active-component/oauth-toolbar.tsx
+++ b/src/components/page-active-component/oauth-toolbar.tsx
@@ -1,6 +1,4 @@
 import { Button, CircularProgress } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import { useDurationInterval } from '../../effects/use-interval';
 import {
   type OAuth2AuxiliaryResource,
@@ -55,10 +53,3 @@ export function OAuthToolbar({
     </div>
   );
 }
-
-OAuthToolbar.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  oauth2: PropTypes.object as PropTypes.Validator<OAuth2AuxiliaryResource>,
-};
diff --git a/src/components/page-active-component/overview.tsx b/src/components/page-active-component/overview.tsx
index d1693102b..702a5e89f 100644
--- a/src/components/page-active-component/overview.tsx
+++ b/src/components/page-active-component/overview.tsx
@@ -1,13 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
-import { DefaultAlias } from './default-alias';
-
-import { ComponentIdentity } from '../component/component-identity';
-import { ComponentPorts } from '../component/component-ports';
-import { DockerImage } from '../docker-image';
-import { ComponentStatusBadge } from '../status-badges';
-
 import type {
   ApplicationAlias,
   Component,
@@ -15,6 +6,11 @@ import type {
   DnsAlias as DnsAliasModel,
   ExternalDns,
 } from '../../store/radix-api';
+import { ComponentIdentity } from '../component/component-identity';
+import { ComponentPorts } from '../component/component-ports';
+import { DockerImage } from '../docker-image';
+import { ComponentStatusBadge } from '../status-badges';
+import { DefaultAlias } from './default-alias';
 import './style.css';
 import { IngressAllowList } from '../component/ingress-allow-list';
 import { ExternalLink } from '../link/external-link';
@@ -30,7 +26,7 @@ type Props = {
   dnsExternalAliases?: ExternalDns[];
   envName: string;
   component: Component;
-  deployment: Deployment;
+  deployment?: Deployment;
 };
 export const Overview = ({
   appAlias,
@@ -56,7 +52,7 @@ export const Overview = ({
           <Typography>
             Image <DockerImage path={component.image} />
           </Typography>
-          {component.identity && (
+          {component.identity && deployment && (
             <ComponentIdentity
               identity={component.identity}
               deployment={deployment}
@@ -67,7 +63,7 @@ export const Overview = ({
         <div className="grid grid--gap-medium">
           <div className="grid grid--gap-small grid--auto-columns">
             <Typography>Status</Typography>
-            <ComponentStatusBadge status={component.status} />
+            <ComponentStatusBadge status={component.status ?? 'Reconciling'} />
           </div>
           {component.variables?.[URL_VAR_NAME] && (
             <Typography>
@@ -86,10 +82,10 @@ export const Overview = ({
               envName={envName}
             />
           )}
-          {dnsAliasUrls?.length > 0 && (
+          {dnsAliasUrls && dnsAliasUrls.length > 0 && (
             <DNSAliases urls={dnsAliasUrls} title={'DNS aliases'} />
           )}
-          {dnsExternalAliasUrls?.length > 0 && (
+          {dnsExternalAliasUrls && dnsExternalAliasUrls.length > 0 && (
             <DNSAliases
               urls={dnsExternalAliasUrls}
               title={'DNS external aliases'}
@@ -100,7 +96,7 @@ export const Overview = ({
               allowedIpRanges={component.network?.ingress?.public?.allow}
             />
           )}
-          <ComponentPorts ports={component.ports} />
+          <ComponentPorts ports={component.ports ?? []} />
           {component.runtime && (
             <div className="grid grid--gap-medium">
               <Runtime runtime={component.runtime!} />
@@ -116,13 +112,3 @@ export const Overview = ({
     </div>
   );
 };
-
-Overview.propTypes = {
-  appAlias: PropTypes.object as PropTypes.Validator<ApplicationAlias>,
-  dnsExternalAliases: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ExternalDns>
-  ),
-  envName: PropTypes.string.isRequired,
-  component: PropTypes.object.isRequired as PropTypes.Validator<Component>,
-  deployment: PropTypes.object.isRequired as PropTypes.Validator<Deployment>,
-};
diff --git a/src/components/page-active-job-component/active-job-component-overview.tsx b/src/components/page-active-job-component/active-job-component-overview.tsx
index 17fb89767..80e75dd02 100644
--- a/src/components/page-active-job-component/active-job-component-overview.tsx
+++ b/src/components/page-active-job-component/active-job-component-overview.tsx
@@ -1,6 +1,3 @@
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import { JobComponentVulnerabilityDetails } from './job-component-vulnerability-details';
 import { Overview } from './overview';
 
@@ -25,11 +22,16 @@ import { EnvironmentVariables } from '../environment-variables';
 import { handlePromiseWithToast } from '../global-top-nav/styled-toaster';
 import { ComponentReplicaList } from '../page-active-component/component-replica-list';
 
-export const ActiveJobComponentOverview: FunctionComponent<{
+type Props = {
   appName: string;
   envName: string;
   jobComponentName: string;
-}> = ({ appName, envName, jobComponentName }) => {
+};
+export const ActiveJobComponentOverview = ({
+  appName,
+  envName,
+  jobComponentName,
+}: Props) => {
   const {
     data: environment,
     refetch,
@@ -168,9 +170,3 @@ export const ActiveJobComponentOverview: FunctionComponent<{
     </>
   );
 };
-
-ActiveJobComponentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-active-job-component/dev.tsx b/src/components/page-active-job-component/dev.tsx
index 2cd606287..e65e1457e 100644
--- a/src/components/page-active-job-component/dev.tsx
+++ b/src/components/page-active-job-component/dev.tsx
@@ -24,6 +24,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z)',
@@ -42,6 +43,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z',
@@ -60,6 +62,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z',
@@ -78,6 +81,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z',
@@ -96,6 +100,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z',
@@ -114,6 +119,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
       {
         created: '2021-07-28T06:33:34.000Z',
@@ -132,6 +138,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
     ],
   },
@@ -158,6 +165,7 @@ const testData: Array<Parameters<typeof ScheduledJobList>[0]> = [
         ],
         backoffLimit: 0,
         failedCount: 0,
+        deploymentName: '',
       },
     ],
   },
diff --git a/src/components/page-active-job-component/overview.tsx b/src/components/page-active-job-component/overview.tsx
index ba5e57107..5159281ff 100644
--- a/src/components/page-active-job-component/overview.tsx
+++ b/src/components/page-active-job-component/overview.tsx
@@ -1,7 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import type { Component, Deployment } from '../../store/radix-api';
 import { ComponentIdentity } from '../component/component-identity';
 import { ComponentPorts } from '../component/component-ports';
@@ -10,10 +7,11 @@ import { DockerImage } from '../docker-image';
 import { ResourceRequirements } from '../resource-requirements';
 import { Runtime } from '../runtime';
 
-export const Overview: FunctionComponent<{
+type Props = {
   component: Component;
-  deployment: Deployment;
-}> = ({ component, deployment }) => (
+  deployment?: Deployment;
+};
+export const Overview = ({ component, deployment }: Props) => (
   <div className="grid grid--gap-medium">
     <Typography variant="h4">Overview</Typography>
     <div className="grid grid--gap-medium grid--overview-columns">
@@ -24,7 +22,7 @@ export const Overview: FunctionComponent<{
         <Typography>
           Image <DockerImage path={component.image} />
         </Typography>
-        {component.identity && (
+        {component.identity && deployment && (
           <ComponentIdentity
             identity={component.identity}
             deployment={deployment}
@@ -32,7 +30,7 @@ export const Overview: FunctionComponent<{
         )}
       </div>
       <div className="grid grid--gap-medium">
-        <ComponentPorts ports={component.ports} />
+        <ComponentPorts ports={component.ports ?? []} />
         {component.runtime && <Runtime runtime={component.runtime!} />}
         {component.resources && (
           <ResourceRequirements resources={component.resources} />
@@ -44,8 +42,3 @@ export const Overview: FunctionComponent<{
     </div>
   </div>
 );
-
-Overview.propTypes = {
-  component: PropTypes.object.isRequired as PropTypes.Validator<Component>,
-  deployment: PropTypes.object.isRequired as PropTypes.Validator<Deployment>,
-};
diff --git a/src/components/page-configuration/build-secrets-accordion.tsx b/src/components/page-configuration/build-secrets-accordion.tsx
index 5b02ab332..561191fb7 100644
--- a/src/components/page-configuration/build-secrets-accordion.tsx
+++ b/src/components/page-configuration/build-secrets-accordion.tsx
@@ -1,6 +1,5 @@
 import { Accordion, List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import { type FunctionComponent, type ReactNode, useState } from 'react';
+import { type ReactNode, useState } from 'react';
 
 import { pollingInterval } from '../../store/defaults';
 import {
@@ -17,12 +16,13 @@ import { BuildSecretStatusBadge } from '../status-badges/build-secret-status-bad
 
 import './style.css';
 
-const BuildSecretForm: FunctionComponent<{
+type Props = {
   appName: string;
   secret: BuildSecret;
   fetchSecret: () => void;
   onSave: () => void;
-}> = ({ appName, secret, fetchSecret, onSave }) => {
+};
+const BuildSecretForm = ({ appName, secret, fetchSecret, onSave }: Props) => {
   const [mutate, { isLoading }] = useUpdateBuildSecretsSecretValueMutation();
 
   const onSaveSecret = handlePromiseWithToast(async (secretValue: string) => {
@@ -48,12 +48,16 @@ const BuildSecretForm: FunctionComponent<{
   );
 };
 
-const SecretLink: FunctionComponent<
-  { title?: string; scrimTitle?: ReactNode } & Pick<
-    Parameters<typeof BuildSecretForm>[0],
-    'appName' | 'fetchSecret' | 'secret'
-  >
-> = ({ secret, title, scrimTitle, ...rest }) => {
+type SecretLinkProps = { title?: string; scrimTitle?: ReactNode } & Pick<
+  Parameters<typeof BuildSecretForm>[0],
+  'appName' | 'fetchSecret' | 'secret'
+>;
+const SecretLink = ({
+  secret,
+  title,
+  scrimTitle,
+  ...rest
+}: SecretLinkProps) => {
   const [visibleScrim, setVisibleScrim] = useState(false);
 
   return (
@@ -85,12 +89,10 @@ const SecretLink: FunctionComponent<
   );
 };
 
-export const BuildSecretsAccordion: FunctionComponent<{ appName: string }> = ({
-  appName,
-}) => {
+export const BuildSecretsAccordion = ({ appName }: { appName: string }) => {
   const { data, refetch, ...state } = useGetBuildSecretsQuery(
     { appName },
-    { skip: !appName, pollingInterval }
+    { pollingInterval }
   );
 
   return (
@@ -101,7 +103,7 @@ export const BuildSecretsAccordion: FunctionComponent<{ appName: string }> = ({
         </Accordion.Header>
         <Accordion.Panel>
           <AsyncResource asyncState={state}>
-            {data?.length > 0 ? (
+            {data && data.length > 0 ? (
               <List className="o-indent-list">
                 {dataSorter(data, [
                   (x, y) => sortCompareString(x.name, y.name),
@@ -128,7 +130,3 @@ export const BuildSecretsAccordion: FunctionComponent<{ appName: string }> = ({
     </Accordion>
   );
 };
-
-BuildSecretsAccordion.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-configuration/change-admin-form.tsx b/src/components/page-configuration/change-admin-form.tsx
index de8129c18..53bd9d28b 100644
--- a/src/components/page-configuration/change-admin-form.tsx
+++ b/src/components/page-configuration/change-admin-form.tsx
@@ -4,10 +4,9 @@ import {
   CircularProgress,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FormEvent, useState } from 'react';
 
-import { difference } from 'lodash';
+import { difference } from 'lodash-es';
 import {
   type ApplicationRegistration,
   useModifyRegistrationDetailsMutation,
@@ -65,11 +64,11 @@ export default function ChangeAdminForm({ registration, refetch }: Props) {
 
   const isUnchanged = adminUnchanged && readerUnchanged;
 
-  const handleReaderAdGroupsChange = (value: AdGroupItem[]) => {
+  const handleReaderAdGroupsChange = (value: Readonly<AdGroupItem[]>) => {
     setReaderAdGroup(value.filter((x) => x.type === 'Group').map((v) => v.id));
     setReaderAdUser(value.filter((x) => x.type !== 'Group').map((x) => x.id));
   };
-  const handleAdGroupsChange = (value: AdGroupItem[]) => {
+  const handleAdGroupsChange = (value: Readonly<AdGroupItem[]>) => {
     setAdminAdGroup(value.filter((x) => x.type === 'Group').map((v) => v.id));
     setAdminAdUser(value.filter((x) => x.type !== 'Group').map((x) => x.id));
   };
@@ -114,8 +113,3 @@ export default function ChangeAdminForm({ registration, refetch }: Props) {
     </Accordion>
   );
 }
-
-ChangeAdminForm.proptypes = {
-  registration: PropTypes.object.isRequired,
-  refetch: PropTypes.func,
-};
diff --git a/src/components/page-configuration/change-ci-form.tsx b/src/components/page-configuration/change-ci-form.tsx
index 13a938aaa..524afed03 100644
--- a/src/components/page-configuration/change-ci-form.tsx
+++ b/src/components/page-configuration/change-ci-form.tsx
@@ -4,7 +4,6 @@ import {
   CircularProgress,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FormEvent, useState } from 'react';
 
 import { useModifyRegistrationDetailsMutation } from '../../store/radix-api';
@@ -25,7 +24,7 @@ export const ChangeConfigurationItemForm = ({
   configurationItem,
   refetch,
 }: Props) => {
-  const [newCI, setNewCI] = useState<Application>();
+  const [newCI, setNewCI] = useState<Application | null>(null);
   const [mutate, { isLoading, error }] = useModifyRegistrationDetailsMutation();
 
   const handleSubmit = handlePromiseWithToast(async (ev: FormEvent) => {
@@ -35,7 +34,7 @@ export const ChangeConfigurationItemForm = ({
       appName,
       applicationRegistrationPatchRequest: {
         applicationRegistrationPatch: {
-          configurationItem: newCI.id,
+          configurationItem: newCI!.id, //Button is disabled if newCI is not set
         },
       },
     }).unwrap();
@@ -89,9 +88,3 @@ export const ChangeConfigurationItemForm = ({
     </Accordion>
   );
 };
-
-ChangeConfigurationItemForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-  configurationItem: PropTypes.string,
-  refetch: PropTypes.func,
-};
diff --git a/src/components/page-configuration/change-config-branch-form.tsx b/src/components/page-configuration/change-config-branch-form.tsx
index 8595cb4e2..f32c0afdd 100644
--- a/src/components/page-configuration/change-config-branch-form.tsx
+++ b/src/components/page-configuration/change-config-branch-form.tsx
@@ -6,8 +6,12 @@ import {
   TextField,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import { type FormEvent, type FunctionComponent, useState } from 'react';
+import {
+  type ChangeEvent,
+  type FormEvent,
+  type FunctionComponent,
+  useState,
+} from 'react';
 import { Link } from 'react-router-dom';
 
 import { routes } from '../../routes';
@@ -71,7 +75,9 @@ export const ChangeConfigBranchForm: FunctionComponent<
               disabled={isLoading}
               type="text"
               value={configBranchState}
-              onChange={(e) => setConfigBranchState(e.target.value)}
+              onChange={(e: ChangeEvent<HTMLInputElement>) =>
+                setConfigBranchState(e.target.value)
+              }
             />
             <div className="o-body-text">
               <List variant="numbered">
@@ -124,8 +130,3 @@ export const ChangeConfigBranchForm: FunctionComponent<
     </Accordion>
   );
 };
-
-ChangeConfigBranchForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-  configBranch: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-configuration/change-config-file-form.tsx b/src/components/page-configuration/change-config-file-form.tsx
index 4e3b511b2..237f790a1 100644
--- a/src/components/page-configuration/change-config-file-form.tsx
+++ b/src/components/page-configuration/change-config-file-form.tsx
@@ -5,7 +5,6 @@ import {
   TextField,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import {
   type ChangeEvent,
   type FormEvent,
@@ -90,8 +89,10 @@ export const ChangeConfigFileForm: FunctionComponent<
                     color="danger"
                     type="submit"
                     disabled={
-                      radixConfigFullName === configNameState ||
-                      configNameState?.length < 5
+                      !!(
+                        radixConfigFullName === configNameState ||
+                        (configNameState && configNameState.length < 5)
+                      )
                     }
                   >
                     Change config file
@@ -105,9 +106,3 @@ export const ChangeConfigFileForm: FunctionComponent<
     </Accordion>
   );
 };
-
-ChangeConfigFileForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-  radixConfigFullName: PropTypes.string,
-  refetch: PropTypes.func,
-};
diff --git a/src/components/page-configuration/change-repository-form.tsx b/src/components/page-configuration/change-repository-form.tsx
index cdcef79af..5224729db 100644
--- a/src/components/page-configuration/change-repository-form.tsx
+++ b/src/components/page-configuration/change-repository-form.tsx
@@ -7,7 +7,6 @@ import {
   TextField,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type ChangeEvent, type FormEvent, useState } from 'react';
 
 import imageDeployKey from '../configure-application-github/deploy-key02.png';
@@ -35,7 +34,7 @@ const DeployKey = ({ appName }: { appName: string }) => {
 
   return (
     <AsyncResource asyncState={depAndSecState}>
-      <Code copy>{deployKeAndSecret?.publicDeployKey}</Code>
+      <Code copy>{deployKeAndSecret?.publicDeployKey ?? ''}</Code>
     </AsyncResource>
   );
 };
@@ -43,7 +42,7 @@ const DeployKey = ({ appName }: { appName: string }) => {
 interface Props {
   appName: string;
   repository: string;
-  refetch?: () => unknown;
+  refetch: () => unknown;
   sharedSecret: string;
 }
 export function ChangeRepositoryForm({
@@ -231,10 +230,3 @@ export function ChangeRepositoryForm({
     </Accordion>
   );
 }
-
-ChangeRepositoryForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-  repository: PropTypes.string.isRequired,
-  refetch: PropTypes.func,
-  sharedSecret: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-configuration/delete-application-form.tsx b/src/components/page-configuration/delete-application-form.tsx
index 717e810a3..b0220bd21 100644
--- a/src/components/page-configuration/delete-application-form.tsx
+++ b/src/components/page-configuration/delete-application-form.tsx
@@ -6,7 +6,6 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { warning_outlined } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { type ChangeEvent, useState } from 'react';
 
 import { Alert } from '../alert';
@@ -115,6 +114,3 @@ export default function DeleteApplicationForm({ appName }: Props) {
     </Accordion>
   );
 }
-DeleteApplicationForm.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-configuration/image-hubs-accordion.tsx b/src/components/page-configuration/image-hubs-accordion.tsx
index e6d1e3fb3..58fa5569d 100644
--- a/src/components/page-configuration/image-hubs-accordion.tsx
+++ b/src/components/page-configuration/image-hubs-accordion.tsx
@@ -1,7 +1,5 @@
 import { Accordion, List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type ReactNode, useState } from 'react';
-
 import { pollingInterval } from '../../store/defaults';
 import {
   type ImageHubSecret,
@@ -39,7 +37,7 @@ function ImageHubForm({ appName, secret, fetchSecret, onSave }: FormProps) {
           await trigger({
             appName,
             serverName: secret.server,
-            secretParameters: { secretValue: value?.toString() || null },
+            secretParameters: { secretValue: value },
           }).unwrap();
 
           fetchSecret();
@@ -115,7 +113,7 @@ export function ImageHubsAccordion({ appName }: Props) {
         </Accordion.Header>
         <Accordion.Panel>
           <AsyncResource asyncState={state}>
-            {data?.length > 0 ? (
+            {data && data.length > 0 ? (
               <List className="o-indent-list">
                 {dataSorter(data, [
                   (x, y) => sortCompareString(x.server, y.server),
@@ -129,7 +127,9 @@ export function ImageHubsAccordion({ appName }: Props) {
                         {...{ appName, secret }}
                       />
 
-                      <ImageHubSecretStatusBadge status={secret.status} />
+                      <ImageHubSecretStatusBadge
+                        status={secret.status ?? 'Pending'}
+                      />
                     </div>
                   </List.Item>
                 ))}
@@ -143,7 +143,3 @@ export function ImageHubsAccordion({ appName }: Props) {
     </Accordion>
   );
 }
-
-ImageHubsAccordion.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-configuration/index.tsx b/src/components/page-configuration/index.tsx
index 5f49c5d12..03cdc91c9 100644
--- a/src/components/page-configuration/index.tsx
+++ b/src/components/page-configuration/index.tsx
@@ -10,7 +10,6 @@ import { ImageHubsAccordion } from './image-hubs-accordion';
 import { Overview } from './overview';
 
 import { routes } from '../../routes';
-import { configVariables } from '../../utils/config';
 import { withRouteParams } from '../../utils/router';
 import { routeWithParams } from '../../utils/string';
 import AsyncResource from '../async-resource/async-resource';
@@ -24,7 +23,7 @@ import { ExternalLink } from '../link/external-link';
 import { RadixConfigFileLink } from '../link/radix-config-file-link';
 import './style.css';
 
-function getConfigBranch(configBranch: string): string {
+function getConfigBranch(configBranch?: string): string {
   return configBranch || 'master';
 }
 
@@ -96,12 +95,7 @@ export function PageConfiguration({ appName }: { appName: string }) {
 
             <section className="grid grid--gap-small">
               <Typography variant="h4">Danger Zone</Typography>
-              {configVariables.FLAGS.enableChangeAdmin && (
-                <ChangeAdminForm
-                  registration={registration}
-                  refetch={refetch}
-                />
-              )}
+              <ChangeAdminForm registration={registration} refetch={refetch} />
               <ChangeRepositoryForm
                 appName={appName}
                 repository={registration.repository}
diff --git a/src/components/page-configuration/overview.tsx b/src/components/page-configuration/overview.tsx
index 085d603ff..b18d8d908 100644
--- a/src/components/page-configuration/overview.tsx
+++ b/src/components/page-configuration/overview.tsx
@@ -4,8 +4,6 @@ import {
   List,
   Typography,
 } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import { computer, group } from '@equinor/eds-icons';
 import {
   useGetAdGroupsQuery,
@@ -103,8 +101,3 @@ export function Overview({ adGroups, adUsers, appName }: Props) {
     </div>
   );
 }
-
-Overview.propTypes = {
-  adGroups: PropTypes.arrayOf(PropTypes.string),
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-create-application/index.tsx b/src/components/page-create-application/index.tsx
index 3ecb3adf7..d7fa8dc64 100644
--- a/src/components/page-create-application/index.tsx
+++ b/src/components/page-create-application/index.tsx
@@ -13,8 +13,12 @@ import type { ApplicationRegistration } from '../../store/radix-api';
 import { NewApplyConfigPipelineLink } from '../link/apply-config-pipeline-link';
 import './style.css';
 
-function scrollToPosition(elementRef: Element, x: number, y: number): void {
-  elementRef.scrollTo?.(x, y);
+function scrollToPosition(
+  elementRef: Element | null,
+  x: number,
+  y: number
+): void {
+  elementRef?.scrollTo?.(x, y);
 }
 
 export default function PageCreateApplication() {
diff --git a/src/components/page-deployment-component/deployment-component-overview.tsx b/src/components/page-deployment-component/deployment-component-overview.tsx
index c3f996a9d..4b6601fec 100644
--- a/src/components/page-deployment-component/deployment-component-overview.tsx
+++ b/src/components/page-deployment-component/deployment-component-overview.tsx
@@ -1,6 +1,4 @@
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
-
 import useLocalStorage from '../../effects/use-local-storage';
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
@@ -78,9 +76,3 @@ export const DeploymentComponentOverview: FunctionComponent<{
     </>
   );
 };
-
-DeploymentComponentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-deployment-component/dev.tsx b/src/components/page-deployment-component/dev.tsx
index 9d5931f13..feb3be18b 100644
--- a/src/components/page-deployment-component/dev.tsx
+++ b/src/components/page-deployment-component/dev.tsx
@@ -160,6 +160,7 @@ new Server({
     );
 
     // Mock response for ChangeEnvVar
+    // @ts-expect-error no idea what this should be
     this.patch<ChangeEnvVarApiResponse>(
       '/api/v1/applications/:appName/environments/:envName/components/:componentName/envvars',
       () => void 0
diff --git a/src/components/page-deployment-job-component/deployment-job-component-overview.tsx b/src/components/page-deployment-job-component/deployment-job-component-overview.tsx
index c6f6e6fc4..8a424b38a 100644
--- a/src/components/page-deployment-job-component/deployment-job-component-overview.tsx
+++ b/src/components/page-deployment-job-component/deployment-job-component-overview.tsx
@@ -1,6 +1,4 @@
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
-
 import useLocalStorage from '../../effects/use-local-storage';
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
@@ -72,9 +70,3 @@ export const DeploymentJobComponentOverview: FunctionComponent<{
     </>
   );
 };
-
-DeploymentJobComponentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-deployment-job-component/dev.tsx b/src/components/page-deployment-job-component/dev.tsx
index 5f75acce4..fcd3afdc9 100644
--- a/src/components/page-deployment-job-component/dev.tsx
+++ b/src/components/page-deployment-job-component/dev.tsx
@@ -215,6 +215,7 @@ const testData: Array<
           },
         },
       ],
+      activeFrom: '1970-01-01',
     },
   },
   {
@@ -226,6 +227,7 @@ const testData: Array<
       environment: 'prod',
       namespace: 'ns',
       repository: 'repo',
+      activeFrom: '1970-01-01',
       components: [
         {
           image: 'radixdev.azurecr.io/radix-job-demo-api:2svag',
@@ -438,6 +440,7 @@ new Server({
     );
 
     // Mock response for ChangeEnvVar
+    // @ts-expect-error no idea what this should be
     this.patch<ChangeEnvVarApiResponse>(
       '/api/v1/applications/:appName/environments/:envName/components/:componentName/envvars',
       () => void 0
diff --git a/src/components/page-deployment/deployment-component-list.tsx b/src/components/page-deployment/deployment-component-list.tsx
index 9514c1069..7476dd4c1 100644
--- a/src/components/page-deployment/deployment-component-list.tsx
+++ b/src/components/page-deployment/deployment-component-list.tsx
@@ -1,7 +1,5 @@
 import { List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-
 import { routes } from '../../routes';
 import type { Component, Deployment } from '../../store/radix-api';
 import { routeWithParams } from '../../utils/string';
@@ -56,11 +54,3 @@ export const DeploymentComponentList = ({
     )}
   </>
 );
-
-DeploymentComponentList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deployment: PropTypes.object.isRequired as PropTypes.Validator<Deployment>,
-  components: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<Component>
-  ),
-};
diff --git a/src/components/page-deployment/deployment-job-component-list.tsx b/src/components/page-deployment/deployment-job-component-list.tsx
index 3d38283d2..795a9326f 100644
--- a/src/components/page-deployment/deployment-job-component-list.tsx
+++ b/src/components/page-deployment/deployment-job-component-list.tsx
@@ -1,7 +1,5 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-
 import { routes } from '../../routes';
 import type { Component } from '../../store/radix-api';
 import { routeWithParams } from '../../utils/string';
@@ -42,11 +40,3 @@ export const DeploymentJobComponentList = ({
     )}
   </>
 );
-
-DeploymentJobComponentList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-  components: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<Component>
-  ),
-};
diff --git a/src/components/page-deployment/deployment-overview.tsx b/src/components/page-deployment/deployment-overview.tsx
index 9c4c5ae0f..c288ce207 100644
--- a/src/components/page-deployment/deployment-overview.tsx
+++ b/src/components/page-deployment/deployment-overview.tsx
@@ -1,7 +1,5 @@
 import { Button, Icon, Typography } from '@equinor/eds-core-react';
 import { info_circle } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-
 import { Link } from 'react-router-dom';
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
@@ -25,7 +23,7 @@ export const DeploymentOverview = ({ appName, deploymentName }: Props) => {
     { appName, deploymentName },
     { skip: !appName || !deploymentName, pollingInterval }
   );
-  const componentMap = deployment && buildComponentMap(deployment.components);
+  const componentMap = buildComponentMap(deployment?.components ?? []);
 
   return (
     <>
@@ -76,7 +74,7 @@ export const DeploymentOverview = ({ appName, deploymentName }: Props) => {
                 <DeploymentComponentList
                   appName={appName}
                   deployment={deployment}
-                  components={componentMap.component}
+                  components={componentMap?.component ?? []}
                 />
               </div>
 
@@ -84,7 +82,7 @@ export const DeploymentOverview = ({ appName, deploymentName }: Props) => {
                 <DeploymentJobComponentList
                   appName={appName}
                   deploymentName={deploymentName}
-                  components={componentMap.job}
+                  components={componentMap?.job ?? []}
                 />
               </div>
             </>
@@ -94,8 +92,3 @@ export const DeploymentOverview = ({ appName, deploymentName }: Props) => {
     </>
   );
 };
-
-DeploymentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deploymentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-deployment/deployment-summary.tsx b/src/components/page-deployment/deployment-summary.tsx
index 5e16edcdd..4a93e3de0 100644
--- a/src/components/page-deployment/deployment-summary.tsx
+++ b/src/components/page-deployment/deployment-summary.tsx
@@ -1,8 +1,6 @@
 import { Icon, Typography } from '@equinor/eds-core-react';
 import { github } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-
 import { routes } from '../../routes';
 import type { Deployment } from '../../store/radix-api';
 import { routeWithParams, smallJobName } from '../../utils/string';
@@ -102,8 +100,3 @@ export const DeploymentSummary = ({ appName, deployment }: Props) => (
     </div>
   </div>
 );
-
-DeploymentSummary.propTypes = {
-  appName: PropTypes.string.isRequired,
-  deployment: PropTypes.object.isRequired as PropTypes.Validator<Deployment>,
-};
diff --git a/src/components/page-deployments/index.tsx b/src/components/page-deployments/index.tsx
index 19aa2db1b..d9f019894 100644
--- a/src/components/page-deployments/index.tsx
+++ b/src/components/page-deployments/index.tsx
@@ -1,5 +1,3 @@
-import * as PropTypes from 'prop-types';
-
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
 import { useGetDeploymentsQuery } from '../../store/radix-api';
@@ -32,9 +30,4 @@ export function PageDeployments({ appName }: Props) {
     </>
   );
 }
-
-PageDeployments.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageDeployments);
diff --git a/src/components/page-environment/component-list.tsx b/src/components/page-environment/component-list.tsx
index 93193ddd3..0f7288557 100644
--- a/src/components/page-environment/component-list.tsx
+++ b/src/components/page-environment/component-list.tsx
@@ -1,6 +1,5 @@
 import { Accordion, Icon, Table, Typography } from '@equinor/eds-core-react';
-import { upperFirst } from 'lodash';
-import * as PropTypes from 'prop-types';
+import { upperFirst } from 'lodash-es';
 import {
   Fragment,
   type FunctionComponent,
@@ -16,6 +15,7 @@ import clsx from 'clsx';
 import type {
   Component,
   Environment,
+  OAuth2AuxiliaryResource,
   ReplicaSummary,
 } from '../../store/radix-api';
 import {
@@ -59,23 +59,20 @@ function getEnvironmentComponentScanModel(
   data: Readonly<EnvironmentVulnerabilities>,
   name: string,
   type: Component['type']
-): ImageWithLastScan {
-  let componentKey = '' as keyof EnvironmentVulnerabilities;
+): ImageWithLastScan | undefined {
   switch (type) {
     case 'component':
-      componentKey = 'components';
-      break;
+      return data?.components?.[name];
     case 'job':
-      componentKey = 'jobs';
-      break;
+      return data?.jobs?.[name];
     default:
-      break;
+      return undefined;
   }
-
-  return data?.[componentKey]?.[name];
 }
 
-function hasComponentOAuth2Service(c: Component): boolean {
+function hasComponentOAuth2Service(
+  c: Component
+): c is Component & { oauth2: OAuth2AuxiliaryResource } {
   return !!c.oauth2;
 }
 
@@ -87,7 +84,7 @@ const ReplicaLinks: FunctionComponent<{
   replicaList?: Readonly<Array<ReplicaSummary>>;
   urlFunc: (replica: ReplicaSummary) => string;
 }> = ({ replicaList, urlFunc }) =>
-  replicaList?.length > 0 ? (
+  replicaList && replicaList.length > 0 ? (
     <div className="component-replica__link-container">
       {replicaList.map((x, i) => (
         <Typography
@@ -97,7 +94,7 @@ const ReplicaLinks: FunctionComponent<{
           to={urlFunc(x)}
           link
         >
-          <ReplicaStatusTooltip status={x.replicaStatus.status} />
+          <ReplicaStatusTooltip status={x.replicaStatus?.status ?? 'Pending'} />
           {smallReplicaName(x.name)}
         </Typography>
       ))}
@@ -134,20 +131,22 @@ export const ComponentList: FunctionComponent<ComponentListProps> = ({
     Object.fromEntries(
       components
         .filter(hasComponentOAuth2Service)
-        .map((c) => [c.name, c.oauth2.deployment.status !== 'Consistent'])
+        .map((c) => [c.name, c.oauth2?.deployment.status !== 'Consistent'])
     )
   );
-  const [trigger, { data: vulnerabilities, ...state }] =
+  const [trigger, { data: vulnerabilities, ...vulnerabilityState }] =
     scanApi.endpoints.getEnvironmentVulnerabilitySummary.useLazyQuery();
   const expandComponent = useCallback(
     (name: string) =>
       setExpandedComponents((x) => ({ ...x, [name]: !x[name] })),
     []
   );
+
   useEffect(() => {
     const request = trigger({ appName, envName });
     return () => request?.abort();
   }, [appName, envName, trigger]);
+
   const compMap = useMemo(() => buildComponentMap(components), [components]);
   const showChevronColumn = useMemo(
     () => components.some(hasComponentAdditionalInfo),
@@ -232,7 +231,9 @@ export const ComponentList: FunctionComponent<ComponentListProps> = ({
                               </Typography>
                             </Table.Cell>
                             <Table.Cell>
-                              <ComponentStatusBadge status={x.status} />
+                              <ComponentStatusBadge
+                                status={x.status ?? 'Reconciling'}
+                              />
                             </Table.Cell>
                             <Table.Cell>
                               <ReplicaLinks
@@ -249,26 +250,30 @@ export const ComponentList: FunctionComponent<ComponentListProps> = ({
                             </Table.Cell>
                             <Table.Cell>
                               <AsyncResource
-                                asyncState={state}
+                                asyncState={vulnerabilityState}
                                 errorContent={
                                   <samp>
-                                    {state.isError &&
+                                    {vulnerabilityState.isError &&
                                       (({ code, message }) =>
                                         [code, message]
                                           .filter((x) => !!x)
                                           .join(': '))(
-                                        getFetchErrorData(state.error)
+                                        getFetchErrorData(
+                                          vulnerabilityState.error
+                                        )
                                       )}
                                   </samp>
                                 }
                               >
-                                <EnvironmentComponentScanSummary
-                                  scan={getEnvironmentComponentScanModel(
-                                    vulnerabilities,
-                                    x.name,
-                                    x.type
-                                  )}
-                                />
+                                {vulnerabilities && (
+                                  <EnvironmentComponentScanSummary
+                                    scan={getEnvironmentComponentScanModel(
+                                      vulnerabilities,
+                                      x.name,
+                                      x.type
+                                    )}
+                                  />
+                                )}
                               </AsyncResource>
                             </Table.Cell>
                           </Table.Row>
@@ -285,7 +290,7 @@ export const ComponentList: FunctionComponent<ComponentListProps> = ({
                                   </Table.Cell>
                                   <Table.Cell>
                                     <ComponentStatusBadge
-                                      status={x.oauth2?.deployment.status}
+                                      status={x.oauth2.deployment.status}
                                     />
                                   </Table.Cell>
                                   <Table.Cell>
@@ -320,11 +325,3 @@ export const ComponentList: FunctionComponent<ComponentListProps> = ({
     </>
   );
 };
-
-ComponentList.propTypes = {
-  appName: PropTypes.string.isRequired,
-  environment: PropTypes.object.isRequired as PropTypes.Validator<Environment>,
-  components: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<Component>
-  ).isRequired,
-};
diff --git a/src/components/page-environment/environment-alerting.tsx b/src/components/page-environment/environment-alerting.tsx
index ebb5ea7fb..31fabc6e3 100644
--- a/src/components/page-environment/environment-alerting.tsx
+++ b/src/components/page-environment/environment-alerting.tsx
@@ -1,12 +1,9 @@
 import { Button, Icon, Typography } from '@equinor/eds-core-react';
 import { notifications, notifications_off } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
-
 import { Alerting } from '../alerting';
 import AsyncResource from '../async-resource/async-resource';
 import { ScrimPopup } from '../scrim-popup';
-
 import './style.css';
 import { pollingInterval } from '../../store/defaults';
 import { type UpdateAlertingConfig, radixApi } from '../../store/radix-api';
@@ -97,8 +94,3 @@ export default function EnvironmentAlerting({ appName, envName }: Props) {
     </AsyncResource>
   );
 }
-
-EnvironmentAlerting.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-environment/environment-overview.tsx b/src/components/page-environment/environment-overview.tsx
index cab90658a..e702f48fc 100644
--- a/src/components/page-environment/environment-overview.tsx
+++ b/src/components/page-environment/environment-overview.tsx
@@ -1,7 +1,5 @@
 import { Button, Icon, Typography } from '@equinor/eds-core-react';
 import { github, trending_up } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 import { Link } from 'react-router-dom';
 
 import { ComponentList } from './component-list';
@@ -17,7 +15,6 @@ import {
   useGetEnvironmentQuery,
 } from '../../store/radix-api';
 import { getFetchErrorMessage } from '../../store/utils';
-import { configVariables } from '../../utils/config';
 import {
   getAppDeploymentUrl,
   getAppUrl,
@@ -45,10 +42,11 @@ import { DNSAliases } from '../component/dns-aliases';
 import { GitCommitTags } from '../component/git-commit-tags';
 import { ExternalLink } from '../link/external-link';
 
-export const EnvironmentOverview: FunctionComponent<{
+type Props = {
   appName: string;
   envName: string;
-}> = ({ appName, envName }) => {
+};
+export const EnvironmentOverview = ({ appName, envName }: Props) => {
   const { data: application } = useGetApplicationQuery(
     { appName },
     { skip: !appName, pollingInterval }
@@ -61,8 +59,10 @@ export const EnvironmentOverview: FunctionComponent<{
     { appName, envName },
     { skip: !appName || !envName, pollingInterval }
   );
-  const [isEventListExpanded, setIsEventListExpanded] =
-    useLocalStorage<boolean>('environmentEventListExpanded', true);
+  const [isEventListExpanded, setIsEventListExpanded] = useLocalStorage(
+    'environmentEventListExpanded',
+    true
+  );
   const { data: events } = useGetEnvironmentEventsQuery(
     { appName, envName },
     { skip: !appName || !envName || !isEventListExpanded, pollingInterval }
@@ -159,7 +159,7 @@ export const EnvironmentOverview: FunctionComponent<{
                       Built and deployed from{' '}
                       <ExternalLink
                         href={linkToGitHubBranch(
-                          application.registration.repository,
+                          application.registration?.repository ?? '',
                           environment.branchMapping
                         )}
                       >
@@ -174,7 +174,7 @@ export const EnvironmentOverview: FunctionComponent<{
                     <Typography>
                       Built from commit{' '}
                       <CommitHash
-                        repo={application.registration.repository}
+                        repo={application.registration?.repository ?? ''}
                         commit={deployment.gitCommitHash}
                       />
                     </Typography>
@@ -189,7 +189,7 @@ export const EnvironmentOverview: FunctionComponent<{
                             <GitCommitTags
                               commitID={component.commitID}
                               // gitTags={component.gitTags}
-                              repository={deployment.repository}
+                              repository={deployment?.repository ?? ''}
                             />
                           </>
                         </Typography>
@@ -220,30 +220,30 @@ export const EnvironmentOverview: FunctionComponent<{
                         >
                           {smallDeploymentName(deployment.name)}
                         </Typography>{' '}
-                        {configVariables.FLAGS.enablePromotionPipeline && (
-                          <Button
-                            variant="ghost"
-                            as={Link}
-                            to={routeWithParams(
-                              routes.appJobNew,
-                              { appName: appName },
-                              {
-                                pipeline: 'promote',
-                                deploymentName: deployment.name,
-                                fromEnvironment: deployment.environment,
-                              }
-                            )}
-                          >
-                            Promote <Icon data={trending_up} />
-                          </Button>
-                        )}
+                        <Button
+                          variant="ghost"
+                          as={Link}
+                          to={routeWithParams(
+                            routes.appJobNew,
+                            { appName: appName },
+                            {
+                              pipeline: 'promote',
+                              deploymentName: deployment.name,
+                              fromEnvironment: deployment.environment,
+                            }
+                          )}
+                        >
+                          Promote <Icon data={trending_up} />
+                        </Button>
                       </Typography>
                       {deployment.gitTags && (
                         <div className="environment-overview__tags grid grid--gap-x-small grid--auto-columns">
                           <Typography>Tags</Typography>
                           <GitTagLinks
                             gitTags={deployment.gitTags}
-                            repository={application.registration.repository}
+                            repository={
+                              application.registration?.repository ?? ''
+                            }
                           />
                           <Icon data={github} size={24} />
                         </div>
@@ -306,9 +306,4 @@ export const EnvironmentOverview: FunctionComponent<{
   );
 };
 
-EnvironmentOverview.propTypes = {
-  appName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-};
-
 export default EnvironmentOverview;
diff --git a/src/components/page-environment/environment-toolbar.tsx b/src/components/page-environment/environment-toolbar.tsx
index 20b84bbef..1833f7beb 100644
--- a/src/components/page-environment/environment-toolbar.tsx
+++ b/src/components/page-environment/environment-toolbar.tsx
@@ -1,5 +1,4 @@
 import { Button, CircularProgress } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import { useDurationInterval } from '../../effects/use-interval';
@@ -12,7 +11,7 @@ export const EnvironmentToolbar: FunctionComponent<{
   environment: Readonly<Environment>;
   startEnabled?: boolean;
   stopEnabled?: boolean;
-  refetch?: () => unknown;
+  refetch: () => unknown;
 }> = ({
   appName,
   environment: { activeDeployment, name },
@@ -116,11 +115,4 @@ export const EnvironmentToolbar: FunctionComponent<{
   );
 };
 
-EnvironmentToolbar.propTypes = {
-  appName: PropTypes.string.isRequired,
-  environment: PropTypes.object.isRequired,
-  startEnabled: PropTypes.bool,
-  stopEnabled: PropTypes.bool,
-};
-
 export default EnvironmentToolbar;
diff --git a/src/components/page-environments/index.tsx b/src/components/page-environments/index.tsx
index 71f33e1cc..eb0b172c9 100644
--- a/src/components/page-environments/index.tsx
+++ b/src/components/page-environments/index.tsx
@@ -1,5 +1,3 @@
-import * as PropTypes from 'prop-types';
-
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
 import { useGetApplicationQuery } from '../../store/radix-api';
@@ -34,8 +32,4 @@ export function PageEnvironments({ appName }: Props) {
   );
 }
 
-PageEnvironments.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageEnvironments);
diff --git a/src/components/page-oauth-replica/index.tsx b/src/components/page-oauth-replica/index.tsx
index 25e7c6463..0697edd24 100644
--- a/src/components/page-oauth-replica/index.tsx
+++ b/src/components/page-oauth-replica/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
@@ -104,12 +103,4 @@ export function PageOAuthAuxiliaryReplica({
     </>
   );
 }
-
-PageOAuthAuxiliaryReplica.propTypes = {
-  appName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  replicaName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageOAuthAuxiliaryReplica);
diff --git a/src/components/page-pipeline-jobs/application-alerting.tsx b/src/components/page-pipeline-jobs/application-alerting.tsx
index d5184eb20..bf10fd153 100644
--- a/src/components/page-pipeline-jobs/application-alerting.tsx
+++ b/src/components/page-pipeline-jobs/application-alerting.tsx
@@ -1,6 +1,5 @@
 import { Button, Icon, Typography } from '@equinor/eds-core-react';
 import { notifications, notifications_off } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
 
 import { Alerting } from '../alerting';
@@ -86,8 +85,4 @@ const ApplicationAlerting = ({ appName }: Props) => {
   );
 };
 
-ApplicationAlerting.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
-
 export default ApplicationAlerting;
diff --git a/src/components/page-pipeline-run-task/index.tsx b/src/components/page-pipeline-run-task/index.tsx
index 3dff1f41b..783abccfc 100644
--- a/src/components/page-pipeline-run-task/index.tsx
+++ b/src/components/page-pipeline-run-task/index.tsx
@@ -1,5 +1,3 @@
-import * as PropTypes from 'prop-types';
-
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
 import {
@@ -75,7 +73,7 @@ export function PagePipelineRunTask({
               pipelineRunName,
             }),
           },
-          { label: task?.name },
+          { label: task?.name ?? ' ' },
         ]}
       />
 
@@ -104,10 +102,4 @@ export function PagePipelineRunTask({
     </>
   );
 }
-PagePipelineRunTask.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRunName: PropTypes.string.isRequired,
-  taskName: PropTypes.string.isRequired,
-};
 export default withRouteParams(PagePipelineRunTask);
diff --git a/src/components/page-pipeline-run/index.tsx b/src/components/page-pipeline-run/index.tsx
index 96ee87686..7a8988976 100644
--- a/src/components/page-pipeline-run/index.tsx
+++ b/src/components/page-pipeline-run/index.tsx
@@ -1,5 +1,3 @@
-import * as PropTypes from 'prop-types';
-
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
 import {
@@ -81,9 +79,4 @@ export function PagePipelineRun({ appName, jobName, pipelineRunName }: Props) {
     </>
   );
 }
-PagePipelineRun.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRunName: PropTypes.string.isRequired,
-};
 export default withRouteParams(PagePipelineRun);
diff --git a/src/components/page-replica/index.tsx b/src/components/page-replica/index.tsx
index 4760f843a..3c39ae549 100644
--- a/src/components/page-replica/index.tsx
+++ b/src/components/page-replica/index.tsx
@@ -1,6 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import useLocalStorage from '../../effects/use-local-storage';
 import { routes } from '../../routes';
 import { pollingInterval } from '../../store/defaults';
@@ -129,11 +127,4 @@ function PageReplica({ appName, envName, componentName, replicaName }: Props) {
   );
 }
 
-PageReplica.propTypes = {
-  appName: PropTypes.string.isRequired,
-  componentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  replicaName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageReplica);
diff --git a/src/components/page-scheduled-batch/dev.tsx b/src/components/page-scheduled-batch/dev.tsx
index bb07bfc1a..a0fd7f252 100644
--- a/src/components/page-scheduled-batch/dev.tsx
+++ b/src/components/page-scheduled-batch/dev.tsx
@@ -6,7 +6,7 @@ import type { ScheduledBatchSummary } from '../../store/radix-api';
 
 const testData: Array<
   Parameters<typeof PageScheduledBatch>[0] & {
-    batchData?: ScheduledBatchSummary;
+    batchData: ScheduledBatchSummary;
   }
 > = [
   {
@@ -33,6 +33,7 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
         {
           created: '2022-03-29T13:09:37.608Z',
@@ -44,6 +45,7 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
       ],
     },
@@ -71,6 +73,7 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
         {
           created: '2022-03-29T13:09:37.608Z',
@@ -81,6 +84,7 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
       ],
     },
@@ -110,6 +114,7 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
         {
           created: '2022-03-29T13:09:37.608Z',
@@ -121,16 +126,11 @@ const testData: Array<
           batchName: 'batchName',
           backoffLimit: 0,
           failedCount: 0,
+          deploymentName: '',
         },
       ],
     },
   },
-  {
-    appName: 'empty-app',
-    envName: 'empty-env',
-    jobComponentName: 'empty-component',
-    scheduledBatchName: 'no-btch',
-  },
 ];
 
 // Mock API response
diff --git a/src/components/page-scheduled-batch/index.tsx b/src/components/page-scheduled-batch/index.tsx
index 92b090d3b..769e1b89c 100644
--- a/src/components/page-scheduled-batch/index.tsx
+++ b/src/components/page-scheduled-batch/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
 
 import { routes } from '../../routes';
@@ -25,36 +24,47 @@ import { RelativeToNow } from '../time/relative-to-now';
 import './style.css';
 import { ScheduledBatchOverview } from './scheduled-batch-overview';
 
-function ScheduleBatchDuration({ batch }: { batch: ScheduledBatchSummary }) {
+type ScheduleBatchDurationProps = {
+  created?: string;
+  started?: string;
+  ended?: string;
+};
+
+function ScheduleBatchDuration({
+  created,
+  started,
+  ended,
+}: ScheduleBatchDurationProps) {
   return (
     <>
-      <Typography>
-        Created{' '}
-        <strong>
-          <RelativeToNow time={new Date(batch.created)} />
-        </strong>
-      </Typography>
-      <Typography>
-        Started{' '}
-        <strong>
-          <RelativeToNow time={new Date(batch.started)} />
-        </strong>
-      </Typography>
-      {batch.ended && (
+      {created && (
+        <Typography>
+          Created{' '}
+          <strong>
+            <RelativeToNow time={new Date(created)} />
+          </strong>
+        </Typography>
+      )}
+      {started && (
+        <Typography>
+          Started{' '}
+          <strong>
+            <RelativeToNow time={new Date(started)} />
+          </strong>
+        </Typography>
+      )}
+      {ended && started && (
         <>
           <Typography>
             Ended{' '}
             <strong>
-              <RelativeToNow time={new Date(batch.ended)} />
+              <RelativeToNow time={new Date(ended)} />
             </strong>
           </Typography>
           <Typography>
             Duration{' '}
             <strong>
-              <Duration
-                start={new Date(batch.started)}
-                end={new Date(batch.ended)}
-              />
+              <Duration start={new Date(started)} end={new Date(ended)} />
             </strong>
           </Typography>
         </>
@@ -173,7 +183,13 @@ export function PageScheduledBatch({
                 <strong>{jobComponentName}</strong>
               </Typography>
             }
-            duration={<ScheduleBatchDuration batch={batch} />}
+            duration={
+              <ScheduleBatchDuration
+                created={batch.created}
+                started={batch.started}
+                ended={batch.ended}
+              />
+            }
             status={<ProgressStatusBadge status={batch.status} />}
             state={<ScheduledBatchState batch={batch} />}
             isCollapsibleOverview
@@ -199,11 +215,4 @@ export function PageScheduledBatch({
   );
 }
 
-PageScheduledBatch.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  scheduledBatchName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageScheduledBatch);
diff --git a/src/components/page-scheduled-batch/scheduled-batch-overview.tsx b/src/components/page-scheduled-batch/scheduled-batch-overview.tsx
index fa5bd35c0..7b1ef8416 100644
--- a/src/components/page-scheduled-batch/scheduled-batch-overview.tsx
+++ b/src/components/page-scheduled-batch/scheduled-batch-overview.tsx
@@ -1,6 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 import type { ScheduledBatchSummary } from '../../store/radix-api';
 import { smallScheduledBatchName } from '../../utils/string';
 import { BatchJobStatuses } from '../component/scheduled-job/batch-job-statuses';
@@ -8,10 +6,11 @@ import { ProgressStatusBadge } from '../status-badges';
 import { Duration } from '../time/duration';
 import { RelativeToNow } from '../time/relative-to-now';
 
-const ScheduledBatchDuration: FunctionComponent<{
+type Props = {
   started: string;
-  finished: string;
-}> = ({ started, finished }) => {
+  finished?: string;
+};
+const ScheduledBatchDuration = ({ started, finished }: Props) => {
   return (
     <>
       <Typography>
@@ -40,14 +39,14 @@ const ScheduledBatchDuration: FunctionComponent<{
   );
 };
 
-const ScheduledBatchState: FunctionComponent<
-  Pick<ScheduledBatchSummary, 'status'>
-> = ({ status }) => <>{status && <ProgressStatusBadge status={status} />}</>;
-
-export const ScheduledBatchOverview: FunctionComponent<{
+type ScheduledBatchOverviewProps = {
   batch: ScheduledBatchSummary;
   jobComponentName: string;
-}> = ({ batch, jobComponentName }) => (
+};
+export const ScheduledBatchOverview = ({
+  batch,
+  jobComponentName,
+}: ScheduledBatchOverviewProps) => (
   <>
     <Typography variant="h4">Overview</Typography>
     <section className="grid grid--gap-medium overview">
@@ -66,7 +65,7 @@ export const ScheduledBatchOverview: FunctionComponent<{
           </Typography>
           {batch.status && (
             <Typography className="status-title">
-              Batch status <ScheduledBatchState status={batch.status} />
+              Batch status <ProgressStatusBadge status={batch.status} />
             </Typography>
           )}
           <Typography className="status-title">
@@ -82,19 +81,15 @@ export const ScheduledBatchOverview: FunctionComponent<{
                 <RelativeToNow time={batch.created} />
               </strong>
             </Typography>
-            <ScheduledBatchDuration
-              started={batch.started}
-              finished={batch.ended}
-            />
+            {batch.started && (
+              <ScheduledBatchDuration
+                started={batch.started}
+                finished={batch.ended}
+              />
+            )}
           </>
         </div>
       </div>
     </section>
   </>
 );
-
-ScheduledBatchOverview.propTypes = {
-  batch: PropTypes.object
-    .isRequired as PropTypes.Validator<ScheduledBatchSummary>,
-  jobComponentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-scheduled-job/dev.tsx b/src/components/page-scheduled-job/dev.tsx
index 4c764d217..75ce5f9d1 100644
--- a/src/components/page-scheduled-job/dev.tsx
+++ b/src/components/page-scheduled-job/dev.tsx
@@ -5,7 +5,7 @@ import { PageScheduledJob } from '.';
 import type { ScheduledJobSummary } from '../../store/radix-api';
 
 const testData: Array<
-  Parameters<typeof PageScheduledJob>[0] & { jobData?: ScheduledJobSummary }
+  Parameters<typeof PageScheduledJob>[0] & { jobData: ScheduledJobSummary }
 > = [
   {
     appName: 'succeeded-app',
@@ -22,6 +22,7 @@ const testData: Array<
       batchName: 'batchName',
       backoffLimit: 0,
       failedCount: 0,
+      deploymentName: 'unknown-deployment',
     },
   },
   {
@@ -38,6 +39,7 @@ const testData: Array<
       batchName: 'batchName',
       backoffLimit: 10,
       failedCount: 0,
+      deploymentName: 'unknown-deployment',
     },
   },
   {
@@ -56,14 +58,9 @@ const testData: Array<
       message: 'some optional failure message',
       backoffLimit: 0,
       failedCount: 0,
+      deploymentName: 'unknown-deployment',
     },
   },
-  {
-    appName: 'empty-app',
-    envName: 'empty-env',
-    jobComponentName: 'empty-component',
-    scheduledJobName: 'no-job',
-  },
 ];
 
 // Mock API response
diff --git a/src/components/page-scheduled-job/duration.tsx b/src/components/page-scheduled-job/duration.tsx
index 02f651027..8e5fd39c6 100644
--- a/src/components/page-scheduled-job/duration.tsx
+++ b/src/components/page-scheduled-job/duration.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import type { FunctionComponent } from 'react';
 import type { ScheduledJobSummary } from '../../store/radix-api';
 import { pluraliser } from '../../utils/string';
 import { Duration } from '../time/duration';
@@ -7,20 +6,23 @@ import { RelativeToNow } from '../time/relative-to-now';
 
 const timesPluraliser = pluraliser('time', 'times');
 
-export const ScheduleJobDuration: FunctionComponent<{
+type Props = {
   job: ScheduledJobSummary;
-}> = ({ job: { created, started, ended, failedCount } }) => (
+};
+export const ScheduleJobDuration = ({
+  job: { created, started, ended, failedCount },
+}: Props) => (
   <>
     <Typography>
       Created{' '}
       <strong>
-        <RelativeToNow time={new Date(created)} />
+        <RelativeToNow time={created} />
       </strong>
     </Typography>
     <Typography>
       Started{' '}
       <strong>
-        <RelativeToNow time={new Date(started)} />
+        <RelativeToNow time={started} />
       </strong>
     </Typography>
     {ended && (
@@ -28,13 +30,13 @@ export const ScheduleJobDuration: FunctionComponent<{
         <Typography>
           Ended{' '}
           <strong>
-            <RelativeToNow time={new Date(ended)} />
+            <RelativeToNow time={ended} />
           </strong>
         </Typography>
         <Typography>
           Duration{' '}
           <strong>
-            <Duration start={new Date(started)} end={new Date(ended)} />
+            <Duration start={started} end={ended} />
           </strong>
         </Typography>
       </>
diff --git a/src/components/page-scheduled-job/index.tsx b/src/components/page-scheduled-job/index.tsx
index 4d5bac3ba..339242001 100644
--- a/src/components/page-scheduled-job/index.tsx
+++ b/src/components/page-scheduled-job/index.tsx
@@ -1,5 +1,4 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useEffect, useMemo, useState } from 'react';
 import { routes } from '../../routes';
 import {
@@ -23,7 +22,7 @@ import { ScheduledJobOverview } from './scheduled-job-overview';
 
 import './style.css';
 
-function isJobSettled(status: ScheduledJobSummary['status']): boolean {
+function isJobSettled(status?: ScheduledJobSummary['status']): boolean {
   switch (status) {
     case 'Failed':
     case 'Stopped':
@@ -184,13 +183,4 @@ export const PageScheduledJob: FunctionComponent<{
     </main>
   );
 };
-
-PageScheduledJob.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  scheduledBatchName: PropTypes.string,
-  scheduledJobName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageScheduledJob);
diff --git a/src/components/page-scheduled-job/job-replica.tsx b/src/components/page-scheduled-job/job-replica.tsx
index 42b6109f6..4ecdea023 100644
--- a/src/components/page-scheduled-job/job-replica.tsx
+++ b/src/components/page-scheduled-job/job-replica.tsx
@@ -1,4 +1,3 @@
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { logApi } from '../../store/log-api';
 import { type ReplicaSummary, radixApi } from '../../store/radix-api';
@@ -15,7 +14,7 @@ export const JobReplica: FunctionComponent<{
   jobComponentName: string;
   envName: string;
   scheduledJobName: string;
-  replica?: ReplicaSummary;
+  replica: ReplicaSummary;
   logState?: FetchQueryResult<string>;
   isExpanded?: boolean;
 }> = ({
@@ -89,14 +88,3 @@ export const JobReplica: FunctionComponent<{
     </div>
   );
 };
-
-JobReplica.propTypes = {
-  header: PropTypes.string,
-  appName: PropTypes.string.isRequired,
-  jobComponentName: PropTypes.string.isRequired,
-  envName: PropTypes.string.isRequired,
-  scheduledJobName: PropTypes.string.isRequired,
-  replica: PropTypes.object as PropTypes.Validator<ReplicaSummary>,
-  logState: PropTypes.object as PropTypes.Validator<FetchQueryResult<string>>,
-  isExpanded: PropTypes.bool,
-};
diff --git a/src/components/page-scheduled-job/scheduled-job-overview.tsx b/src/components/page-scheduled-job/scheduled-job-overview.tsx
index cf2b798c3..3051ac8e5 100644
--- a/src/components/page-scheduled-job/scheduled-job-overview.tsx
+++ b/src/components/page-scheduled-job/scheduled-job-overview.tsx
@@ -1,6 +1,5 @@
 import { Typography } from '@equinor/eds-core-react';
-import { isNil } from 'lodash';
-import * as PropTypes from 'prop-types';
+import { isNil } from 'lodash-es';
 import type { FunctionComponent } from 'react';
 import type { ScheduledJobSummary } from '../../store/radix-api';
 import {
@@ -16,7 +15,7 @@ import { RelativeToNow } from '../time/relative-to-now';
 
 const ScheduledJobDuration: FunctionComponent<{
   started: string;
-  finished: string;
+  finished?: string;
 }> = ({ started, finished }) => {
   return (
     <>
@@ -104,7 +103,12 @@ export const ScheduledJobOverview: FunctionComponent<{
                 <RelativeToNow time={job.created} />
               </strong>
             </Typography>
-            <ScheduledJobDuration started={job.started} finished={job.ended} />
+            {job.started && (
+              <ScheduledJobDuration
+                started={job.started}
+                finished={job.ended}
+              />
+            )}
           </>
         </div>
         <div className="grid grid--gap-medium">
@@ -131,8 +135,3 @@ export const ScheduledJobOverview: FunctionComponent<{
     </section>
   </>
 );
-
-ScheduledJobOverview.propTypes = {
-  job: PropTypes.object.isRequired as PropTypes.Validator<ScheduledJobSummary>,
-  jobComponentName: PropTypes.string.isRequired,
-};
diff --git a/src/components/page-step/dev.tsx b/src/components/page-step/dev.tsx
index 747511db6..aefd6e747 100644
--- a/src/components/page-step/dev.tsx
+++ b/src/components/page-step/dev.tsx
@@ -1,4 +1,4 @@
-import PageStep from '.';
+import { PageStep } from '.';
 
 export default (
   <>
diff --git a/src/components/page-step/index.tsx b/src/components/page-step/index.tsx
index 02bb030ee..a182c101d 100644
--- a/src/components/page-step/index.tsx
+++ b/src/components/page-step/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import {
   getPipelineStepDescription,
   getPipelineStepTitle,
@@ -74,8 +73,9 @@ export function PageStep({ appName, jobName, stepName }: PageStepProps) {
             <div className="grid grid--gap-medium grid--overview-columns">
               <div className="grid grid--gap-medium">
                 <Typography>
-                  Pipeline Step <strong>
-                    {step.status.toLowerCase()}
+                  Pipeline Step{' '}
+                  <strong>
+                    {step.status?.toLowerCase() ?? 'pending'}
                   </strong>{' '}
                 </Typography>
                 <Typography>
@@ -119,7 +119,7 @@ export function PageStep({ appName, jobName, stepName }: PageStepProps) {
           </section>
 
           {stepName === 'run-pipelines' &&
-            (pipelineRuns?.length > 0 ? (
+            (pipelineRuns && pipelineRuns.length > 0 ? (
               <section>
                 <Typography
                   variant="h4"
@@ -158,10 +158,4 @@ export function PageStep({ appName, jobName, stepName }: PageStepProps) {
     </>
   );
 }
-PageStep.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  stepName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageStep);
diff --git a/src/components/page-step/job-step-logs.tsx b/src/components/page-step/job-step-logs.tsx
index f194df94e..d118e0262 100644
--- a/src/components/page-step/job-step-logs.tsx
+++ b/src/components/page-step/job-step-logs.tsx
@@ -1,5 +1,4 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
 
 import { addMinutes } from 'date-fns';
@@ -31,9 +30,12 @@ export interface StepLogsProps {
   end?: string;
 }
 
-function findContainer(data: ModelsInventoryResponse, stepName: string) {
+function findContainer(
+  data: ModelsInventoryResponse,
+  stepName: string
+): BrandedContainerModel | null {
   for (const replica of data?.replicas ?? []) {
-    for (const container of replica.containers) {
+    for (const container of replica.containers ?? []) {
       if (container.name === stepName) {
         return { ...container, parentId: replica.name };
       }
@@ -49,7 +51,7 @@ function HistoricalLog({
   start,
   end,
 }: StepLogsProps) {
-  end = end ? addMinutes(new Date(end), 10).toISOString() : null;
+  end = end ? addMinutes(new Date(end), 10).toISOString() : undefined;
   const { container, ...state } = useGetPipelineJobInventoryQuery(
     { appName, pipelineJobName: jobName, start, end },
     {
@@ -93,7 +95,7 @@ function ContainerLog({
   start,
   end,
 }: ContainerLogProps) {
-  end = end ? addMinutes(new Date(end), 10).toISOString() : null;
+  end = end ? addMinutes(new Date(end), 10).toISOString() : undefined;
   const { data, ...state } = useGetPipelineJobContainerLogQuery(
     {
       appName,
@@ -191,11 +193,3 @@ export function JobStepLogs({
     </Accordion>
   );
 }
-
-JobStepLogs.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  stepName: PropTypes.string.isRequired,
-  start: PropTypes.string,
-  end: PropTypes.string,
-};
diff --git a/src/components/pipeline-run-task-steps/index.tsx b/src/components/pipeline-run-task-steps/index.tsx
index fae74dba1..3c7803bb6 100644
--- a/src/components/pipeline-run-task-steps/index.tsx
+++ b/src/components/pipeline-run-task-steps/index.tsx
@@ -1,12 +1,10 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useMemo, useState } from 'react';
-
 import type { PipelineRunTaskStep as PipelineRunTaskStepModel } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
 import { PipelineTaskStepsTableRow } from './pipeline-task-table-row';
@@ -19,7 +17,7 @@ interface Props {
 }
 
 export function PipelineRunTaskSteps({ steps, limit }: Props) {
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
   const sortedData = useMemo(() => {
     return dataSorter(steps?.slice(0, limit || steps.length), [
       (x, y) => sortCompareDate(x.started, y.started, dateSort),
@@ -53,8 +51,3 @@ export function PipelineRunTaskSteps({ steps, limit }: Props) {
     <Typography variant="h4">No pipeline tasks</Typography>
   );
 }
-
-PipelineRunTaskSteps.propTypes = {
-  steps: PropTypes.array.isRequired,
-  limit: PropTypes.number,
-};
diff --git a/src/components/pipeline-run-task-steps/pipeline-task-table-row.tsx b/src/components/pipeline-run-task-steps/pipeline-task-table-row.tsx
index 28cf102aa..94dce9c19 100644
--- a/src/components/pipeline-run-task-steps/pipeline-task-table-row.tsx
+++ b/src/components/pipeline-run-task-steps/pipeline-task-table-row.tsx
@@ -1,6 +1,4 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import type { PipelineRunTaskStep as PipelineRunTaskStepModel } from '../../store/radix-api';
 import { PipelineRunStatusBadge } from '../status-badges';
 import { Duration } from '../time/duration';
@@ -28,12 +26,8 @@ export function PipelineTaskStepsTableRow({
         )}
       </Table.Cell>
       <Table.Cell variant="icon">
-        <PipelineRunStatusBadge status={status} />
+        <PipelineRunStatusBadge status={status ?? 'PipelineRunPending'} />
       </Table.Cell>
     </Table.Row>
   );
 }
-
-PipelineTaskStepsTableRow.propTypes = {
-  step: PropTypes.object.isRequired,
-};
diff --git a/src/components/pipeline-run-task/index.tsx b/src/components/pipeline-run-task/index.tsx
index 4f7e90b75..9f46ae8a5 100644
--- a/src/components/pipeline-run-task/index.tsx
+++ b/src/components/pipeline-run-task/index.tsx
@@ -1,7 +1,5 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useState } from 'react';
-
 import type { PipelineRunTask as PipelineRunTaskModel } from '../../store/radix-api';
 import { getTaskRunExecutionState } from '../component/execution-state';
 import { Duration } from '../time/duration';
@@ -24,7 +22,7 @@ export function PipelineRunTask({ task }: Props) {
           <div className="grid grid--gap-medium grid--overview-columns">
             <div className="grid grid--gap-medium">
               <Typography>
-                Task <strong>{task.status.toLowerCase()}</strong>
+                Task <strong>{task.status?.toLowerCase()}</strong>
               </Typography>
               <Typography>
                 {getTaskRunExecutionState(task.status)} task{' '}
@@ -57,7 +55,7 @@ export function PipelineRunTask({ task }: Props) {
               </div>
             )}
           </div>
-          {task.statusMessage?.length > 0 && (
+          {task.statusMessage && task.statusMessage.length > 0 && (
             <div className="grid grid--gap-medium grid--overview-columns">
               <Typography>Status message {task.statusMessage}</Typography>
             </div>
@@ -67,7 +65,3 @@ export function PipelineRunTask({ task }: Props) {
     </div>
   );
 }
-
-PipelineRunTask.propTypes = {
-  task: PropTypes.object.isRequired,
-};
diff --git a/src/components/pipeline-run-tasks/index.tsx b/src/components/pipeline-run-tasks/index.tsx
index 6b9e22a8b..7ff74bd84 100644
--- a/src/components/pipeline-run-tasks/index.tsx
+++ b/src/components/pipeline-run-tasks/index.tsx
@@ -1,21 +1,17 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useEffect, useState } from 'react';
-
 import type {
   PipelineRun as PipelineRunModel,
   PipelineRunTask as PipelineRunTaskModel,
 } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
 import { PipelineTaskTableRow } from './pipeline-task-table-row';
-
 import './style.css';
-import type { Validator } from 'prop-types';
 
 interface Props {
   appName: string;
@@ -33,7 +29,7 @@ export function PipelineRunTasks({
 }: Props) {
   const [sortedData, setSortedData] = useState(tasks || []);
 
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
   useEffect(() => {
     setSortedData(
       dataSorter(tasks?.slice(0, limit || tasks?.length), [
@@ -73,13 +69,3 @@ export function PipelineRunTasks({
     <Typography variant="h4">No pipeline tasks</Typography>
   );
 }
-
-PipelineRunTasks.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRun: PropTypes.object.isRequired as Validator<PipelineRunModel>,
-  tasks: PropTypes.arrayOf(PropTypes.object).isRequired as Validator<
-    PipelineRunTaskModel[]
-  >,
-  limit: PropTypes.number,
-};
diff --git a/src/components/pipeline-run-tasks/pipeline-task-table-row.tsx b/src/components/pipeline-run-tasks/pipeline-task-table-row.tsx
index 57692aa43..84915b198 100644
--- a/src/components/pipeline-run-tasks/pipeline-task-table-row.tsx
+++ b/src/components/pipeline-run-tasks/pipeline-task-table-row.tsx
@@ -1,5 +1,4 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 
 import { routes } from '../../routes';
@@ -27,7 +26,7 @@ export function PipelineTaskTableRow({
   return (
     <Table.Row>
       <Table.Cell>
-        {pipelineRunName?.length > 0 && (
+        {pipelineRunName && pipelineRunName.length > 0 && (
           <Typography
             link
             as={Link}
@@ -57,16 +56,8 @@ export function PipelineTaskTableRow({
         )}
       </Table.Cell>
       <Table.Cell variant="icon">
-        <PipelineRunStatusBadge status={task.status} />
+        <PipelineRunStatusBadge status={task.status ?? 'PipelineRunPending'} />
       </Table.Cell>
     </Table.Row>
   );
 }
-
-PipelineTaskTableRow.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRunName: PropTypes.string,
-  task: PropTypes.object
-    .isRequired as PropTypes.Validator<PipelineRunTaskModel>,
-};
diff --git a/src/components/pipeline-run/index.tsx b/src/components/pipeline-run/index.tsx
index dac897bb5..5db5822f7 100644
--- a/src/components/pipeline-run/index.tsx
+++ b/src/components/pipeline-run/index.tsx
@@ -1,6 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-
 import type { PipelineRun as PipelineRunModel } from '../../store/radix-api';
 import { getPipelineRunExecutionState } from '../component/execution-state';
 import { Duration } from '../time/duration';
@@ -21,7 +19,10 @@ export function PipelineRun({ pipelineRun }: Props) {
           <div className="grid grid--gap-medium grid--overview-columns">
             <div className="grid grid--gap-medium">
               <Typography>
-                Pipeline run <strong>{pipelineRun.status.toLowerCase()}</strong>
+                Pipeline run{' '}
+                <strong>
+                  {pipelineRun.status?.toLowerCase() ?? 'pending'}
+                </strong>
               </Typography>
               <Typography>
                 {getPipelineRunExecutionState(pipelineRun.status)} pipeline{' '}
@@ -65,7 +66,3 @@ export function PipelineRun({ pipelineRun }: Props) {
     </main>
   );
 }
-
-PipelineRun.propTypes = {
-  pipelineRun: PropTypes.object.isRequired,
-};
diff --git a/src/components/pipeline-runs/index.tsx b/src/components/pipeline-runs/index.tsx
index 848dc55b9..b51f0af4c 100644
--- a/src/components/pipeline-runs/index.tsx
+++ b/src/components/pipeline-runs/index.tsx
@@ -1,18 +1,14 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { useMemo, useState } from 'react';
-
-import { PipelineRunTableRow } from './pipeline-run-table-row';
-
 import type { PipelineRun as PipelineRunModel } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
-
+import { PipelineRunTableRow } from './pipeline-run-table-row';
 import './style.css';
 
 interface Props {
@@ -23,8 +19,8 @@ interface Props {
 }
 
 export function PipelineRuns({ appName, jobName, pipelineRuns, limit }: Props) {
-  const [dateSort, setDateSort] = useState<sortDirection>('descending');
-  const [envSort, setEnvSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>('descending');
+  const [envSort, setEnvSort] = useState<SortDirection>();
 
   const sortedData = useMemo(() => {
     return dataSorter(pipelineRuns?.slice(0, limit || pipelineRuns.length), [
@@ -73,12 +69,3 @@ export function PipelineRuns({ appName, jobName, pipelineRuns, limit }: Props) {
     <Typography variant="h4">No pipeline runs yet</Typography>
   );
 }
-
-PipelineRuns.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRuns: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<PipelineRunModel>
-  ).isRequired,
-  limit: PropTypes.number,
-};
diff --git a/src/components/pipeline-runs/pipeline-run-table-row.tsx b/src/components/pipeline-runs/pipeline-run-table-row.tsx
index 96ca7edcd..9fc149733 100644
--- a/src/components/pipeline-runs/pipeline-run-table-row.tsx
+++ b/src/components/pipeline-runs/pipeline-run-table-row.tsx
@@ -1,14 +1,11 @@
 import { Table, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
-
 import { routes } from '../../routes';
 import type { PipelineRun as PipelineRunModel } from '../../store/radix-api';
 import { routeWithParams } from '../../utils/string';
 import { PipelineRunStatusBadge } from '../status-badges';
 import { Duration } from '../time/duration';
 import { RelativeToNow } from '../time/relative-to-now';
-
 import './style.css';
 
 interface Props {
@@ -56,15 +53,10 @@ export function PipelineRunTableRow({ appName, jobName, pipelineRun }: Props) {
         )}
       </Table.Cell>
       <Table.Cell variant="icon">
-        <PipelineRunStatusBadge status={pipelineRun.status} />
+        <PipelineRunStatusBadge
+          status={pipelineRun.status ?? 'PipelineRunPending'}
+        />
       </Table.Cell>
     </Table.Row>
   );
 }
-
-PipelineRunTableRow.propTypes = {
-  appName: PropTypes.string.isRequired,
-  jobName: PropTypes.string.isRequired,
-  pipelineRun: PropTypes.object
-    .isRequired as PropTypes.Validator<PipelineRunModel>,
-};
diff --git a/src/components/replica-image/index.tsx b/src/components/replica-image/index.tsx
index 0f719f1a2..32c1b9b69 100644
--- a/src/components/replica-image/index.tsx
+++ b/src/components/replica-image/index.tsx
@@ -1,19 +1,11 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
-import { type FunctionComponent, useEffect, useState } from 'react';
-
 import type { ReplicaSummary } from '../../store/radix-api';
 import { parseImageDigest, parseImageTag } from '../../utils/docker';
 
-export const ReplicaImage: FunctionComponent<{ replica?: ReplicaSummary }> = ({
-  replica,
-}) => {
-  const [image, setImage] = useState<string>();
-  const [digest, setDigest] = useState<string>();
-  useEffect(() => {
-    setImage(parseImageTag(replica?.image).image);
-    setDigest(parseImageDigest(replica?.imageId).digest);
-  }, [replica]);
+type props = { replica?: ReplicaSummary };
+export const ReplicaImage = ({ replica }: props) => {
+  const image = parseImageTag(replica?.image ?? '').image;
+  const digest = parseImageDigest(replica?.imageId ?? '').digest;
 
   return (
     <>
@@ -30,7 +22,3 @@ export const ReplicaImage: FunctionComponent<{ replica?: ReplicaSummary }> = ({
     </>
   );
 };
-
-ReplicaImage.propTypes = {
-  replica: PropTypes.object as PropTypes.Validator<ReplicaSummary>,
-};
diff --git a/src/components/replica-list/index.tsx b/src/components/replica-list/index.tsx
index d8462291d..06cbfa226 100644
--- a/src/components/replica-list/index.tsx
+++ b/src/components/replica-list/index.tsx
@@ -1,7 +1,6 @@
 import { Icon, Table, Typography } from '@equinor/eds-core-react';
 import { chevron_down, chevron_up } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import {
   Fragment,
   type FunctionComponent,
@@ -12,10 +11,10 @@ import {
 
 import type { ReplicaSummary } from '../../store/radix-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareDate,
   sortCompareString,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { TableSortIcon, getNewSortDir } from '../../utils/table-sort-utils';
 import { ReplicaImage } from '../replica-image';
@@ -31,8 +30,8 @@ export const ReplicaList: FunctionComponent<{
   replicaUrlFunc: (name: string) => string;
 }> = ({ replicaList, replicaUrlFunc }) => {
   const [sortedData, setSortedData] = useState(replicaList || []);
-  const [dateSort, setDateSort] = useState<sortDirection>();
-  const [statusSort, setStatusSort] = useState<sortDirection>();
+  const [dateSort, setDateSort] = useState<SortDirection>();
+  const [statusSort, setStatusSort] = useState<SortDirection>();
   const [expandedRows, setExpandedRows] = useState<Record<string, boolean>>({});
   const [lastUpdate, setLastUpdate] = useState(new Date());
 
@@ -118,16 +117,15 @@ export const ReplicaList: FunctionComponent<{
                   />
                 </Table.Cell>
                 <Table.Cell>
-                  <ReplicaStatusBadge status={replica.replicaStatus?.status} />
+                  <ReplicaStatusBadge
+                    status={replica.replicaStatus?.status ?? 'Pending'}
+                  />
                 </Table.Cell>
                 <Table.Cell>
-                  <RelativeToNow time={new Date(replica.created)} />
+                  <RelativeToNow time={replica.created} />
                 </Table.Cell>
                 <Table.Cell>
-                  <Duration
-                    start={new Date(replica.created)}
-                    end={lastUpdate}
-                  />
+                  <Duration start={replica.created} end={lastUpdate} />
                 </Table.Cell>
               </Table.Row>
               {expanded && (
@@ -146,10 +144,3 @@ export const ReplicaList: FunctionComponent<{
     </Table>
   );
 };
-
-ReplicaList.propTypes = {
-  replicaList: PropTypes.arrayOf(
-    PropTypes.object as PropTypes.Validator<ReplicaSummary>
-  ).isRequired,
-  replicaUrlFunc: PropTypes.func.isRequired,
-};
diff --git a/src/components/replica-list/replica-name.tsx b/src/components/replica-list/replica-name.tsx
index 5d9c575ce..931125736 100644
--- a/src/components/replica-list/replica-name.tsx
+++ b/src/components/replica-list/replica-name.tsx
@@ -5,7 +5,6 @@ import {
   Typography,
 } from '@equinor/eds-core-react';
 import { info_circle } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 import type { ReplicaSummary } from '../../store/radix-api';
@@ -92,8 +91,3 @@ export const ReplicaName: FunctionComponent<{
       );
   }
 };
-
-ReplicaName.propTypes = {
-  replica: PropTypes.object.isRequired as PropTypes.Validator<ReplicaSummary>,
-  replicaUrlFunc: PropTypes.func.isRequired,
-};
diff --git a/src/components/replica/index.tsx b/src/components/replica/index.tsx
index 608e880a1..80963298f 100644
--- a/src/components/replica/index.tsx
+++ b/src/components/replica/index.tsx
@@ -1,7 +1,6 @@
 import { Accordion, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type React from 'react';
-import { type FunctionComponent, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import { useInterval } from '../../effects/use-interval';
 import type { ReplicaSummary } from '../../store/radix-api';
@@ -22,10 +21,8 @@ interface ReplicaElements {
   state?: React.JSX.Element;
 }
 
-const ReplicaDuration: FunctionComponent<{ created: Date; ended?: Date }> = ({
-  created,
-  ended,
-}) => {
+type DurationProps = { started: number | string | Date; ended?: Date };
+const ReplicaDuration = ({ started, ended }: DurationProps) => {
   const [now, setNow] = useState(new Date());
   useInterval(() => setNow(new Date()), 1000);
 
@@ -34,7 +31,7 @@ const ReplicaDuration: FunctionComponent<{ created: Date; ended?: Date }> = ({
       <Typography>
         Replica created{' '}
         <strong>
-          <RelativeToNow time={created} />
+          <RelativeToNow time={started} />
         </strong>
       </Typography>
       {ended && (
@@ -48,17 +45,14 @@ const ReplicaDuration: FunctionComponent<{ created: Date; ended?: Date }> = ({
       <Typography>
         Replica duration{' '}
         <strong>
-          <Duration start={created} end={ended || now} />
+          <Duration start={started} end={ended || now} />
         </strong>
       </Typography>
     </>
   );
 };
 
-const ContainerDuration: FunctionComponent<{ started: Date; ended?: Date }> = ({
-  started,
-  ended,
-}) => {
+const ContainerDuration = ({ started, ended }: DurationProps) => {
   useInterval(() => setNow(new Date()), 1000);
   const [now, setNow] = useState(new Date());
 
@@ -88,11 +82,13 @@ const ContainerDuration: FunctionComponent<{ started: Date; ended?: Date }> = ({
   );
 };
 
-const ReplicaState: FunctionComponent<
-  Pick<ReplicaSummary, 'restartCount' | 'statusMessage'>
-> = ({ restartCount, statusMessage }) => (
+type ReplicaStateProps = {
+  restartCount: ReplicaSummary['restartCount'];
+  statusMessage: ReplicaSummary['statusMessage'];
+};
+const ReplicaState = ({ restartCount, statusMessage }: ReplicaStateProps) => (
   <>
-    {!Number.isNaN(restartCount) && restartCount > 0 && (
+    {restartCount && restartCount > 0 && (
       <div>
         <Typography>
           Restarted <strong>{restartCount} times</strong>
@@ -109,9 +105,14 @@ const ReplicaState: FunctionComponent<
   </>
 );
 
-const Overview: FunctionComponent<
-  { replica: ReplicaSummary } & ReplicaElements
-> = ({ replica, title, duration, status, state }) => (
+type OverviewProps = { replica: ReplicaSummary } & ReplicaElements;
+const Overview = ({
+  replica,
+  title,
+  duration,
+  status,
+  state,
+}: OverviewProps) => (
   <>
     <section className="grid grid--gap-medium overview">
       <div className="grid grid--gap-medium grid--overview-columns">
@@ -123,26 +124,33 @@ const Overview: FunctionComponent<
           )}
           <ReplicaImage replica={replica} />
           {status || (
-            <ReplicaStatusBadge status={replica.replicaStatus?.status} />
+            <ReplicaStatusBadge
+              status={replica.replicaStatus?.status ?? 'Pending'}
+            />
           )}
         </div>
         <div className="grid grid--gap-medium">
-          {duration || (
-            <>
-              <ReplicaDuration
-                created={new Date(replica.created)}
-                ended={replica.endTime ? new Date(replica.endTime) : undefined}
-              />
-              {replica.containerStarted && (
-                <ContainerDuration
-                  started={new Date(replica.containerStarted)}
+          {duration ||
+            (replica.startTime ? (
+              <>
+                <ReplicaDuration
+                  started={replica.startTime}
                   ended={
                     replica.endTime ? new Date(replica.endTime) : undefined
                   }
                 />
-              )}
-            </>
-          )}
+                {replica.containerStarted && (
+                  <ContainerDuration
+                    started={new Date(replica.containerStarted)}
+                    ended={
+                      replica.endTime ? new Date(replica.endTime) : undefined
+                    }
+                  />
+                )}
+              </>
+            ) : (
+              'waiting'
+            ))}
         </div>
         <div className="grid grid--gap-medium">
           {replica.resources && (
@@ -152,18 +160,30 @@ const Overview: FunctionComponent<
       </div>
     </section>
     <section className="grid grid--gap-medium">
-      {state || <ReplicaState {...replica} />}
+      {state || (
+        <ReplicaState
+          restartCount={replica.restartCount}
+          statusMessage={replica.statusMessage}
+        />
+      )}
     </section>
   </>
 );
 
-const ReplicaLog: FunctionComponent<{
-  isCollapsibleLog: boolean;
-  isLogExpanded: boolean;
-  downloadCb: () => unknown;
+type RepliceLogProps = {
+  isCollapsibleLog?: boolean;
+  isLogExpanded?: boolean;
+  downloadCb?: () => unknown;
   log?: string;
   logState?: FetchQueryResult<string>;
-}> = ({ isCollapsibleLog, isLogExpanded, downloadCb, log, logState }) => (
+};
+const ReplicaLog = ({
+  isCollapsibleLog,
+  isLogExpanded,
+  downloadCb,
+  log,
+  logState,
+}: RepliceLogProps) => (
   <>
     {isCollapsibleLog ? (
       <Accordion className="accordion elevated" chevronPosition="right">
@@ -177,33 +197,32 @@ const ReplicaLog: FunctionComponent<{
           </Accordion.Header>
           <Accordion.Panel>
             <Code copy autoscroll resizable download downloadCb={downloadCb}>
-              {log || logState?.data}
+              {(log || logState?.data) ?? ''}
             </Code>
           </Accordion.Panel>
         </Accordion.Item>
       </Accordion>
     ) : (
       <Code copy autoscroll resizable download downloadCb={downloadCb}>
-        {log || logState?.data}
+        {(log || logState?.data) ?? ''}
       </Code>
     )}
   </>
 );
 
-export const Replica: FunctionComponent<
-  {
-    header?: string;
-    replica: ReplicaSummary;
-    logState?: FetchQueryResult<string>;
-    getLog?: () => Promise<string>;
-    isCollapsibleOverview?: boolean;
-    isCollapsibleLog?: boolean;
-    downloadCb?: () => unknown;
-    downloadHistoryCb?: () => unknown;
-    isLogExpanded?: boolean;
-    getHistoryLog?: () => Promise<unknown>;
-  } & ReplicaElements
-> = ({
+type ReplicaProps = {
+  header?: string;
+  replica: ReplicaSummary;
+  logState?: FetchQueryResult<string>;
+  getLog?: () => Promise<string>;
+  isCollapsibleOverview?: boolean;
+  isCollapsibleLog?: boolean;
+  downloadCb: () => unknown;
+  downloadHistoryCb?: () => unknown;
+  isLogExpanded?: boolean;
+  getHistoryLog?: () => Promise<unknown>;
+} & ReplicaElements;
+export const Replica = ({
   header,
   logState,
   getLog,
@@ -215,7 +234,7 @@ export const Replica: FunctionComponent<
   getHistoryLog,
   replica,
   ...rest
-}) => {
+}: ReplicaProps) => {
   const [log, setLog] = useState('');
   const [historyLog, setHistoryLog] = useState('');
 
@@ -232,7 +251,7 @@ export const Replica: FunctionComponent<
     if (logState?.data || log) {
       return;
     }
-    getHistoryLog?.().then(setHistoryLog);
+    getHistoryLog?.().then((data: unknown) => setHistoryLog(data as string));
   }, [replica, logState?.data]);
 
   return (
@@ -286,18 +305,3 @@ export const Replica: FunctionComponent<
     </>
   );
 };
-
-Replica.propTypes = {
-  replica: PropTypes.object.isRequired as PropTypes.Validator<ReplicaSummary>,
-  logState: PropTypes.object as PropTypes.Validator<FetchQueryResult<string>>,
-  isCollapsibleOverview: PropTypes.bool,
-  isCollapsibleLog: PropTypes.bool,
-  downloadCb: PropTypes.func,
-  getLog: PropTypes.func,
-  title: PropTypes.element,
-  duration: PropTypes.element,
-  status: PropTypes.element,
-  state: PropTypes.element,
-  getHistoryLog: PropTypes.func,
-  downloadHistoryCb: PropTypes.func,
-};
diff --git a/src/components/resource-requirements/index.tsx b/src/components/resource-requirements/index.tsx
index e96c9abcd..5a5004263 100644
--- a/src/components/resource-requirements/index.tsx
+++ b/src/components/resource-requirements/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import type { ResourceRequirements as ResourceRequirementsModel } from '../../store/radix-api';
 
@@ -27,7 +26,3 @@ export const ResourceRequirements: FunctionComponent<
     </Typography>
   </>
 );
-
-ResourceRequirements.propTypes = {
-  resources: PropTypes.object as PropTypes.Validator<ResourceRequirementsModel>,
-};
diff --git a/src/components/resources/index.tsx b/src/components/resources/index.tsx
index c83e7d7f7..953bbb575 100644
--- a/src/components/resources/index.tsx
+++ b/src/components/resources/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import { externalUrls } from '../../externalUrls';
 import {
@@ -156,7 +155,3 @@ export const UsedResources: FunctionComponent<UsedResourcesProps> = ({
     </div>
   );
 };
-
-UsedResources.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
diff --git a/src/components/runtime/index.tsx b/src/components/runtime/index.tsx
index b7e380e41..bc63c4deb 100644
--- a/src/components/runtime/index.tsx
+++ b/src/components/runtime/index.tsx
@@ -1,5 +1,4 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 import type { Runtime as RuntimeModel } from '../../store/radix-api';
 
@@ -16,7 +15,3 @@ export const Runtime: FunctionComponent<RuntimeProps> = ({ runtime }) => (
     )}
   </>
 );
-
-Runtime.propTypes = {
-  runtime: PropTypes.object as PropTypes.Validator<RuntimeModel>,
-};
diff --git a/src/components/scrim-popup/index.tsx b/src/components/scrim-popup/index.tsx
index ac5f841f3..6162a0794 100644
--- a/src/components/scrim-popup/index.tsx
+++ b/src/components/scrim-popup/index.tsx
@@ -7,7 +7,6 @@ import {
 } from '@equinor/eds-core-react';
 import { clear } from '@equinor/eds-icons';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent, PropsWithChildren, ReactNode } from 'react';
 
 import './style.css';
@@ -24,7 +23,12 @@ export const ScrimPopup: FunctionComponent<
   PropsWithChildren<ScrimPopupProps>
 > = ({ className, title, children, open, onClose, isDismissable }) => (
   <Scrim open={open} {...(isDismissable && { isDismissable, onClose })}>
-    <div className={clsx('scrim-dialog', { [className]: !!className })}>
+    <div
+      className={clsx(
+        'scrim-dialog',
+        className ? { [className]: !!className } : undefined
+      )}
+    >
       <div className="dialog-header">
         {typeof title === 'string' || typeof title === 'number' ? (
           <Typography variant="h5">{title}</Typography>
@@ -48,12 +52,3 @@ export const ScrimPopup: FunctionComponent<
     </div>
   </Scrim>
 );
-
-ScrimPopup.propTypes = {
-  className: PropTypes.string,
-  title: PropTypes.node.isRequired,
-  children: PropTypes.node,
-  open: PropTypes.bool.isRequired,
-  onClose: PropTypes.func,
-  isDismissable: PropTypes.bool,
-};
diff --git a/src/components/secret-form/index.tsx b/src/components/secret-form/index.tsx
index b283f39d7..d940e0866 100644
--- a/src/components/secret-form/index.tsx
+++ b/src/components/secret-form/index.tsx
@@ -1,5 +1,4 @@
 import { Button, TextField, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import {
   type ChangeEvent,
   type FunctionComponent,
@@ -28,7 +27,7 @@ export const SecretForm: FunctionComponent<{
    * @param value form value
    * @returns true to prevent or disallow saving the same value twice, or false/void to allow this behavior
    */
-  onSave?: (value: string) => Promise<boolean | undefined>;
+  onSave: (value: string) => Promise<boolean | undefined>;
 }> = ({
   secret,
   secretName,
@@ -39,7 +38,7 @@ export const SecretForm: FunctionComponent<{
   onSave,
 }) => {
   const [value, setValue] = useState<{ current: string; previous?: string }>({
-    current: undefined,
+    current: '',
   });
   return (
     <div className="grid grid--gap-medium">
@@ -98,16 +97,3 @@ export const SecretForm: FunctionComponent<{
     </div>
   );
 };
-
-SecretForm.propTypes = {
-  secret: PropTypes.oneOfType([
-    PropTypes.object as PropTypes.Validator<Secret>,
-    PropTypes.object as PropTypes.Validator<BuildSecret>,
-    PropTypes.object as PropTypes.Validator<ImageHubSecret>,
-  ]).isRequired,
-  secretName: PropTypes.string.isRequired,
-  overview: PropTypes.node,
-  disableForm: PropTypes.bool,
-  disableSave: PropTypes.bool,
-  onSave: PropTypes.func,
-};
diff --git a/src/components/secret-status/index.tsx b/src/components/secret-status/index.tsx
index 8ecec83a3..bcf88f3bf 100644
--- a/src/components/secret-status/index.tsx
+++ b/src/components/secret-status/index.tsx
@@ -1,12 +1,8 @@
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import type { Secret } from '../../store/radix-api';
-import { StatusBadge } from '../status-badges';
+import { GenericStatusBadge as StatusBadge } from '../status-badges';
 
-export const SecretStatus: FunctionComponent<{ status?: Secret['status'] }> = ({
-  status,
-}) => {
+type Props = { status?: Secret['status'] };
+export const SecretStatus = ({ status }: Props) => {
   if (!status) {
     console.warn('Secret for component is not being reported by environment');
     return <StatusBadge type="danger">Status not reported</StatusBadge>;
@@ -23,7 +19,3 @@ export const SecretStatus: FunctionComponent<{ status?: Secret['status'] }> = ({
       return <StatusBadge type="danger">{status}</StatusBadge>;
   }
 };
-
-SecretStatus.propTypes = {
-  status: PropTypes.string as PropTypes.Validator<Secret['status']>,
-};
diff --git a/src/components/status-badges/build-secret-status-badge.tsx b/src/components/status-badges/build-secret-status-badge.tsx
index 34f11f141..a5426b5db 100644
--- a/src/components/status-badges/build-secret-status-badge.tsx
+++ b/src/components/status-badges/build-secret-status-badge.tsx
@@ -1,8 +1,5 @@
 import { Icon } from '@equinor/eds-core-react';
 import { check, time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
-
 import {
   StatusBadgeTemplate,
   type StatusBadgeTemplateProps,
@@ -10,24 +7,17 @@ import {
 
 import type { BuildSecret } from '../../store/radix-api';
 
-const BadgeTemplates: Record<
-  BuildSecret['status'],
-  Pick<StatusBadgeTemplateProps, 'icon' | 'type'>
-> = {
+type RequiredStatus = Required<BuildSecret>['status'];
+const BadgeTemplates = {
   Pending: { icon: <Icon data={time} /> },
   Consistent: { icon: <Icon data={check} /> },
-};
+} satisfies Record<RequiredStatus, StatusBadgeTemplateProps>;
 
-export const BuildSecretStatusBadge: FunctionComponent<{
+type Props = {
   status: BuildSecret['status'];
-}> = ({ status }) => (
-  <StatusBadgeTemplate {...BadgeTemplates[status]}>
+};
+export const BuildSecretStatusBadge = ({ status }: Props) => (
+  <StatusBadgeTemplate {...BadgeTemplates[status ?? 'Pending']}>
     {status}
   </StatusBadgeTemplate>
 );
-
-BuildSecretStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<
-    BuildSecret['status']
-  >,
-};
diff --git a/src/components/status-badges/component-secret-status-badge.tsx b/src/components/status-badges/component-secret-status-badge.tsx
index 5b2726ae7..d33153c3d 100644
--- a/src/components/status-badges/component-secret-status-badge.tsx
+++ b/src/components/status-badges/component-secret-status-badge.tsx
@@ -1,7 +1,5 @@
 import { Icon } from '@equinor/eds-core-react';
 import { check, error_outlined, stop, time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 
 import {
   StatusBadgeTemplate,
@@ -10,7 +8,7 @@ import {
 
 import type { Secret } from '../../store/radix-api';
 
-type SecretStatus = Secret['status'];
+type SecretStatus = Required<Secret>['status'];
 
 const Unsupported = {
   type: 'warning',
@@ -26,13 +24,10 @@ const BadgeTemplates = {
   },
 } satisfies Record<SecretStatus, StatusBadgeTemplateProps>;
 
-export const ComponentSecretStatusBadge: FunctionComponent<{
-  status: SecretStatus;
-}> = ({ status }) => {
-  const props = BadgeTemplates[status] ?? Unsupported;
-  return <StatusBadgeTemplate {...props}>{status}</StatusBadgeTemplate>;
+type Props = {
+  status?: SecretStatus;
 };
-
-ComponentSecretStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<SecretStatus>,
+export const ComponentSecretStatusBadge = ({ status }: Props) => {
+  const props = status ? BadgeTemplates[status] : Unsupported;
+  return <StatusBadgeTemplate {...props}>{status}</StatusBadgeTemplate>;
 };
diff --git a/src/components/status-badges/component-status-badge.tsx b/src/components/status-badges/component-status-badge.tsx
index bb33f41dd..15e3c9f3c 100644
--- a/src/components/status-badges/component-status-badge.tsx
+++ b/src/components/status-badges/component-status-badge.tsx
@@ -1,6 +1,5 @@
 import { CircularProgress, Icon } from '@equinor/eds-core-react';
 import { check_circle_outlined, info_circle, stop } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import {
@@ -13,7 +12,9 @@ import type {
   Component,
 } from '../../store/radix-api';
 
-type ComponentStatus = (AuxiliaryResourceDeployment | Component)['status'];
+type ComponentStatus = Required<
+  AuxiliaryResourceDeployment | Component
+>['status'];
 
 const BadgeTemplates = {
   Reconciling: { icon: <CircularProgress /> },
@@ -30,7 +31,3 @@ export const ComponentStatusBadge: FunctionComponent<{
     {status}
   </StatusBadgeTemplate>
 );
-
-ComponentStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<ComponentStatus>,
-};
diff --git a/src/components/status-badges/dev.tsx b/src/components/status-badges/dev.tsx
index 3ae284b62..d20119297 100644
--- a/src/components/status-badges/dev.tsx
+++ b/src/components/status-badges/dev.tsx
@@ -47,12 +47,9 @@ const templateTestData: Array<
   { description: 'type Default', text: 'Default', type: 'default' },
 ];
 
-const genericTestData: Array<
-  TestDataTemplate &
-    Pick<GenericStatusBadgeProps, 'className' | 'customIconData' | 'type'>
-> = [
-  { description: 'no Type, no Text' },
-  { description: 'no Type, Text', text: 'TestLabel' },
+const genericTestData = [
+  { description: 'no Type, no Text', type: 'unknown' },
+  { description: 'no Type, Text', text: 'TestLabel', type: 'unknown' },
   { description: 'Type, no Text', type: 'warning' },
   { description: 'Success', text: 'Success', type: 'success' },
   { description: 'Warning', text: 'Warning', type: 'warning' },
@@ -62,6 +59,7 @@ const genericTestData: Array<
     description: 'no Type, Custom Class',
     text: 'TestLabel',
     className: 'TestClass',
+    type: 'unknown',
   },
   {
     description: 'Custom Icon, Type',
@@ -73,8 +71,9 @@ const genericTestData: Array<
     description: 'Custom Icon, no Type',
     text: 'TestLabel',
     customIconData: coffee,
+    type: 'unknown',
   },
-];
+] satisfies Array<TestDataTemplate & GenericStatusBadgeProps>;
 
 const GenericBadge: <P, S extends TestDataTemplate>(
   title: string,
@@ -118,6 +117,7 @@ const testData = [
   EnumBadge(
     'ComponentSecretStatusBadge',
     ['Pending', 'Consistent', 'NotAvailable', 'Invalid', 'Unsupported'],
+    // @ts-expect-error No idea how to fix this one
     ComponentSecretStatusBadge
   ),
   EnumBadge(
@@ -130,6 +130,7 @@ const testData = [
       'ComponentOutdated',
       'Unsupported',
     ],
+    // @ts-expect-error No idea how to fix this one
     ComponentStatusBadge
   ),
   EnumBadge(
@@ -139,6 +140,7 @@ const testData = [
   ),
   EnumBadge(
     'PipelineRunBadges',
+    // @ts-expect-error No idea how to fix this one
     Object.keys(BadgeTemplates),
     PipelineRunStatusBadge
   ),
@@ -149,6 +151,7 @@ const testData = [
   ),
   EnumBadge(
     'RadixJobConditionBadges',
+    // @ts-expect-error No idea how to fix this one
     Object.keys(JobConditionBadgeTemplates),
     RadixJobConditionBadge
   ),
diff --git a/src/components/status-badges/external-dns-status-badge.tsx b/src/components/status-badges/external-dns-status-badge.tsx
index 4a84cbcad..a77c08ad4 100644
--- a/src/components/status-badges/external-dns-status-badge.tsx
+++ b/src/components/status-badges/external-dns-status-badge.tsx
@@ -1,6 +1,5 @@
 import { Icon } from '@equinor/eds-core-react';
 import { check, error_outlined, time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 
 import {
   StatusBadgeTemplate,
@@ -32,7 +31,3 @@ export function ExternalDNSStatusBadge({ status }: Props) {
     </StatusBadgeTemplate>
   );
 }
-
-ExternalDNSStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<Status>,
-};
diff --git a/src/components/status-badges/generic-status-badge.tsx b/src/components/status-badges/generic-status-badge.tsx
index 90d681c28..24faf438a 100644
--- a/src/components/status-badges/generic-status-badge.tsx
+++ b/src/components/status-badges/generic-status-badge.tsx
@@ -9,80 +9,44 @@ import {
   traffic_light,
   warning_outlined,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 
+import type { PropsWithChildren } from 'react';
 import {
   StatusBadgeTemplate,
   type StatusBadgeTemplateProps,
 } from './status-badge-template';
 
-export type GenericStatusBadgeProps = {
-  customIconData?: IconData;
-  type?: string;
-} & ChipProps;
-
-function getGenericStatus(
-  status: string
-): Pick<StatusBadgeTemplateProps, 'icon' | 'type'> {
-  const data: Pick<StatusBadgeTemplateProps, 'icon' | 'type'> = {};
-
-  switch (status) {
-    case 'running':
-      data.icon = <Icon data={run} />;
-      break;
-    case 'danger':
-    case 'failed':
-      data.icon = <Icon data={error_outlined} />;
-      data.type = 'danger';
-      break;
-    case 'queued':
-      data.icon = <Icon data={timer} />;
-      break;
-    case 'waiting':
-      data.icon = <Icon data={traffic_light} />;
-      break;
-    case 'stopped':
-    case 'stoppednochanges':
-      data.icon = <Icon data={blocked} />;
-      break;
-    case 'success':
-    case 'succeeded':
-      data.icon = <Icon data={check} />;
-      break;
-    case 'unknown':
-    case 'warning':
-      data.icon = <Icon data={warning_outlined} />;
-      data.type = 'warning';
-      break;
-    default:
-      break;
-  }
-
-  return data;
-}
-
-/** GenericStatusBadge */
-export const GenericStatusBadge: FunctionComponent<GenericStatusBadgeProps> = ({
+const BadgeTemplates = {
+  running: { icon: <Icon data={run} /> },
+  danger: { icon: <Icon data={error_outlined} />, type: 'danger' },
+  failed: { icon: <Icon data={error_outlined} />, type: 'danger' },
+  queued: { icon: <Icon data={timer} /> },
+  waiting: { icon: <Icon data={traffic_light} /> },
+  stopped: { icon: <Icon data={blocked} /> },
+  stoppednochanges: { icon: <Icon data={blocked} /> },
+  success: { icon: <Icon data={check} /> },
+  succeeded: { icon: <Icon data={check} /> },
+  unknown: { icon: <Icon data={warning_outlined} />, type: 'warning' },
+  warning: { icon: <Icon data={warning_outlined} />, type: 'warning' },
+} satisfies Record<string, StatusBadgeTemplateProps>;
+
+export type GenericStatusBadgeProps = PropsWithChildren<
+  {
+    customIconData?: IconData;
+    type?: keyof typeof BadgeTemplates;
+  } & ChipProps
+>;
+export const GenericStatusBadge = ({
   customIconData,
   type,
-  ...rest
-}) => (
+  ...chipProps
+}: GenericStatusBadgeProps) => (
   <StatusBadgeTemplate
     {...{
-      ...rest,
-      ...getGenericStatus(type?.toLowerCase()),
+      ...chipProps,
+      // @ts-expect-error ToLowerCase should return Lowercase<> https://github.com/microsoft/TypeScript/issues/44268
+      ...(type ? BadgeTemplates[type.toLowerCase()] : {}),
       ...(!!customIconData && { icon: <Icon data={customIconData} /> }),
     }}
   />
 );
-
-GenericStatusBadge.propTypes = {
-  customIconData: PropTypes.object as PropTypes.Validator<IconData>,
-  type: PropTypes.string,
-};
-
-/** GenericStatusBadgeProps alias */
-export type StatusBadgeProps = GenericStatusBadgeProps;
-/** GenericStatusBadge alias */
-export const StatusBadge = GenericStatusBadge;
diff --git a/src/components/status-badges/image-hub-secret-status-badge.tsx b/src/components/status-badges/image-hub-secret-status-badge.tsx
index 3c91b895a..33b5cbd9c 100644
--- a/src/components/status-badges/image-hub-secret-status-badge.tsx
+++ b/src/components/status-badges/image-hub-secret-status-badge.tsx
@@ -1,7 +1,5 @@
 import { Icon } from '@equinor/eds-core-react';
 import { check, time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 
 import {
   StatusBadgeTemplate,
@@ -10,24 +8,15 @@ import {
 
 import type { ImageHubSecret } from '../../store/radix-api';
 
-const BadgeTemplates: Record<
-  ImageHubSecret['status'],
-  Pick<StatusBadgeTemplateProps, 'icon' | 'type'>
-> = {
+type StatusType = Required<ImageHubSecret>['status'];
+const BadgeTemplates = {
   Pending: { icon: <Icon data={time} /> },
   Consistent: { icon: <Icon data={check} /> },
-};
+} satisfies Record<StatusType, StatusBadgeTemplateProps>;
 
-export const ImageHubSecretStatusBadge: FunctionComponent<{
-  status: ImageHubSecret['status'];
-}> = ({ status }) => (
+type Props = { status: StatusType };
+export const ImageHubSecretStatusBadge = ({ status }: Props) => (
   <StatusBadgeTemplate {...BadgeTemplates[status]}>
     {status}
   </StatusBadgeTemplate>
 );
-
-ImageHubSecretStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<
-    ImageHubSecret['status']
-  >,
-};
diff --git a/src/components/status-badges/pipeline-run-status-badge.tsx b/src/components/status-badges/pipeline-run-status-badge.tsx
index 41d2e1c38..39dc97a53 100644
--- a/src/components/status-badges/pipeline-run-status-badge.tsx
+++ b/src/components/status-badges/pipeline-run-status-badge.tsx
@@ -11,8 +11,8 @@ import { StatusBadgeTemplate } from './status-badge-template';
 
 type BadgeProps = ComponentProps<typeof StatusBadgeTemplate>;
 
-type TaskRunReason = PipelineRunTaskStep['status'];
-type PipelineRunReason = PipelineRunTask['status'];
+type TaskRunReason = Required<PipelineRunTaskStep>['status'];
+type PipelineRunReason = Required<PipelineRunTask>['status'];
 type Status = TaskRunReason | PipelineRunReason;
 
 const FailedIcon = {
diff --git a/src/components/status-badges/progress-status-badge.tsx b/src/components/status-badges/progress-status-badge.tsx
index e5c0ffd46..812887875 100644
--- a/src/components/status-badges/progress-status-badge.tsx
+++ b/src/components/status-badges/progress-status-badge.tsx
@@ -7,7 +7,6 @@ import {
   time,
   traffic_light,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
 
 import {
@@ -45,8 +44,3 @@ export const ProgressStatusBadge: FunctionComponent<{
     {status === 'Active' ? 'Starting' : status}
   </StatusBadgeTemplate>
 );
-
-ProgressStatusBadge.propTypes = {
-  status: PropTypes.string
-    .isRequired as PropTypes.Validator<JobSchedulerProgressStatus>,
-};
diff --git a/src/components/status-badges/radix-job-condition-badge.tsx b/src/components/status-badges/radix-job-condition-badge.tsx
index 3f470af5e..b8e1f893d 100644
--- a/src/components/status-badges/radix-job-condition-badge.tsx
+++ b/src/components/status-badges/radix-job-condition-badge.tsx
@@ -6,10 +6,11 @@ import {
   time,
   traffic_light,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { ComponentProps, FunctionComponent } from 'react';
 
-import { StatusBadgeTemplate } from './status-badge-template';
+import {
+  StatusBadgeTemplate,
+  type StatusBadgeTemplateProps,
+} from './status-badge-template';
 
 import type {
   JobSummary,
@@ -18,10 +19,9 @@ import type {
   Step,
 } from '../../store/radix-api';
 
-type BadgeProps = ComponentProps<typeof StatusBadgeTemplate>;
 type JobSummaryStatus =
-  | Step['status']
-  | JobSummary['status']
+  | Required<Step>['status']
+  | Required<JobSummary>['status']
   | ScheduledBatchSummary['status']
   | ScheduledJobSummary['status'];
 
@@ -39,16 +39,13 @@ export const JobConditionBadgeTemplates = {
     type: 'danger',
     icon: <Icon data={error_outlined} />,
   },
-} satisfies Record<JobSummaryStatus, BadgeProps>;
+} satisfies Record<JobSummaryStatus, StatusBadgeTemplateProps>;
 
-export const RadixJobConditionBadge: FunctionComponent<{
+type Props = {
   status: JobSummaryStatus;
-}> = ({ status }) => (
+};
+export const RadixJobConditionBadge = ({ status }: Props) => (
   <StatusBadgeTemplate {...JobConditionBadgeTemplates[status]}>
     {status == 'Active' ? 'Starting' : status}
   </StatusBadgeTemplate>
 );
-
-RadixJobConditionBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<JobSummaryStatus>,
-};
diff --git a/src/components/status-badges/replica-status-badge.tsx b/src/components/status-badges/replica-status-badge.tsx
index e30f2b8ca..44cacf171 100644
--- a/src/components/status-badges/replica-status-badge.tsx
+++ b/src/components/status-badges/replica-status-badge.tsx
@@ -6,8 +6,6 @@ import {
   stop,
   time,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 
 import {
   StatusBadgeTemplate,
@@ -16,10 +14,9 @@ import {
 
 import type { ReplicaSummary } from '../../store/radix-api';
 
-const BadgeTemplates: Record<
-  ReplicaSummary['replicaStatus']['status'],
-  Pick<StatusBadgeTemplateProps, 'icon' | 'type'>
-> = {
+type Status = Required<ReplicaSummary>['replicaStatus']['status'];
+
+const BadgeTemplates = {
   Pending: { icon: <Icon data={time} /> },
   Failed: { type: 'danger', icon: <Icon data={error_outlined} /> },
   Failing: { type: 'danger', icon: <Icon data={error_outlined} /> },
@@ -27,19 +24,14 @@ const BadgeTemplates: Record<
   Running: { icon: <Icon data={run} /> },
   Starting: { icon: <CircularProgress /> },
   Stopped: { icon: <Icon data={stop} /> },
-  Terminated: undefined,
-};
+  Terminated: { icon: <Icon data={stop} /> },
+} satisfies Record<Status, StatusBadgeTemplateProps>;
 
-export const ReplicaStatusBadge: FunctionComponent<{
-  status: ReplicaSummary['replicaStatus']['status'];
-}> = ({ status }) => (
+type Props = {
+  status: Status;
+};
+export const ReplicaStatusBadge = ({ status }: Props) => (
   <StatusBadgeTemplate {...BadgeTemplates[status]}>
     {status}
   </StatusBadgeTemplate>
 );
-
-ReplicaStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<
-    ReplicaSummary['replicaStatus']['status']
-  >,
-};
diff --git a/src/components/status-badges/status-badge-template.tsx b/src/components/status-badges/status-badge-template.tsx
index cfed959c0..32ca55bb5 100644
--- a/src/components/status-badges/status-badge-template.tsx
+++ b/src/components/status-badges/status-badge-template.tsx
@@ -1,8 +1,8 @@
 import { Chip, type ChipProps } from '@equinor/eds-core-react';
 import { clsx } from 'clsx';
-import type React from 'react';
 
 import './style.css';
+import type { PropsWithChildren } from 'react';
 
 export type StatusBadgeTemplateType =
   | 'success'
@@ -23,14 +23,14 @@ export function StatusBadgeTemplate({
   icon,
   type,
   ...rest
-}: StatusBadgeTemplateProps) {
+}: PropsWithChildren<StatusBadgeTemplateProps>) {
   return (
     <Chip
       className={clsx(
         'status-badge',
         `status-badge-type__${type ?? 'default'}`,
         { center: !icon },
-        { [className]: !!className }
+        className ? { [className]: true } : undefined
       )}
       {...rest}
     >
diff --git a/src/components/status-badges/tls-automation-status-badge.tsx b/src/components/status-badges/tls-automation-status-badge.tsx
index 8595d5e7c..486818ea7 100644
--- a/src/components/status-badges/tls-automation-status-badge.tsx
+++ b/src/components/status-badges/tls-automation-status-badge.tsx
@@ -1,14 +1,11 @@
 import { Icon } from '@equinor/eds-core-react';
 import { check, error_outlined, time } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-
+import type { TlsAutomation } from '../../store/radix-api';
 import {
   StatusBadgeTemplate,
   type StatusBadgeTemplateProps,
 } from './status-badge-template';
 
-import type { TlsAutomation } from '../../store/radix-api';
-
 type Status = TlsAutomation['status'] | 'Unknown';
 
 const BadgeTemplates: Record<
@@ -45,7 +42,3 @@ export function TLSAutomationStatusBadge({ status }: Props) {
     </StatusBadgeTemplate>
   );
 }
-
-TLSAutomationStatusBadge.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<Status>,
-};
diff --git a/src/components/status-tooltips/replica-status-tooltip.tsx b/src/components/status-tooltips/replica-status-tooltip.tsx
index 882c56834..1d17cfd9a 100644
--- a/src/components/status-tooltips/replica-status-tooltip.tsx
+++ b/src/components/status-tooltips/replica-status-tooltip.tsx
@@ -6,17 +6,13 @@ import {
   stop,
   time,
 } from '@equinor/eds-icons';
-import * as PropTypes from 'prop-types';
-import type { FunctionComponent } from 'react';
 
 import {
   StatusTooltipTemplate,
   type StatusTooltipTemplateProps,
 } from './status-tooltip-template';
 
-import type { ReplicaSummary } from '../../store/radix-api';
-
-type ReplicaStatus = ReplicaSummary['replicaStatus']['status'];
+import type { ReplicaStatus } from '../../store/radix-api';
 
 const TooltipTemplates = {
   Pending: { title: 'Pending', icon: <Icon data={time} /> },
@@ -36,16 +32,11 @@ const TooltipTemplates = {
     icon: <Icon data={check_circle_outlined} />,
   },
   Stopped: { title: 'Stopped', icon: <Icon data={stop} /> },
-  Terminated: undefined,
+  Terminated: { title: 'Terminated', icon: <Icon data={stop} /> },
   Starting: { title: 'Starting', icon: <CircularProgress /> },
-} satisfies Record<ReplicaStatus, StatusTooltipTemplateProps>;
+} satisfies Record<ReplicaStatus['status'], StatusTooltipTemplateProps>;
 
-export const ReplicaStatusTooltip: FunctionComponent<{
-  status: ReplicaStatus;
-}> = ({ status }) => (
-  <StatusTooltipTemplate title={status} {...TooltipTemplates[status]} />
+type Props = { status: ReplicaStatus['status'] };
+export const ReplicaStatusTooltip = ({ status }: Props) => (
+  <StatusTooltipTemplate {...TooltipTemplates[status]} />
 );
-
-ReplicaStatusTooltip.propTypes = {
-  status: PropTypes.string.isRequired as PropTypes.Validator<ReplicaStatus>,
-};
diff --git a/src/components/status-tooltips/status-tooltip-template.tsx b/src/components/status-tooltips/status-tooltip-template.tsx
index 3797169c9..b06bd45b5 100644
--- a/src/components/status-tooltips/status-tooltip-template.tsx
+++ b/src/components/status-tooltips/status-tooltip-template.tsx
@@ -36,7 +36,7 @@ export const StatusTooltipTemplate: FunctionComponent<
       className={clsx(
         'status-tooltip',
         `status-tooltip-type__${type ?? 'default'}`,
-        { [className]: !!className }
+        className ? { [className]: true } : undefined
       )}
     >
       {icon ?? <></>}
diff --git a/src/components/time/duration.tsx b/src/components/time/duration.tsx
index aab84c0ca..02c0c3695 100644
--- a/src/components/time/duration.tsx
+++ b/src/components/time/duration.tsx
@@ -2,8 +2,8 @@ import { isValid } from 'date-fns';
 import { differenceInWords } from '../../utils/datetime';
 
 type Props = {
-  start: number | string | Date;
-  end: number | string | Date;
+  start?: number | string | Date;
+  end?: number | string | Date;
   title?: string;
 };
 export function Duration({ start, end, title }: Props) {
@@ -14,7 +14,7 @@ export function Duration({ start, end, title }: Props) {
     end = new Date(end);
   }
 
-  if (!end || !isValid(end) || !isValid(start)) {
+  if (!end || !isValid(end) || !start || !isValid(start)) {
     return null;
   }
 
diff --git a/src/components/time/index.test.tsx b/src/components/time/index.test.tsx
index e251ec010..38843ac76 100644
--- a/src/components/time/index.test.tsx
+++ b/src/components/time/index.test.tsx
@@ -20,8 +20,8 @@ const Times = [
   1705580730,
   '2024-01-05T14:35:16Z',
   new Date(''),
-  new Date(null),
-  new Date(undefined),
+  new Date(null!),
+  new Date(undefined!),
   new Date(Infinity),
   new Date(-Infinity),
   new Date(+Infinity),
@@ -35,7 +35,7 @@ describe('Test Duration mixed Render', () => {
       <>
         {Times.map((a, ai) =>
           Times.map((b, bi) => (
-            <Duration key={`${ai}-${bi}`} start={a} end={b} />
+            <Duration key={`${ai}-${bi}`} start={a!} end={b!} />
           ))
         )}
       </>
@@ -57,8 +57,8 @@ const DurationTests = [
   { test: 1705580730, result: '423857 hours 0 mins 59 secs' },
   { test: '2024-01-05T14:35:16Z', result: '0 secs' },
   { test: new Date(''), result: '' },
-  { test: new Date(null), result: '424330 hours 47 mins 20 secs' },
-  { test: new Date(undefined), result: '' },
+  { test: new Date(null!), result: '424330 hours 47 mins 20 secs' },
+  { test: new Date(undefined!), result: '' },
   { test: new Date(Infinity), result: '' },
   { test: new Date(-Infinity), result: '' },
   { test: new Date(+Infinity), result: '' },
@@ -69,7 +69,7 @@ describe('Test Duration results and render', () => {
   it('should render without error', () => {
     DurationTests.map(({ test, result }, i) => {
       const { container } = render(
-        <Duration key={i} start={test} end={new Date()} />
+        <Duration key={i} start={test!} end={new Date()} />
       );
       expect(container.textContent).to.equal(result, `Test ${i}`);
     });
@@ -90,8 +90,8 @@ const RelativeToNowTests = [
   { test: 1705580730, result: 'Jan 20, 1970 at 18:46' },
   { test: '2024-01-05T14:35:16Z', result: 'Jan 5, 2024 at 15:35' },
   { test: new Date(''), result: '' },
-  { test: new Date(null), result: 'Jan 1, 1970 at 01:00' },
-  { test: new Date(undefined), result: '' },
+  { test: new Date(null!), result: 'Jan 1, 1970 at 01:00' },
+  { test: new Date(undefined!), result: '' },
   { test: new Date(Infinity), result: '' },
   { test: new Date(-Infinity), result: '' },
   { test: new Date(+Infinity), result: '' },
@@ -101,7 +101,7 @@ const RelativeToNowTests = [
 describe('Test Relative-to-now Render', () => {
   it('should render without error', () => {
     RelativeToNowTests.map(({ test, result }, i) => {
-      const { container } = render(<RelativeToNow key={i} time={test} />);
+      const { container } = render(<RelativeToNow key={i} time={test!} />);
       expect(container.textContent).to.equal(result, `Test ${i}`);
     });
   });
@@ -121,8 +121,8 @@ const DurationToNowTimes = [
   { test: 1705580730, result: '423857 hours 0 mins 59 secs' },
   { test: '2024-01-05T14:35:16Z', result: '0 secs' },
   { test: new Date(''), result: '' },
-  { test: new Date(null), result: '424330 hours 47 mins 20 secs' },
-  { test: new Date(undefined), result: '' },
+  { test: new Date(null!), result: '424330 hours 47 mins 20 secs' },
+  { test: new Date(undefined!), result: '' },
   { test: new Date(Infinity), result: '' },
   { test: new Date(-Infinity), result: '' },
   { test: new Date(+Infinity), result: '' },
@@ -132,7 +132,7 @@ const DurationToNowTimes = [
 describe('Test Duration-to-now Render', () => {
   it('should render without error', () => {
     DurationToNowTimes.map(({ test, result }, i) => {
-      const { container } = render(<DurationToNow key={i} start={test} />);
+      const { container } = render(<DurationToNow key={i} start={test!} />);
       expect(container.textContent).to.equal(result, `Test ${i}`);
     });
   });
diff --git a/src/components/time/relative-to-now.tsx b/src/components/time/relative-to-now.tsx
index 9842c6080..e09be763e 100644
--- a/src/components/time/relative-to-now.tsx
+++ b/src/components/time/relative-to-now.tsx
@@ -2,7 +2,7 @@ import { isValid } from 'date-fns';
 import { formatDateTimePrecise, relativeTimeToNow } from '../../utils/datetime';
 
 type Props = {
-  time: number | string | Date;
+  time?: number | string | Date;
   titlePrefix?: string;
   capitalize?: boolean;
   includeSeconds?: boolean;
diff --git a/src/components/tls-certificate-list/index.tsx b/src/components/tls-certificate-list/index.tsx
index e42f73157..d4f069e48 100644
--- a/src/components/tls-certificate-list/index.tsx
+++ b/src/components/tls-certificate-list/index.tsx
@@ -58,7 +58,7 @@ export const TLSCertificateList: FunctionComponent<{
                       <strong>{formatDateTime(new Date(tls.notAfter))}</strong>
                     </Typography>
                   )}
-                  {tls.dnsNames?.length > 0 && (
+                  {tls.dnsNames && tls.dnsNames.length > 0 && (
                     <Typography>
                       Subject alternative name{' '}
                       {tls.dnsNames.map((name, i, { length }) => (
diff --git a/src/components/vulnerability-details/index.tsx b/src/components/vulnerability-details/index.tsx
index c0ccdb455..0d8b1f77a 100644
--- a/src/components/vulnerability-details/index.tsx
+++ b/src/components/vulnerability-details/index.tsx
@@ -1,19 +1,18 @@
 import { Accordion } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { type FunctionComponent, useEffect, useState } from 'react';
 
 import type { Vulnerability } from '../../store/scan-api';
 import {
+  type SortDirection,
   dataSorter,
   sortCompareNumber,
-  type sortDirection,
 } from '../../utils/sort-utils';
 import { Alert } from '../alert';
 import { VulnerabilityList } from '../vulnerability-list';
 
 export interface VulnerabilityDetailsProps {
   vulnerabilities?: Array<Vulnerability>;
-  direction?: sortDirection;
+  direction?: SortDirection;
 }
 
 const severityOrder: Record<string, number> = {
@@ -48,7 +47,7 @@ function useGroupVulnerabilities(
 export const VulnerabilityDetails: FunctionComponent<
   VulnerabilityDetailsProps
 > = ({ vulnerabilities, direction = 'ascending' }) => {
-  const groupedList = useGroupVulnerabilities(vulnerabilities);
+  const groupedList = useGroupVulnerabilities(vulnerabilities ?? []);
   const keys = Object.keys(groupedList);
 
   return keys.length > 0 ? (
@@ -80,8 +79,3 @@ export const VulnerabilityDetails: FunctionComponent<
     <Alert>No vulnerabilities found</Alert>
   );
 };
-
-VulnerabilityDetails.propTypes = {
-  vulnerabilities: PropTypes.array,
-  direction: PropTypes.oneOf<sortDirection>(['ascending', 'descending']),
-};
diff --git a/src/components/vulnerability-list/index.tsx b/src/components/vulnerability-list/index.tsx
index b922834f0..2ce6c2337 100644
--- a/src/components/vulnerability-list/index.tsx
+++ b/src/components/vulnerability-list/index.tsx
@@ -1,12 +1,9 @@
 import { Divider, List, Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent, HTMLAttributes } from 'react';
 import ReactMarkdown, { type Components } from 'react-markdown';
-
 import { externalUrls } from '../../externalUrls';
 import type { Vulnerability } from '../../store/scan-api';
 import { formatDateTimeYear } from '../../utils/datetime';
-
 import './style.css';
 import { ExternalLink } from '../link/external-link';
 
@@ -79,7 +76,7 @@ const VulnerabilityMetadata: FunctionComponent<{
       <Typography variant="overline">Version</Typography>
       {vulnerability.version}
     </List.Item>
-    {vulnerability.cwe?.length > 0 && (
+    {vulnerability.cwe && vulnerability.cwe.length > 0 && (
       <List.Item>
         <Typography variant="overline">CWE</Typography>
         <ExternalLink
@@ -89,7 +86,7 @@ const VulnerabilityMetadata: FunctionComponent<{
         </ExternalLink>
       </List.Item>
     )}
-    {vulnerability.cve?.length > 0 && (
+    {vulnerability.cve && vulnerability.cve.length > 0 && (
       <List.Item>
         <Typography variant="overline">CVE</Typography>
         <ExternalLink
@@ -140,7 +137,7 @@ const VulnerabilityItem: FunctionComponent<{
       </div>
     )}
 
-    {vulnerability.references?.length > 0 && (
+    {vulnerability.references && vulnerability.references.length > 0 && (
       <div>
         <Typography variant="overline">References</Typography>
         <List className="o-indent-list" variant="bullet">
@@ -169,7 +166,3 @@ export const VulnerabilityList: FunctionComponent<VulnerabilityListProps> = ({
     ))}
   </List>
 );
-
-VulnerabilityList.propTypes = {
-  vulnerabilityList: PropTypes.array.isRequired,
-};
diff --git a/src/components/vulnerability-summary/index.tsx b/src/components/vulnerability-summary/index.tsx
index 6335fbf93..12191107a 100644
--- a/src/components/vulnerability-summary/index.tsx
+++ b/src/components/vulnerability-summary/index.tsx
@@ -1,25 +1,25 @@
 import { List, Tooltip, Typography } from '@equinor/eds-core-react';
 import { clsx } from 'clsx';
-import * as PropTypes from 'prop-types';
 import type { FunctionComponent } from 'react';
-
 import type { ImageScan, Vulnerability } from '../../store/scan-api';
-
 import './style.css';
 
-export interface VulnerabilitySummaryProps {
-  summary?: ImageScan['vulnerabilitySummary'];
-  visibleKeys?: Array<Lowercase<Vulnerability['severity']>>;
-}
-
-const VulnerabilitySummaryKeys = Object.freeze<
-  Array<Lowercase<Vulnerability['severity']>>
->(['critical', 'high', 'medium', 'low', 'unknown']);
+const VulnerabilitySummaryKeys = [
+  'critical',
+  'high',
+  'medium',
+  'low',
+  'unknown',
+] as const;
 
-const VulnerabilityBadge: FunctionComponent<{
-  severity: keyof ImageScan['vulnerabilitySummary'];
+type VulnerabilityBadgeProps = {
+  severity: (typeof VulnerabilitySummaryKeys)[number];
   count: number;
-}> = ({ severity, count }) => (
+};
+const VulnerabilityBadge: FunctionComponent<VulnerabilityBadgeProps> = ({
+  severity,
+  count,
+}) => (
   <div
     className={clsx('severity-summary-badge', {
       [`severity-summary-badge__${severity}`]: !!(count && severity),
@@ -36,12 +36,15 @@ const VulnerabilityBadge: FunctionComponent<{
   </div>
 );
 
-export const VulnerabilitySummary: FunctionComponent<
-  VulnerabilitySummaryProps
-> = ({ summary, visibleKeys }) => {
-  const keys = [
-    ...(visibleKeys?.length > 0 ? visibleKeys : VulnerabilitySummaryKeys),
-  ];
+export interface VulnerabilitySummaryProps {
+  summary?: ImageScan['vulnerabilitySummary'];
+  visibleKeys?: Array<Lowercase<Vulnerability['severity']>>;
+}
+export const VulnerabilitySummary = ({
+  summary,
+  visibleKeys,
+}: VulnerabilitySummaryProps) => {
+  const keys = visibleKeys ?? VulnerabilitySummaryKeys;
 
   return (
     <List className="grid grid--gap-small grid--auto-columns">
@@ -56,8 +59,3 @@ export const VulnerabilitySummary: FunctionComponent<
     </List>
   );
 };
-
-VulnerabilitySummary.propTypes = {
-  summary: PropTypes.objectOf(PropTypes.number),
-  visibleKeys: PropTypes.arrayOf(PropTypes.oneOf(VulnerabilitySummaryKeys)),
-};
diff --git a/src/config.json b/src/config.json
deleted file mode 100644
index 1df08b7a9..000000000
--- a/src/config.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "APP_NAME": "Radix Web Console",
-  "FLAGS": {
-    "enablePromotionPipeline": true,
-    "enableChangeAdmin": true
-  },
-  "RADIX_CLUSTER_BASE": "dev.radix.equinor.com",
-  "RADIX_CLUSTERNAME": "weekly-32",
-  "RADIX_CLUSTER_TYPE": "development",
-  "RADIX_ENVIRONMENT": "prod",
-  "CLUSTER_EGRESS_IPS": "1.1.1.1,1.1.1.1",
-  "CLUSTER_INGRESS_IPS": "2.2.2.2,2.2.4.4",
-  "OAUTH2_CLIENT_ID": "5687b237-eda3-4ec3-a2a1-023e85a2bd84",
-  "OAUTH2_AUTHORITY": "https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0",
-  "SERVICENOW_PROXY_SCOPES": [
-    "1b4a22f1-d4a1-4b6a-81b2-fd936daf1786/Application.Read"
-  ],
-  "SERVICENOW_PROXY_BASEURL": "https://api-radix-servicenow-proxy-qa.dev.radix.equinor.com/api/v1",
-  "CMDB_CI_URL": "https://equinor.service-now.com/selfservice?id=form&table=cmdb_ci_spkg&sys_id={CIID}",
-  "CLUSTER_OIDC_ISSUER_URL": ""
-}
diff --git a/src/effects/use-debounce.ts b/src/effects/use-debounce.ts
index 75d1eca08..1ad25924f 100644
--- a/src/effects/use-debounce.ts
+++ b/src/effects/use-debounce.ts
@@ -1,19 +1,20 @@
-import { debounce } from 'lodash';
+import { debounce } from 'lodash-es';
+import type { DebouncedFunc } from 'lodash-es';
 import { useEffect, useMemo, useRef } from 'react';
 
 // Picked up from https://www.developerway.com/posts/debouncing-in-react
 export function useDebounce<TArgs extends Array<unknown>, TReturn>(
   fn: (...args: TArgs) => TReturn,
   delay: number
-): (...args: TArgs) => TReturn {
-  const ref = useRef<(...args: TArgs) => TReturn>();
+): DebouncedFunc<(...args: TArgs) => TReturn> {
+  const ref = useRef<(...args: TArgs) => TReturn>(fn);
 
   useEffect(() => {
     ref.current = fn;
   }, [fn]);
 
   const debouncedCallback = useMemo(() => {
-    const func = (...args: TArgs): TReturn => ref.current?.(...args);
+    const func = (...args: TArgs): TReturn => ref.current(...args);
     return debounce(func, delay);
   }, [delay]);
 
diff --git a/src/effects/use-interval.ts b/src/effects/use-interval.ts
index 5a2fd29d7..dd404da2f 100644
--- a/src/effects/use-interval.ts
+++ b/src/effects/use-interval.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react';
 
 export function useInterval(callback: () => void, delay?: number): void {
-  const savedCallback = useRef<() => void>();
+  const savedCallback = useRef<() => void>(callback);
 
   // Remember latest callback.
   useEffect(() => {
diff --git a/src/index.ts b/src/index.ts
index 96c502ba0..302759971 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -23,5 +23,6 @@ async function fetchRoot(): Promise<React.JSX.Element> {
   return defaultEntry;
 }
 
+// @ts-expect-error root element exists
 const root = createRoot(document.getElementById('root'));
 (async () => root.render(await fetchRoot()))();
diff --git a/src/init/entry-dev-component.tsx b/src/init/entry-dev-component.tsx
index ce94d3200..41037b936 100644
--- a/src/init/entry-dev-component.tsx
+++ b/src/init/entry-dev-component.tsx
@@ -11,7 +11,7 @@ import { routes } from '../routes';
 type DefaultModuleImport = { default: React.JSX.Element };
 
 class DevComponent extends Component<
-  { component: string },
+  { component?: string },
   { content: React.JSX.Element }
 > {
   private isLoaded: boolean;
diff --git a/src/init/entry-dev-integration.tsx b/src/init/entry-dev-integration.tsx
index 0c2ab31f6..36ebec896 100644
--- a/src/init/entry-dev-integration.tsx
+++ b/src/init/entry-dev-integration.tsx
@@ -30,7 +30,7 @@ export function createRadixApiUrl(
 fetchMock.post('*', { thisIsADummyResponse: true });
 
 class IntegrationComponent extends Component<
-  { component: string },
+  { component?: string },
   { content: React.JSX.Element }
 > {
   private isLoaded: boolean;
diff --git a/src/pages/page-application/index.tsx b/src/pages/page-application/index.tsx
index a3cf749d1..12d256d77 100644
--- a/src/pages/page-application/index.tsx
+++ b/src/pages/page-application/index.tsx
@@ -1,13 +1,11 @@
 import { Typography } from '@equinor/eds-core-react';
-import * as PropTypes from 'prop-types';
 import { Outlet } from 'react-router';
-import { withRouteParams } from '../../utils/router';
-
 import { Alert } from '../../components/alert';
 import { DocumentTitle } from '../../components/document-title';
 import { LayoutApp } from '../../components/layout-app';
 import { pollingInterval } from '../../store/defaults';
 import { useGetApplicationQuery } from '../../store/radix-api';
+import { withRouteParams } from '../../utils/router';
 
 export function PageApplication({ appName }: { appName: string }) {
   const { data: application, isSuccess } = useGetApplicationQuery(
@@ -34,8 +32,4 @@ export function PageApplication({ appName }: { appName: string }) {
   );
 }
 
-PageApplication.propTypes = {
-  appName: PropTypes.string.isRequired,
-};
-
 export default withRouteParams(PageApplication);
diff --git a/src/store/configs/index.ts b/src/store/configs/index.ts
index c0a5a8b82..b20192e25 100644
--- a/src/store/configs/index.ts
+++ b/src/store/configs/index.ts
@@ -43,7 +43,7 @@ export const serviceNowStoreApi = createApi({
       const state = getState() as RootState;
 
       const provider = state.auth.provider;
-      if (!provider) return headers;
+      if (!provider || !provider.serviceNowAuthProvider) return headers;
 
       const token = await provider.serviceNowAuthProvider.getAccessToken();
       headers.set('Authorization', `Bearer ${token}`);
diff --git a/src/store/configs/log-openapi-config.cts b/src/store/configs/log-openapi-config.cts
index 3de3f1d62..b709b1b6c 100644
--- a/src/store/configs/log-openapi-config.cts
+++ b/src/store/configs/log-openapi-config.cts
@@ -1,8 +1,11 @@
 import type { ConfigFile } from '@rtk-query/codegen-openapi';
 
+const RADIX_LOG_API_SWAGGER_URL =
+  process.env.OVERRIDE_RADIX_LOG_API_SWAGGER_URL ||
+  'https://server-radix-log-api-qa.radix.equinor.com/swagger/doc.json';
+
 const config: ConfigFile = {
-  schemaFile:
-    'https://server-radix-log-api-qa.radix.equinor.com/swagger/doc.json',
+  schemaFile: RADIX_LOG_API_SWAGGER_URL,
   apiFile: './index.ts',
   apiImport: 'logStoreApi',
   outputFile: '../log-api.ts',
diff --git a/src/store/log-api.ts b/src/store/log-api.ts
index 6bae44e8c..be4a074af 100644
--- a/src/store/log-api.ts
+++ b/src/store/log-api.ts
@@ -310,7 +310,7 @@ export type GetPipelineJobContainerLogApiArg = {
 };
 export type ModelsContainer = {
   creationTimestamp?: string;
-  id?: string;
+  id: string;
   lastKnown?: string;
   name?: string;
 };
@@ -318,7 +318,7 @@ export type ModelsReplica = {
   containers?: ModelsContainer[];
   creationTimestamp?: string;
   lastKnown?: string;
-  name?: string;
+  name: string;
 };
 export type ModelsInventoryResponse = {
   replicas?: ModelsReplica[];
diff --git a/src/store/ms-graph-api.ts b/src/store/ms-graph-api.ts
index 55e830a4f..26cbda88a 100644
--- a/src/store/ms-graph-api.ts
+++ b/src/store/ms-graph-api.ts
@@ -3,25 +3,36 @@ import type { RootState } from '../store/store';
 import { Client, GraphError } from '@microsoft/microsoft-graph-client';
 import type { FetchBaseQueryError } from '@reduxjs/toolkit/query';
 
+function isRootState(state: any): state is RootState {
+  return !!state?.auth?.provider !== undefined;
+}
+
 let graphClient: Client | undefined = undefined;
-function ensureClient(state: RootState) {
-  if (!graphClient) {
-    const provider = state.auth.provider;
-    if (!provider) throw new Error('MS Graph Provider not reay');
-
-    graphClient = Client.initWithMiddleware({
-      authProvider: provider.graphAuthProvider,
-    });
+function ensureClient(state: unknown) {
+  if (graphClient) {
+    return graphClient;
   }
 
-  return graphClient;
+  if (!isRootState(state)){
+    throw new Error("Unknown state!")
+  }
+
+  if (!state.auth.provider) {
+    throw new Error('MS Graph Provider not ready');
+  }
+
+  graphClient = Client.initWithMiddleware({
+    authProvider: state.auth.provider.graphAuthProvider,
+  });
+  return graphClient
 }
 
-function parseGraphError(e): FetchBaseQueryError {
+function parseGraphError(e: unknown): FetchBaseQueryError {
   if (e instanceof GraphError) {
     return { data: e.body, status: e.statusCode };
   }
 
+  // @ts-expect-error not sure what e is in this case
   return { error: e, status: 'CUSTOM_ERROR' };
 }
 
@@ -30,8 +41,7 @@ const injectedRtkApi = api.injectEndpoints({
     getAdGroup: build.query<EntraItem, GetAdGroupArg>({
       queryFn: async ({ id }, { getState }) => {
         try {
-          ensureClient(getState() as RootState);
-          const group: EntraItem = await graphClient
+          const group: EntraItem = await ensureClient(getState())
             .api(`/groups/${id}`)
             .select('displayName,id')
             .get();
@@ -59,9 +69,8 @@ const injectedRtkApi = api.injectEndpoints({
             return { data: [] };
           }
 
-          ensureClient(getState() as RootState);
           const idFilter = ids.map((s) => `'${s}'`).join(',');
-          const response: SearchResponse = await graphClient
+          const response: SearchResponse = await ensureClient(getState())
             .api(`/groups`)
             .select('displayName,id')
             .filter(`id in (${idFilter})`)
@@ -91,9 +100,8 @@ const injectedRtkApi = api.injectEndpoints({
             return { data: [] };
           }
 
-          ensureClient(getState() as RootState);
           const idFilter = ids.map((s) => `'${s}'`).join(',');
-          const response: SearchResponse = await graphClient
+          const response: SearchResponse = await ensureClient(getState())
             .api(`/servicePrincipals`)
             .select('displayName,id,appId')
             .filter(`id in (${idFilter})`)
@@ -122,9 +130,8 @@ const injectedRtkApi = api.injectEndpoints({
             return { data: [] };
           }
 
-          ensureClient(getState() as RootState);
           const idFilter = ids.map((s) => `'${s}'`).join(',');
-          const response: SearchResponse = await graphClient
+          const response: SearchResponse = await ensureClient(getState())
             .api(`/applications`)
             .select('displayName,id,appId')
             .filter(`id in (${idFilter})`)
@@ -140,9 +147,7 @@ const injectedRtkApi = api.injectEndpoints({
     searchAdGroups: build.query<SearchResponse, SearchEntraArgs>({
       queryFn: async ({ displayName, limit }, { getState }) => {
         try {
-          ensureClient(getState() as RootState);
-
-          const groups: SearchResponse = await graphClient
+          const groups: SearchResponse = await ensureClient(getState())
             .api('/groups')
             .select('displayName,id')
             .filter(displayName ? `startswith(displayName,'${displayName}')` : '')
@@ -159,9 +164,7 @@ const injectedRtkApi = api.injectEndpoints({
     searchAdServicePrincipals: build.query<SearchResponse, SearchEntraArgs>({
       queryFn: async ({ displayName, limit }, { getState }) => {
         try {
-          ensureClient(getState() as RootState);
-
-          const groups: SearchResponse = await graphClient
+          const groups: SearchResponse = await ensureClient(getState())
             .api('/servicePrincipals')
             .select('displayName,id,appId')
             .filter(displayName ? `startswith(displayName,'${displayName}')` : '')
@@ -178,9 +181,7 @@ const injectedRtkApi = api.injectEndpoints({
     searchAdApplications: build.query<SearchResponse, SearchEntraArgs>({
       queryFn: async ({ displayName, limit }, { getState }) => {
         try {
-          ensureClient(getState() as RootState);
-
-          const groups: SearchResponse = await graphClient
+          const groups: SearchResponse = await ensureClient(getState())
             .api('/applications')
             .select('displayName,id,appId')
             .filter(displayName ? `startswith(displayName,'${displayName}')` : '')
diff --git a/src/store/msal/reducer.ts b/src/store/msal/reducer.ts
index a67f89824..01b69c08d 100644
--- a/src/store/msal/reducer.ts
+++ b/src/store/msal/reducer.ts
@@ -9,8 +9,8 @@ type Store = {
 
 // Initial state
 const initialState: Store = {
-  provider: null,
-  account: null,
+  provider: undefined,
+  account: undefined,
 };
 
 const authSlice = createSlice({
@@ -27,7 +27,5 @@ const authSlice = createSlice({
 });
 
 export const { setProvider, setAccount } = authSlice.actions;
-export const selectAuth = (state) => state.auth;
-
 export const authReducer = authSlice.reducer;
 export default authReducer;
diff --git a/src/store/radix-api.ts b/src/store/radix-api.ts
index ff8b8f8f0..7bab2aaf0 100644
--- a/src/store/radix-api.ts
+++ b/src/store/radix-api.ts
@@ -2462,7 +2462,7 @@ export type ReplicaSummary = {
   /** Container started timestamp */
   containerStarted?: string;
   /** Created timestamp */
-  created?: string;
+  created: string;
   /** The time at which the batch job's pod finishedAt. */
   endTime?: string;
   /** Exit status from the last termination of the container */
@@ -2572,7 +2572,7 @@ export type JobSummary = {
   /** CommitID the commit ID of the branch to build */
   commitID?: string;
   /** Created timestamp */
-  created?: string;
+  created: string;
   /** DeployExternalDNS deploy external DNS */
   deployExternalDNS?: boolean | null;
   /** Ended timestamp */
@@ -2584,7 +2584,7 @@ export type JobSummary = {
     [key: string]: string;
   };
   /** Name of the job */
-  name?: string;
+  name: string;
   /** OverrideUseBuildCache override default or configured build cache option */
   overrideUseBuildCache?: boolean | null;
   /** Name of the pipeline */
@@ -2617,7 +2617,7 @@ export type ApplicationSummary = {
   };
   latestJob?: JobSummary;
   /** Name the name of the application */
-  name?: string;
+  name: string;
 };
 export type ApplicationRegistration = {
   /** AdGroups the groups that should be able to access the application */
@@ -2751,7 +2751,7 @@ export type EnvironmentSummary = {
   /** BranchMapping The branch mapped to this environment */
   branchMapping?: string;
   /** Name of the environment */
-  name?: string;
+  name: string;
   /** Status of the environment
     Pending = Environment exists in Radix config, but not in cluster
     Consistent = Environment exists in Radix config and in cluster
@@ -2769,8 +2769,8 @@ export type Application = {
   /** Jobs list of run jobs for the application */
   jobs?: JobSummary[];
   /** Name the name of the application */
-  name?: string;
-  registration?: ApplicationRegistration;
+  name: string;
+  registration: ApplicationRegistration;
   /** UserIsAdmin if user is member of application's admin groups */
   userIsAdmin: boolean;
 };
@@ -2897,7 +2897,7 @@ export type DeployKeyAndSecret = {
 };
 export type Deployment = {
   /** ActiveFrom Timestamp when the deployment starts (or created) */
-  activeFrom?: string;
+  activeFrom: string;
   /** ActiveTo Timestamp when the deployment ends */
   activeTo?: string;
   /** Name of the branch used to build the deployment */
@@ -2907,13 +2907,13 @@ export type Deployment = {
   /** Name of job creating deployment */
   createdByJob?: string;
   /** Environment the environment this Radix application deployment runs in */
-  environment?: string;
+  environment: string;
   /** GitCommitHash the hash of the git commit from which radixconfig.yaml was parsed */
   gitCommitHash?: string;
   /** GitTags the git tags that the git commit hash points to */
   gitTags?: string;
   /** Name the unique name of the Radix application deployment */
-  name?: string;
+  name: string;
   /** Namespace where the deployment is stored */
   namespace: string;
   /** Repository the GitHub repository that the deployment was built from */
@@ -2959,7 +2959,7 @@ export type Environment = {
   /** Deployments All deployments in environment */
   deployments?: DeploymentSummary[];
   /** Name of the environment */
-  name?: string;
+  name: string;
   /** Secrets All secrets in environment */
   secrets?: Secret[];
   /** Status of the environment
@@ -3066,7 +3066,7 @@ export type ScheduledJobSummary = {
   /** Created timestamp */
   created?: string;
   /** DeploymentName name of RadixDeployment for the job */
-  deploymentName?: string;
+  deploymentName: string;
   /** Ended timestamp */
   ended?: string;
   /** FailedCount is the number of times the job has failed */
@@ -3076,7 +3076,7 @@ export type ScheduledJobSummary = {
   /** Message of a status, if any, of the job */
   message?: string;
   /** Name of the scheduled job */
-  name?: string;
+  name: string;
   node?: Node;
   /** Array of ReplicaSummary */
   replicaList?: ReplicaSummary[];
diff --git a/src/store/utils/index.ts b/src/store/utils/index.ts
index 0c82cd63a..bdd6fe837 100644
--- a/src/store/utils/index.ts
+++ b/src/store/utils/index.ts
@@ -4,64 +4,157 @@ import { getReasonPhrase } from 'http-status-codes';
 
 import type { FetchQueryError } from '../types';
 
-export function getFetchErrorData(error: FetchQueryError): {
-  code?: string | number;
+type ManagedErrors = FetchQueryError | SerializedError | Error | unknown;
+
+export function getFetchErrorData(error: ManagedErrors): {
+  code?: number;
   message: string;
   error: string;
 } {
-  const errObj: ReturnType<typeof getFetchErrorData> = {
-    code: undefined,
-    message: '',
-    error: '',
-  };
+  if (typeof error === "string") {
+    return {
+      code: undefined,
+      message: error,
+      error: "unknown error",
+    }
+  }
+
+  if (typeof error !== "object" || error === null) {
+    console.warn("unkown error: ", error)
+    return {
+      code: undefined,
+      message: "unknown error",
+      error: "unknown error",
+    }
+  }
 
-  if ((error as SerializedError).message || (error as SerializedError).code) {
-    errObj.code = (error as SerializedError).code;
-    errObj.message = (error as SerializedError).message;
-  } else if ((error as FetchBaseQueryError).status) {
-    const err = error as FetchBaseQueryError;
-    if (err.data?.['code'] || err.data?.['message'] || err.data?.['error']) {
-      // data is an object containing status
-      errObj.code = err.status;
-      if (err.data['code']) {
-        errObj.code = err.data['code'];
-      }
-      if (typeof err.data['message'] === 'string') {
-        errObj.message = err.data['message'];
-      }
-      if (typeof err.data['error'] === 'string') {
-        errObj.error = err.data['error'];
-      }
-    } else if (typeof err.status === 'number') {
-      errObj.code = err.status;
-      if (typeof err.data === 'string') {
-        errObj.message = err.data;
-      }
-    } else if (err.status === 'PARSING_ERROR') {
-      errObj.code = err.originalStatus;
-      try {
-        const code = getReasonPhrase(errObj.code);
-        errObj.message = code;
-      } catch (_) {
-        // noop
-      }
-    } else {
-      errObj.code = err.status;
-      errObj.message = err.error;
+  if (IsRTKQueryError(error)) {
+    const code = isFetchBaseQueryError(error) ? error.status : IsParsingError(error) ? error.originalStatus : undefined;
+    return {
+      code: code,
+      error: isFetchBaseQueryError(error) ? "server error" : error.error,
+      message: "failed to fetch data: " + (code ? getReasonPhrase(code) : "unknown")
     }
   }
 
-  return errObj;
+
+  console.warn("unkown error received: ", error)
+  // This might be SerialziedError, or something unknown
+  return {
+    code: 'code' in error ? Number(error.code) : undefined,
+    message: 'message' in error ? String(error.message) : "unknown error",
+    error: 'name' in error ? String(error.name) : "unknown error",
+  };
 }
 
 export function getFetchErrorCode(
-  error: FetchQueryError
-): ReturnType<typeof getFetchErrorData>['code'] {
+  error: ManagedErrors
+): number|undefined {
   return getFetchErrorData(error).code;
 }
 
 export function getFetchErrorMessage(
-  error: FetchQueryError
-): ReturnType<typeof getFetchErrorData>['message'] {
+  error: ManagedErrors
+): string|undefined {
   return getFetchErrorData(error).message;
 }
+
+
+function IsRTKQueryError(e: any): e is FetchBaseQueryError {
+  return isFetchBaseQueryError(e) || IsFetchError(e) || IsParsingError(e) || IsTimeoutError(e) || IsCustomError(e)
+}
+
+type BaseQueryError = FetchBaseQueryError & {
+  status: number;
+  data: unknown;
+}
+function isFetchBaseQueryError(e: FetchBaseQueryError): e is BaseQueryError {
+  return 'status' in e && typeof e.status === 'number'
+}
+
+
+type FetchError = FetchBaseQueryError & {
+  status: 'FETCH_ERROR';
+  originalStatus: number;
+  data: string;
+  error: string;
+}
+function IsFetchError(e: FetchBaseQueryError): e is FetchError {
+  if (!('status' in e))
+    return false
+
+  if (!('originalStatus' in e) || typeof e.originalStatus !== 'number')
+    return false
+
+  if (typeof e.data !== 'string')
+    return false
+
+  if (typeof e.error !== 'string')
+    return false
+
+  // @ts-expect-error I want to check it anyway :)
+  return e.status === "FETCH_ERROR"
+}
+
+type ParsingError = FetchBaseQueryError & {
+  status: 'PARSING_ERROR';
+  originalStatus: number;
+  data: string;
+  error: string;
+}
+function IsParsingError(e: FetchBaseQueryError): e is ParsingError {
+  if (!('status' in e))
+    return false
+
+  if (!('originalStatus' in e) || typeof e.originalStatus !== 'number')
+    return false
+
+  if (typeof e.data !== 'string')
+    return false
+
+  if (typeof e.error !== 'string')
+    return false
+
+  return e.status === "PARSING_ERROR"
+}
+
+
+type TimeoutError = FetchBaseQueryError & {
+  status: 'TIMEOUT_ERROR';
+  originalStatus: number;
+  data: string;
+  error: string;
+}
+function IsTimeoutError(e: FetchBaseQueryError): e is TimeoutError {
+  if (!('status' in e))
+    return false
+
+  if (!('originalStatus' in e) || typeof e.originalStatus !== 'number')
+    return false
+
+  if (typeof e.data !== 'string')
+    return false
+
+  if (typeof e.error !== 'string')
+    return false
+
+  // @ts-expect-error I want to check it anyway :)
+  return e.status === "TIMEOUT_ERROR"
+}
+
+
+type CustomError = FetchBaseQueryError & {
+  status: 'TIMEOUT_ERROR';
+  originalStatus: number;
+  data: string;
+  error: string;
+}
+function IsCustomError(e: FetchBaseQueryError): e is CustomError {
+  if (!('status' in e))
+    return false
+
+  if (!('error' in e) || typeof e.error !== 'string')
+    return false
+
+  return e.status === "CUSTOM_ERROR"
+}
diff --git a/src/utils/config/index.ts b/src/utils/config/index.ts
index 188c654aa..cf1d5b161 100644
--- a/src/utils/config/index.ts
+++ b/src/utils/config/index.ts
@@ -1,37 +1,31 @@
-import jsonConfig from '../../config.json';
-
-function arrayTransformer(
-  delimiter = ','
-): (value: string | Array<string>) => Array<string> {
-  return (v) => (Array.isArray(v) ? v : (v?.split(delimiter) ?? []));
+declare global {
+  interface Window {
+    injectEnv: Record<string, string> | undefined;
+  }
 }
 
-const transformers: Partial<
-  Record<
-    keyof typeof jsonConfig,
-    (...values: Array<unknown>) => string | Array<string>
-  >
-> = {
-  CLUSTER_EGRESS_IPS: arrayTransformer(),
-  CLUSTER_INGRESS_IPS: arrayTransformer(),
-  SERVICENOW_PROXY_SCOPES: arrayTransformer(' '),
-};
+export const configVariables = {
+  "APP_NAME": getVariable("APP_NAME", "Radix Web Console"),
+  "RADIX_CLUSTER_BASE": getVariable("RADIX_CLUSTER_BASE", "dev.radix.equinor.com"),
+  "RADIX_CLUSTERNAME": getVariable("RADIX_CLUSTERNAME", "weekly-32"),
+  "RADIX_CLUSTER_TYPE": getVariable("RADIX_CLUSTER_TYPE", "development"),
+  "RADIX_ENVIRONMENT": getVariable("RADIX_ENVIRONMENT", "prod"),
+  "CLUSTER_EGRESS_IPS": getVariable("CLUSTER_EGRESS_IPS", "1.1.1.1,1.1.1.1"),
+  "CLUSTER_INGRESS_IPS": getVariable("CLUSTER_INGRESS_IPS", "2.2.2.2,2.2.4.4"),
+  "OAUTH2_CLIENT_ID": getVariable("OAUTH2_CLIENT_ID", "5687b237-eda3-4ec3-a2a1-023e85a2bd84"),
+  "OAUTH2_AUTHORITY": getVariable("OAUTH2_AUTHORITY", "https://login.microsoftonline.com/3aa4a235-b6e2-48d5-9195-7fcf05b459b0"),
+  "SERVICENOW_PROXY_SCOPES": getVariable("SERVICENOW_PROXY_SCOPES", "1b4a22f1-d4a1-4b6a-81b2-fd936daf1786/Application.Read"),
+  "SERVICENOW_PROXY_BASEURL": getVariable("SERVICENOW_PROXY_BASEURL", "https://api-radix-servicenow-proxy-qa.dev.radix.equinor.com/api/v1"),
+  "CMDB_CI_URL": getVariable("CMDB_CI_URL", "https://equinor.service-now.com/selfservice?id=form&table=cmdb_ci_spkg&sys_id={CIID}"),
+  "CLUSTER_OIDC_ISSUER_URL": getVariable("CLUSTER_OIDC_ISSUER_URL", ""),
+}
 
-const injectEnvKey = 'injectEnv';
 
-export const configVariables: Readonly<typeof jsonConfig> = Object.freeze(
-  Object.keys(jsonConfig).reduce<typeof jsonConfig>(
-    (config, key: keyof typeof jsonConfig) => {
-      const value =
-        !window[injectEnvKey] ||
-        !window[injectEnvKey][key] ||
-        window[injectEnvKey][key].startsWith('${')
-          ? jsonConfig[key]
-          : window[injectEnvKey][key];
+function getVariable(key: string, defaultVariable: string): string {
+  const envVar = window.injectEnv?.[key];
+  if (envVar === undefined || envVar.startsWith("${")) {
+    return defaultVariable
+  }
 
-      config[key] = transformers[key] ? transformers[key](value) : value;
-      return config;
-    },
-    Object.create({})
-  )
-);
+  return envVar
+}
diff --git a/src/utils/event-model/index.ts b/src/utils/event-model/index.ts
index 4e8d6381c..9a9c4bc08 100644
--- a/src/utils/event-model/index.ts
+++ b/src/utils/event-model/index.ts
@@ -41,8 +41,8 @@ function getWarningStateHandler({
   involvedObjectKind,
   reason,
 }: Readonly<Event>) {
-  return warningStateHandler[involvedObjectKind?.toLowerCase()]?.[
-    reason?.toLowerCase()
+  return warningStateHandler[involvedObjectKind?.toLowerCase() ?? 'unknown']?.[
+    reason?.toLowerCase() ?? 'unknown'
   ];
 }
 
diff --git a/src/utils/exception.ts b/src/utils/exception.ts
index aa0009e6d..d802c7e6b 100644
--- a/src/utils/exception.ts
+++ b/src/utils/exception.ts
@@ -5,7 +5,7 @@ export class NetworkException extends Error {
   constructor(
     message: string,
     statusCode: number,
-    innerException: string = null
+    innerException: string | undefined = undefined
   ) {
     super(message);
     this.message = message;
diff --git a/src/utils/filter-fields.ts b/src/utils/filter-fields.ts
index 901eba7c2..e7245c300 100644
--- a/src/utils/filter-fields.ts
+++ b/src/utils/filter-fields.ts
@@ -23,6 +23,7 @@ function splitFields<T extends object, K extends keyof T>(
 ): { filtered: Pick<T, K>; unfiltered: Omit<T, K> } {
   return Object.keys(obj ?? {}).reduce(
     (o, key) => {
+      // @ts-expect-error I gave up typing this //todo
       o[keys?.includes(key as K) ? 'filtered' : 'unfiltered'][key] = obj?.[key];
       return o;
     },
diff --git a/src/utils/object.ts b/src/utils/object.ts
index 47fd95ea0..370335e5f 100644
--- a/src/utils/object.ts
+++ b/src/utils/object.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 type NestedKeyOf<T extends object> = {
   [K in keyof T & (string | number)]: T[K] extends object
diff --git a/src/utils/pipeline/index.ts b/src/utils/pipeline/index.ts
index beca5c8a3..ba21da8c5 100644
--- a/src/utils/pipeline/index.ts
+++ b/src/utils/pipeline/index.ts
@@ -8,7 +8,7 @@ export enum PipelineStep {
   BuildComponent = 'build',
 }
 
-export function getPipelineStepDescription(stepName: string): string {
+export function getPipelineStepDescription(stepName?: string): string | null {
   switch (stepName) {
     case PipelineStep.CloneConfig:
       return 'Cloning Radix config from config branch';
@@ -27,7 +27,7 @@ export function getPipelineStepDescription(stepName: string): string {
   }
 }
 
-export function getPipelineStepTitle(stepName: string): string {
+export function getPipelineStepTitle(stepName?: string): string | null {
   switch (stepName) {
     case PipelineStep.CloneConfig:
       return 'Cloning Radix config';
diff --git a/src/utils/promise-handler.ts b/src/utils/promise-handler.ts
index 086dfff26..34bd907bc 100644
--- a/src/utils/promise-handler.ts
+++ b/src/utils/promise-handler.ts
@@ -2,7 +2,7 @@ import { errorToast } from '../components/global-top-nav/styled-toaster';
 
 export function promiseHandler<T>(
   promise: Promise<T>,
-  onSuccess: (data: T) => void,
+  onSuccess: ((data: T) => void) | undefined,
   errMsg = 'Error'
 ): void {
   promise
diff --git a/src/utils/router.tsx b/src/utils/router.tsx
index 3ca0dcc6b..088d34bd4 100644
--- a/src/utils/router.tsx
+++ b/src/utils/router.tsx
@@ -1,6 +1,12 @@
-import type { Attributes, ComponentType, FunctionComponent } from 'react';
+import type {
+  Attributes,
+  ComponentType,
+  ElementType,
+  FunctionComponent,
+} from 'react';
 import { type LoaderFunctionArgs, useLoaderData } from 'react-router';
 
+import type * as React from 'react';
 import { useParams } from 'react-router-dom';
 import type { RouteParams } from '../routes';
 
@@ -38,6 +44,7 @@ const WithParams = ({ Component }: { Component: FunctionComponent }) => {
   const params = useParams();
   return <Component {...params} />;
 };
-export const withRouteParams = (Component: FunctionComponent) => {
+export const withRouteParams = (Component: FunctionComponent | ElementType) => {
+  // @ts-expect-error Component is not matching the type...
   return ({ ...props }) => <WithParams {...props} Component={Component} />;
 };
diff --git a/src/utils/routing.ts b/src/utils/routing.ts
index b7c43effe..cc2464d05 100644
--- a/src/utils/routing.ts
+++ b/src/utils/routing.ts
@@ -52,6 +52,7 @@ export function mapRouteParamsToProps<
     const mappedProps = (
       Array.isArray(propMap) ? (propMap as Array<string>) : Object.keys(propMap)
     ).reduce<Partial<P>>(
+      // @ts-expect-error I gave up typing this //todo
       (obj, key) => ({ ...obj, [key]: params[propMap[key] || key] }),
       {}
     );
diff --git a/src/utils/sort-utils.ts b/src/utils/sort-utils.ts
index ae0e0731c..37fe42eda 100644
--- a/src/utils/sort-utils.ts
+++ b/src/utils/sort-utils.ts
@@ -1,4 +1,4 @@
-export type sortDirection = 'ascending' | 'descending';
+export type SortDirection = 'ascending' | 'descending' | undefined;
 
 /**
  * Creates a copy of the array and performs multiple sort operations
@@ -8,7 +8,7 @@ export type sortDirection = 'ascending' | 'descending';
  * @returns sorted copy of array
  */
 export function dataSorter<T>(
-  array: Readonly<Array<T>>,
+  array: Readonly<Array<T> | undefined>,
   sorters: Array<Parameters<Array<T>['sort']>[0]>
 ): Array<T> {
   const data = [...(array ?? [])];
@@ -16,14 +16,14 @@ export function dataSorter<T>(
   return data;
 }
 
-function sorter(direction: sortDirection): 1 | -1 {
+function sorter(direction: SortDirection): 1 | -1 {
   return direction === 'ascending' ? 1 : -1;
 }
 
 function sortWhenNull(
   a: unknown | null | undefined,
   b: unknown | null | undefined,
-  direction: sortDirection
+  direction: SortDirection
 ): number {
   if (a == null && b == null) {
     return 0;
@@ -39,7 +39,7 @@ function sortWhenNull(
 export function sortCompareString(
   a: string | null | undefined,
   b: string | null | undefined,
-  direction: sortDirection = 'ascending',
+  direction: SortDirection = 'ascending',
   caseInsensitive = true,
   when?: () => boolean
 ): number {
@@ -64,7 +64,7 @@ export function sortCompareString(
 export function sortCompareBoolean(
   a: boolean | null | undefined,
   b: boolean | null | undefined,
-  direction: sortDirection = 'ascending',
+  direction: SortDirection = 'ascending',
   when?: () => boolean
 ): number {
   if (when && !when()) {
@@ -85,7 +85,7 @@ export function sortCompareBoolean(
 export function sortCompareNumber(
   a: number | null | undefined,
   b: number | null | undefined,
-  direction: sortDirection = 'ascending',
+  direction: SortDirection = 'ascending',
   when?: () => boolean
 ): number {
   if (when && !when()) {
@@ -106,7 +106,7 @@ export function sortCompareNumber(
 export function sortCompareDate(
   a: string | Date | null | undefined,
   b: string | Date | null | undefined,
-  direction: sortDirection = 'ascending',
+  direction: SortDirection = 'ascending',
   when?: () => boolean
 ): number {
   if (when && !when()) {
diff --git a/src/utils/table-sort-utils.tsx b/src/utils/table-sort-utils.tsx
index 1149c7f1e..0d1fe0a3c 100644
--- a/src/utils/table-sort-utils.tsx
+++ b/src/utils/table-sort-utils.tsx
@@ -7,9 +7,9 @@ import {
 } from '@equinor/eds-icons';
 import type { FunctionComponent } from 'react';
 
-import type { sortDirection } from './sort-utils';
+import type { SortDirection } from './sort-utils';
 
-function getTableSortIcon(dir: sortDirection): IconData {
+function getTableSortIcon(dir: SortDirection): IconData {
   switch (dir) {
     case 'ascending':
       return chevron_down;
@@ -20,10 +20,7 @@ function getTableSortIcon(dir: sortDirection): IconData {
   }
 }
 
-export function getNewSortDir(
-  direction: sortDirection,
-  nullable?: boolean
-): sortDirection | null {
+export function getNewSortDir(direction: SortDirection, nullable?: boolean) {
   if (!direction) {
     return 'ascending';
   }
@@ -32,11 +29,11 @@ export function getNewSortDir(
     return 'descending';
   }
 
-  return nullable ? null : 'ascending';
+  return nullable ? undefined : 'ascending';
 }
 
 export const TableSortIcon: FunctionComponent<{
-  direction: sortDirection;
+  direction: SortDirection;
   size?: IconProps['size'];
 }> = ({ direction, size = 16 }) => (
   <Icon
diff --git a/tsconfig.json b/tsconfig.json
index 81f714b6b..00f37fdeb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,22 +4,28 @@
     "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "jsx": "react-jsx",
     "module": "ESNext",
-    "allowJs": true,
+    "allowJs": false,
     "outDir": "./build-ts",
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": false,
     "forceConsistentCasingInFileNames": true,
-    "strict": false,
-    "strictNullChecks": false,
     "skipLibCheck": false,
     "moduleResolution": "Node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
+    "strict": true,
+    "strictNullChecks": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,
     "noImplicitReturns": true,
     "noUnusedLocals": true,
+    "noImplicitThis": true,
+    "strictPropertyInitialization": true,
+    "strictBindCallApply": true,
+    "noImplicitAny": true,
+    "strictFunctionTypes": true,
+    "useUnknownInCatchVariables": true,
     "types": ["vitest/globals"]
   },
   "include": ["./src/**/*"],