From 011a4f346695e3161e69eb5caa3a8fc8173199d8 Mon Sep 17 00:00:00 2001
From: Avi Shah <avishah1904@gmail.com>
Date: Wed, 10 Jul 2024 14:29:17 +0530
Subject: [PATCH] Dast Final Changes

---
 app/components/dynamic-scan/expiry/index.hbs  |   40 -
 app/components/dynamic-scan/index.hbs         |  124 --
 app/components/dynamic-scan/index.ts          |  106 --
 app/components/dynamic-scan/modal/index.hbs   |  217 ---
 app/components/dynamic-scan/modal/index.scss  |   29 -
 app/components/file-chart/index.hbs           |    8 +-
 app/components/file-details/api-scan/index.ts |    4 +-
 .../file-details/api-scan/results/index.hbs   |    1 +
 .../dynamic-scan/action/drawer/index.hbs      |    6 +-
 .../dynamic-scan/action/drawer/index.scss     |    6 +-
 .../dynamic-scan/action/expiry/index.scss     |   30 +-
 .../dynamic-scan/action/index.hbs             |   29 +-
 .../file-details/dynamic-scan/action/index.ts |   25 +-
 .../dynamic-scan/automated/index.hbs          |    1 +
 .../dynamic-scan/automated/index.scss         |    2 +-
 .../dynamic-scan/drawer-old/index.hbs         |  241 ++++
 .../dynamic-scan/drawer-old/index.scss        |   37 +
 .../dynamic-scan/drawer-old}/index.ts         |    6 +-
 .../drawer-old}/proxy-settings-view/index.hbs |    0
 .../proxy-settings-view/index.scss            |    3 +-
 .../drawer-old/proxy-settings-view/index.ts   |   85 ++
 .../dynamic-scan/expiry-old/index.hbs         |   69 +
 .../dynamic-scan/expiry-old/index.scss        |   26 +
 .../dynamic-scan/expiry-old}/index.ts         |   95 +-
 .../file-details/dynamic-scan/header/index.ts |   14 +-
 .../dynamic-scan/manual/index.hbs             |  102 +-
 .../dynamic-scan/manual/index.scss            |   35 +
 .../file-details/dynamic-scan/manual/index.ts |   25 +-
 .../dynamic-scan/results/index.hbs            |    1 +
 .../dynamic-scan/status-chip/index.hbs        |   59 +-
 .../dynamic-scan/status-chip/index.scss       |    3 +
 .../dynamic-scan/status-chip/index.ts         |   76 +-
 app/components/file-details/index.hbs         |   42 +-
 .../file-details/manual-scan/index.ts         |    4 +-
 .../request-form/basic-info/index.hbs         |    4 +-
 .../request-form/login-details/index.ts       |    2 +-
 .../manual-scan/results/index.hbs             |    1 +
 .../file-details/proxy-settings/index.ts      |    2 +-
 .../api-scan/captured-apis/index.hbs          |   88 --
 .../api-scan/captured-apis/index.scss         |   17 -
 .../api-scan/captured-apis/index.ts           |  139 --
 .../api-scan/captured-apis/overview/index.hbs |   24 -
 .../captured-apis/overview/index.scss         |    8 -
 .../api-scan/captured-apis/overview/index.ts  |   22 -
 .../scan-actions-old/api-scan/index.hbs       |  114 --
 .../scan-actions-old/api-scan/index.scss      |    9 -
 .../scan-actions-old/api-scan/index.ts        |  131 --
 .../file-details/scan-actions-old/index.hbs   |   92 --
 .../file-details/scan-actions-old/index.scss  |   10 -
 .../file-details/scan-actions-old/index.ts    |   29 -
 .../manual-scan/basic-info/index.hbs          |   91 --
 .../manual-scan/basic-info/index.scss         |   17 -
 .../manual-scan/basic-info/index.ts           |   53 -
 .../scan-actions-old/manual-scan/index.hbs    |  123 --
 .../scan-actions-old/manual-scan/index.ts     |  248 ----
 .../manual-scan/login-details/index.hbs       |  110 --
 .../manual-scan/login-details/index.scss      |   17 -
 .../manual-scan/login-details/index.ts        |  122 --
 .../login-details/user-role-action/index.hbs  |    7 -
 .../login-details/user-role-action/index.ts   |   15 -
 .../manual-scan/vpn-details/index.hbs         |   65 -
 .../manual-scan/vpn-details/index.scss        |   17 -
 .../manual-scan/vpn-details/index.ts          |   29 -
 .../scan-actions-old/static-scan/index.hbs    |   48 -
 .../scan-actions-old/static-scan/index.ts     |   59 -
 .../api-scan/captured-apis/index.hbs          |   88 --
 .../api-scan/captured-apis/index.scss         |   17 -
 .../api-scan/captured-apis/index.ts           |  139 --
 .../api-scan/captured-apis/overview/index.hbs |   24 -
 .../captured-apis/overview/index.scss         |    8 -
 .../api-scan/captured-apis/overview/index.ts  |   22 -
 .../scan-actions/api-scan/index.hbs           |    3 +
 .../scan-actions/dynamic-scan/index.hbs       |   12 +-
 .../scan-actions/dynamic-scan/index.scss      |    4 -
 .../scan-actions/dynamic-scan/index.ts        |    6 +-
 .../file-details/scan-actions/index.scss      |    4 +-
 .../manual-scan/basic-info/index.hbs          |   91 --
 .../manual-scan/basic-info/index.scss         |   17 -
 .../manual-scan/basic-info/index.ts           |   53 -
 .../scan-actions/manual-scan/index.hbs        |    3 +
 .../manual-scan/login-details/index.hbs       |  110 --
 .../manual-scan/login-details/index.scss      |   17 -
 .../manual-scan/login-details/index.ts        |  122 --
 .../login-details/user-role-action/index.hbs  |    7 -
 .../login-details/user-role-action/index.ts   |   15 -
 .../manual-scan/vpn-details/index.hbs         |   65 -
 .../manual-scan/vpn-details/index.scss        |   17 -
 .../manual-scan/vpn-details/index.ts          |   29 -
 .../scan-actions/static-scan/index.hbs        |    3 +
 .../file-details/severity-level/index.hbs     |    8 +-
 .../file-details/skeleton-loader/index.hbs    |   70 +-
 .../file-details/skeleton-loader/index.scss   |   11 +
 .../file-details/static-scan/index.hbs        |    1 +
 .../summary-old/app-platform/index.hbs        |    6 -
 .../summary-old/app-platform/index.scss       |   12 -
 .../summary-old/app-platform/index.ts         |   21 -
 .../summary-old/file-tags/index.hbs           |   55 -
 .../summary-old/file-tags/index.scss          |    7 -
 .../summary-old/file-tags/index.ts            |  135 --
 .../file-details/summary-old/index.hbs        |  196 ---
 .../file-details/summary-old/index.scss       |   39 -
 .../file-details/summary-old/index.ts         |  101 --
 app/components/file-details/summary/index.hbs |    1 +
 .../vulnerability-analysis-details/index.ts   |   36 +-
 .../vulnerability-analysis/table/index.scss   |    2 +-
 .../vulnerability-analysis/table/index.ts     |   13 +-
 .../dynamicscan-automation-settings/index.hbs |    5 +
 .../dynamicscan-automation-settings/index.ts  |    1 +
 .../scripts-archived/index.hbs                |  174 ---
 .../scripts-archived/index.scss               |   23 -
 .../scripts-archived/index.ts                 |  188 ---
 .../general-settings/index.hbs                |   29 +-
 .../general-settings/index.ts                 |    4 +
 app/components/proxy-settings-view/index.ts   |   91 --
 app/components/vnc-viewer-old/index.hbs       |   83 --
 app/components/vnc-viewer-old/index.scss      |   37 -
 app/components/vnc-viewer-old/index.ts        |  145 --
 app/components/vnc-viewer/index.hbs           |   19 +-
 app/components/vnc-viewer/index.scss          |   20 +-
 app/components/vnc-viewer/index.ts            |    3 +
 .../authenticated/dashboard/file/analysis.ts  |    5 +
 app/router.ts                                 |    2 +-
 app/styles/_component-variables.scss          |   56 +-
 app/styles/_icons.scss                        |    4 +
 .../dashboard/file/index-loading.hbs          |    2 +-
 .../authenticated/dashboard/file/index.hbs    |   10 +-
 tests/acceptance/file-details-test.js         |   45 +
 .../acceptance/file-details/api-scan-test.js  |    4 +-
 .../file-details/dynamic-scan-test.js         |  189 ++-
 .../file-details/manual-scan-test.js          |    4 +-
 .../components/dynamic-scan-test.js           | 1115 --------------
 .../file-details/dynamic-scan/manual-test.js  | 1283 +++++++++++++++++
 .../dynamic-scan/status-chip-test.js          |   17 +-
 .../file-details/scan-actions-old-test.js     |  313 ----
 .../scan-actions-old/api-scan-test.js         |  496 -------
 .../scan-actions-old/manual-scan-test.js      |  620 --------
 .../file-details/summary-old-test.js          |  392 -----
 .../index-test.js                             |    4 +-
 .../scripts-archived-test.js                  |  381 -----
 .../components/vnc-viewer-old-test.js         |  253 ----
 translations/en.json                          |    9 +-
 translations/ja.json                          |    9 +-
 types/global.d.ts                             |    7 +
 143 files changed, 2579 insertions(+), 8317 deletions(-)
 delete mode 100644 app/components/dynamic-scan/expiry/index.hbs
 delete mode 100644 app/components/dynamic-scan/index.hbs
 delete mode 100644 app/components/dynamic-scan/index.ts
 delete mode 100644 app/components/dynamic-scan/modal/index.hbs
 delete mode 100644 app/components/dynamic-scan/modal/index.scss
 create mode 100644 app/components/file-details/dynamic-scan/drawer-old/index.hbs
 create mode 100644 app/components/file-details/dynamic-scan/drawer-old/index.scss
 rename app/components/{dynamic-scan/modal => file-details/dynamic-scan/drawer-old}/index.ts (94%)
 rename app/components/{ => file-details/dynamic-scan/drawer-old}/proxy-settings-view/index.hbs (100%)
 rename app/components/{ => file-details/dynamic-scan/drawer-old}/proxy-settings-view/index.scss (54%)
 create mode 100644 app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.ts
 create mode 100644 app/components/file-details/dynamic-scan/expiry-old/index.hbs
 create mode 100644 app/components/file-details/dynamic-scan/expiry-old/index.scss
 rename app/components/{dynamic-scan/expiry => file-details/dynamic-scan/expiry-old}/index.ts (60%)
 create mode 100644 app/components/file-details/dynamic-scan/status-chip/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/api-scan/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/basic-info/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/basic-info/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/basic-info/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/login-details/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/login-details/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/login-details/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.scss
 delete mode 100644 app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.ts
 delete mode 100644 app/components/file-details/scan-actions-old/static-scan/index.hbs
 delete mode 100644 app/components/file-details/scan-actions-old/static-scan/index.ts
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/index.scss
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/index.ts
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.scss
 delete mode 100644 app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.ts
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/basic-info/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/basic-info/index.scss
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/basic-info/index.ts
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/login-details/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/login-details/index.scss
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/login-details/index.ts
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.ts
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/vpn-details/index.hbs
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/vpn-details/index.scss
 delete mode 100644 app/components/file-details/scan-actions/manual-scan/vpn-details/index.ts
 delete mode 100644 app/components/file-details/summary-old/app-platform/index.hbs
 delete mode 100644 app/components/file-details/summary-old/app-platform/index.scss
 delete mode 100644 app/components/file-details/summary-old/app-platform/index.ts
 delete mode 100644 app/components/file-details/summary-old/file-tags/index.hbs
 delete mode 100644 app/components/file-details/summary-old/file-tags/index.scss
 delete mode 100644 app/components/file-details/summary-old/file-tags/index.ts
 delete mode 100644 app/components/file-details/summary-old/index.hbs
 delete mode 100644 app/components/file-details/summary-old/index.scss
 delete mode 100644 app/components/file-details/summary-old/index.ts
 delete mode 100644 app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.hbs
 delete mode 100644 app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.scss
 delete mode 100644 app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.ts
 delete mode 100644 app/components/proxy-settings-view/index.ts
 delete mode 100644 app/components/vnc-viewer-old/index.hbs
 delete mode 100644 app/components/vnc-viewer-old/index.scss
 delete mode 100644 app/components/vnc-viewer-old/index.ts
 create mode 100644 app/controllers/authenticated/dashboard/file/analysis.ts
 delete mode 100644 tests/integration/components/dynamic-scan-test.js
 create mode 100644 tests/integration/components/file-details/dynamic-scan/manual-test.js
 delete mode 100644 tests/integration/components/file-details/scan-actions-old-test.js
 delete mode 100644 tests/integration/components/file-details/scan-actions-old/api-scan-test.js
 delete mode 100644 tests/integration/components/file-details/scan-actions-old/manual-scan-test.js
 delete mode 100644 tests/integration/components/file-details/summary-old-test.js
 delete mode 100644 tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived-test.js
 delete mode 100644 tests/integration/components/vnc-viewer-old-test.js

diff --git a/app/components/dynamic-scan/expiry/index.hbs b/app/components/dynamic-scan/expiry/index.hbs
deleted file mode 100644
index 17c7fc4fa7..0000000000
--- a/app/components/dynamic-scan/expiry/index.hbs
+++ /dev/null
@@ -1,40 +0,0 @@
-<div>
-  <AkStack @justifyContent='center' @alignItems='center' @spacing='1'>
-    <AkTypography @tag='span' @variant='h5' @fontWeight='regular'>
-      {{this.timeRemaining.minutes}}:{{this.timeRemaining.seconds}}
-    </AkTypography>
-
-    {{#if this.extendtime.isRunning}}
-      <AkLoader @size={{16}} />
-    {{else}}
-      <AkTooltip
-        @disabled={{this.canExtend}}
-        @color='dark'
-        @placement='top'
-        @arrow={{true}}
-        @title={{t 'dynamicScanExtentionLimit'}}
-      >
-        <AkIconButton
-          @size='small'
-          disabled={{not this.canExtend}}
-          @variant='outlined'
-          {{on 'click' this.handleExtendTimeClick}}
-        >
-          <AkIcon @iconName='add' />
-        </AkIconButton>
-      </AkTooltip>
-    {{/if}}
-  </AkStack>
-
-  <AkMenu
-    @anchorRef={{this.extendBtnAnchorRef}}
-    @onClose={{this.handleExtendTimeMenuClose}}
-    as |akm|
-  >
-    {{#each this.extendTimeOptions as |time|}}
-      <akm.listItem @onClick={{perform this.extendtime time}} as |li|>
-        <li.text @primaryText='{{time}} mins' />
-      </akm.listItem>
-    {{/each}}
-  </AkMenu>
-</div>
\ No newline at end of file
diff --git a/app/components/dynamic-scan/index.hbs b/app/components/dynamic-scan/index.hbs
deleted file mode 100644
index df945a7d03..0000000000
--- a/app/components/dynamic-scan/index.hbs
+++ /dev/null
@@ -1,124 +0,0 @@
-<AkStack @direction='column' @alignItems='center' @spacing='1'>
-  {{#if @file.isDynamicStatusNotReady}}
-    <AkStack @alignItems='stretch' @spacing='1.5'>
-      {{#if @file.isDynamicStatusNeitherNoneNorReadyNorError}}
-        <AkButton data-test-dynamicScan-startBtn @variant='outlined'>
-          <:leftIcon>
-            <AkLoader @size={{13}} />
-          </:leftIcon>
-
-          <:default>{{@file.statusText}}</:default>
-        </AkButton>
-
-        {{#if @file.isDynamicStatusQueueAndHasAutomation}}
-          <AkIconButton
-            data-test-dynamicScan-restartBtn
-            {{style padding='0.5em'}}
-            {{on 'click' this.openDynamicScanModal}}
-            @variant='outlined'
-            @borderColor='primary'
-            disabled={{not @file.isActive}}
-          >
-            <AkIcon @iconName='refresh' @color='primary' />
-          </AkIconButton>
-        {{/if}}
-      {{/if}}
-
-      {{#if @file.isDynamicStatusNoneOrError}}
-        {{#if @file.isDynamicStatusError}}
-          <AkButton
-            data-test-dynamicScan-startBtn
-            @variant='outlined'
-            @disabled={{true}}
-          >
-            <:leftIcon>
-              <AkIcon @iconName='warning' />
-            </:leftIcon>
-
-            <:default>{{t 'errored'}}</:default>
-          </AkButton>
-
-          <AkIconButton
-            data-test-dynamicScan-restartBtn
-            data-test-cy='dynamicScan-restartBtn'
-            {{style padding='0.5em'}}
-            {{on 'click' this.openDynamicScanModal}}
-            @variant='outlined'
-            @borderColor='primary'
-            disabled={{not @file.isActive}}
-          >
-            <AkIcon @iconName='refresh' @color='primary' />
-          </AkIconButton>
-        {{else if @file.isDynamicDone}}
-          <AkButton
-            data-test-dynamicScan-startBtn
-            {{style pointerEvents='none'}}
-          >
-            <:leftIcon>
-              <AkIcon @iconName='done' />
-            </:leftIcon>
-
-            <:default>{{t 'completed'}}</:default>
-          </AkButton>
-
-          <AkIconButton
-            data-test-dynamicScan-restartBtn
-            data-test-cy='dynamicScan-restartBtn'
-            {{style padding='0.5em'}}
-            {{on 'click' this.openDynamicScanModal}}
-            @variant='outlined'
-            @borderColor='primary'
-            disabled={{not @file.isActive}}
-          >
-            <AkIcon @iconName='refresh' @color='primary' />
-          </AkIconButton>
-        {{else}}
-          <AkButton
-            data-test-dynamicScan-startBtn
-            @variant='outlined'
-            {{on 'click' this.openDynamicScanModal}}
-          >
-            <:leftIcon>
-              <AkIcon @iconName='play-arrow' />
-            </:leftIcon>
-
-            <:default>{{@dynamicScanText}}</:default>
-          </AkButton>
-        {{/if}}
-      {{/if}}
-    </AkStack>
-  {{/if}}
-
-  {{#if @file.isDynamicStatusReady}}
-    <AkButton
-      data-test-dynamicScan-stopBtn
-      @variant='outlined'
-      {{on 'click' (perform this.dynamicShutdown)}}
-      @disabled={{not @file.isActive}}
-    >
-      <:leftIcon>
-        {{#if this.dynamicShutdown.isRunning}}
-          <AkLoader @size={{13}} />
-        {{else}}
-          <AkIcon @iconName='stop' />
-        {{/if}}
-      </:leftIcon>
-
-      <:default>{{t 'stop'}}</:default>
-    </AkButton>
-  {{/if}}
-
-  {{#if (and @vncViewer @file.isDynamicStatusStarting)}}
-    <div>
-      {{t 'dynamicScanText'}}
-    </div>
-  {{/if}}
-</AkStack>
-
-{{#if this.showDynamicScanModal}}
-  <DynamicScan::Modal
-    @onClose={{this.closeDynamicScanModal}}
-    @pollDynamicStatus={{this.pollDynamicStatus}}
-    @file={{@file}}
-  />
-{{/if}}
\ No newline at end of file
diff --git a/app/components/dynamic-scan/index.ts b/app/components/dynamic-scan/index.ts
deleted file mode 100644
index ba0fed9ed7..0000000000
--- a/app/components/dynamic-scan/index.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import { action } from '@ember/object';
-import ENV from 'irene/config/environment';
-import ENUMS from 'irene/enums';
-import triggerAnalytics from 'irene/utils/trigger-analytics';
-import { tracked } from '@glimmer/tracking';
-import FileModel from 'irene/models/file';
-import PollService from 'irene/services/poll';
-
-export interface DynamicScanSignature {
-  Args: {
-    vncViewer?: boolean;
-    onScanShutdown?: () => void;
-    file: FileModel;
-    dynamicScanText: string;
-  };
-}
-
-export default class DynamicScanComponent extends Component<DynamicScanSignature> {
-  @service declare ajax: any;
-  @service('notifications') declare notify: NotificationService;
-  @service declare poll: PollService;
-
-  @tracked showDynamicScanModal = false;
-
-  constructor(owner: unknown, args: DynamicScanSignature['Args']) {
-    super(owner, args);
-
-    this.pollDynamicStatus();
-  }
-
-  @action
-  openDynamicScanModal() {
-    triggerAnalytics(
-      'feature',
-      ENV.csb['dynamicScanBtnClick'] as CsbAnalyticsFeatureData
-    );
-
-    this.showDynamicScanModal = true;
-  }
-
-  @action
-  closeDynamicScanModal() {
-    this.showDynamicScanModal = false;
-  }
-
-  @action
-  pollDynamicStatus() {
-    const file = this.args.file;
-    const isDynamicReady = file.isDynamicStatusReady;
-
-    if (isDynamicReady) {
-      return;
-    }
-
-    if (!file.id) {
-      return;
-    }
-
-    const stopPoll = this.poll.startPolling(
-      () =>
-        file
-          .reload()
-          .then((f) => {
-            if (
-              f.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE ||
-              f.dynamicStatus === ENUMS.DYNAMIC_STATUS.READY
-            ) {
-              stopPoll();
-            }
-          })
-          .catch(() => stopPoll()),
-      5000
-    );
-  }
-
-  dynamicShutdown = task({ drop: true }, async () => {
-    const file = this.args.file;
-
-    file.setShuttingDown();
-
-    const dynamicUrl = [ENV.endpoints['dynamic'], file.id].join('/');
-
-    try {
-      await this.ajax.delete(dynamicUrl);
-
-      this.args.onScanShutdown?.();
-
-      if (!this.isDestroyed) {
-        this.pollDynamicStatus();
-      }
-    } catch (error) {
-      file.setNone();
-
-      this.notify.error((error as AdapterError).payload.error);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    DynamicScan: typeof DynamicScanComponent;
-  }
-}
diff --git a/app/components/dynamic-scan/modal/index.hbs b/app/components/dynamic-scan/modal/index.hbs
deleted file mode 100644
index 29da606b33..0000000000
--- a/app/components/dynamic-scan/modal/index.hbs
+++ /dev/null
@@ -1,217 +0,0 @@
-<ProjectPreferencesOld::Provider
-  @profileId={{this.profileId}}
-  @platform={{this.projectPlatform}}
-  @project={{@file.project}}
-  as |dpContext|
->
-  <AkModal
-    data-test-cy='dynamicScanModal'
-    @showHeader={{true}}
-    @headerTitle={{t 'modalCard.dynamicScan.title'}}
-    @onClose={{@onClose}}
-    @disableClose={{or
-      this.startDynamicScan.isRunning
-      this.scheduleDynamicScan.isRunning
-    }}
-  >
-    <:default>
-      <div local-class='dynamic-scan-modal-body' class='p-1'>
-        <AkStack
-          local-class='dynamic-scan-modal-alert'
-          class='p-2'
-          @alignItems='center'
-          @spacing='2'
-          data-test-dynamicScanModal-warningAlert
-        >
-          <AkIcon @iconName='info' />
-
-          <AkTypography>
-            {{t 'modalCard.dynamicScan.warning'}}
-          </AkTypography>
-        </AkStack>
-
-        {{#if @file.minOsVersion}}
-          <div
-            data-test-dynamicScanModal-deviceRequirementContainer
-            class='mt-3'
-          >
-            <AkTypography
-              data-test-dynamicScanModal-deviceRequirementTitle
-              @variant='h6'
-              @gutterBottom={{true}}
-            >
-              {{t 'modalCard.dynamicScan.deviceRequirements'}}
-            </AkTypography>
-
-            <AkStack local-class='bordered-box' @direction='column'>
-              {{#each this.deviceRequirements as |dr|}}
-                <AkStack
-                  data-test-dynamicScanModal-deviceRequirementGroup='{{dr.type}}'
-                  local-class='bordered-box-item'
-                  @width='full'
-                >
-                  <AkTypography
-                    @variant='body2'
-                    data-test-dynamicScanModal-deviceRequirementType
-                    class='w-4/12'
-                  >
-                    {{dr.type}}
-                  </AkTypography>
-
-                  <AkTypography
-                    @variant='body2'
-                    data-test-dynamicScanModal-deviceRequirementValue
-                  >
-                    <strong>
-                      {{dr.boldValue}}
-                    </strong>
-
-                    {{dr.value}}
-                  </AkTypography>
-                </AkStack>
-              {{/each}}
-            </AkStack>
-          </div>
-        {{/if}}
-
-        <div class='mt-3'>
-          <ProjectPreferencesOld::DevicePreference @dpContext={{dpContext}} />
-        </div>
-
-        {{#unless @file.showScheduleAutomatedDynamicScan}}
-          <AkTypography
-            data-test-dynamicScanModal-device-settings-warning
-            local-class='device-settings-warning'
-            class='mt-2'
-            @variant='body2'
-            @color='textSecondary'
-          >
-            <strong>{{t 'note'}}:</strong>
-            {{t 'modalCard.dynamicScan.deviceSettingsWarning'}}
-          </AkTypography>
-        {{/unless}}
-
-        <div class='mt-4'>
-          <ProxySettingsView
-            @profile={{@file.profile}}
-            @project={{@file.project}}
-          />
-        </div>
-
-        <div class='mt-2'>
-          <AkFormControlLabel
-            data-test-dynamicScanModal-runApiScanFormControl
-            @label={{t 'modalCard.dynamicScan.runApiScan'}}
-            as |fc|
-          >
-            <fc.control>
-              <AkCheckbox
-                data-test-dynamicScanModal-runApiScanCheckbox
-                @onChange={{this.enableApiScan}}
-              />
-            </fc.control>
-          </AkFormControlLabel>
-
-          {{#if this.showApiScanSettings}}
-            <div
-              data-test-dynamicScanModal-apiSettingsContainer
-              local-class='bordered-box'
-              class='my-3 p-2'
-            >
-              <AkTypography
-                data-test-dynamicScanModal-apiSettingScanDescription
-              >
-                {{t 'modalCard.dynamicScan.apiScanDescription' htmlSafe=true}}
-              </AkTypography>
-
-              <AkDivider @color='dark' class='my-2' />
-
-              <ApiFilter @profileId={{this.profileId}} />
-            </div>
-          {{/if}}
-
-          {{#if @file.showScheduleAutomatedDynamicScan}}
-            <div
-              data-test-dynamicScanModal-automatedDynamicScanContainer
-              local-class='bordered-box'
-              class='my-3 p-2'
-            >
-              <AkStack @spacing='1.5'>
-                <AkTypography
-                  data-test-dynamicScanModal-automatedDynamicScanTitle
-                  @variant='h6'
-                >
-                  {{t 'dynamicScanAutomation'}}
-                </AkTypography>
-
-                <AkChip
-                  @label={{t 'experimentalFeature'}}
-                  @variant='semi-filled'
-                  @size='small'
-                  @color='warn'
-                  data-test-dynamicScanModal-automatedDynamicScanChip
-                >
-                  <:icon>
-                    <AkIcon @iconName='build' />
-                  </:icon>
-                </AkChip>
-              </AkStack>
-
-              <AkTypography
-                data-test-dynamicScanModal-automatedDynamicScanDescription
-                class='mt-1'
-              >
-                {{t 'scheduleDynamicscanDesc'}}
-              </AkTypography>
-
-              <AkStack class='mt-3' @justifyContent='flex-start'>
-                <AkButton
-                  @variant='outlined'
-                  {{on 'click' (perform this.scheduleDynamicScan)}}
-                  data-test-dynamicScanModal-automatedDynamicScanScheduleBtn
-                >
-                  <:leftIcon>
-                    {{#if this.scheduleDynamicScan.isRunning}}
-                      <AkLoader @size={{13}} />
-                    {{else}}
-                      <AkIcon @iconName='schedule' />
-                    {{/if}}
-                  </:leftIcon>
-
-                  <:default>
-                    {{t 'scheduleDynamicscan'}}
-                  </:default>
-                </AkButton>
-              </AkStack>
-            </div>
-          {{/if}}
-        </div>
-      </div>
-    </:default>
-
-    <:footer>
-      <AkDivider />
-
-      <AkStack class='px-3 py-2' @justifyContent='flex-end' @spacing='1.5'>
-        <AkButton
-          data-test-dynamicScanModal-cancelBtn
-          @variant='outlined'
-          @color='neutral'
-          {{on 'click' @onClose}}
-          @disabled={{this.startDynamicScan.isRunning}}
-        >
-          {{t 'cancel'}}
-        </AkButton>
-
-        <AkButton
-          data-test-dynamicScanModal-startBtn
-          {{on 'click' this.runDynamicScan}}
-          @loading={{this.startDynamicScan.isRunning}}
-          @disabled={{not dpContext.isPreferredDeviceAvailable}}
-        >
-          {{t 'modalCard.dynamicScan.start'}}
-        </AkButton>
-      </AkStack>
-    </:footer>
-  </AkModal>
-</ProjectPreferencesOld::Provider>
\ No newline at end of file
diff --git a/app/components/dynamic-scan/modal/index.scss b/app/components/dynamic-scan/modal/index.scss
deleted file mode 100644
index fc5079e21e..0000000000
--- a/app/components/dynamic-scan/modal/index.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-.dynamic-scan-modal-body {
-  width: 650px;
-}
-
-.dynamic-scan-modal-alert {
-  background-color: var(--dynamic-scan-modal-alert-background-color);
-  color: var(--dynamic-scan-modal-alert-text-color);
-  border: 1px solid var(--dynamic-scan-modal-alert-border-color);
-  border-radius: var(--dynamic-scan-modal-border-radius);
-}
-
-.device-settings-warning {
-  color: var(--dynamic-scan-modal-device-settings-warning-text-color);
-  line-height: 1.3;
-}
-
-.bordered-box {
-  border: 1px solid var(--dynamic-scan-modal-border-color);
-  border-radius: var(--dynamic-scan-modal-border-radius);
-  box-sizing: border-box;
-
-  .bordered-box-item {
-    padding: 0.5em 1em;
-
-    &:not(:last-child) {
-      border-bottom: 1px solid var(--dynamic-scan-modal-border-color);
-    }
-  }
-}
diff --git a/app/components/file-chart/index.hbs b/app/components/file-chart/index.hbs
index 040e160d17..efdae918ee 100644
--- a/app/components/file-chart/index.hbs
+++ b/app/components/file-chart/index.hbs
@@ -1,5 +1,11 @@
 {{#if this.fetchUnknownAnalysisStatus.isRunning}}
-  <AkStack {{style height='200px'}} @alignItems='center' @spacing='1.5'>
+  <AkStack
+    {{style height='200px'}}
+    @alignItems='center'
+    @justifyContent='center'
+    @spacing='1.5'
+    @width='full'
+  >
     <AkLoader @size={{16}} />
 
     <AkTypography>
diff --git a/app/components/file-details/api-scan/index.ts b/app/components/file-details/api-scan/index.ts
index 8a78df6863..6b7b43d8f2 100644
--- a/app/components/file-details/api-scan/index.ts
+++ b/app/components/file-details/api-scan/index.ts
@@ -31,7 +31,7 @@ export default class FileDetailsApiScanComponent extends Component<FileDetailsAp
       },
       {
         route: 'authenticated.dashboard.file.api-scan',
-        linkTitle: this.intl.t('apiScanResult'),
+        linkTitle: this.intl.t('apiScanResults'),
         model: this.args.file.id,
       },
     ];
@@ -47,7 +47,7 @@ export default class FileDetailsApiScanComponent extends Component<FileDetailsAp
       },
       {
         id: 'api-results',
-        label: this.intl.t('apiResults'),
+        label: this.intl.t('apiScanResults'),
         hasBadge: this.isApiScanRunningOrDone,
         badgeCount: this.args.file.apiVulnerabilityCount,
         route: 'authenticated.dashboard.file.api-scan.results',
diff --git a/app/components/file-details/api-scan/results/index.hbs b/app/components/file-details/api-scan/results/index.hbs
index 906f2dd264..3f6db69d21 100644
--- a/app/components/file-details/api-scan/results/index.hbs
+++ b/app/components/file-details/api-scan/results/index.hbs
@@ -27,6 +27,7 @@
       @filterVulnerabilityType={{this.filterVulnerabilityType}}
       @sorts={{this.sorts}}
       @updateAnalysesSorts={{this.updateAnalysesSorts}}
+      @pageReferrer='api'
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/action/drawer/index.hbs b/app/components/file-details/dynamic-scan/action/drawer/index.hbs
index f5e737a5f6..2c6934ea02 100644
--- a/app/components/file-details/dynamic-scan/action/drawer/index.hbs
+++ b/app/components/file-details/dynamic-scan/action/drawer/index.hbs
@@ -9,7 +9,7 @@
   <AkStack
     @direction='column'
     @width='full'
-    local-class='dynamic-scan-modal'
+    local-class='dynamic-scan-drawer'
     data-test-fileDetails-dynamicScanDrawer-drawerContainer
   >
     <AkAppbar
@@ -42,7 +42,7 @@
     <AkStack
       @direction='column'
       @width='full'
-      local-class='dynamic-scan-modal-body'
+      local-class='dynamic-scan-drawer-body'
       class='p-3'
     >
       {{#if @isAutomatedScan}}
@@ -68,7 +68,7 @@
       @justifyContent={{if @isAutomatedScan 'space-between' 'flex-start'}}
       @spacing='1.5'
       class='px-3 py-2'
-      local-class='dynamic-scan-modal-cta'
+      local-class='dynamic-scan-drawer-cta'
     >
       <AkButton
         {{on 'click' this.runDynamicScan}}
diff --git a/app/components/file-details/dynamic-scan/action/drawer/index.scss b/app/components/file-details/dynamic-scan/action/drawer/index.scss
index f91c12b525..e5f4da7e87 100644
--- a/app/components/file-details/dynamic-scan/action/drawer/index.scss
+++ b/app/components/file-details/dynamic-scan/action/drawer/index.scss
@@ -1,13 +1,13 @@
-.dynamic-scan-modal {
+.dynamic-scan-drawer {
   height: fit-content;
 
-  .dynamic-scan-modal-body {
+  .dynamic-scan-drawer-body {
     width: 650px;
     min-height: calc(100vh - 120px);
     height: fit-content;
   }
 
-  .dynamic-scan-modal-cta {
+  .dynamic-scan-drawer-cta {
     z-index: 10;
     position: sticky;
     bottom: 0;
diff --git a/app/components/file-details/dynamic-scan/action/expiry/index.scss b/app/components/file-details/dynamic-scan/action/expiry/index.scss
index 332de0028d..0cc114d6eb 100644
--- a/app/components/file-details/dynamic-scan/action/expiry/index.scss
+++ b/app/components/file-details/dynamic-scan/action/expiry/index.scss
@@ -1,20 +1,26 @@
 .extend-time-btn {
-    border-radius: 50%;
-    background-color: var(--dynamic-scan-action-expiry-extend-btn-background) !important;
-    padding: 0 !important;
+  border-radius: 50%;
+  background-color: var(
+    --file-details-dynamic-scan-action-expiry-extend-btn-background
+  ) !important;
+  padding: 0 !important;
 
-    :global(.ak-icon) {
-        color: var(--dynamic-scan-action-expiry-extend-btn-icon-color) !important;
-    }
+  :global(.ak-icon) {
+    color: var(
+      --file-details-dynamic-scan-action-expiry-extend-btn-icon-color
+    ) !important;
+  }
 }
 
 .dynamic-scan-expiry-container {
-    background-color: var(--dynamic-scan-action-expiry-container-background-color);
-    padding: 0.3em 1em;
-    border-radius: 200px;
+  background-color: var(
+    --file-details-dynamic-scan-action-expiry-container-background-color
+  );
+  padding: 0.3em 1em;
+  border-radius: 200px;
 }
 
 .info-btn {
-    border-radius: 50%;
-    margin-right: 0.5em;
-}
\ No newline at end of file
+  border-radius: 50%;
+  margin-right: 0.5em;
+}
diff --git a/app/components/file-details/dynamic-scan/action/index.hbs b/app/components/file-details/dynamic-scan/action/index.hbs
index b208e525d2..483fd60091 100644
--- a/app/components/file-details/dynamic-scan/action/index.hbs
+++ b/app/components/file-details/dynamic-scan/action/index.hbs
@@ -1,5 +1,7 @@
 <AkStack @direction='column' @alignItems='center' @spacing='1'>
-  {{#if @dynamicScan.isReadyOrRunning}}
+  {{! TODO: Logic should be replaced by comments when full DAST feature is ready }}
+  {{!-- {{#if @dynamicScan.isReadyOrRunning}} --}}
+  {{#if (or @file.isDynamicStatusReady @file.isDynamicStatusInProgress)}}
     {{#if @isAutomatedScan}}
       <AkButton
         local-class='dynamic-scan-btn'
@@ -7,7 +9,7 @@
         @color='neutral'
         @disabled={{not @file.isActive}}
         {{on 'click' (perform this.dynamicShutdown)}}
-        data-test-dynamicScan-cancelBtn
+        data-test-fileDetails-dynamicScanAction-cancelBtn
       >
         <:leftIcon>
           {{#if this.dynamicShutdown.isRunning}}
@@ -21,16 +23,16 @@
       </AkButton>
     {{else}}
       <AkButton
-        data-test-dynamicScan-stopBtn
+        data-test-fileDetails-dynamicScanAction-stopBtn
         local-class='dynamic-scan-btn'
-        {{on 'click' (perform this.dynamicShutdown)}}
+        {{on 'click' this.shutdownDynamicScan}}
         @disabled={{not @file.isActive}}
       >
         <:leftIcon>
           {{#if this.dynamicShutdown.isRunning}}
             <AkLoader @size={{13}} />
           {{else}}
-            <AkIcon @iconName='stop' />
+            <AkIcon @iconName='stop-circle' />
           {{/if}}
         </:leftIcon>
 
@@ -38,10 +40,11 @@
       </AkButton>
     {{/if}}
 
-  {{else if (or @file.isDynamicDone @dynamicScan.isDynamicStatusError)}}
+    {{!-- {{else if (or @file.isDynamicDone @dynamicScan.isDynamicStatusError)}} --}}
+  {{else if (or @file.isDynamicDone @file.isDynamicStatusError)}}
     <AkButton
       local-class='dynamic-scan-btn'
-      data-test-dynamicScan-restartBtn
+      data-test-fileDetails-dynamicScanAction-restartBtn
       data-test-cy='dynamicScan-restartBtn'
       {{on 'click' this.openDynamicScanDrawer}}
       @disabled={{not @file.isActive}}
@@ -55,7 +58,7 @@
   {{else}}
     <AkButton
       local-class='dynamic-scan-btn'
-      data-test-dynamicScan-startBtn
+      data-test-fileDetails-dynamicScanAction-startBtn
       {{on 'click' this.openDynamicScanDrawer}}
       @disabled={{not @file.isActive}}
     >
@@ -69,6 +72,14 @@
 </AkStack>
 
 {{#if this.showDynamicScanDrawer}}
+  <FileDetails::DynamicScan::DrawerOld
+    @onClose={{this.closeDynamicScanDrawer}}
+    @pollDynamicStatus={{this.pollDynamicStatus}}
+    @file={{@file}}
+  />
+{{/if}}
+
+{{!-- {{#if this.showDynamicScanDrawer}}
   <ProjectPreferences::Provider
     @profileId={{this.profileId}}
     @platform={{this.projectPlatform}}
@@ -83,4 +94,4 @@
       @isAutomatedScan={{@isAutomatedScan}}
     />
   </ProjectPreferences::Provider>
-{{/if}}
\ No newline at end of file
+{{/if}} --}}
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/action/index.ts b/app/components/file-details/dynamic-scan/action/index.ts
index 3f80d275ef..9e848a3d63 100644
--- a/app/components/file-details/dynamic-scan/action/index.ts
+++ b/app/components/file-details/dynamic-scan/action/index.ts
@@ -63,7 +63,7 @@ export default class DynamicScanActionComponent extends Component<DynamicScanAct
 
   @action
   pollDynamicStatus() {
-    const isDynamicReady = this.args.dynamicScan?.isDynamicStatusReady;
+    const isDynamicReady = this.file.isDynamicStatusReady;
 
     if (isDynamicReady) {
       return;
@@ -75,12 +75,12 @@ export default class DynamicScanActionComponent extends Component<DynamicScanAct
 
     const stopPoll = this.poll.startPolling(
       () =>
-        this.args.dynamicScan
+        this.file
           ?.reload()
-          .then((ds) => {
+          .then((f) => {
             if (
-              ds.status === ENUMS.DYNAMIC_STATUS.NONE ||
-              ds.status === ENUMS.DYNAMIC_STATUS.READY
+              f.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE ||
+              f.dynamicStatus === ENUMS.DYNAMIC_STATUS.READY
             ) {
               stopPoll();
             }
@@ -90,23 +90,24 @@ export default class DynamicScanActionComponent extends Component<DynamicScanAct
     );
   }
 
+  @action shutdownDynamicScan() {
+    this.dynamicShutdown.perform();
+    this.args.onScanShutdown?.();
+  }
+
   dynamicShutdown = task({ drop: true }, async () => {
-    this.args.dynamicScan?.setShuttingDown();
+    this.file.setShuttingDown();
 
-    const dynamicUrl = [ENV.endpoints['dynamicscans'], this.profileId].join(
-      '/'
-    );
+    const dynamicUrl = [ENV.endpoints['dynamic'], this.file.id].join('/');
 
     try {
       await this.ajax.delete(dynamicUrl);
 
-      this.args.onScanShutdown?.();
-
       if (!this.isDestroyed) {
         this.pollDynamicStatus();
       }
     } catch (error) {
-      this.args.dynamicScan?.setNone();
+      this.file.setNone();
 
       this.notify.error((error as AdapterError).payload.error);
     }
diff --git a/app/components/file-details/dynamic-scan/automated/index.hbs b/app/components/file-details/dynamic-scan/automated/index.hbs
index e8c5b6b6d6..b93d06ea1e 100644
--- a/app/components/file-details/dynamic-scan/automated/index.hbs
+++ b/app/components/file-details/dynamic-scan/automated/index.hbs
@@ -6,6 +6,7 @@
     @spacing='1.5'
   >
     <AkLoader @size={{16}} />
+
     <AkTypography local-class='loading-text' @color='textSecondary'>
       {{t 'loading'}}...
     </AkTypography>
diff --git a/app/components/file-details/dynamic-scan/automated/index.scss b/app/components/file-details/dynamic-scan/automated/index.scss
index 135a4eaa87..6d18820cf1 100644
--- a/app/components/file-details/dynamic-scan/automated/index.scss
+++ b/app/components/file-details/dynamic-scan/automated/index.scss
@@ -29,4 +29,4 @@
   .loading-text {
     font-style: italic;
   }
-}
\ No newline at end of file
+}
diff --git a/app/components/file-details/dynamic-scan/drawer-old/index.hbs b/app/components/file-details/dynamic-scan/drawer-old/index.hbs
new file mode 100644
index 0000000000..4f6c3635e8
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/drawer-old/index.hbs
@@ -0,0 +1,241 @@
+<ProjectPreferencesOld::Provider
+  @profileId={{this.profileId}}
+  @platform={{this.projectPlatform}}
+  @project={{@file.project}}
+  as |dpContext|
+>
+  <AkDrawer
+    data-test-cy='dynamicScanModal'
+    @open={{true}}
+    @onClose={{@onClose}}
+    @anchor='right'
+    as |dr|
+  >
+    <AkStack
+      @direction='column'
+      @justifyContent='space-between'
+      @spacing='1.5'
+      {{style width='600px' height='100%'}}
+    >
+      <AkStack @direction='column'>
+        <AkAppbar
+          @position='sticky'
+          @justifyContent='space-between'
+          class='px-3'
+          as |ab|
+        >
+          <AkTypography @color='inherit' @variant='h5' @fontWeight='medium'>
+            {{t 'modalCard.dynamicScan.title'}}
+          </AkTypography>
+
+          <AkIconButton
+            {{on 'click' dr.closeHandler}}
+            class={{ab.classes.defaultIconBtn}}
+          >
+            <AkIcon @iconName='close' />
+          </AkIconButton>
+        </AkAppbar>
+
+        <div class='p-3 mb-6'>
+          <AkStack
+            local-class='dynamic-scan-drawer-alert'
+            class='p-2'
+            @alignItems='center'
+            @spacing='2'
+            data-test-fileDetails-dynamicScanDrawerOld-warningAlert
+          >
+            <AkIcon @iconName='info' />
+
+            <AkTypography>
+              {{t 'modalCard.dynamicScan.warning'}}
+            </AkTypography>
+          </AkStack>
+
+          {{#if @file.minOsVersion}}
+            <div
+              data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementContainer
+              class='mt-3'
+            >
+              <AkTypography
+                data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementTitle
+                @variant='h6'
+                @gutterBottom={{true}}
+              >
+                {{t 'modalCard.dynamicScan.deviceRequirements'}}
+              </AkTypography>
+
+              <AkStack local-class='bordered-box' @direction='column'>
+                {{#each this.deviceRequirements as |dr|}}
+                  <AkStack
+                    data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementGroup='{{dr.type}}'
+                    local-class='bordered-box-item'
+                    @width='full'
+                  >
+                    <AkTypography
+                      @variant='body2'
+                      data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementType
+                      class='w-4/12'
+                    >
+                      {{dr.type}}
+                    </AkTypography>
+
+                    <AkTypography
+                      @variant='body2'
+                      data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementValue
+                    >
+                      <strong>
+                        {{dr.boldValue}}
+                      </strong>
+
+                      {{dr.value}}
+                    </AkTypography>
+                  </AkStack>
+                {{/each}}
+              </AkStack>
+            </div>
+          {{/if}}
+
+          <div class='mt-3'>
+            <ProjectPreferencesOld::DevicePreference @dpContext={{dpContext}} />
+          </div>
+
+          {{#unless @file.showScheduleAutomatedDynamicScan}}
+            <AkTypography
+              data-test-fileDetails-dynamicScanDrawerOld-device-settings-warning
+              local-class='device-settings-warning'
+              class='mt-2'
+              @variant='body2'
+              @color='textSecondary'
+            >
+              <strong>{{t 'note'}}:</strong>
+              {{t 'modalCard.dynamicScan.deviceSettingsWarning'}}
+            </AkTypography>
+          {{/unless}}
+
+          <div class='mt-4'>
+            <FileDetails::DynamicScan::DrawerOld::ProxySettingsView
+              @profile={{@file.profile}}
+              @project={{@file.project}}
+            />
+          </div>
+
+          <div class='mt-2'>
+            <AkFormControlLabel
+              data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl
+              @label={{t 'modalCard.dynamicScan.runApiScan'}}
+              as |fc|
+            >
+              <fc.control>
+                <AkCheckbox
+                  data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox
+                  @onChange={{this.enableApiScan}}
+                />
+              </fc.control>
+            </AkFormControlLabel>
+
+            {{#if this.showApiScanSettings}}
+              <div
+                data-test-fileDetails-dynamicScanDrawerOld-apiSettingsContainer
+                local-class='bordered-box'
+                class='my-3 p-2'
+              >
+                <AkTypography
+                  data-test-fileDetails-dynamicScanDrawerOld-apiSettingScanDescription
+                >
+                  {{t 'modalCard.dynamicScan.apiScanDescription' htmlSafe=true}}
+                </AkTypography>
+
+                <AkDivider @color='dark' class='my-2' />
+
+                <ApiFilter @profileId={{this.profileId}} />
+              </div>
+            {{/if}}
+
+            {{#if @file.showScheduleAutomatedDynamicScan}}
+              <div
+                data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanContainer
+                local-class='bordered-box'
+                class='my-3 p-2'
+              >
+                <AkStack @spacing='1.5'>
+                  <AkTypography
+                    data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanTitle
+                    @variant='h6'
+                  >
+                    {{t 'dynamicScanAutomation'}}
+                  </AkTypography>
+
+                  <AkChip
+                    @label={{t 'experimentalFeature'}}
+                    @variant='semi-filled'
+                    @size='small'
+                    @color='warn'
+                    data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanChip
+                  >
+                    <:icon>
+                      <AkIcon @iconName='build' />
+                    </:icon>
+                  </AkChip>
+                </AkStack>
+
+                <AkTypography
+                  data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanDescription
+                  class='mt-1'
+                >
+                  {{t 'scheduleDynamicscanDesc'}}
+                </AkTypography>
+
+                <AkStack class='mt-3' @justifyContent='flex-start'>
+                  <AkButton
+                    @variant='outlined'
+                    {{on 'click' (perform this.scheduleDynamicScan)}}
+                    data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanScheduleBtn
+                  >
+                    <:leftIcon>
+                      {{#if this.scheduleDynamicScan.isRunning}}
+                        <AkLoader @size={{13}} />
+                      {{else}}
+                        <AkIcon @iconName='schedule' />
+                      {{/if}}
+                    </:leftIcon>
+
+                    <:default>
+                      {{t 'scheduleDynamicscan'}}
+                    </:default>
+                  </AkButton>
+                </AkStack>
+              </div>
+            {{/if}}
+          </div>
+        </div>
+      </AkStack>
+
+      <AkStack
+        @width='full'
+        @justifyContent='flex-end'
+        @spacing='1.5'
+        local-class='dynamic-scan-drawer-cta'
+        class='px-3 py-2'
+      >
+        <AkButton
+          data-test-fileDetails-dynamicScanDrawerOld-cancelBtn
+          @variant='outlined'
+          @color='neutral'
+          {{on 'click' @onClose}}
+          @disabled={{this.startDynamicScan.isRunning}}
+        >
+          {{t 'cancel'}}
+        </AkButton>
+
+        <AkButton
+          data-test-fileDetails-dynamicScanDrawerOld-startBtn
+          {{on 'click' this.runDynamicScan}}
+          @loading={{this.startDynamicScan.isRunning}}
+          @disabled={{not dpContext.isPreferredDeviceAvailable}}
+        >
+          {{t 'modalCard.dynamicScan.start'}}
+        </AkButton>
+      </AkStack>
+    </AkStack>
+  </AkDrawer>
+</ProjectPreferencesOld::Provider>
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/drawer-old/index.scss b/app/components/file-details/dynamic-scan/drawer-old/index.scss
new file mode 100644
index 0000000000..8f439f4933
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/drawer-old/index.scss
@@ -0,0 +1,37 @@
+.dynamic-scan-drawer-alert {
+  background-color: var(
+    --file-details-dynamic-scan-drawer-old-alert-background-color
+  );
+  color: var(--file-details-dynamic-scan-drawer-old-alert-text-color);
+  border: 1px solid
+    var(--file-details-dynamic-scan-drawer-old-alert-border-color);
+  border-radius: var(--file-details-dynamic-scan-drawer-old-border-radius);
+}
+
+.device-settings-warning {
+  color: var(
+    --file-details-dynamic-scan-drawer-old-device-settings-warning-text-color
+  );
+  line-height: 1.3;
+}
+
+.bordered-box {
+  border: 1px solid var(--file-details-dynamic-scan-drawer-old-border-color);
+  border-radius: var(--file-details-dynamic-scan-drawer-old-border-radius);
+  box-sizing: border-box;
+
+  .bordered-box-item {
+    padding: 0.5em 1em;
+
+    &:not(:last-child) {
+      border-bottom: 1px solid
+        var(--file-details-dynamic-scan-drawer-old-border-color);
+    }
+  }
+}
+
+.dynamic-scan-drawer-cta {
+  border-top: 1px solid var(--file-details-dynamic-scan-drawer-border-color);
+  background-color: var(--file-details-dynamic-scan-drawer-background-main);
+  box-shadow: var(--file-details-dynamic-scan-drawer-cta-box-shadow);
+}
diff --git a/app/components/dynamic-scan/modal/index.ts b/app/components/file-details/dynamic-scan/drawer-old/index.ts
similarity index 94%
rename from app/components/dynamic-scan/modal/index.ts
rename to app/components/file-details/dynamic-scan/drawer-old/index.ts
index bca12fca66..2c756ccb3e 100644
--- a/app/components/dynamic-scan/modal/index.ts
+++ b/app/components/file-details/dynamic-scan/drawer-old/index.ts
@@ -9,7 +9,7 @@ import Store from '@ember-data/store';
 import { tracked } from '@glimmer/tracking';
 import FileModel from 'irene/models/file';
 
-export interface DynamicScanModalSignature {
+export interface FileDetailsDynamicScanDrawerOldSignature {
   Args: {
     onClose: () => void;
     pollDynamicStatus: () => void;
@@ -17,7 +17,7 @@ export interface DynamicScanModalSignature {
   };
 }
 
-export default class DynamicScanModalComponent extends Component<DynamicScanModalSignature> {
+export default class FileDetailsDynamicScanDrawerOldComponent extends Component<FileDetailsDynamicScanDrawerOldSignature> {
   @service declare intl: IntlService;
   @service declare ajax: any;
   @service declare store: Store;
@@ -169,6 +169,6 @@ export default class DynamicScanModalComponent extends Component<DynamicScanModa
 
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
-    'DynamicScan::Modal': typeof DynamicScanModalComponent;
+    'FileDetails::DynamicScan::DrawerOld': typeof FileDetailsDynamicScanDrawerOldComponent;
   }
 }
diff --git a/app/components/proxy-settings-view/index.hbs b/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.hbs
similarity index 100%
rename from app/components/proxy-settings-view/index.hbs
rename to app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.hbs
diff --git a/app/components/proxy-settings-view/index.scss b/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.scss
similarity index 54%
rename from app/components/proxy-settings-view/index.scss
rename to app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.scss
index 063fca6442..4ed742f9b1 100644
--- a/app/components/proxy-settings-view/index.scss
+++ b/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.scss
@@ -1,5 +1,6 @@
 .bordered-box {
-  border: 1px solid var(--proxy-settings-view-border-color);
+  border: 1px solid
+    var(--file-details-dynamic-scan-drawer-old-proxy-settings-view-border-color);
   padding: 1.25em;
   box-sizing: border-box;
 }
diff --git a/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.ts b/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.ts
new file mode 100644
index 0000000000..bf5c9c49de
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/drawer-old/proxy-settings-view/index.ts
@@ -0,0 +1,85 @@
+import Component from '@glimmer/component';
+import ENV from 'irene/config/environment';
+import triggerAnalytics from 'irene/utils/trigger-analytics';
+import { inject as service } from '@ember/service';
+import { task } from 'ember-concurrency';
+import { tracked } from '@glimmer/tracking';
+import type IntlService from 'ember-intl/services/intl';
+import type Store from '@ember-data/store';
+import type { AsyncBelongsTo } from '@ember-data/model';
+
+import type ProxySettingModel from 'irene/models/proxy-setting';
+import type ProfileModel from 'irene/models/profile';
+import type ProjectModel from 'irene/models/project';
+import parseError from 'irene/utils/parse-error';
+
+export interface FileDetailsDynamicScanDrawerOldProxySettingsViewSignature {
+  Args: {
+    profile: AsyncBelongsTo<ProfileModel>;
+    project: AsyncBelongsTo<ProjectModel>;
+  };
+}
+
+export default class FileDetailsDynamicScanDrawerOldProxySettingsViewComponent extends Component<FileDetailsDynamicScanDrawerOldProxySettingsViewSignature> {
+  @service declare intl: IntlService;
+  @service('notifications') declare notify: NotificationService;
+  @service declare store: Store;
+
+  @tracked proxy?: ProxySettingModel;
+
+  constructor(
+    owner: unknown,
+    args: FileDetailsDynamicScanDrawerOldProxySettingsViewSignature['Args']
+  ) {
+    super(owner, args);
+
+    this.fetchProxySetting.perform();
+  }
+
+  get projectId() {
+    return this.args.project.get('id');
+  }
+
+  fetchProxySetting = task(async () => {
+    try {
+      const profileId = this.args.profile.get('id');
+
+      if (profileId) {
+        this.proxy = await this.store.findRecord('proxy-setting', profileId);
+      }
+    } catch (error) {
+      this.notify.error(parseError(error, this.intl.t('somethingWentWrong')));
+    }
+  });
+
+  /* Proxy enable or disable */
+  toggleProxy = task(async (event) => {
+    try {
+      const enabled = event.target.checked;
+
+      this.proxy?.set('enabled', enabled);
+
+      await this.proxy?.save();
+
+      const statusText = enabled ? this.intl.t('on') : this.intl.t('off');
+
+      this.notify.info(
+        `${this.intl.t('proxyTurned')} ${statusText.toUpperCase()}`
+      );
+
+      const analyticsData = enabled
+        ? ENV.csb['enableProxy']
+        : ENV.csb['disableProxy'];
+
+      triggerAnalytics('feature', analyticsData as CsbAnalyticsFeatureData);
+    } catch (error) {
+      this.notify.error(parseError(error, this.intl.t('pleaseTryAgain')));
+    }
+  });
+}
+
+declare module '@glint/environment-ember-loose/registry' {
+  export default interface Registry {
+    'FileDetails::DynamicScan::DrawerOld::ProxySettingsView': typeof FileDetailsDynamicScanDrawerOldProxySettingsViewComponent;
+  }
+}
diff --git a/app/components/file-details/dynamic-scan/expiry-old/index.hbs b/app/components/file-details/dynamic-scan/expiry-old/index.hbs
new file mode 100644
index 0000000000..922b7627b3
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/expiry-old/index.hbs
@@ -0,0 +1,69 @@
+<div>
+  <AkStack
+    data-test-fileDetails-dynamicScan-expiry
+    local-class='dynamic-scan-expiry-container'
+    @justifyContent='center'
+    @alignItems='center'
+    @spacing='1'
+  >
+    <AkTooltip
+      data-test-fileDetails-dynamicScan-expiry-tooltip
+      @color='dark'
+      @placement='top'
+      @arrow={{true}}
+      @title={{t 'dynamicScanTitleTooltip'}}
+    >
+      <AkIconButton @size='small' local-class='info-btn'>
+        <AkIcon @iconName='info' @color='primary' />
+      </AkIconButton>
+    </AkTooltip>
+
+    <AkTypography
+      data-test-fileDetails-dynamicScan-expiry-time
+      @tag='span'
+      @variant='h5'
+      @fontWeight='regular'
+    >
+      {{this.timeRemaining.minutes}}:{{this.timeRemaining.seconds}}
+    </AkTypography>
+
+    {{#if this.extendtime.isRunning}}
+      <AkLoader @size={{16}} />
+    {{else}}
+      <AkTooltip
+        data-test-fileDetails-dynamicScan-expiry-extendBtn-tooltip
+        @disabled={{this.canExtend}}
+        @color='dark'
+        @placement='top'
+        @arrow={{true}}
+        @title={{t 'dynamicScanExtentionLimit'}}
+      >
+        <AkIconButton
+          data-test-fileDetails-dynamicScan-expiry-extendBtn
+          @size='small'
+          disabled={{not this.canExtend}}
+          {{on 'click' this.handleExtendTimeClick}}
+          local-class='extend-time-btn'
+        >
+          <AkIcon @size='small' @iconName='add' />
+        </AkIconButton>
+      </AkTooltip>
+    {{/if}}
+  </AkStack>
+
+  <AkMenu
+    @anchorRef={{this.extendBtnAnchorRef}}
+    @onClose={{this.handleExtendTimeMenuClose}}
+    as |akm|
+  >
+    {{#each this.extendTimeOptions as |time|}}
+      <akm.listItem
+        data-test-fileDetails-dynamicScan-expiry-extendTime-menu-item
+        @onClick={{perform this.extendtime time}}
+        as |li|
+      >
+        <li.text @primaryText='{{time}} mins' />
+      </akm.listItem>
+    {{/each}}
+  </AkMenu>
+</div>
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/expiry-old/index.scss b/app/components/file-details/dynamic-scan/expiry-old/index.scss
new file mode 100644
index 0000000000..0cc114d6eb
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/expiry-old/index.scss
@@ -0,0 +1,26 @@
+.extend-time-btn {
+  border-radius: 50%;
+  background-color: var(
+    --file-details-dynamic-scan-action-expiry-extend-btn-background
+  ) !important;
+  padding: 0 !important;
+
+  :global(.ak-icon) {
+    color: var(
+      --file-details-dynamic-scan-action-expiry-extend-btn-icon-color
+    ) !important;
+  }
+}
+
+.dynamic-scan-expiry-container {
+  background-color: var(
+    --file-details-dynamic-scan-action-expiry-container-background-color
+  );
+  padding: 0.3em 1em;
+  border-radius: 200px;
+}
+
+.info-btn {
+  border-radius: 50%;
+  margin-right: 0.5em;
+}
diff --git a/app/components/dynamic-scan/expiry/index.ts b/app/components/file-details/dynamic-scan/expiry-old/index.ts
similarity index 60%
rename from app/components/dynamic-scan/expiry/index.ts
rename to app/components/file-details/dynamic-scan/expiry-old/index.ts
index ac7f979c89..6f362a13e7 100644
--- a/app/components/dynamic-scan/expiry/index.ts
+++ b/app/components/file-details/dynamic-scan/expiry-old/index.ts
@@ -1,66 +1,66 @@
-/* eslint-disable ember/no-observers */
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { later } from '@ember/runloop';
-import { task } from 'ember-concurrency';
+import { task, timeout } from 'ember-concurrency';
 import dayjs from 'dayjs';
-import { addObserver, removeObserver } from '@ember/object/observers';
 import Store from '@ember-data/store';
 import FileModel from 'irene/models/file';
 import DatetimeService from 'irene/services/datetime';
 import { Duration } from 'dayjs/plugin/duration';
-import { EmberRunTimer } from '@ember/runloop/types';
-import DynamicscanModal from 'irene/models/dynamicscan-old';
+import DynamicscanOldModel from 'irene/models/dynamicscan-old';
 import ENV from 'irene/config/environment';
+import parseError from 'irene/utils/parse-error';
 
-export interface DynamicScanExpirySignature {
+export interface FileDetailsDynamicScanExpiryOldSignature {
   Args: {
     file: FileModel;
   };
 }
 
-export default class DynamicScanExpiryComponent extends Component<DynamicScanExpirySignature> {
+export default class FileDetailsDynamicScanExpiryOldComponent extends Component<FileDetailsDynamicScanExpiryOldSignature> {
   @service('notifications') declare notify: NotificationService;
   @service declare store: Store;
   @service declare datetime: DatetimeService;
 
-  @tracked dynamicscan: DynamicscanModal | null = null;
+  @tracked dynamicscan: DynamicscanOldModel | null = null;
   @tracked durationRemaining: null | Duration = null;
   @tracked clockStop = false;
   @tracked extendBtnAnchorRef: HTMLElement | null = null;
 
-  constructor(owner: unknown, args: DynamicScanExpirySignature['Args']) {
+  constructor(
+    owner: unknown,
+    args: FileDetailsDynamicScanExpiryOldSignature['Args']
+  ) {
     super(owner, args);
 
-    this.fetchDynaminscan.perform();
-
-    this.clock();
-
-    addObserver(this.args.file, 'isReady', this.observeDeviceState);
+    this.fetchDynamicscan.perform();
   }
 
   willDestroy() {
     super.willDestroy();
 
     this.clockStop = true;
-
-    removeObserver(this.args.file, 'isReady', this.observeDeviceState);
   }
 
   get extendTimeOptions() {
     return [5, 15, 30];
   }
 
-  fetchDynaminscan = task(async () => {
-    const id = this.args.file.id;
-    this.dynamicscan = await this.store.findRecord('dynamicscan-old', id);
-  });
+  fetchDynamicscan = task(async () => {
+    try {
+      const id = this.args.file.id;
+      const dynamicscan = await this.store.findRecord('dynamicscan-old', id);
+      const expiresOn = dynamicscan ? dynamicscan.expiresOn : null;
 
-  observeDeviceState() {
-    this.fetchDynaminscan.perform();
-  }
+      this.dynamicscan = dynamicscan;
+
+      this.setScanDuration(expiresOn);
+      this.clock.perform();
+    } catch (error) {
+      this.notify.error(parseError(error));
+    }
+  });
 
   get canExtend() {
     const duration = this.durationRemaining;
@@ -88,25 +88,19 @@ export default class DynamicScanExpiryComponent extends Component<DynamicScanExp
     };
   }
 
-  clock(): EmberRunTimer | undefined {
-    if (this.clockStop || ENV.environment === 'test') {
-      return;
-    }
-
-    const expiresOn = this.dynamicscan ? this.dynamicscan.expiresOn : null;
-
-    if (!expiresOn) {
-      return later(this, this.clock, 1000);
-    }
+  clock = task(async () => {
+    while (Number(this.durationRemaining?.asSeconds()) > -1) {
+      if (ENV.environment === 'test') {
+        break;
+      }
 
-    const mExpiresOn = dayjs(expiresOn);
-    const mNow = dayjs();
-    const duration = this.datetime.duration(mExpiresOn.diff(mNow));
+      const expiresOn = this.dynamicscan ? this.dynamicscan.expiresOn : null;
 
-    this.durationRemaining = duration;
+      this.setScanDuration(expiresOn);
 
-    later(this, this.clock, 1000);
-  }
+      await timeout(1000);
+    }
+  });
 
   extendtime = task(async (time: number) => {
     const dynamicscan = this.dynamicscan;
@@ -115,6 +109,8 @@ export default class DynamicScanExpiryComponent extends Component<DynamicScanExp
       return;
     }
 
+    this.handleExtendTimeMenuClose();
+
     try {
       await dynamicscan.extendTime(time);
     } catch (error) {
@@ -129,9 +125,24 @@ export default class DynamicScanExpiryComponent extends Component<DynamicScanExp
       throw err;
     }
 
-    await this.fetchDynaminscan.perform();
+    await this.fetchDynamicscan.perform();
   });
 
+  @action
+  setScanDuration(expiresOn: Date | null) {
+    if (!expiresOn) {
+      this.durationRemaining = null;
+
+      return;
+    }
+
+    const mExpiresOn = dayjs(expiresOn);
+    const mNow = dayjs();
+    const duration = this.datetime.duration(mExpiresOn.diff(mNow));
+
+    this.durationRemaining = duration;
+  }
+
   @action
   handleExtendTimeClick(event: MouseEvent) {
     this.extendBtnAnchorRef = event.currentTarget as HTMLElement;
@@ -145,6 +156,6 @@ export default class DynamicScanExpiryComponent extends Component<DynamicScanExp
 
 declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry {
-    'DynamicScan::Expiry': typeof DynamicScanExpiryComponent;
+    'FileDetails::DynamicScan::ExpiryOld': typeof FileDetailsDynamicScanExpiryOldComponent;
   }
 }
diff --git a/app/components/file-details/dynamic-scan/header/index.ts b/app/components/file-details/dynamic-scan/header/index.ts
index 237a73a7a0..4c8cc337a0 100644
--- a/app/components/file-details/dynamic-scan/header/index.ts
+++ b/app/components/file-details/dynamic-scan/header/index.ts
@@ -64,13 +64,13 @@ export default class FileDetailsDastHeader extends Component<FileDetailsDastHead
         route: 'authenticated.dashboard.file.dynamic-scan.manual',
         activeRoutes: 'authenticated.dashboard.file.dynamic-scan.manual',
       },
-      {
-        id: 'automated-dast',
-        label: this.intl.t('dastTabs.automatedDAST'),
-        route: 'authenticated.dashboard.file.dynamic-scan.automated',
-        activeRoutes: 'authenticated.dashboard.file.dynamic-scan.automated',
-        inProgress: this.isAutomatedScanRunning,
-      },
+      // {
+      //   id: 'automated-dast',
+      //   label: this.intl.t('dastTabs.automatedDAST'),
+      //   route: 'authenticated.dashboard.file.dynamic-scan.automated',
+      //   activeRoutes: 'authenticated.dashboard.file.dynamic-scan.automated',
+      //   inProgress: this.isAutomatedScanRunning,
+      // },
       {
         id: 'dast-results',
         label: this.intl.t('dastTabs.dastResults'),
diff --git a/app/components/file-details/dynamic-scan/manual/index.hbs b/app/components/file-details/dynamic-scan/manual/index.hbs
index ac0d88ca2b..5df9947e4f 100644
--- a/app/components/file-details/dynamic-scan/manual/index.hbs
+++ b/app/components/file-details/dynamic-scan/manual/index.hbs
@@ -31,42 +31,90 @@
       {{#if this.showActionButton}}
         <FileDetails::DynamicScan::Action
           @file={{@file}}
-          @dynamicScanText={{t 'dastTabs.manualDAST'}}
+          @dynamicScanText={{t 'modalCard.dynamicScan.title'}}
           @onScanShutdown={{this.handleFullscreenClose}}
           @dynamicScan={{this.dynamicScan}}
         />
       {{/if}}
 
-      <AkIconButton
-        data-test-fileDetails-dynamicScan-manualDast-fullscreenBtn
-        {{on 'click' this.toggleFullscreenView}}
-      >
-        <AkIcon @iconName='open-in-full' />
-      </AkIconButton>
+      {{#if (and @file.isReady (not this.isFullscreenView))}}
+        <AkIconButton
+          data-test-fileDetails-dynamicScan-manualDast-fullscreenBtn
+          {{on 'click' this.toggleFullscreenView}}
+        >
+          <AkIcon @iconName='open-in-full' />
+        </AkIconButton>
+      {{/if}}
     </AkStack>
   </AkStack>
 
-  {{#if this.isFullscreenView}}
-    <AkModal
-      data-test-fileDetails-dynamicScan-manualDast-fullscreenModal
-      @headerTitle={{t 'realDevice'}}
-      @showHeader={{true}}
-      @onClose={{this.toggleFullscreenView}}
-    >
-      <VncViewer
-        @file={{@file}}
-        @profileId={{@profileId}}
-        @dynamicScan={{this.dynamicScan}}
+  <div
+    data-test-vncViewer-root
+    local-class='
+    {{if this.isFullscreenView "vnc-viewer-fullscreen"}}'
+  >
+    {{#if this.isFullscreenView}}
+      <div
+        data-test-vncViewer-backdrop
+        aria-hidden='true'
+        local-class='vnc-viewer-backdrop'
       />
-    </AkModal>
+    {{/if}}
 
-  {{else}}
-    <AkStack data-test-fileDetails-dynamicScan-manualDast-vncViewer class='p-3'>
-      <VncViewer
-        @file={{@file}}
-        @profileId={{@profileId}}
-        @dynamicScan={{this.dynamicScan}}
-      />
+    <AkStack
+      @direction='column'
+      @alignItems='center'
+      local-class='{{if
+        this.isFullscreenView
+        "vnc-viewer-fullscreen-container"
+      }}'
+    >
+      {{#if this.isFullscreenView}}
+        <AkAppbar
+          @justifyContent='space-between'
+          @position='sticky'
+          class='px-3'
+          as |ab|
+        >
+          <AkTypography
+            data-test-fileDetails-dynamicScan-manualDastFullScreen-title
+            @color='inherit'
+            @variant='h5'
+          >
+            {{t 'realDevice'}}
+          </AkTypography>
+
+          <AkIconButton
+            data-test-fileDetails-dynamicScan-manualDastFullScreen-closeBtn
+            {{on 'click' this.toggleFullscreenView}}
+            class={{ab.classes.defaultIconBtn}}
+          >
+            <AkIcon @iconName='close' />
+          </AkIconButton>
+        </AkAppbar>
+      {{/if}}
+
+      <AkStack
+        data-test-fileDetails-dynamicScan-manualDast-vncViewer
+        class='p-3 py-4'
+      >
+        <VncViewer
+          @file={{@file}}
+          @profileId={{@profileId}}
+          @dynamicScan={{this.dynamicScan}}
+        >
+          <:controls>
+            {{#if this.isFullscreenView}}
+              <FileDetails::DynamicScan::Action
+                @file={{@file}}
+                @dynamicScanText={{t 'modalCard.dynamicScan.title'}}
+                @onScanShutdown={{this.toggleFullscreenView}}
+                @dynamicScan={{this.dynamicScan}}
+              />
+            {{/if}}
+          </:controls>
+        </VncViewer>
+      </AkStack>
     </AkStack>
-  {{/if}}
+  </div>
 </AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/manual/index.scss b/app/components/file-details/dynamic-scan/manual/index.scss
index de9a79dbab..2642134883 100644
--- a/app/components/file-details/dynamic-scan/manual/index.scss
+++ b/app/components/file-details/dynamic-scan/manual/index.scss
@@ -6,4 +6,39 @@
 .manual-dast-header {
   border-bottom: 1px solid var(--file-details-dynamic-scan-manual-border-color);
   padding: 0.5em 1.5em;
+  min-height: 48px;
+}
+
+.vnc-viewer-fullscreen {
+  position: fixed;
+  inset: 0px;
+  z-index: var(--vnc-viewer-modal-zIndex);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.vnc-viewer-backdrop {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  inset: 0px;
+  background-color: var(--vnc-viewer-modal-backdrop-overlay-background);
+  z-index: -1;
+}
+
+.vnc-viewer-fullscreen-container {
+  width: 450px;
+  background-color: var(--vnc-viewer-modal-background);
+  color: var(--vnc-viewer-modal-text-color);
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  height: calc(100% - 64px);
+  flex: 1 0 auto;
+  z-index: var(--vnc-viewer-modal-zIndex);
+  position: fixed;
+  outline: 0px;
 }
diff --git a/app/components/file-details/dynamic-scan/manual/index.ts b/app/components/file-details/dynamic-scan/manual/index.ts
index 984ed1058b..e7845491cc 100644
--- a/app/components/file-details/dynamic-scan/manual/index.ts
+++ b/app/components/file-details/dynamic-scan/manual/index.ts
@@ -28,15 +28,20 @@ export default class FileDetailsDastManual extends Component<FileDetailsDastManu
   constructor(owner: unknown, args: FileDetailsDastManualSignature['Args']) {
     super(owner, args);
 
-    this.fetchDynamicscan.perform();
+    // TODO: Uncomment when full DAST feature is ready.
+    // this.fetchDynamicscan.perform();
+  }
+
+  get file() {
+    return this.args.file;
   }
 
   get showStatusChip() {
-    if (this.dynamicScan?.isDynamicStatusReady) {
+    if (this.file?.isDynamicStatusReady) {
       return false;
     } else if (
-      this.dynamicScan?.isDynamicStatusNoneOrError ||
-      this.dynamicScan?.isDynamicStatusInProgress
+      this.file?.isDynamicStatusNoneOrError ||
+      this.file?.isDynamicStatusInProgress
     ) {
       return true;
     }
@@ -45,14 +50,16 @@ export default class FileDetailsDastManual extends Component<FileDetailsDastManu
   }
 
   get showActionButton() {
-    if (
-      this.dynamicScan?.isDynamicStatusReady ||
-      this.dynamicScan?.isDynamicStatusError
-    ) {
+    if (this.isFullscreenView) {
+      return false;
+    }
+
+    if (this.file?.isDynamicStatusReady || this.file?.isDynamicStatusError) {
       return true;
-    } else if (this.dynamicScan?.isDynamicStatusInProgress) {
+    } else if (this.file?.isDynamicStatusInProgress) {
       return false;
     }
+
     return true;
   }
 
diff --git a/app/components/file-details/dynamic-scan/results/index.hbs b/app/components/file-details/dynamic-scan/results/index.hbs
index 1fcd63739d..1b6295b40c 100644
--- a/app/components/file-details/dynamic-scan/results/index.hbs
+++ b/app/components/file-details/dynamic-scan/results/index.hbs
@@ -28,5 +28,6 @@
     @columns={{this.columns}}
     @sorts={{this.sorts}}
     @updateAnalysesSorts={{this.updateSorts}}
+    @pageReferrer='dast'
   />
 </AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/status-chip/index.hbs b/app/components/file-details/dynamic-scan/status-chip/index.hbs
index 3daef12c82..3c3cc5ecde 100644
--- a/app/components/file-details/dynamic-scan/status-chip/index.hbs
+++ b/app/components/file-details/dynamic-scan/status-chip/index.hbs
@@ -1,44 +1,35 @@
-{{#if @dynamicScan.isDynamicStatusError}}
+{{#if (or this.chipDetails.icon this.chipDetails.loaderColor)}}
   <AkChip
-    data-test-dynamicScan-statusChip
-    @variant='semi-filled-outlined'
-    @label={{t 'errored'}}
-    @color='warn'
+    data-test-fileDetails-dynamicScan-statusChip
+    @variant='semi-filled'
+    @size='small'
+    @label={{if @chipStatusText @chipStatusText this.chipDetails.label}}
+    @color={{this.chipDetails.color}}
+    {{style textTransform='uppercase'}}
+    ...attributes
   >
     <:icon>
-      <AkIcon @iconName='warning' />
-    </:icon>
-  </AkChip>
-
-{{else if @file.isDynamicDone}}
-  <AkChip
-    data-test-dynamicScan-statusChip
-    @variant='semi-filled-outlined'
-    @label={{t 'completed'}}
-    @color='success'
-  />
+      {{#if this.chipDetails.icon}}
+        <AkIcon @iconName={{this.chipDetails.icon}} />
+      {{/if}}
 
-{{else if @dynamicScan.isDynamicStatusInProgress}}
-  <AkChip
-    data-test-dynamicScan-statusChip
-    @label={{@dynamicScan.statusText}}
-    @variant='semi-filled-outlined'
-    @color={{this.chipColor}}
-  >
-    <:icon>
-      <AkLoader
-        data-test-dynamicScan-statusChip-loader
-        @color={{this.loaderColor}}
-        @size={{13}}
-      />
+      {{#if this.chipDetails.loaderColor}}
+        <AkLoader
+          data-test-fileDetails-dynamicScan-statusChip-loader
+          @color={{this.chipDetails.loaderColor}}
+          @size={{13}}
+        />
+      {{/if}}
     </:icon>
   </AkChip>
-
 {{else}}
   <AkChip
-    data-test-dynamicScan-statusChip
-    @label={{t 'notStarted'}}
-    @variant='semi-filled-outlined'
-    @color='secondary'
+    data-test-fileDetails-dynamicScan-statusChip
+    @label={{if @chipStatusText @chipStatusText this.chipDetails.label}}
+    @variant='semi-filled'
+    @size='small'
+    @color={{this.chipDetails.color}}
+    {{style textTransform='uppercase'}}
+    ...attributes
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/components/file-details/dynamic-scan/status-chip/index.scss b/app/components/file-details/dynamic-scan/status-chip/index.scss
new file mode 100644
index 0000000000..38a6161d65
--- /dev/null
+++ b/app/components/file-details/dynamic-scan/status-chip/index.scss
@@ -0,0 +1,3 @@
+.chips-uppercase {
+  text-transform: uppercase;
+}
diff --git a/app/components/file-details/dynamic-scan/status-chip/index.ts b/app/components/file-details/dynamic-scan/status-chip/index.ts
index 78a209f392..e873375804 100644
--- a/app/components/file-details/dynamic-scan/status-chip/index.ts
+++ b/app/components/file-details/dynamic-scan/status-chip/index.ts
@@ -1,41 +1,83 @@
 import Component from '@glimmer/component';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
 import ENUMS from 'irene/enums';
+
+import { type AkLoaderColor } from 'irene/components/ak-loader';
+import { type AkChipColor } from 'irene/components/ak-chip';
 import type DynamicscanModel from 'irene/models/dynamicscan';
 import type FileModel from 'irene/models/file';
 
 export interface DynamicScanStatusChipSignature {
+  Element: HTMLElement;
   Args: {
     file: FileModel;
-    dynamicScan: DynamicscanModel | null;
+    dynamicScan?: DynamicscanModel | null;
+    uppercase?: boolean;
+    chipStatusText?: string;
     isAutomatedScan?: boolean;
   };
 }
 
 export default class DynamicScanStatusChipComponent extends Component<DynamicScanStatusChipSignature> {
-  getColor(status: string | number | undefined, isDark: boolean) {
-    if (
-      this.args.dynamicScan?.isDynamicStatusInProgress &&
-      !this.args.dynamicScan?.isRunning
-    ) {
-      return isDark ? 'warn-dark' : 'warn';
+  @service declare intl: IntlService;
+
+  get file() {
+    return this.args.file;
+  }
+
+  get chipColor() {
+    return this.getColor(this.file?.dynamicStatus, false) as AkChipColor;
+  }
+
+  get loaderColor() {
+    return this.getColor(this.file?.dynamicStatus, true) as AkLoaderColor;
+  }
+
+  get chipDetails() {
+    if (this.file.isDynamicStatusError) {
+      return {
+        label: this.intl.t('errored'),
+        color: 'error' as const,
+        icon: 'warning',
+      };
+    } else if (this.file.isDynamicStatusInProgress) {
+      return {
+        label: this.file.statusText,
+        color: this.chipColor,
+        loaderColor: this.loaderColor,
+      };
+    } else if (this.file.isDynamicDone) {
+      return {
+        label: this.intl.t('completed'),
+        color: 'success' as const,
+      };
+    }
+
+    return {
+      label: this.intl.t('notStarted'),
+      color: 'secondary' as const,
+    };
+  }
+
+  @action
+  getColor(
+    status: string | number | undefined,
+    isLoader: boolean
+  ): AkChipColor | AkLoaderColor {
+    if (this.file?.isDynamicStatusInProgress) {
+      return isLoader ? 'warn-dark' : 'warn';
     } else if (status === ENUMS.DYNAMIC_STATUS.COMPLETED) {
       return 'success';
     } else if (status === ENUMS.DYNAMIC_STATUS.NONE) {
       return 'secondary';
     } else if (status === ENUMS.DYNAMIC_STATUS.RUNNING) {
-      return isDark ? 'info-dark' : 'info';
+      return isLoader ? 'info-dark' : 'info';
     } else {
-      return isDark ? 'warn-dark' : 'warn';
+      return isLoader ? 'warn-dark' : 'warn';
     }
   }
-
-  get chipColor() {
-    return this.getColor(this.args.dynamicScan?.status, false);
-  }
-
-  get loaderColor() {
-    return this.getColor(this.args.dynamicScan?.status, true);
-  }
 }
 
 declare module '@glint/environment-ember-loose/registry' {
diff --git a/app/components/file-details/index.hbs b/app/components/file-details/index.hbs
index a67a384178..3f8431f266 100644
--- a/app/components/file-details/index.hbs
+++ b/app/components/file-details/index.hbs
@@ -1,25 +1,27 @@
-<div class='px-2'>
-  <AkBreadcrumbs::Container
-    class='mt-2 mb-3'
-    data-test-fileDetails-breadcrumbContainer
-  >
-    {{#each this.breadcrumbItems as |item|}}
-      <AkBreadcrumbs::Item
-        @route={{item.route}}
-        @model={{item.model}}
-        @linkTitle={{item.linkTitle}}
-        data-test-fileDetails-breadcrumbItem='{{item.linkTitle}}'
-      />
-    {{/each}}
-  </AkBreadcrumbs::Container>
+<div local-class='file-details-root'>
+  <div local-class='file-details-container'>
+    <AkBreadcrumbs::Container
+      class='mt-2 mb-3'
+      data-test-fileDetails-breadcrumbContainer
+    >
+      {{#each this.breadcrumbItems as |item|}}
+        <AkBreadcrumbs::Item
+          @route={{item.route}}
+          @model={{item.model}}
+          @linkTitle={{item.linkTitle}}
+          data-test-fileDetails-breadcrumbItem='{{item.linkTitle}}'
+        />
+      {{/each}}
+    </AkBreadcrumbs::Container>
 
-  <AkStack @direction='column' @spacing='2.5'>
-    <FileDetails::SummaryOld @file={{@file}} />
+    <AkStack @direction='column' @spacing='2.5'>
+      <FileDetails::Summary @file={{@file}} />
 
-    <FileDetails::ScanActionsOld @file={{@file}} />
+      <FileDetails::ScanActions @file={{@file}} />
 
-    <FileDetails::InsightsWrapper @file={{@file}} />
-  </AkStack>
+      <FileDetails::InsightsWrapper @file={{@file}} />
+    </AkStack>
 
-  <FileDetails::VulnerabilityAnalysis @file={{@file}} />
+    <FileDetails::VulnerabilityAnalysis @file={{@file}} />
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/components/file-details/manual-scan/index.ts b/app/components/file-details/manual-scan/index.ts
index edb87ad4b1..8c47a71f31 100644
--- a/app/components/file-details/manual-scan/index.ts
+++ b/app/components/file-details/manual-scan/index.ts
@@ -49,7 +49,7 @@ export default class FileDetailsManualScanComponent extends Component<FileDetail
       },
       {
         route: 'authenticated.dashboard.file.manual-scan',
-        linkTitle: 'Manual Scan',
+        linkTitle: this.intl.t('manualScan'),
         model: this.args.file.id,
       },
     ];
@@ -66,7 +66,7 @@ export default class FileDetailsManualScanComponent extends Component<FileDetail
       {
         id: 'manual-results',
         hidden: !this.args.file.isManualDone,
-        label: this.intl.t('manualResults'),
+        label: this.intl.t('manualScanResults'),
         hasBadge: true,
         badgeCount: this.args.file.manualVulnerabilityCount,
         route: 'authenticated.dashboard.file.manual-scan.results',
diff --git a/app/components/file-details/manual-scan/request-form/basic-info/index.hbs b/app/components/file-details/manual-scan/request-form/basic-info/index.hbs
index 2e123e30c7..95426c7edd 100644
--- a/app/components/file-details/manual-scan/request-form/basic-info/index.hbs
+++ b/app/components/file-details/manual-scan/request-form/basic-info/index.hbs
@@ -26,13 +26,13 @@
       data-test-manualScanBasicInfo-minOSVersionLabel
       local-class='basic-info-label'
     >
-      {{t 'modalCard.manual.minOSVersion'}}
+      {{t 'minOSVersion'}}
     </AkTypography>
 
     <div local-class='basic-info-input-container'>
       <AkTextField
         data-test-manualScanBasicInfo-minOSVersionInput
-        @placeholder={{t 'modalCard.manual.minOSVersion'}}
+        @placeholder={{t 'minOSVersion'}}
         @value={{@manualscan.minOsVersion}}
         @disabled={{not @file.isActive}}
       />
diff --git a/app/components/file-details/manual-scan/request-form/login-details/index.ts b/app/components/file-details/manual-scan/request-form/login-details/index.ts
index b0cf19ecca..b838a6dfc6 100644
--- a/app/components/file-details/manual-scan/request-form/login-details/index.ts
+++ b/app/components/file-details/manual-scan/request-form/login-details/index.ts
@@ -38,7 +38,7 @@ export default class FileDetailsManualScanRequestFormLoginDetailsComponent exten
       {
         name: this.intl.t('action'),
         component:
-          'file-details/scan-actions/manual-scan/login-details/user-role-action' as const,
+          'file-details/manual-scan/request-form/login-details/user-role-action' as const,
         textAlign: 'center',
       },
     ];
diff --git a/app/components/file-details/manual-scan/results/index.hbs b/app/components/file-details/manual-scan/results/index.hbs
index 71a9138655..2b0315cbef 100644
--- a/app/components/file-details/manual-scan/results/index.hbs
+++ b/app/components/file-details/manual-scan/results/index.hbs
@@ -27,6 +27,7 @@
       @filterVulnerabilityType={{this.filterVulnerabilityType}}
       @sorts={{this.sorts}}
       @updateAnalysesSorts={{this.updateAnalysesSorts}}
+      @pageReferrer='manual'
     />
   </div>
 </div>
\ No newline at end of file
diff --git a/app/components/file-details/proxy-settings/index.ts b/app/components/file-details/proxy-settings/index.ts
index e971a456d6..1e54f8ec3e 100644
--- a/app/components/file-details/proxy-settings/index.ts
+++ b/app/components/file-details/proxy-settings/index.ts
@@ -72,7 +72,7 @@ export default class FileDetailsProxySettingsComponent extends Component<FileDet
       }
     } catch (error) {
       const err = error as AdapterError;
-      let errMsg = this.intl.t('plaseTryAgain');
+      let errMsg = this.intl.t('pleaseTryAgain');
 
       if (err.errors && err.errors.length) {
         errMsg = err.errors[0]?.detail || errMsg;
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.hbs b/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.hbs
deleted file mode 100644
index 96d5ae6238..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.hbs
+++ /dev/null
@@ -1,88 +0,0 @@
-<AkPaginationProvider
-  @results={{this.capturedApiList}}
-  @onItemPerPageChange={{this.handleItemPerPageChange}}
-  @totalItems={{this.totalCapturedApiCount}}
-  @nextAction={{this.handlePrevNextAction}}
-  @prevAction={{this.handlePrevNextAction}}
-  @itemPerPageOptions={{array 5 10 20}}
-  @defaultLimit={{this.limit}}
-  @offset={{this.offset}}
-  as |pgc|
->
-  {{#if this.fetchCapturedApis.isRunning}}
-    <AkStack
-      local-class='loading-container'
-      @alignItems='center'
-      @justifyContent='center'
-    >
-      <AkStack @alignItems='center' @justifyContent='center' @spacing='1.5'>
-        <AkLoader @size={{16}} />
-        <AkTypography @color='textSecondary'>
-          {{t 'loading'}}...
-        </AkTypography>
-      </AkStack>
-    </AkStack>
-  {{else if this.hasNoCapturedApi}}
-    <AkStack @spacing='1.5'>
-      <AkIcon @iconName='info' />
-
-      <div>
-        <AkTypography
-          @variant='h6'
-          @gutterBottom={{true}}
-          data-test-capturedApi-emptyTitle
-        >
-          {{t 'capturedApiEmptyTitle'}}
-        </AkTypography>
-
-        <AkTypography data-test-capturedApi-emptyDescription>
-          {{t 'capturedApiEmptyDesc' htmlSafe=true}}
-        </AkTypography>
-      </div>
-    </AkStack>
-  {{else}}
-    <div class='mb-1' local-class='bordered-box'>
-      <AkStack @alignItems='center' @justifyContent='space-between'>
-        <AkTypography data-test-capturedApi-title @variant='subtitle1'>
-          {{t 'capturedApiTitle'}}
-        </AkTypography>
-
-        {{#if this.totalCapturedApiCount}}
-          <AkTypography
-            data-test-capturedApi-apiCount
-            @variant='body2'
-            @color='textSecondary'
-          >
-            {{t 'selected'}}
-            ({{this.selectedCount}}/{{this.totalCapturedApiCount}})
-          </AkTypography>
-        {{/if}}
-      </AkStack>
-
-      <AkStack class='mt-2' @direction='column' @spacing='1.5'>
-        {{#each pgc.currentPageResults as |ca|}}
-          <FileDetails::ScanActionsOld::ApiScan::CapturedApis::Overview
-            @capturedApi={{ca}}
-            @toggleApi={{perform this.toggleApi ca}}
-          />
-        {{/each}}
-      </AkStack>
-    </div>
-
-    <AkPagination
-      @variant='compact'
-      @disableNext={{pgc.disableNext}}
-      @nextAction={{pgc.nextAction}}
-      @disablePrev={{pgc.disablePrev}}
-      @prevAction={{pgc.prevAction}}
-      @endItemIdx={{pgc.endItemIdx}}
-      @startItemIdx={{pgc.startItemIdx}}
-      @itemPerPageOptions={{pgc.itemPerPageOptions}}
-      @onItemPerPageChange={{pgc.onItemPerPageChange}}
-      @selectedOption={{pgc.selectedOption}}
-      @tableItemLabel={{t 'apis'}}
-      @perPageTranslation={{t 'recordPerPage'}}
-      @totalItems={{pgc.totalItems}}
-    />
-  {{/if}}
-</AkPaginationProvider>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.scss b/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.scss
deleted file mode 100644
index 4b2ffae709..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.bordered-box {
-  padding: 1.25em;
-  border: 1px solid
-    var(--file-details-scan-actions-api-scan-captured-apis-border-color);
-  box-sizing: border-box;
-}
-
-.loading-container {
-  padding: 1.5em;
-  height: 150px;
-  border-radius: var(
-    --file-details-scan-actions-api-scan-captured-apis-border-radius
-  );
-  border: 1px solid
-    var(--file-details-scan-actions-api-scan-captured-apis-border-color);
-  box-sizing: border-box;
-}
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.ts b/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.ts
deleted file mode 100644
index 8f9d79a5f9..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/index.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import FileModel from 'irene/models/file';
-import IntlService from 'ember-intl/services/intl';
-import Store from '@ember-data/store';
-import CapturedApiModel from 'irene/models/capturedapi';
-import ENV from 'irene/config/environment';
-
-// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
-import { DS } from 'ember-data';
-import { PaginationProviderActionsArgs } from 'irene/components/ak-pagination-provider';
-import { action } from '@ember/object';
-
-export interface FileDetailsScanActionsOldApiScanCapturedApisSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-type CapturedApiQueryResponse =
-  DS.AdapterPopulatedRecordArray<CapturedApiModel> & {
-    meta: { count: number };
-  };
-
-export default class FileDetailsScanActionsOldApiScanCapturedApisComponent extends Component<FileDetailsScanActionsOldApiScanCapturedApisSignature> {
-  @service declare intl: IntlService;
-  @service declare ajax: any;
-  @service declare store: Store;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked selectedCount = 0;
-  @tracked capturedApiResponse: CapturedApiQueryResponse | null = null;
-  @tracked limit = 5;
-  @tracked offset = 0;
-
-  constructor(
-    owner: unknown,
-    args: FileDetailsScanActionsOldApiScanCapturedApisSignature['Args']
-  ) {
-    super(owner, args);
-
-    this.setSelectedCount.perform();
-    this.fetchCapturedApis.perform(this.limit, this.offset);
-  }
-
-  get capturedApiList() {
-    return this.capturedApiResponse?.toArray() || [];
-  }
-
-  get totalCapturedApiCount() {
-    return this.capturedApiResponse?.meta?.count || 0;
-  }
-
-  get hasNoCapturedApi() {
-    return this.totalCapturedApiCount === 0;
-  }
-
-  @action
-  handlePrevNextAction({ limit, offset }: PaginationProviderActionsArgs) {
-    this.limit = limit;
-    this.offset = offset;
-
-    this.fetchCapturedApis.perform(limit, offset);
-  }
-
-  @action
-  handleItemPerPageChange({ limit }: PaginationProviderActionsArgs) {
-    this.offset = 0;
-
-    this.fetchCapturedApis.perform(limit, this.offset);
-  }
-
-  getSelectedApis = task(async () => {
-    const url = [
-      ENV.endpoints['files'],
-      this.args.file.id,
-      'capturedapis',
-    ].join('/');
-
-    const data = { fileId: this.args.file.id, is_active: true };
-
-    return await this.ajax.request(url, { namespace: ENV.namespace_v2, data });
-  });
-
-  setSelectedCount = task(async () => {
-    try {
-      const selectedApis = await this.getSelectedApis.perform();
-
-      this.selectedCount = selectedApis.count;
-    } catch (error) {
-      const err = error as AdapterError;
-      this.notify.error(err.toString());
-    }
-  });
-
-  toggleApi = task(async (capturedApi: CapturedApiModel) => {
-    try {
-      capturedApi.set('isActive', !capturedApi.isActive);
-
-      await capturedApi.save();
-
-      this.notify.success(this.intl.t('capturedApiSaveSuccessMsg'));
-
-      this.setSelectedCount.perform();
-    } catch (err) {
-      const error = err as AdapterError;
-      let errMsg = this.intl.t('tPleaseTryAgain');
-
-      if (error.errors && error.errors.length) {
-        errMsg = error.errors[0]?.detail || errMsg;
-      } else if (error.message) {
-        errMsg = error.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-
-  fetchCapturedApis = task(async (limit: number, offset: number) => {
-    try {
-      this.capturedApiResponse = (await this.store.query('capturedapi', {
-        limit,
-        offset,
-        fileId: this.args.file.id,
-      })) as CapturedApiQueryResponse;
-    } catch (error) {
-      const err = error as AdapterError;
-      this.notify.error(err.toString());
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ApiScan::CapturedApis': typeof FileDetailsScanActionsOldApiScanCapturedApisComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.hbs b/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.hbs
deleted file mode 100644
index 7b5e5ee028..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<AkStack data-test-capturedApi-endpointContainer @spacing='1' @tag='label'>
-  <AkCheckbox
-    @checked={{@capturedApi.isActive}}
-    @onChange={{perform this.handleToggleApi}}
-    @disabled={{this.handleToggleApi.isRunning}}
-    data-test-capturedApi-endpointSelectCheckbox
-  />
-
-  <AkStack local-class='api-endpoint-container' @spacing='1.5'>
-    <AkChip
-      data-test-capturedApi-endpointMethodChip
-      @label={{@capturedApi.request.method}}
-      @size='small'
-    />
-
-    <AkTypography local-class='api-endpoint' data-test-capturedApi-endpointUrl>
-      {{request-to-url @capturedApi.request}}
-
-      {{#if this.handleToggleApi.isRunning}}
-        <AkLoader class='mx-1' @size={{13}} />
-      {{/if}}
-    </AkTypography>
-  </AkStack>
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.scss b/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.scss
deleted file mode 100644
index ec7b5e5d52..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.api-endpoint-container {
-  margin-top: 0.4em;
-
-  .api-endpoint {
-    word-break: break-all;
-    white-space: normal;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.ts b/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.ts
deleted file mode 100644
index 69535547de..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/captured-apis/overview/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import Component from '@glimmer/component';
-import { task } from 'ember-concurrency';
-import CapturedApiModel from 'irene/models/capturedapi';
-
-export interface FileDetailsScanActionsOldApiScanCapturedApiOverviewSignature {
-  Args: {
-    capturedApi: CapturedApiModel;
-    toggleApi: () => Promise<void>;
-  };
-}
-
-export default class FileDetailsScanActionsOldApiScanCapturedApiOverviewComponent extends Component<FileDetailsScanActionsOldApiScanCapturedApiOverviewSignature> {
-  handleToggleApi = task(async () => {
-    await this.args.toggleApi();
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ApiScan::CapturedApis::Overview': typeof FileDetailsScanActionsOldApiScanCapturedApiOverviewComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/api-scan/index.hbs b/app/components/file-details/scan-actions-old/api-scan/index.hbs
deleted file mode 100644
index 69fd69a92d..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/index.hbs
+++ /dev/null
@@ -1,114 +0,0 @@
-{{#if @file.isRunningApiScan}}
-  <AkButton data-test-apiScan-btn @variant='outlined' @disabled={{true}}>
-    {{t 'scanning'}}
-    :
-    {{@file.apiScanProgress}}%
-  </AkButton>
-{{else if @file.isApiDone}}
-  <AkButton data-test-apiScan-btn {{style pointerEvents='none'}}>
-    <:leftIcon>
-      <AkIcon @iconName='done' />
-    </:leftIcon>
-
-    <:default>{{t 'completed'}}</:default>
-  </AkButton>
-{{else if @file.isApiNotDone}}
-  <AkButton
-    data-test-apiScan-btn
-    @variant='outlined'
-    {{on 'click' (perform this.openApiScanModal)}}
-    @disabled={{if (and @file.isActive @file.isDynamicDone) false true}}
-  >
-    <:leftIcon>
-      {{#if this.openApiScanModal.isRunning}}
-        <AkLoader @size={{13}} />
-      {{else}}
-        <AkIcon @iconName='play-arrow' />
-      {{/if}}
-    </:leftIcon>
-
-    <:default>{{t 'start'}}</:default>
-  </AkButton>
-{{/if}}
-
-{{#if this.showApiScanModal}}
-  <AkModal
-    @showHeader={{true}}
-    @headerTitle={{t 'modalCard.apiScan.title'}}
-    @onClose={{this.closeApiScanModal}}
-    @disableClose={{this.runApiScan.isRunning}}
-  >
-    <:default>
-      <div {{style maxWidth='650px'}}>
-        {{#if this.hasDynamicScanDone}}
-          {{#if this.capturedApisCount}}
-            <AkStack
-              @alignItems='center'
-              @spacing='2'
-              local-class='api-scan-modal-alert'
-              data-test-apiScanModal-warnAlert
-            >
-              <AkIcon @iconName='warning' />
-
-              <AkTypography>
-                {{t 'modalCard.apiScan.warning' htmlSafe=true}}
-              </AkTypography>
-            </AkStack>
-
-            <div class='my-3'>
-              <AkTypography data-test-apiScanModal-description>
-                {{t 'modalCard.apiScan.description'}}
-              </AkTypography>
-            </div>
-          {{/if}}
-
-          <div class='mt-2'>
-            <FileDetails::ScanActionsOld::ApiScan::CapturedApis
-              @file={{@file}}
-            />
-          </div>
-
-          <div class='mt-3'>
-            <ProxySettingsView
-              @profile={{@file.profile}}
-              @project={{@file.project}}
-            />
-          </div>
-        {{else}}
-          <AkStack @alignItems='center' @spacing='1.5' class='alert alert-info'>
-            <AkIcon @iconName='info' />
-
-            <AkTypography @color='inherit'>
-              {{t 'modalCard.apiScan.noDynamicScan'}}
-            </AkTypography>
-          </AkStack>
-        {{/if}}
-      </div>
-    </:default>
-
-    <:footer>
-      <AkDivider />
-
-      <AkStack @justifyContent='flex-end' class='p-2'>
-        {{#if this.capturedApisCount}}
-          <AkButton
-            data-test-apiScanModal-startBtn
-            {{on 'click' (perform this.runApiScan)}}
-            @loading={{this.runApiScan.isRunning}}
-          >
-            {{t 'modalCard.apiScan.start'}}
-          </AkButton>
-        {{else}}
-          <AkButton
-            data-test-apiScanModal-closeBtn
-            @variant='outlined'
-            @color='neutral'
-            {{on 'click' this.closeApiScanModal}}
-          >
-            {{t 'close'}}
-          </AkButton>
-        {{/if}}
-      </AkStack>
-    </:footer>
-  </AkModal>
-{{/if}}
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/api-scan/index.scss b/app/components/file-details/scan-actions-old/api-scan/index.scss
deleted file mode 100644
index 021ee4b3b9..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/index.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.api-scan-modal-alert {
-  padding: 1em;
-  background-color: var(
-    --file-details-scan-actions-api-scan-alert-background-color
-  );
-  color: var(--file-details-scan-actions-api-scan-alert-text-color);
-  border: 1px solid var(--file-details-scan-actions-api-scan-alert-border-color);
-  border-radius: var(--file-details-scan-actions-api-scan-border-radius);
-}
diff --git a/app/components/file-details/scan-actions-old/api-scan/index.ts b/app/components/file-details/scan-actions-old/api-scan/index.ts
deleted file mode 100644
index cd1292d47f..0000000000
--- a/app/components/file-details/scan-actions-old/api-scan/index.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import ENV from 'irene/config/environment';
-import triggerAnalytics from 'irene/utils/trigger-analytics';
-import { task } from 'ember-concurrency';
-import IntlService from 'ember-intl/services/intl';
-import { tracked } from '@glimmer/tracking';
-
-import FileModel from 'irene/models/file';
-import RealtimeService from 'irene/services/realtime';
-import TrailService from 'irene/services/trial';
-
-export interface FileDetailsScanActionsOldApiScanSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsScanActionsOldApiScanComponent extends Component<FileDetailsScanActionsOldApiScanSignature> {
-  @service declare intl: IntlService;
-  @service declare trial: TrailService;
-  @service declare ajax: any;
-  @service('notifications') declare notify: NotificationService;
-  @service declare realtime: RealtimeService;
-
-  @tracked capturedApisCount = 0;
-  @tracked showApiScanModal = false;
-
-  get tStartingApiScan() {
-    return this.intl.t('startingApiScan');
-  }
-
-  get tPleaseTryAgain() {
-    return this.intl.t('pleaseTryAgain');
-  }
-
-  get hasDynamicScanDone() {
-    return this.args.file.isDynamicDone;
-  }
-
-  /* fetch captured apis count */
-  setCapturedApisCount = task(async () => {
-    const url = [
-      ENV.endpoints['files'],
-      this.args.file.id,
-      'capturedapis',
-    ].join('/');
-
-    const data = { fileId: this.args.file.id };
-
-    const apis = await this.ajax.request(url, {
-      namespace: ENV.namespace_v2,
-      data,
-    });
-
-    this.realtime.incrementProperty('CapturedApiCounter');
-
-    try {
-      this.capturedApisCount = apis.count;
-    } catch (error) {
-      this.notify.error((error as Error).toString());
-    }
-  });
-
-  /* API scan modal actions */
-  openApiScanModal = task({ drop: true }, async () => {
-    if (this.hasDynamicScanDone) {
-      await this.setCapturedApisCount.perform();
-    }
-
-    triggerAnalytics(
-      'feature',
-      ENV.csb['apiScanBtnClick'] as CsbAnalyticsFeatureData
-    );
-
-    this.showApiScanModal = true;
-  });
-
-  @action
-  closeApiScanModal() {
-    this.showApiScanModal = false;
-  }
-
-  /* init API scan */
-  startApiScan = task(async () => {
-    const dynamicUrl = [
-      ENV.endpoints['files'],
-      this.args.file.id,
-      ENV.endpoints['capturedApiScanStart'],
-    ].join('/');
-
-    return await this.ajax.post(dynamicUrl, { namespace: ENV.namespace_v2 });
-  });
-
-  runApiScan = task(async () => {
-    try {
-      this.showApiScanModal = false;
-
-      await this.startApiScan.perform();
-
-      triggerAnalytics(
-        'feature',
-        ENV.csb['runAPIScan'] as CsbAnalyticsFeatureData
-      );
-
-      this.notify.success(this.tStartingApiScan);
-    } catch (e) {
-      const err = e as AdapterError;
-
-      let errMsg = this.tPleaseTryAgain;
-
-      if (err.errors && err.errors.length) {
-        errMsg = err.errors[0]?.detail || errMsg;
-      } else if (err.payload && err.payload.detail) {
-        errMsg = err.payload.detail;
-      } else if (err.message) {
-        errMsg = err.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ApiScan': typeof FileDetailsScanActionsOldApiScanComponent;
-    'file-details/scan-actions-old/api-scan': typeof FileDetailsScanActionsOldApiScanComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/index.hbs b/app/components/file-details/scan-actions-old/index.hbs
deleted file mode 100644
index 81692b8021..0000000000
--- a/app/components/file-details/scan-actions-old/index.hbs
+++ /dev/null
@@ -1,92 +0,0 @@
-<div local-class='scan-actions-root'>
-  <AkStack
-    @alignItems='center'
-    @justifyContent='space-between'
-    local-class='scan-actions-header'
-  >
-    <AkTypography data-test-fileDetailScanActions-title @variant='subtitle1'>
-      {{t 'scanTypes'}}
-    </AkTypography>
-
-    {{#unless @file.isActive}}
-      <AkTooltip
-        @placement='top'
-        @arrow={{true}}
-        @title={{t 'fileInactive'}}
-        @color='dark'
-      >
-        <AkIcon
-          data-test-fileDetailScanActions-inactiveFileIcon
-          @color='warn'
-          @iconName='warning'
-        />
-      </AkTooltip>
-    {{/unless}}
-  </AkStack>
-
-  <AkDivider @color='dark' />
-
-  <AkStack class='p-3' @spacing='6' @alignItems='center'>
-    <AkStack
-      @direction='column'
-      @alignItems='center'
-      @spacing='1.5'
-      data-test-cy='staticScan-infoContainer'
-    >
-      <AkTypography
-        data-test-fileDetailScanActions-staticScanTitle
-        @variant='h6'
-      >
-        {{t 'staticScan'}}
-      </AkTypography>
-
-      <FileDetails::ScanActionsOld::StaticScan @file={{@file}} />
-    </AkStack>
-
-    <AkStack
-      @direction='column'
-      @alignItems='center'
-      @spacing='1.5'
-      data-test-cy='dynamicScan-infoContainer'
-    >
-      <AkTypography
-        data-test-fileDetailScanActions-dynamicScanTitle
-        @variant='h6'
-      >
-        {{t 'dynamicScan'}}
-      </AkTypography>
-
-      <DynamicScan
-        @file={{@file}}
-        @vncViewer={{false}}
-        @dynamicScanText={{t 'start'}}
-      />
-    </AkStack>
-
-    {{#if this.isAPIScanEnabled}}
-      <AkStack @direction='column' @alignItems='center' @spacing='1.5'>
-        <AkTypography
-          data-test-fileDetailScanActions-apiScanTitle
-          @variant='h6'
-        >
-          {{t 'apiScan'}}
-        </AkTypography>
-
-        <FileDetails::ScanActionsOld::ApiScan @file={{@file}} />
-      </AkStack>
-    {{/if}}
-
-    {{#unless this.isManualScanDisabled}}
-      <AkStack @direction='column' @alignItems='center' @spacing='1.5'>
-        <AkTypography
-          data-test-fileDetailScanActions-manualScanTitle
-          @variant='h6'
-        >
-          {{t 'manualScan'}}
-        </AkTypography>
-
-        <FileDetails::ScanActionsOld::ManualScan @file={{@file}} />
-      </AkStack>
-    {{/unless}}
-  </AkStack>
-</div>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/index.scss b/app/components/file-details/scan-actions-old/index.scss
deleted file mode 100644
index 4b990614dc..0000000000
--- a/app/components/file-details/scan-actions-old/index.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.scan-actions-root {
-  width: 100%;
-  border: 1px solid var(--file-details-scan-actions-old-border-color);
-  background-color: var(--file-details-scan-actions-old-background-color);
-  box-sizing: border-box;
-
-  .scan-actions-header {
-    padding: 0.75em 1.5em;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/index.ts b/app/components/file-details/scan-actions-old/index.ts
deleted file mode 100644
index 373791352d..0000000000
--- a/app/components/file-details/scan-actions-old/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { inject as service } from '@ember/service';
-import Component from '@glimmer/component';
-
-import FileModel from 'irene/models/file';
-import OrganizationService from 'irene/services/organization';
-
-export interface FileDetailsScanActionsOldSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsScanActionsOldComponent extends Component<FileDetailsScanActionsOldSignature> {
-  @service declare organization: OrganizationService;
-
-  get isManualScanDisabled() {
-    return !this.args.file.project.get('isManualScanAvailable');
-  }
-
-  get isAPIScanEnabled() {
-    return this.args.file.project.get('isAPIScanEnabled');
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld': typeof FileDetailsScanActionsOldComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.hbs b/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.hbs
deleted file mode 100644
index 5fca30eb5b..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.hbs
+++ /dev/null
@@ -1,91 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-appEnvLabel
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.appEnv'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkSelect
-        data-test-manualScanBasicInfo-appEnvSelect
-        @options={{this.environments}}
-        @selected={{this.selectedAppEnvironment}}
-        @onChange={{this.selectAppEnvironment}}
-        as |aks|
-      >
-        {{t (app-environment aks.value)}}
-      </AkSelect>
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-minOSVersionLabel
-      local-class='basic-info-label'
-    >
-      {{t 'minOSVersion'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkTextField
-        data-test-manualScanBasicInfo-minOSVersionInput
-        @placeholder={{t 'minOSVersion'}}
-        @value={{@manualscan.minOsVersion}}
-      />
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-appQuestion1Label
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.appQuestion1'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkSelect
-        data-test-manualScanBasicInfo-appQuestion1Select
-        @options={{this.appActions}}
-        @selected={{this.selectedAppAction}}
-        @onChange={{this.handleAppActionChange}}
-        @helperText={{if
-          @manualscan.showProceedText
-          (t 'modalCard.manual.appQuestion1Answer1')
-          (if
-            @manualscan.showHaltText (t 'modalCard.manual.appQuestion1Answer2')
-          )
-        }}
-        as |aks|
-      >
-        {{t (app-action aks.value)}}
-      </AkSelect>
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-pocLabel
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.poc'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkTextField
-        data-test-manualScanBasicInfo-pocNameInput
-        @placeholder={{t 'name'}}
-        @value={{@manualscan.contact.name}}
-      />
-
-      <AkTextField
-        data-test-manualScanBasicInfo-pocEmailInput
-        @formControlClass='mt-2'
-        @placeholder={{t 'email'}}
-        @value={{@manualscan.contact.email}}
-      />
-    </div>
-  </div>
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.scss b/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.scss
deleted file mode 100644
index 1bada3b3a6..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.basic-info-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .basic-info-label {
-    flex: 1;
-  }
-
-  .basic-info-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.ts b/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.ts
deleted file mode 100644
index a9c1a132b9..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/basic-info/index.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import Component from '@glimmer/component';
-import FileModel from 'irene/models/file';
-import ENUMS from 'irene/enums';
-import ManualscanModel from 'irene/models/manualscan';
-import { action } from '@ember/object';
-
-export interface FileDetailsScanActionsOldManualScanBasicInfoSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsOldManualScanBasicInfoComponent extends Component<FileDetailsScanActionsOldManualScanBasicInfoSignature> {
-  get environments() {
-    return ENUMS.APP_ENV.CHOICES.slice(0, -1);
-  }
-
-  get selectedAppEnvironment() {
-    return this.environments.find(
-      (it) => it.value === this.args.manualscan?.filteredAppEnv
-    );
-  }
-
-  get appActions() {
-    return ENUMS.APP_ACTION.CHOICES.slice(0, -1);
-  }
-
-  get selectedAppAction() {
-    return this.appActions.find(
-      (it) => it.value === this.args.manualscan?.filteredAppAction
-    );
-  }
-
-  @action
-  selectAppEnvironment({ value }: { value: string }) {
-    this.args.manualscan?.set('appEnv', value);
-  }
-
-  @action
-  handleAppActionChange({ value }: { value: string }) {
-    const appAction = parseInt(value);
-
-    this.args.manualscan?.set('appAction', appAction);
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ManualScan::BasicInfo': typeof FileDetailsScanActionsOldManualScanBasicInfoComponent;
-    'file-details/scan-actions-old/manual-scan/basic-info': typeof FileDetailsScanActionsOldManualScanBasicInfoComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/index.hbs b/app/components/file-details/scan-actions-old/manual-scan/index.hbs
deleted file mode 100644
index b9deb24fe1..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/index.hbs
+++ /dev/null
@@ -1,123 +0,0 @@
-<div>
-  {{#if @file.isManualRequested}}
-    <AkButton data-test-manualScan-statusBtn {{style pointerEvents='none'}}>
-      <:leftIcon>
-        <AkIcon @iconName={{if @file.isManualDone 'done' 'schedule'}} />
-      </:leftIcon>
-
-      <:default>
-        {{this.manualScanStatusText}}
-      </:default>
-    </AkButton>
-  {{else}}
-    <AkButton
-      data-test-manualScan-requestBtn
-      @variant='outlined'
-      {{on
-        'click'
-        (if
-          this.organization.selected.isTrial
-          this.handleManualScanRequestAccessModalOpen
-          this.handleManualScanModalOpen
-        )
-      }}
-      @disabled={{not @file.isActive}}
-    >
-      <:leftIcon>
-        <AkIcon @iconName='play-arrow' />
-      </:leftIcon>
-
-      <:default>{{t 'start'}}</:default>
-    </AkButton>
-  {{/if}}
-
-  {{#if this.showManualScanModal}}
-    <AkModal
-      @showHeader={{true}}
-      @headerTitle={{t 'modalCard.manual.title'}}
-      @onClose={{this.handleManualScanModalClose}}
-      @disableClose={{this.saveManualScanForm.isRunning}}
-      @noGutter={{true}}
-    >
-      <:default>
-        <div {{style width='600px'}}>
-          <AkTypography data-test-manualScanModal-description class='px-3 py-2'>
-            {{t 'modalCard.manual.description'}}
-          </AkTypography>
-
-          <AkAccordion::Group @defaultOpen={{array 'basic-info'}} as |actx|>
-            {{#each this.manualScanFormSections as |msf|}}
-              <AkAccordion
-                @id={{msf.id}}
-                @accordionCtx={{actx}}
-                @summaryText={{msf.summaryText}}
-              >
-                <:content>
-                  {{#let (component msf.contentComponent) as |Component|}}
-                    <Component
-                      @file={{@file}}
-                      @manualscan={{this.manualscan}}
-                    />
-                  {{/let}}
-                </:content>
-              </AkAccordion>
-            {{/each}}
-          </AkAccordion::Group>
-
-          <div class='my-2 px-3'>
-            <AkTypography
-              data-test-manualScanModal-additionalCommentLabel
-              @variant='h6'
-              @tag='label'
-              @color='textSecondary'
-              for='manual-scan-additional-comments'
-            >
-              {{t 'modalCard.manual.additionalComments'}}
-            </AkTypography>
-
-            <Textarea
-              data-test-manualScanModal-additionalCommentInput
-              id='manual-scan-additional-comments'
-              class='mt-1'
-              local-class='textarea-input'
-              rows='5'
-              @value={{this.manualscan.additionalComments}}
-            />
-          </div>
-        </div>
-      </:default>
-
-      <:footer>
-        <AkDivider />
-
-        <AkStack @justifyContent='flex-end' @spacing='1.5' class='px-3 py-2'>
-          <AkButton
-            @variant='outlined'
-            @color='neutral'
-            {{on 'click' this.handleManualScanModalClose}}
-            data-test-manualScanModal-cancelBtn
-          >
-            {{t 'cancel'}}
-          </AkButton>
-
-          <AkButton
-            data-test-manualScanModal-requestBtn
-            {{on 'click' (perform this.saveManualScanForm)}}
-            @loading={{this.saveManualScanForm.isRunning}}
-          >
-            {{t 'modalCard.manual.title'}}
-          </AkButton>
-        </AkStack>
-      </:footer>
-    </AkModal>
-  {{/if}}
-
-  <ConfirmBox
-    @isActive={{this.showManualScanRequestAccessModal}}
-    @title={{t 'modalCard.requestAccess.title'}}
-    @description={{t 'modalCard.requestAccess.description'}}
-    @confirmText={{t 'modalCard.requestAccess.button'}}
-    @confirmAction={{perform this.requestManualScanAccess}}
-    @disabled={{this.requestManualScanAccess.isRunning}}
-  />
-</div>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/manual-scan/index.ts b/app/components/file-details/scan-actions-old/manual-scan/index.ts
deleted file mode 100644
index 84da02a705..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/index.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import IntlService from 'ember-intl/services/intl';
-import Store from '@ember-data/store';
-import { isEmpty } from '@ember/utils';
-
-import triggerAnalytics from 'irene/utils/trigger-analytics';
-import ENV from 'irene/config/environment';
-import FileModel from 'irene/models/file';
-import OrganizationService from 'irene/services/organization';
-import ManualscanModel from 'irene/models/manualscan';
-import ENUMS from 'irene/enums';
-
-export interface FileDetailsScanActionsOldManualScanSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsScanActionsOldManualScanComponent extends Component<FileDetailsScanActionsOldManualScanSignature> {
-  @service declare intl: IntlService;
-  @service declare organization: OrganizationService;
-  @service declare ajax: any;
-  @service declare store: Store;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked showManualScanModal = false;
-  @tracked showManualScanRequestAccessModal = false;
-  @tracked manualscan: ManualscanModel | null = null;
-
-  constructor(
-    owner: unknown,
-    args: FileDetailsScanActionsOldManualScanSignature['Args']
-  ) {
-    super(owner, args);
-
-    this.fetchManualScan.perform();
-  }
-
-  get manualScanFormSections() {
-    return [
-      {
-        id: 'basic-info',
-        summaryText: this.intl.t('modalCard.manual.basicAppInfo'),
-        contentComponent:
-          'file-details/scan-actions/manual-scan/basic-info' as const,
-      },
-      {
-        id: 'login-details',
-        summaryText: this.intl.t('modalCard.manual.loginDetails'),
-        contentComponent:
-          'file-details/scan-actions/manual-scan/login-details' as const,
-      },
-      {
-        id: 'vpn-details',
-        summaryText: this.intl.t('modalCard.manual.vpnDetails'),
-        contentComponent:
-          'file-details/scan-actions/manual-scan/vpn-details' as const,
-      },
-    ];
-  }
-
-  get manualScanStatusLabels() {
-    return {
-      [ENUMS.MANUAL.NONE]: this.intl.t('notStarted'),
-      [ENUMS.MANUAL.REQUESTED]: this.intl.t('requested'),
-      [ENUMS.MANUAL.ASSESSING]: this.intl.t('inProgress'),
-      [ENUMS.MANUAL.DONE]: this.intl.t('completed'),
-    };
-  }
-
-  get manualScanStatusText() {
-    if (this.args.file.isManualDone) {
-      return this.manualScanStatusLabels[ENUMS.MANUAL.DONE];
-    } else if (this.args.file.manual == 3 && !this.args.file.isManualDone) {
-      return this.manualScanStatusLabels[ENUMS.MANUAL.ASSESSING];
-    } else {
-      return this.manualScanStatusLabels[this.args.file.manual];
-    }
-  }
-
-  @action
-  handleManualScanRequestAccessModalOpen() {
-    this.showManualScanRequestAccessModal = true;
-  }
-
-  @action
-  handleManualScanModalOpen() {
-    triggerAnalytics(
-      'feature',
-      ENV.csb['manualScanBtnClick'] as CsbAnalyticsFeatureData
-    );
-
-    this.showManualScanModal = true;
-  }
-
-  @action
-  handleManualScanModalClose() {
-    this.showManualScanModal = false;
-  }
-
-  fetchManualScan = task(async () => {
-    this.manualscan = await this.store.findRecord(
-      'manualscan',
-      this.args.file.id
-    );
-  });
-
-  saveManualScanForm = task(async () => {
-    const appName = this.args.file.name;
-    const appEnv = this.manualscan?.filteredAppEnv;
-    const appAction = this.manualscan?.filteredAppAction;
-    const minOsVersion = this.manualscan?.minOsVersion;
-
-    const contactName = this.manualscan?.contact.name;
-    const contactEmail = this.manualscan?.contact.email;
-
-    const contact = {
-      name: contactName,
-      email: contactEmail,
-    };
-
-    const tPleaseEnterUserRoles = this.intl.t(
-      'modalCard.manual.pleaseEnterUserRoles'
-    );
-
-    const loginRequired = this.manualscan?.loginRequired;
-    const userRoles = this.manualscan?.userRoles;
-
-    if (loginRequired) {
-      if (isEmpty(userRoles)) {
-        return this.notify.error(tPleaseEnterUserRoles);
-      }
-    }
-
-    if (userRoles) {
-      userRoles.forEach((userRole) => {
-        delete userRole.id;
-      });
-    }
-
-    const tPleaseEnterVPNDetails = this.intl.t(
-      'modalCard.manual.pleaseEnterVPNDetails'
-    );
-
-    const vpnRequired = this.manualscan?.vpnRequired;
-
-    const vpnAddress = this.manualscan?.vpnDetails?.address;
-    const vpnPort = this.manualscan?.vpnDetails?.port;
-
-    if (vpnRequired) {
-      for (const inputValue of [vpnAddress, vpnPort]) {
-        if (isEmpty(inputValue)) {
-          return this.notify.error(tPleaseEnterVPNDetails);
-        }
-      }
-    }
-
-    const vpnUsername = this.manualscan?.vpnDetails.username;
-    const vpnPassword = this.manualscan?.vpnDetails.password;
-
-    const vpnDetails = {
-      address: vpnAddress,
-      port: vpnPort,
-      username: vpnUsername,
-      password: vpnPassword,
-    };
-
-    const additionalComments = this.manualscan?.additionalComments;
-
-    const data = {
-      app_name: appName,
-      app_env: appEnv,
-      min_os_version: minOsVersion,
-      app_action: appAction,
-      login_required: loginRequired,
-      user_roles: userRoles,
-      vpn_required: vpnRequired,
-      vpn_details: vpnDetails,
-      contact,
-      additional_comments: additionalComments,
-    };
-
-    const tManualRequested = this.intl.t('manualRequested');
-
-    const url = [ENV.endpoints['manualscans'], this.args.file.id].join('/');
-
-    try {
-      await this.ajax.put(url, {
-        data: JSON.stringify(data),
-        contentType: 'application/json',
-      });
-
-      triggerAnalytics(
-        'feature',
-        ENV.csb['requestManualScan'] as CsbAnalyticsFeatureData
-      );
-
-      this.notify.info(tManualRequested);
-
-      if (!this.isDestroyed) {
-        await this.args.file.reload();
-        this.handleManualScanModalClose();
-      }
-    } catch (error) {
-      const e = error as AdapterError;
-      this.notify.error(e.payload.error);
-    }
-  });
-
-  requestManualScanAccess = task(async () => {
-    try {
-      const url = [
-        ENV.endpoints['organizations'],
-        this.organization.selected?.id,
-        ENV.endpoints['requestAccess'],
-      ].join('/');
-
-      await this.ajax.post(url);
-      await this.args.file.reload();
-
-      this.notify.success(this.intl.t('accessRequested'));
-
-      this.showManualScanRequestAccessModal = false;
-    } catch (error) {
-      const err = error as AdapterError;
-      let errMsg = this.intl.t('pleaseTryAgain');
-
-      if (err.errors && err.errors.length) {
-        errMsg = err.errors[0]?.detail || errMsg;
-      } else if (err.message) {
-        errMsg = err.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ManualScan': typeof FileDetailsScanActionsOldManualScanComponent;
-    'file-details/scan-actions-old/manual-scan': typeof FileDetailsScanActionsOldManualScanComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.hbs b/app/components/file-details/scan-actions-old/manual-scan/login-details/index.hbs
deleted file mode 100644
index 8d0ee1b9f0..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='login-details-group'>
-    <AkTypography
-      data-test-manualScanLoginDetails-loginRequiredLabel
-      local-class='login-details-label'
-    >
-      {{t 'modalCard.manual.loginRequired'}}
-    </AkTypography>
-
-    <div local-class='login-details-input-container'>
-      <AkSelect
-        data-test-manualScanLoginDetails-loginRequiredSelect
-        @options={{this.loginStatuses}}
-        @selected={{@manualscan.loginStatus}}
-        @onChange={{this.handleLoginStatusChange}}
-        as |status|
-      >
-        {{t status}}
-      </AkSelect>
-    </div>
-  </div>
-
-  {{#if @manualscan.loginRequired}}
-    <div data-test-manualScanLoginDetails-userRoleDetailsContainer class='mt-2'>
-      <AkTypography data-test-manualScanLoginDetails-detailsLabel>
-        {{t 'modalCard.manual.enterLoginDetails' htmlSafe=true}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanLoginDetails-roleInput
-          @placeholder={{t 'role'}}
-          @value={{this.role}}
-        />
-
-        <AkTextField
-          data-test-manualScanLoginDetails-usernameInput
-          @placeholder={{t 'username'}}
-          @value={{this.username}}
-        />
-
-        <AkTextField
-          data-test-manualScanLoginDetails-passwordInput
-          @type='password'
-          @placeholder={{t 'password'}}
-          @value={{this.password}}
-        />
-      </AkStack>
-
-      <AkButton
-        data-test-manualScanLoginDetails-addRoleBtn
-        @variant='outlined'
-        {{on 'click' this.addUserRole}}
-      >
-        <:leftIcon>
-          <AkIcon @iconName='add' />
-        </:leftIcon>
-
-        <:default>{{t 'modalCard.manual.addUserRole'}}</:default>
-      </AkButton>
-
-      {{#if this.hasUserRole}}
-        <div class='mt-2'>
-          <AkTable
-            data-test-manualScanLoginDetails-userRole-table
-            @dense={{true}}
-            as |t|
-          >
-            <t.head
-              data-test-manualScanLoginDetails-userRole-thead
-              @columns={{this.columns}}
-            />
-            <t.body @rows={{this.allUserRoles}} as |b|>
-              <b.row data-test-manualScanLoginDetails-userRole-row as |r|>
-                <r.cell
-                  data-test-manualScanLoginDetails-userRole-cell
-                  as |value|
-                >
-                  {{#if r.columnValue.component}}
-                    {{#let (component r.columnValue.component) as |Component|}}
-                      <Component
-                        @onDeleteClick={{fn
-                          this.handleDeleteUserRoleConfirmBoxOpen
-                          r.rowValue
-                        }}
-                      />
-                    {{/let}}
-                  {{else}}
-                    <AkTypography title={{value}} @noWrap={{true}}>
-                      {{value}}
-                    </AkTypography>
-                  {{/if}}
-                </r.cell>
-              </b.row>
-            </t.body>
-          </AkTable>
-        </div>
-      {{/if}}
-    </div>
-  {{/if}}
-
-  <ConfirmBox
-    @isActive={{this.showRemoveRoleConfirmBox}}
-    @description={{t 'confirmBox.removeUserRole'}}
-    @confirmText={{t 'delete'}}
-    @confirmAction={{this.handleDeleteUserRole}}
-    @cancelAction={{this.handleDeleteUserRoleConfirmBoxClose}}
-    @blurOverlay={{true}}
-  />
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.scss b/app/components/file-details/scan-actions-old/manual-scan/login-details/index.scss
deleted file mode 100644
index 48adac1d89..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.login-details-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .login-details-label {
-    flex: 1;
-  }
-
-  .login-details-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.ts b/app/components/file-details/scan-actions-old/manual-scan/login-details/index.ts
deleted file mode 100644
index 0e2ef64d56..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/login-details/index.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { isEmpty } from '@ember/utils';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import IntlService from 'ember-intl/services/intl';
-import FileModel from 'irene/models/file';
-import ManualscanModel, { UserRole } from 'irene/models/manualscan';
-
-export interface FileDetailsScanActionsOldManualScanLoginDetailsSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsOldManualScanLoginDetailsComponent extends Component<FileDetailsScanActionsOldManualScanLoginDetailsSignature> {
-  @service declare intl: IntlService;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked role = '';
-  @tracked username = '';
-  @tracked password = '';
-  @tracked showRemoveRoleConfirmBox = false;
-  @tracked selectedUserRole: UserRole | null = null;
-
-  get loginStatuses() {
-    return ['yes', 'no'];
-  }
-
-  get columns() {
-    return [
-      { name: this.intl.t('username'), valuePath: 'username' },
-      { name: this.intl.t('role'), valuePath: 'role' },
-      { name: this.intl.t('password'), valuePath: 'password' },
-      {
-        name: this.intl.t('action'),
-        component:
-          'file-details/scan-actions/manual-scan/login-details/user-role-action' as const,
-        textAlign: 'center',
-      },
-    ];
-  }
-
-  get allUserRoles() {
-    return (
-      this.args.manualscan?.userRoles.map((role, i) => {
-        role.id = i + 1;
-        return role;
-      }) || []
-    );
-  }
-
-  get hasUserRole() {
-    return this.allUserRoles.length > 0;
-  }
-
-  @action
-  handleDeleteUserRoleConfirmBoxOpen(role: UserRole) {
-    this.showRemoveRoleConfirmBox = true;
-    this.selectedUserRole = role;
-  }
-
-  @action
-  handleDeleteUserRoleConfirmBoxClose() {
-    this.showRemoveRoleConfirmBox = false;
-    this.selectedUserRole = null;
-  }
-
-  @action
-  handleDeleteUserRole() {
-    this.args.manualscan?.set(
-      'userRoles',
-      this.allUserRoles.filter((it) => it.id !== this.selectedUserRole?.id)
-    );
-
-    this.handleDeleteUserRoleConfirmBoxClose();
-  }
-
-  @action
-  handleLoginStatusChange(status: string) {
-    this.args.manualscan?.set('loginRequired', status === 'yes');
-  }
-
-  @action
-  addUserRole() {
-    const tRoleAdded = this.intl.t('tRoleAdded');
-    const tPleaseEnterAllValues = this.intl.t('tPleaseEnterAllValues');
-
-    for (const inputValue of [this.role, this.username, this.password]) {
-      if (isEmpty(inputValue)) {
-        return this.notify.error(tPleaseEnterAllValues);
-      }
-    }
-
-    const userRoles = this.args.manualscan?.userRoles || [];
-
-    const userRole = {
-      id: userRoles.length + 1,
-      role: this.role,
-      username: this.username,
-      password: this.password,
-    };
-
-    userRoles.addObject(userRole);
-
-    this.args.manualscan?.set('userRoles', userRoles);
-
-    this.notify.success(tRoleAdded);
-
-    this.role = '';
-    this.username = '';
-    this.password = '';
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ManualScan::LoginDetails': typeof FileDetailsScanActionsOldManualScanLoginDetailsComponent;
-    'file-details/scan-actions-old/manual-scan/login-details': typeof FileDetailsScanActionsOldManualScanLoginDetailsComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.hbs b/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.hbs
deleted file mode 100644
index 5c4342ef8c..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<AkIconButton
-  data-test-manualScanLoginDetails-userRole-deleteBtn
-  @size='small'
-  {{on 'click' @onDeleteClick}}
->
-  <AkIcon @iconName='delete' />
-</AkIconButton>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.ts b/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.ts
deleted file mode 100644
index 948b5ac968..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/login-details/user-role-action/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Component from '@glimmer/component';
-
-export interface FileDetailsScanActionsOldManualScanLoginDetailsUserRoleActionSignature {
-  Args: {
-    onDeleteClick: () => void;
-  };
-}
-
-export default class FileDetailsScanActionsOldManualScanLoginDetailsUserRoleActionComponent extends Component<FileDetailsScanActionsOldManualScanLoginDetailsUserRoleActionSignature> {}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'file-details/scan-actions-old/manual-scan/login-details/user-role-action': typeof FileDetailsScanActionsOldManualScanLoginDetailsUserRoleActionComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.hbs b/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.hbs
deleted file mode 100644
index caa4029faf..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.hbs
+++ /dev/null
@@ -1,65 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='vpn-details-group'>
-    <AkTypography
-      data-test-manualScanVpnDetails-vpnRequiredLabel
-      local-class='vpn-details-label'
-    >
-      {{t 'modalCard.manual.vpnRequired'}}
-    </AkTypography>
-
-    <div local-class='vpn-details-input-container'>
-      <AkSelect
-        data-test-manualScanVpnDetails-vpnRequiredSelect
-        @options={{this.vpnStatuses}}
-        @selected={{@manualscan.vpnStatus}}
-        @onChange={{this.handleVpnStatusChange}}
-        as |status|
-      >
-        {{t status}}
-      </AkSelect>
-    </div>
-  </div>
-
-  {{#if @manualscan.vpnRequired}}
-    <div data-test-manualScanVpnDetails-detailsContainer class='mt-2'>
-      <AkTypography data-test-manualScanVpnDetails-detailsLabel>
-        {{t 'modalCard.manual.enterVPNDetails'}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanVpnDetails-vpnAddressInput
-          @placeholder={{t 'modalCard.manual.vpnAddress'}}
-          @value={{@manualscan.vpnDetails.address}}
-        />
-
-        <AkTextField
-          data-test-manualScanVpnDetails-vpnPortInput
-          @placeholder={{t 'modalCard.manual.vpnPort'}}
-          @value={{@manualscan.vpnDetails.port}}
-        />
-      </AkStack>
-    </div>
-
-    <div>
-      <AkTypography data-test-manualScanVpnDetails-credentialsLabel>
-        {{t 'modalCard.manual.enterCredentails'}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanVpnDetails-usernameInput
-          @placeholder={{t 'username'}}
-          @value={{@manualscan.vpnDetails.username}}
-        />
-
-        <AkTextField
-          data-test-manualScanVpnDetails-passwordInput
-          @type='password'
-          @placeholder={{t 'password'}}
-          @value={{@manualscan.vpnDetails.password}}
-        />
-      </AkStack>
-    </div>
-  {{/if}}
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.scss b/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.scss
deleted file mode 100644
index d827b7e8fa..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.vpn-details-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .vpn-details-label {
-    flex: 1;
-  }
-
-  .vpn-details-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.ts b/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.ts
deleted file mode 100644
index 12661fc307..0000000000
--- a/app/components/file-details/scan-actions-old/manual-scan/vpn-details/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { action } from '@ember/object';
-import Component from '@glimmer/component';
-import FileModel from 'irene/models/file';
-import ManualscanModel from 'irene/models/manualscan';
-
-export interface FileDetailsScanActionsOldManualScanVpnDetailsSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsOldManualScanVpnDetailsComponent extends Component<FileDetailsScanActionsOldManualScanVpnDetailsSignature> {
-  get vpnStatuses() {
-    return ['yes', 'no'];
-  }
-
-  @action
-  handleVpnStatusChange(status: string) {
-    this.args.manualscan?.set('vpnRequired', status === 'yes');
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::ManualScan::VpnDetails': typeof FileDetailsScanActionsOldManualScanVpnDetailsComponent;
-    'file-details/scan-actions-old/manual-scan/vpn-details': typeof FileDetailsScanActionsOldManualScanVpnDetailsComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions-old/static-scan/index.hbs b/app/components/file-details/scan-actions-old/static-scan/index.hbs
deleted file mode 100644
index abc2f09d05..0000000000
--- a/app/components/file-details/scan-actions-old/static-scan/index.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-<div>
-  {{#if @file.isStaticCompleted}}
-    <AkStack @alignItems='stretch' @spacing='1.5'>
-      <AkButton
-        data-test-fileDetailScanActions-staticScanCompletedStatus
-        {{style pointerEvents='none'}}
-      >
-        <:leftIcon>
-          <AkIcon @iconName='done' />
-        </:leftIcon>
-
-        <:default>{{t 'completed'}}</:default>
-      </AkButton>
-
-      <AkIconButton
-        {{style padding='0.5em'}}
-        {{on 'click' this.handleRescanModalOpen}}
-        @variant='outlined'
-        @borderColor='primary'
-        data-test-fileDetailScanActions-staticScanRestartBtn
-      >
-        <AkIcon @iconName='refresh' @color='primary' />
-      </AkIconButton>
-    </AkStack>
-  {{else}}
-    <AkButton
-      data-test-fileDetailScanActions-staticScanInProgressStatus
-      @variant='outlined'
-      @disabled={{true}}
-    >
-      {{t 'scanning'}}
-      :
-      {{@file.staticScanProgress}}%
-    </AkButton>
-  {{/if}}
-
-  {{#if @file.isStaticCompleted}}
-    <ConfirmBox
-      @isActive={{this.showRescanModal}}
-      @title={{t 'modalCard.rescan.title'}}
-      @description={{t 'modalCard.rescan.description'}}
-      @confirmText={{t 'yes'}}
-      @cancelText={{t 'no'}}
-      @confirmAction={{perform this.handleRescanApp}}
-      @disabled={{this.handleRescanApp.isRunning}}
-    />
-  {{/if}}
-</div>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions-old/static-scan/index.ts b/app/components/file-details/scan-actions-old/static-scan/index.ts
deleted file mode 100644
index b2573f59ef..0000000000
--- a/app/components/file-details/scan-actions-old/static-scan/index.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import IntlService from 'ember-intl/services/intl';
-
-import ENV from 'irene/config/environment';
-import FileModel from 'irene/models/file';
-
-export interface FileDetailsScanActionsOldStaticScanSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsScanActionsOldStaticScanComponent extends Component<FileDetailsScanActionsOldStaticScanSignature> {
-  @service declare intl: IntlService;
-  @service declare ajax: any;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked showRescanModal = false;
-
-  get tRescanInitiated() {
-    return this.intl.t('rescanInitiated');
-  }
-
-  @action
-  handleRescanModalOpen() {
-    this.showRescanModal = true;
-  }
-
-  handleRescanApp = task(async () => {
-    try {
-      const data = {
-        file_id: this.args.file.id,
-      };
-
-      await this.ajax.post(ENV.endpoints['rescan'] ?? '', {
-        data,
-      });
-
-      this.notify.info(this.tRescanInitiated);
-
-      if (!this.isDestroyed) {
-        this.showRescanModal = false;
-      }
-    } catch (error) {
-      this.notify.error((error as AjaxError).payload.detail);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActionsOld::StaticScan': typeof FileDetailsScanActionsOldStaticScanComponent;
-    'file-details/scan-actions-old/static-scan': typeof FileDetailsScanActionsOldStaticScanComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/index.hbs b/app/components/file-details/scan-actions/api-scan/captured-apis/index.hbs
deleted file mode 100644
index 5a3799ca72..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/index.hbs
+++ /dev/null
@@ -1,88 +0,0 @@
-<AkPaginationProvider
-  @results={{this.capturedApiList}}
-  @onItemPerPageChange={{this.handleItemPerPageChange}}
-  @totalItems={{this.totalCapturedApiCount}}
-  @nextAction={{this.handlePrevNextAction}}
-  @prevAction={{this.handlePrevNextAction}}
-  @itemPerPageOptions={{array 5 10 20}}
-  @defaultLimit={{this.limit}}
-  @offset={{this.offset}}
-  as |pgc|
->
-  {{#if this.fetchCapturedApis.isRunning}}
-    <AkStack
-      local-class='loading-container'
-      @alignItems='center'
-      @justifyContent='center'
-    >
-      <AkStack @alignItems='center' @justifyContent='center' @spacing='1.5'>
-        <AkLoader @size={{16}} />
-        <AkTypography @color='textSecondary'>
-          {{t 'loading'}}...
-        </AkTypography>
-      </AkStack>
-    </AkStack>
-  {{else if this.hasNoCapturedApi}}
-    <AkStack @spacing='1.5'>
-      <AkIcon @iconName='info' />
-
-      <div>
-        <AkTypography
-          @variant='h6'
-          @gutterBottom={{true}}
-          data-test-capturedApi-emptyTitle
-        >
-          {{t 'capturedApiEmptyTitle'}}
-        </AkTypography>
-
-        <AkTypography data-test-capturedApi-emptyDescription>
-          {{t 'capturedApiEmptyDesc' htmlSafe=true}}
-        </AkTypography>
-      </div>
-    </AkStack>
-  {{else}}
-    <div class='mb-1' local-class='bordered-box'>
-      <AkStack @alignItems='center' @justifyContent='space-between'>
-        <AkTypography data-test-capturedApi-title @variant='subtitle1'>
-          {{t 'capturedApiTitle'}}
-        </AkTypography>
-
-        {{#if this.totalCapturedApiCount}}
-          <AkTypography
-            data-test-capturedApi-apiCount
-            @variant='body2'
-            @color='textSecondary'
-          >
-            {{t 'selected'}}
-            ({{this.selectedCount}}/{{this.totalCapturedApiCount}})
-          </AkTypography>
-        {{/if}}
-      </AkStack>
-
-      <AkStack class='mt-2' @direction='column' @spacing='1.5'>
-        {{#each pgc.currentPageResults as |ca|}}
-          <FileDetails::ScanActions::ApiScan::CapturedApis::Overview
-            @capturedApi={{ca}}
-            @toggleApi={{perform this.toggleApi ca}}
-          />
-        {{/each}}
-      </AkStack>
-    </div>
-
-    <AkPagination
-      @variant='compact'
-      @disableNext={{pgc.disableNext}}
-      @nextAction={{pgc.nextAction}}
-      @disablePrev={{pgc.disablePrev}}
-      @prevAction={{pgc.prevAction}}
-      @endItemIdx={{pgc.endItemIdx}}
-      @startItemIdx={{pgc.startItemIdx}}
-      @itemPerPageOptions={{pgc.itemPerPageOptions}}
-      @onItemPerPageChange={{pgc.onItemPerPageChange}}
-      @selectedOption={{pgc.selectedOption}}
-      @tableItemLabel={{t 'apis'}}
-      @perPageTranslation={{t 'recordPerPage'}}
-      @totalItems={{pgc.totalItems}}
-    />
-  {{/if}}
-</AkPaginationProvider>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/index.scss b/app/components/file-details/scan-actions/api-scan/captured-apis/index.scss
deleted file mode 100644
index 4b2ffae709..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.bordered-box {
-  padding: 1.25em;
-  border: 1px solid
-    var(--file-details-scan-actions-api-scan-captured-apis-border-color);
-  box-sizing: border-box;
-}
-
-.loading-container {
-  padding: 1.5em;
-  height: 150px;
-  border-radius: var(
-    --file-details-scan-actions-api-scan-captured-apis-border-radius
-  );
-  border: 1px solid
-    var(--file-details-scan-actions-api-scan-captured-apis-border-color);
-  box-sizing: border-box;
-}
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/index.ts b/app/components/file-details/scan-actions/api-scan/captured-apis/index.ts
deleted file mode 100644
index e32d4086f6..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/index.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import FileModel from 'irene/models/file';
-import IntlService from 'ember-intl/services/intl';
-import Store from '@ember-data/store';
-import CapturedApiModel from 'irene/models/capturedapi';
-import ENV from 'irene/config/environment';
-
-// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
-import { DS } from 'ember-data';
-import { PaginationProviderActionsArgs } from 'irene/components/ak-pagination-provider';
-import { action } from '@ember/object';
-
-export interface FileDetailsScanActionsApiScanCapturedApisSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-type CapturedApiQueryResponse =
-  DS.AdapterPopulatedRecordArray<CapturedApiModel> & {
-    meta: { count: number };
-  };
-
-export default class FileDetailsScanActionsApiScanCapturedApisComponent extends Component<FileDetailsScanActionsApiScanCapturedApisSignature> {
-  @service declare intl: IntlService;
-  @service declare ajax: any;
-  @service declare store: Store;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked selectedCount = 0;
-  @tracked capturedApiResponse: CapturedApiQueryResponse | null = null;
-  @tracked limit = 5;
-  @tracked offset = 0;
-
-  constructor(
-    owner: unknown,
-    args: FileDetailsScanActionsApiScanCapturedApisSignature['Args']
-  ) {
-    super(owner, args);
-
-    this.setSelectedCount.perform();
-    this.fetchCapturedApis.perform(this.limit, this.offset);
-  }
-
-  get capturedApiList() {
-    return this.capturedApiResponse?.toArray() || [];
-  }
-
-  get totalCapturedApiCount() {
-    return this.capturedApiResponse?.meta?.count || 0;
-  }
-
-  get hasNoCapturedApi() {
-    return this.totalCapturedApiCount === 0;
-  }
-
-  @action
-  handlePrevNextAction({ limit, offset }: PaginationProviderActionsArgs) {
-    this.limit = limit;
-    this.offset = offset;
-
-    this.fetchCapturedApis.perform(limit, offset);
-  }
-
-  @action
-  handleItemPerPageChange({ limit }: PaginationProviderActionsArgs) {
-    this.offset = 0;
-
-    this.fetchCapturedApis.perform(limit, this.offset);
-  }
-
-  getSelectedApis = task(async () => {
-    const url = [
-      ENV.endpoints['files'],
-      this.args.file.id,
-      'capturedapis',
-    ].join('/');
-
-    const data = { fileId: this.args.file.id, is_active: true };
-
-    return await this.ajax.request(url, { namespace: ENV.namespace_v2, data });
-  });
-
-  setSelectedCount = task(async () => {
-    try {
-      const selectedApis = await this.getSelectedApis.perform();
-
-      this.selectedCount = selectedApis.count;
-    } catch (error) {
-      const err = error as AdapterError;
-      this.notify.error(err.toString());
-    }
-  });
-
-  toggleApi = task(async (capturedApi: CapturedApiModel) => {
-    try {
-      capturedApi.set('isActive', !capturedApi.isActive);
-
-      await capturedApi.save();
-
-      this.notify.success(this.intl.t('capturedApiSaveSuccessMsg'));
-
-      this.setSelectedCount.perform();
-    } catch (err) {
-      const error = err as AdapterError;
-      let errMsg = this.intl.t('tPleaseTryAgain');
-
-      if (error.errors && error.errors.length) {
-        errMsg = error.errors[0]?.detail || errMsg;
-      } else if (error.message) {
-        errMsg = error.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-
-  fetchCapturedApis = task(async (limit: number, offset: number) => {
-    try {
-      this.capturedApiResponse = (await this.store.query('capturedapi', {
-        limit,
-        offset,
-        fileId: this.args.file.id,
-      })) as CapturedApiQueryResponse;
-    } catch (error) {
-      const err = error as AdapterError;
-      this.notify.error(err.toString());
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActions::ApiScan::CapturedApis': typeof FileDetailsScanActionsApiScanCapturedApisComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.hbs b/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.hbs
deleted file mode 100644
index 7b5e5ee028..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<AkStack data-test-capturedApi-endpointContainer @spacing='1' @tag='label'>
-  <AkCheckbox
-    @checked={{@capturedApi.isActive}}
-    @onChange={{perform this.handleToggleApi}}
-    @disabled={{this.handleToggleApi.isRunning}}
-    data-test-capturedApi-endpointSelectCheckbox
-  />
-
-  <AkStack local-class='api-endpoint-container' @spacing='1.5'>
-    <AkChip
-      data-test-capturedApi-endpointMethodChip
-      @label={{@capturedApi.request.method}}
-      @size='small'
-    />
-
-    <AkTypography local-class='api-endpoint' data-test-capturedApi-endpointUrl>
-      {{request-to-url @capturedApi.request}}
-
-      {{#if this.handleToggleApi.isRunning}}
-        <AkLoader class='mx-1' @size={{13}} />
-      {{/if}}
-    </AkTypography>
-  </AkStack>
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.scss b/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.scss
deleted file mode 100644
index ec7b5e5d52..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.api-endpoint-container {
-  margin-top: 0.4em;
-
-  .api-endpoint {
-    word-break: break-all;
-    white-space: normal;
-  }
-}
diff --git a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.ts b/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.ts
deleted file mode 100644
index 722bc0c60a..0000000000
--- a/app/components/file-details/scan-actions/api-scan/captured-apis/overview/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import Component from '@glimmer/component';
-import { task } from 'ember-concurrency';
-import CapturedApiModel from 'irene/models/capturedapi';
-
-export interface FileDetailsScanActionsApiScanCapturedApiOverviewSignature {
-  Args: {
-    capturedApi: CapturedApiModel;
-    toggleApi: () => Promise<void>;
-  };
-}
-
-export default class FileDetailsScanActionsApiScanCapturedApiOverviewComponent extends Component<FileDetailsScanActionsApiScanCapturedApiOverviewSignature> {
-  handleToggleApi = task(async () => {
-    await this.args.toggleApi();
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActions::ApiScan::CapturedApis::Overview': typeof FileDetailsScanActionsApiScanCapturedApiOverviewComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/api-scan/index.hbs b/app/components/file-details/scan-actions/api-scan/index.hbs
index 4e42e0b729..36c543e8be 100644
--- a/app/components/file-details/scan-actions/api-scan/index.hbs
+++ b/app/components/file-details/scan-actions/api-scan/index.hbs
@@ -48,8 +48,11 @@
   @color='primary'
   @underline='always'
   @fontWeight='bold'
+  @route='authenticated.dashboard.file.api-scan'
+  @model={{@file.id}}
   class='px-2 py-1'
   local-class='view-details-icon'
+  data-test-fileDetailScanActions-apiScanViewDetails
 >
   <:default>
     {{t 'viewDetails'}}
diff --git a/app/components/file-details/scan-actions/dynamic-scan/index.hbs b/app/components/file-details/scan-actions/dynamic-scan/index.hbs
index fe395a8e68..c6bc33b6ac 100644
--- a/app/components/file-details/scan-actions/dynamic-scan/index.hbs
+++ b/app/components/file-details/scan-actions/dynamic-scan/index.hbs
@@ -8,12 +8,9 @@
     {{t 'dast'}}
   </AkTypography>
 
-  <AkChip
-    @label={{this.chipStatusText}}
-    @color={{if @file.isDynamicDone 'success' 'default'}}
-    @variant='semi-filled'
-    @size='small'
-    local-class='chips-uppercase'
+  <FileDetails::DynamicScan::StatusChip
+    @file={{@file}}
+    @chipStatusText={{this.chipStatusText}}
     data-test-fileDetailScanActions-dynamicScanStatus
   />
 </AkStack>
@@ -24,8 +21,11 @@
   @color='primary'
   @underline='always'
   @fontWeight='bold'
+  @route='authenticated.dashboard.file.dynamic-scan.manual'
+  @model={{@file.id}}
   class='px-2 py-1'
   local-class='view-details-icon'
+  data-test-fileDetailScanActions-dynamicScanViewDetails
 >
   <:default>
     {{t 'viewDetails'}}
diff --git a/app/components/file-details/scan-actions/dynamic-scan/index.scss b/app/components/file-details/scan-actions/dynamic-scan/index.scss
index a892fd3d97..ec1c357a5e 100644
--- a/app/components/file-details/scan-actions/dynamic-scan/index.scss
+++ b/app/components/file-details/scan-actions/dynamic-scan/index.scss
@@ -3,7 +3,3 @@
     font-size: 1.5rem !important;
   }
 }
-
-.chips-uppercase {
-  text-transform: uppercase;
-}
diff --git a/app/components/file-details/scan-actions/dynamic-scan/index.ts b/app/components/file-details/scan-actions/dynamic-scan/index.ts
index c7643ad7f5..941fef9b08 100644
--- a/app/components/file-details/scan-actions/dynamic-scan/index.ts
+++ b/app/components/file-details/scan-actions/dynamic-scan/index.ts
@@ -1,8 +1,8 @@
 import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
-import IntlService from 'ember-intl/services/intl';
+import type IntlService from 'ember-intl/services/intl';
 
-import FileModel from 'irene/models/file';
+import type FileModel from 'irene/models/file';
 
 export interface FileDetailsScanActionsDynamicScanSignature {
   Args: {
@@ -16,6 +16,8 @@ export default class FileDetailsScanActionsDynamicScanComponent extends Componen
   get chipStatusText() {
     if (this.args.file.isDynamicStatusNeitherNoneNorReadyNorError) {
       return this.args.file.statusText;
+    } else if (this.args.file.isDynamicStatusInProgress) {
+      return this.intl.t('inProgress');
     } else if (this.args.file.isDynamicDone) {
       return this.intl.t('completed');
     } else {
diff --git a/app/components/file-details/scan-actions/index.scss b/app/components/file-details/scan-actions/index.scss
index dfebcf006a..ac6a79f3bd 100644
--- a/app/components/file-details/scan-actions/index.scss
+++ b/app/components/file-details/scan-actions/index.scss
@@ -1,5 +1,7 @@
 .scan-status-card {
   border: 1px solid var(--file-details-scan-actions-border-color);
   background-color: var(--file-details-scan-actions-background-color);
-  width: 240px;
+  min-width: 240px;
+  max-width: 360px;
+  flex: 1;
 }
diff --git a/app/components/file-details/scan-actions/manual-scan/basic-info/index.hbs b/app/components/file-details/scan-actions/manual-scan/basic-info/index.hbs
deleted file mode 100644
index 5fca30eb5b..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/basic-info/index.hbs
+++ /dev/null
@@ -1,91 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-appEnvLabel
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.appEnv'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkSelect
-        data-test-manualScanBasicInfo-appEnvSelect
-        @options={{this.environments}}
-        @selected={{this.selectedAppEnvironment}}
-        @onChange={{this.selectAppEnvironment}}
-        as |aks|
-      >
-        {{t (app-environment aks.value)}}
-      </AkSelect>
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-minOSVersionLabel
-      local-class='basic-info-label'
-    >
-      {{t 'minOSVersion'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkTextField
-        data-test-manualScanBasicInfo-minOSVersionInput
-        @placeholder={{t 'minOSVersion'}}
-        @value={{@manualscan.minOsVersion}}
-      />
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-appQuestion1Label
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.appQuestion1'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkSelect
-        data-test-manualScanBasicInfo-appQuestion1Select
-        @options={{this.appActions}}
-        @selected={{this.selectedAppAction}}
-        @onChange={{this.handleAppActionChange}}
-        @helperText={{if
-          @manualscan.showProceedText
-          (t 'modalCard.manual.appQuestion1Answer1')
-          (if
-            @manualscan.showHaltText (t 'modalCard.manual.appQuestion1Answer2')
-          )
-        }}
-        as |aks|
-      >
-        {{t (app-action aks.value)}}
-      </AkSelect>
-    </div>
-  </div>
-
-  <div local-class='basic-info-group'>
-    <AkTypography
-      data-test-manualScanBasicInfo-pocLabel
-      local-class='basic-info-label'
-    >
-      {{t 'modalCard.manual.poc'}}
-    </AkTypography>
-
-    <div local-class='basic-info-input-container'>
-      <AkTextField
-        data-test-manualScanBasicInfo-pocNameInput
-        @placeholder={{t 'name'}}
-        @value={{@manualscan.contact.name}}
-      />
-
-      <AkTextField
-        data-test-manualScanBasicInfo-pocEmailInput
-        @formControlClass='mt-2'
-        @placeholder={{t 'email'}}
-        @value={{@manualscan.contact.email}}
-      />
-    </div>
-  </div>
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/manual-scan/basic-info/index.scss b/app/components/file-details/scan-actions/manual-scan/basic-info/index.scss
deleted file mode 100644
index 1bada3b3a6..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/basic-info/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.basic-info-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .basic-info-label {
-    flex: 1;
-  }
-
-  .basic-info-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/basic-info/index.ts b/app/components/file-details/scan-actions/manual-scan/basic-info/index.ts
deleted file mode 100644
index 4aded05093..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/basic-info/index.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import Component from '@glimmer/component';
-import FileModel from 'irene/models/file';
-import ENUMS from 'irene/enums';
-import ManualscanModel from 'irene/models/manualscan';
-import { action } from '@ember/object';
-
-export interface FileDetailsScanActionsManualScanBasicInfoSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsManualScanBasicInfoComponent extends Component<FileDetailsScanActionsManualScanBasicInfoSignature> {
-  get environments() {
-    return ENUMS.APP_ENV.CHOICES.slice(0, -1);
-  }
-
-  get selectedAppEnvironment() {
-    return this.environments.find(
-      (it) => it.value === this.args.manualscan?.filteredAppEnv
-    );
-  }
-
-  get appActions() {
-    return ENUMS.APP_ACTION.CHOICES.slice(0, -1);
-  }
-
-  get selectedAppAction() {
-    return this.appActions.find(
-      (it) => it.value === this.args.manualscan?.filteredAppAction
-    );
-  }
-
-  @action
-  selectAppEnvironment({ value }: { value: string }) {
-    this.args.manualscan?.set('appEnv', value);
-  }
-
-  @action
-  handleAppActionChange({ value }: { value: string }) {
-    const appAction = parseInt(value);
-
-    this.args.manualscan?.set('appAction', appAction);
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActions::ManualScan::BasicInfo': typeof FileDetailsScanActionsManualScanBasicInfoComponent;
-    'file-details/scan-actions/manual-scan/basic-info': typeof FileDetailsScanActionsManualScanBasicInfoComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/index.hbs b/app/components/file-details/scan-actions/manual-scan/index.hbs
index bf94a78a97..f60e22d036 100644
--- a/app/components/file-details/scan-actions/manual-scan/index.hbs
+++ b/app/components/file-details/scan-actions/manual-scan/index.hbs
@@ -34,8 +34,11 @@
   @color='primary'
   @underline='always'
   @fontWeight='bold'
+  @route='authenticated.dashboard.file.manual-scan'
+  @model={{@file.id}}
   class='px-2 py-1'
   local-class='view-details-icon'
+  data-test-fileDetailScanActions-manualScanViewDetails
 >
   <:default>
     {{t 'viewDetails'}}
diff --git a/app/components/file-details/scan-actions/manual-scan/login-details/index.hbs b/app/components/file-details/scan-actions/manual-scan/login-details/index.hbs
deleted file mode 100644
index 8d0ee1b9f0..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/login-details/index.hbs
+++ /dev/null
@@ -1,110 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='login-details-group'>
-    <AkTypography
-      data-test-manualScanLoginDetails-loginRequiredLabel
-      local-class='login-details-label'
-    >
-      {{t 'modalCard.manual.loginRequired'}}
-    </AkTypography>
-
-    <div local-class='login-details-input-container'>
-      <AkSelect
-        data-test-manualScanLoginDetails-loginRequiredSelect
-        @options={{this.loginStatuses}}
-        @selected={{@manualscan.loginStatus}}
-        @onChange={{this.handleLoginStatusChange}}
-        as |status|
-      >
-        {{t status}}
-      </AkSelect>
-    </div>
-  </div>
-
-  {{#if @manualscan.loginRequired}}
-    <div data-test-manualScanLoginDetails-userRoleDetailsContainer class='mt-2'>
-      <AkTypography data-test-manualScanLoginDetails-detailsLabel>
-        {{t 'modalCard.manual.enterLoginDetails' htmlSafe=true}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanLoginDetails-roleInput
-          @placeholder={{t 'role'}}
-          @value={{this.role}}
-        />
-
-        <AkTextField
-          data-test-manualScanLoginDetails-usernameInput
-          @placeholder={{t 'username'}}
-          @value={{this.username}}
-        />
-
-        <AkTextField
-          data-test-manualScanLoginDetails-passwordInput
-          @type='password'
-          @placeholder={{t 'password'}}
-          @value={{this.password}}
-        />
-      </AkStack>
-
-      <AkButton
-        data-test-manualScanLoginDetails-addRoleBtn
-        @variant='outlined'
-        {{on 'click' this.addUserRole}}
-      >
-        <:leftIcon>
-          <AkIcon @iconName='add' />
-        </:leftIcon>
-
-        <:default>{{t 'modalCard.manual.addUserRole'}}</:default>
-      </AkButton>
-
-      {{#if this.hasUserRole}}
-        <div class='mt-2'>
-          <AkTable
-            data-test-manualScanLoginDetails-userRole-table
-            @dense={{true}}
-            as |t|
-          >
-            <t.head
-              data-test-manualScanLoginDetails-userRole-thead
-              @columns={{this.columns}}
-            />
-            <t.body @rows={{this.allUserRoles}} as |b|>
-              <b.row data-test-manualScanLoginDetails-userRole-row as |r|>
-                <r.cell
-                  data-test-manualScanLoginDetails-userRole-cell
-                  as |value|
-                >
-                  {{#if r.columnValue.component}}
-                    {{#let (component r.columnValue.component) as |Component|}}
-                      <Component
-                        @onDeleteClick={{fn
-                          this.handleDeleteUserRoleConfirmBoxOpen
-                          r.rowValue
-                        }}
-                      />
-                    {{/let}}
-                  {{else}}
-                    <AkTypography title={{value}} @noWrap={{true}}>
-                      {{value}}
-                    </AkTypography>
-                  {{/if}}
-                </r.cell>
-              </b.row>
-            </t.body>
-          </AkTable>
-        </div>
-      {{/if}}
-    </div>
-  {{/if}}
-
-  <ConfirmBox
-    @isActive={{this.showRemoveRoleConfirmBox}}
-    @description={{t 'confirmBox.removeUserRole'}}
-    @confirmText={{t 'delete'}}
-    @confirmAction={{this.handleDeleteUserRole}}
-    @cancelAction={{this.handleDeleteUserRoleConfirmBoxClose}}
-    @blurOverlay={{true}}
-  />
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/manual-scan/login-details/index.scss b/app/components/file-details/scan-actions/manual-scan/login-details/index.scss
deleted file mode 100644
index 48adac1d89..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/login-details/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.login-details-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .login-details-label {
-    flex: 1;
-  }
-
-  .login-details-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/login-details/index.ts b/app/components/file-details/scan-actions/manual-scan/login-details/index.ts
deleted file mode 100644
index 6a2b6029cc..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/login-details/index.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { isEmpty } from '@ember/utils';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import IntlService from 'ember-intl/services/intl';
-import FileModel from 'irene/models/file';
-import ManualscanModel, { UserRole } from 'irene/models/manualscan';
-
-export interface FileDetailsScanActionsManualScanLoginDetailsSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsManualScanLoginDetailsComponent extends Component<FileDetailsScanActionsManualScanLoginDetailsSignature> {
-  @service declare intl: IntlService;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked role = '';
-  @tracked username = '';
-  @tracked password = '';
-  @tracked showRemoveRoleConfirmBox = false;
-  @tracked selectedUserRole: UserRole | null = null;
-
-  get loginStatuses() {
-    return ['yes', 'no'];
-  }
-
-  get columns() {
-    return [
-      { name: this.intl.t('username'), valuePath: 'username' },
-      { name: this.intl.t('role'), valuePath: 'role' },
-      { name: this.intl.t('password'), valuePath: 'password' },
-      {
-        name: this.intl.t('action'),
-        component:
-          'file-details/scan-actions/manual-scan/login-details/user-role-action' as const,
-        textAlign: 'center',
-      },
-    ];
-  }
-
-  get allUserRoles() {
-    return (
-      this.args.manualscan?.userRoles.map((role, i) => {
-        role.id = i + 1;
-        return role;
-      }) || []
-    );
-  }
-
-  get hasUserRole() {
-    return this.allUserRoles.length > 0;
-  }
-
-  @action
-  handleDeleteUserRoleConfirmBoxOpen(role: UserRole) {
-    this.showRemoveRoleConfirmBox = true;
-    this.selectedUserRole = role;
-  }
-
-  @action
-  handleDeleteUserRoleConfirmBoxClose() {
-    this.showRemoveRoleConfirmBox = false;
-    this.selectedUserRole = null;
-  }
-
-  @action
-  handleDeleteUserRole() {
-    this.args.manualscan?.set(
-      'userRoles',
-      this.allUserRoles.filter((it) => it.id !== this.selectedUserRole?.id)
-    );
-
-    this.handleDeleteUserRoleConfirmBoxClose();
-  }
-
-  @action
-  handleLoginStatusChange(status: string) {
-    this.args.manualscan?.set('loginRequired', status === 'yes');
-  }
-
-  @action
-  addUserRole() {
-    const tRoleAdded = this.intl.t('tRoleAdded');
-    const tPleaseEnterAllValues = this.intl.t('tPleaseEnterAllValues');
-
-    for (const inputValue of [this.role, this.username, this.password]) {
-      if (isEmpty(inputValue)) {
-        return this.notify.error(tPleaseEnterAllValues);
-      }
-    }
-
-    const userRoles = this.args.manualscan?.userRoles || [];
-
-    const userRole = {
-      id: userRoles.length + 1,
-      role: this.role,
-      username: this.username,
-      password: this.password,
-    };
-
-    userRoles.addObject(userRole);
-
-    this.args.manualscan?.set('userRoles', userRoles);
-
-    this.notify.success(tRoleAdded);
-
-    this.role = '';
-    this.username = '';
-    this.password = '';
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActions::ManualScan::LoginDetails': typeof FileDetailsScanActionsManualScanLoginDetailsComponent;
-    'file-details/scan-actions/manual-scan/login-details': typeof FileDetailsScanActionsManualScanLoginDetailsComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.hbs b/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.hbs
deleted file mode 100644
index 5c4342ef8c..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<AkIconButton
-  data-test-manualScanLoginDetails-userRole-deleteBtn
-  @size='small'
-  {{on 'click' @onDeleteClick}}
->
-  <AkIcon @iconName='delete' />
-</AkIconButton>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.ts b/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.ts
deleted file mode 100644
index dee33fd74b..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/login-details/user-role-action/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Component from '@glimmer/component';
-
-export interface FileDetailsScanActionsManualScanLoginDetailsUserRoleActionSignature {
-  Args: {
-    onDeleteClick: () => void;
-  };
-}
-
-export default class FileDetailsScanActionsManualScanLoginDetailsUserRoleActionComponent extends Component<FileDetailsScanActionsManualScanLoginDetailsUserRoleActionSignature> {}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'file-details/scan-actions/manual-scan/login-details/user-role-action': typeof FileDetailsScanActionsManualScanLoginDetailsUserRoleActionComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.hbs b/app/components/file-details/scan-actions/manual-scan/vpn-details/index.hbs
deleted file mode 100644
index caa4029faf..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.hbs
+++ /dev/null
@@ -1,65 +0,0 @@
-<AkStack @direction='column' @spacing='1.5' class='px-3 py-2'>
-  <div local-class='vpn-details-group'>
-    <AkTypography
-      data-test-manualScanVpnDetails-vpnRequiredLabel
-      local-class='vpn-details-label'
-    >
-      {{t 'modalCard.manual.vpnRequired'}}
-    </AkTypography>
-
-    <div local-class='vpn-details-input-container'>
-      <AkSelect
-        data-test-manualScanVpnDetails-vpnRequiredSelect
-        @options={{this.vpnStatuses}}
-        @selected={{@manualscan.vpnStatus}}
-        @onChange={{this.handleVpnStatusChange}}
-        as |status|
-      >
-        {{t status}}
-      </AkSelect>
-    </div>
-  </div>
-
-  {{#if @manualscan.vpnRequired}}
-    <div data-test-manualScanVpnDetails-detailsContainer class='mt-2'>
-      <AkTypography data-test-manualScanVpnDetails-detailsLabel>
-        {{t 'modalCard.manual.enterVPNDetails'}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanVpnDetails-vpnAddressInput
-          @placeholder={{t 'modalCard.manual.vpnAddress'}}
-          @value={{@manualscan.vpnDetails.address}}
-        />
-
-        <AkTextField
-          data-test-manualScanVpnDetails-vpnPortInput
-          @placeholder={{t 'modalCard.manual.vpnPort'}}
-          @value={{@manualscan.vpnDetails.port}}
-        />
-      </AkStack>
-    </div>
-
-    <div>
-      <AkTypography data-test-manualScanVpnDetails-credentialsLabel>
-        {{t 'modalCard.manual.enterCredentails'}}
-      </AkTypography>
-
-      <AkStack class='my-2' @spacing='1.5'>
-        <AkTextField
-          data-test-manualScanVpnDetails-usernameInput
-          @placeholder={{t 'username'}}
-          @value={{@manualscan.vpnDetails.username}}
-        />
-
-        <AkTextField
-          data-test-manualScanVpnDetails-passwordInput
-          @type='password'
-          @placeholder={{t 'password'}}
-          @value={{@manualscan.vpnDetails.password}}
-        />
-      </AkStack>
-    </div>
-  {{/if}}
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.scss b/app/components/file-details/scan-actions/manual-scan/vpn-details/index.scss
deleted file mode 100644
index d827b7e8fa..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.vpn-details-group {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1.5em;
-  box-sizing: border-box;
-
-  .vpn-details-label {
-    flex: 1;
-  }
-
-  .vpn-details-input-container {
-    flex: 1;
-    max-width: 200px;
-  }
-}
diff --git a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.ts b/app/components/file-details/scan-actions/manual-scan/vpn-details/index.ts
deleted file mode 100644
index f26369c4e8..0000000000
--- a/app/components/file-details/scan-actions/manual-scan/vpn-details/index.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { action } from '@ember/object';
-import Component from '@glimmer/component';
-import FileModel from 'irene/models/file';
-import ManualscanModel from 'irene/models/manualscan';
-
-export interface FileDetailsScanActionsManualScanVpnDetailsSignature {
-  Args: {
-    file: FileModel;
-    manualscan: ManualscanModel | null;
-  };
-}
-
-export default class FileDetailsScanActionsManualScanVpnDetailsComponent extends Component<FileDetailsScanActionsManualScanVpnDetailsSignature> {
-  get vpnStatuses() {
-    return ['yes', 'no'];
-  }
-
-  @action
-  handleVpnStatusChange(status: string) {
-    this.args.manualscan?.set('vpnRequired', status === 'yes');
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::ScanActions::ManualScan::VpnDetails': typeof FileDetailsScanActionsManualScanVpnDetailsComponent;
-    'file-details/scan-actions/manual-scan/vpn-details': typeof FileDetailsScanActionsManualScanVpnDetailsComponent;
-  }
-}
diff --git a/app/components/file-details/scan-actions/static-scan/index.hbs b/app/components/file-details/scan-actions/static-scan/index.hbs
index cd76823d37..6cd7695826 100644
--- a/app/components/file-details/scan-actions/static-scan/index.hbs
+++ b/app/components/file-details/scan-actions/static-scan/index.hbs
@@ -40,8 +40,11 @@
   @color='primary'
   @underline='always'
   @fontWeight='bold'
+  @route='authenticated.dashboard.file.static-scan'
+  @model={{@file.id}}
   class='px-2 py-1'
   local-class='view-details-icon'
+  data-test-fileDetailScanActions-staticScanViewDetails
 >
   <:default>
     {{t 'viewDetails'}}
diff --git a/app/components/file-details/severity-level/index.hbs b/app/components/file-details/severity-level/index.hbs
index 68b04bf99c..59c6ced919 100644
--- a/app/components/file-details/severity-level/index.hbs
+++ b/app/components/file-details/severity-level/index.hbs
@@ -5,13 +5,7 @@
     </AkTypography>
   </div>
 
-  <AkStack
-    class='p-3'
-    @spacing='5'
-    @justifyContent='center'
-    @alignItems='center'
-    @flexWrap='wrap'
-  >
+  <AkStack class='p-3' @spacing='5' @alignItems='center' @flexWrap='wrap'>
     <FileChart
       {{style maxWidth='350px'}}
       @file={{@file}}
diff --git a/app/components/file-details/skeleton-loader/index.hbs b/app/components/file-details/skeleton-loader/index.hbs
index 35f36d41e8..3cec87479c 100644
--- a/app/components/file-details/skeleton-loader/index.hbs
+++ b/app/components/file-details/skeleton-loader/index.hbs
@@ -1,4 +1,8 @@
-<div class='px-2 py-3'>
+<div local-class='file-details-skeleton-container'>
+  <AkStack class='mt-2 mb-3'>
+    <AkSkeleton @width='275px' />
+  </AkStack>
+
   <AkStack @direction='column' @spacing='2.5'>
     {{! summary }}
     <div local-class='box-section-root'>
@@ -27,43 +31,67 @@
           <AkSkeleton @width='100px' />
           <AkSkeleton @width='50px' />
         </AkStack>
-
-        <AkDivider />
-
-        <AkSkeleton @width='100px' />
       </AkStack>
     </div>
 
     {{! scan actions }}
-    <div local-class='box-section-root'>
-      <div local-class='box-section-header'>
-        <AkSkeleton @width='100px' />
+    <AkStack @flexWrap='wrap' @spacing='2' @width='full'>
+      <div local-class='box-section-root scan-actions-status-card'>
+        <AkStack @justifyContent='space-between' class='p-2'>
+          <AkSkeleton @width='100px' />
+
+          <AkSkeleton @width='70px' />
+        </AkStack>
+
+        <AkDivider @color='dark' />
+
+        <AkStack class='px-2 py-1'>
+          <AkSkeleton @width='100px' />
+        </AkStack>
       </div>
 
-      <AkDivider @color='dark' />
+      <div local-class='box-section-root scan-actions-status-card'>
+        <AkStack @justifyContent='space-between' class='p-2'>
+          <AkSkeleton @width='100px' />
+
+          <AkSkeleton @width='70px' />
+        </AkStack>
+
+        <AkDivider @color='dark' />
 
-      <AkStack @spacing='6' class='p-3'>
-        <AkStack @direction='column' @spacing='1' @alignItems='center'>
+        <AkStack class='px-2 py-1'>
           <AkSkeleton @width='100px' />
-          <AkSkeleton @width='70px' @height='32px' />
         </AkStack>
+      </div>
 
-        <AkStack @direction='column' @spacing='1' @alignItems='center'>
+      <div local-class='box-section-root scan-actions-status-card'>
+        <AkStack @justifyContent='space-between' class='p-2'>
           <AkSkeleton @width='100px' />
-          <AkSkeleton @width='70px' @height='32px' />
+
+          <AkSkeleton @width='70px' />
         </AkStack>
 
-        <AkStack @direction='column' @spacing='1' @alignItems='center'>
+        <AkDivider @color='dark' />
+
+        <AkStack class='px-2 py-1'>
           <AkSkeleton @width='100px' />
-          <AkSkeleton @width='70px' @height='32px' />
         </AkStack>
+      </div>
 
-        <AkStack @direction='column' @spacing='1' @alignItems='center'>
+      <div local-class='box-section-root scan-actions-status-card'>
+        <AkStack @justifyContent='space-between' class='p-2'>
           <AkSkeleton @width='100px' />
-          <AkSkeleton @width='70px' @height='32px' />
+
+          <AkSkeleton @width='70px' />
         </AkStack>
-      </AkStack>
-    </div>
+
+        <AkDivider @color='dark' />
+
+        <AkStack class='px-2 py-1'>
+          <AkSkeleton @width='100px' />
+        </AkStack>
+      </div>
+    </AkStack>
 
     {{! insights wrapper }}
     <div local-class='box-section-root'>
@@ -87,7 +115,7 @@
 
           <AkDivider @color='dark' />
 
-          <AkStack class='p-3' @spacing='5' @justifyContent='center'>
+          <AkStack class='p-3' @spacing='5'>
             <AkSkeleton @width='210px' @height='180px' />
 
             <AkStack @direction='column' @spacing='1.5'>
diff --git a/app/components/file-details/skeleton-loader/index.scss b/app/components/file-details/skeleton-loader/index.scss
index 6055132748..e36e4aeb06 100644
--- a/app/components/file-details/skeleton-loader/index.scss
+++ b/app/components/file-details/skeleton-loader/index.scss
@@ -9,3 +9,14 @@
     padding: 0.75em 1.5em;
   }
 }
+
+.file-details-skeleton-container {
+  max-width: 1200px;
+  margin: 0 auto;
+}
+
+.scan-actions-status-card {
+  min-width: 240px;
+  max-width: 360px;
+  flex: 1;
+}
diff --git a/app/components/file-details/static-scan/index.hbs b/app/components/file-details/static-scan/index.hbs
index ac8d005435..b869c7964c 100644
--- a/app/components/file-details/static-scan/index.hbs
+++ b/app/components/file-details/static-scan/index.hbs
@@ -100,6 +100,7 @@
         @columns={{this.columns}}
         @sorts={{this.sorts}}
         @updateAnalysesSorts={{this.updateSorts}}
+        @pageReferrer='sast'
       />
     </AkStack>
   </div>
diff --git a/app/components/file-details/summary-old/app-platform/index.hbs b/app/components/file-details/summary-old/app-platform/index.hbs
deleted file mode 100644
index b325484cd9..0000000000
--- a/app/components/file-details/summary-old/app-platform/index.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-<span
-  data-test-fileDetailsSummary-fileOverview-appPlatform
-  local-class='app-platform-icon-{{this.platformIconClass}}'
->
-  <AkIcon @iconName='{{this.platformIconClass}}' local-class='app-platform-icon'/>
-</span>
\ No newline at end of file
diff --git a/app/components/file-details/summary-old/app-platform/index.scss b/app/components/file-details/summary-old/app-platform/index.scss
deleted file mode 100644
index 39fd60bac6..0000000000
--- a/app/components/file-details/summary-old/app-platform/index.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.app-platform-icon-apple {
-  color: var(--file-details-summary-app-platform-color-ios);
-}
-
-.app-platform-icon-android {
-  color: var(--file-details-summary-app-platform-color-android);
-}
-
-.app-platform-icon {
-  font-size: 1.25rem;
-  vertical-align: unset;
-}
diff --git a/app/components/file-details/summary-old/app-platform/index.ts b/app/components/file-details/summary-old/app-platform/index.ts
deleted file mode 100644
index e808cc2c6a..0000000000
--- a/app/components/file-details/summary-old/app-platform/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import Component from '@glimmer/component';
-import FileModel from 'irene/models/file';
-
-export interface FileDetailsSummaryOldAppPlatformSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsSummaryOldAppPlatformComponent extends Component<FileDetailsSummaryOldAppPlatformSignature> {
-  get platformIconClass() {
-    return this.args.file.project.get('platformIconClass');
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::SummaryOld::AppPlatform': typeof FileDetailsSummaryOldAppPlatformComponent;
-    'file-details/summary-old/app-platform': typeof FileDetailsSummaryOldAppPlatformComponent;
-  }
-}
diff --git a/app/components/file-details/summary-old/file-tags/index.hbs b/app/components/file-details/summary-old/file-tags/index.hbs
deleted file mode 100644
index 4cca7b6b15..0000000000
--- a/app/components/file-details/summary-old/file-tags/index.hbs
+++ /dev/null
@@ -1,55 +0,0 @@
-<AkStack @spacing='1' @flexWrap='wrap'>
-  {{#each @file.tags as |tag|}}
-    <AkChip
-      data-test-fileDetailsSummary-fileTag='{{tag.name}}'
-      @label={{tag.name}}
-      @variant='outlined'
-      @onDelete={{perform this.handleDeleteTag tag}}
-    />
-  {{/each}}
-
-  {{#if this.showAddTagForm}}
-    <AkStack @spacing='1'>
-      <div {{style width='135px'}}>
-        <AkTextField
-          data-test-fileDetailsSummary-addTagInput
-          @value={{this.tagName}}
-          @placeholder={{t 'enterTagName'}}
-          @textFieldRootClass={{this.classes.addTagTextFieldRoot}}
-          @autofocus={{true}}
-        />
-      </div>
-
-      <AkIconButton
-        @variant='outlined'
-        {{on 'click' (perform this.handleAddTag)}}
-        disabled={{this.handleAddTag.isRunning}}
-        data-test-fileDetailsSummary-addTagConfirmBtn
-      >
-        <AkIcon @iconName='done' @color='success' />
-      </AkIconButton>
-
-      <AkIconButton
-        @variant='outlined'
-        {{on 'click' this.handleHideAddTagForm}}
-        disabled={{this.handleAddTag.isRunning}}
-        data-test-fileDetailsSummary-addTagCancelBtn
-      >
-        <AkIcon @iconName='close' @color='error' />
-      </AkIconButton>
-    </AkStack>
-  {{else}}
-    <AkButton
-      data-test-fileDetailsSummary-addTagBtn
-      local-class='add-tag-btn'
-      @variant='outlined'
-      {{on 'click' this.handleShowAddTagForm}}
-    >
-      <:default>{{t 'addTags'}}</:default>
-
-      <:rightIcon>
-        <AkIcon @iconName='add' />
-      </:rightIcon>
-    </AkButton>
-  {{/if}}
-</AkStack>
\ No newline at end of file
diff --git a/app/components/file-details/summary-old/file-tags/index.scss b/app/components/file-details/summary-old/file-tags/index.scss
deleted file mode 100644
index 522de0d7e9..0000000000
--- a/app/components/file-details/summary-old/file-tags/index.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.add-tag-btn {
-  height: 32px;
-}
-
-.add-tag-text-field-root {
-  height: 32px;
-}
diff --git a/app/components/file-details/summary-old/file-tags/index.ts b/app/components/file-details/summary-old/file-tags/index.ts
deleted file mode 100644
index e06880c4fa..0000000000
--- a/app/components/file-details/summary-old/file-tags/index.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
-import { task } from 'ember-concurrency';
-import IntlService from 'ember-intl/services/intl';
-import styles from './index.scss';
-
-import FileModel from 'irene/models/file';
-import ENV from 'irene/config/environment';
-import TagModel from 'irene/models/tag';
-
-export interface FileDetailsSummaryOldFileTagsSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-export default class FileDetailsSummaryOldFileTagsComponent extends Component<FileDetailsSummaryOldFileTagsSignature> {
-  @service declare intl: IntlService;
-  @service declare ajax: any;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked showAddTagForm = false;
-  @tracked tagName = '';
-
-  get tPleaseTryAgain() {
-    return this.intl.t('pleaseTryAgain');
-  }
-
-  get classes() {
-    return {
-      addTagTextFieldRoot: styles['add-tag-text-field-root'],
-    };
-  }
-
-  @action
-  handleShowAddTagForm() {
-    this.showAddTagForm = true;
-  }
-
-  @action
-  handleHideAddTagForm() {
-    this.showAddTagForm = false;
-  }
-
-  handleAddTag = task(async () => {
-    try {
-      if (this.tagName.trim()) {
-        const url = [
-          ENV.endpoints['files'],
-          this.args.file.id,
-          ENV.endpoints['tags'],
-        ].join('/');
-
-        await this.ajax.post(url, {
-          namespace: ENV.namespace_v2,
-          data: {
-            name: this.tagName,
-          },
-        });
-
-        await this.args.file.reload();
-
-        this.notify.success(this.intl.t('fileTag.addedSuccessMsg'));
-
-        this.handleHideAddTagForm();
-
-        this.tagName = '';
-      } else {
-        throw Error(this.intl.t('fileTag.blankErrorMsg'));
-      }
-    } catch (error) {
-      const err = error as AdapterError;
-      let errMsg = this.tPleaseTryAgain;
-
-      if (err.payload && Object.keys(err.payload).length) {
-        Object.keys(err.payload).forEach((p) => {
-          errMsg = err.payload[p];
-
-          if (typeof errMsg !== 'string') {
-            errMsg = err.payload[p][0];
-          }
-
-          this.notify.error(errMsg);
-        });
-
-        return;
-      } else if (err.errors && err.errors.length) {
-        errMsg = err.errors[0]?.detail || errMsg;
-      } else if (err.message) {
-        errMsg = err.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-
-  handleDeleteTag = task(async (tag: TagModel) => {
-    try {
-      const url = [
-        ENV.endpoints['files'],
-        this.args.file.id,
-        ENV.endpoints['tags'],
-        tag.id,
-      ].join('/');
-
-      await this.ajax.delete(url, {
-        namespace: ENV.namespace_v2,
-      });
-
-      await this.args.file.reload();
-
-      this.notify.success(this.intl.t('fileTag.deletedSuccessMsg'));
-    } catch (e) {
-      const err = e as AdapterError;
-      let errMsg = this.tPleaseTryAgain;
-
-      if (err.errors && err.errors.length) {
-        errMsg = err.errors[0]?.detail || errMsg;
-      } else if (err.message) {
-        errMsg = err.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::SummaryOld::FileTags': typeof FileDetailsSummaryOldFileTagsComponent;
-    'file-details/summary-old/file-tags': typeof FileDetailsSummaryOldFileTagsComponent;
-  }
-}
diff --git a/app/components/file-details/summary-old/index.hbs b/app/components/file-details/summary-old/index.hbs
deleted file mode 100644
index 494070de0a..0000000000
--- a/app/components/file-details/summary-old/index.hbs
+++ /dev/null
@@ -1,196 +0,0 @@
-<div local-class='file-summary-root'>
-  <AkStack class='p-2' @alignItems='center' @justifyContent='space-between'>
-    <AkStack @alignItems='center' @spacing='1.5'>
-      <AppLogo
-        @src={{@file.iconUrl}}
-        @size='large'
-        @alt={{concat @file.name ' - logo'}}
-      />
-
-      <AkStack @direction='column' @spacing='0.5'>
-        <AkTypography data-test-fileDetailsSummary-appName @variant='subtitle1'>
-          {{@file.name}}
-        </AkTypography>
-
-        <AkTypography
-          data-test-fileDetailsSummary-appPackageName
-          @color='textSecondary'
-        >
-          {{this.packageName}}
-        </AkTypography>
-      </AkStack>
-    </AkStack>
-
-    <AkStack @alignItems='stretch' @spacing='1.5'>
-      <div>
-        <File::ReportBtn @file={{@file}} />
-      </div>
-
-      <AkIconButton
-        {{style padding='0.5em'}}
-        {{on 'click' this.handleFileMoreMenuOpen}}
-        @variant='outlined'
-        data-test-fileDetailsSummary-moreMenuBtn
-        aria-label='file summary more button'
-      >
-        <AkIcon @iconName='more-vert' />
-      </AkIconButton>
-    </AkStack>
-  </AkStack>
-
-  <AkDivider @color='dark' />
-
-  <div class='px-2'>
-    <AkStack
-      local-class='file-summary-padding'
-      @alignItems='center'
-      @justifyContent='space-between'
-    >
-      <AkTypography data-test-fileDetailsSummary-fileId @variant='subtitle1'>
-        {{t 'fileID'}}
-        -
-        {{@file.id}}
-      </AkTypography>
-
-      <AkStack @alignItems='center' @spacing='1'>
-        <FileDetails::Summary::AppPlatform @file={{@file}} />
-
-        {{#if @file.submission.url}}
-          <AkTooltip
-            @placement='top'
-            @arrow={{true}}
-            @title='{{if
-              @file.submission.isIos
-              (t "openInAppstore")
-              (t "openInPlaystore")
-            }}'
-          >
-            <a
-              target='_blank'
-              href={{@file.submission.url}}
-              rel='noopener noreferrer'
-              local-class='store-logo-container'
-            >
-              {{#if @file.submission.isIos}}
-                <AkSvg::AppstoreLogo local-class='appstore-logo-vector' />
-              {{/if}}
-
-              {{#if @file.submission.isAndroid}}
-                <AkSvg::PlaystoreLogo />
-              {{/if}}
-            </a>
-          </AkTooltip>
-        {{/if}}
-      </AkStack>
-    </AkStack>
-
-    <AkDivider />
-
-    {{#if this.showMoreFileSummary}}
-      {{#each this.fileSummary as |fs|}}
-        <AkStack
-          local-class='file-summary-padding'
-          data-test-fileDetailsSummary-fileOverviewGroup='{{fs.label}}'
-        >
-          <AkTypography
-            {{style width='160px'}}
-            @color='textSecondary'
-            data-test-fileDetailsSummary-fileOverviewLabel
-          >
-            {{fs.label}}
-          </AkTypography>
-
-          <AkTypography
-            @variant='h6'
-            data-test-fileDetailsSummary-fileOverviewValue
-          >
-            {{fs.value}}
-          </AkTypography>
-        </AkStack>
-
-        <AkDivider />
-      {{/each}}
-
-      <div class='my-2'>
-        <AkTypography
-          data-test-fileDetailsSummary-fileTagTitle
-          @variant='subtitle1'
-          @gutterBottom={{true}}
-        >
-          {{t 'tags'}}
-        </AkTypography>
-
-        <FileDetails::Summary::FileTags @file={{@file}} />
-      </div>
-
-      <AkDivider />
-    {{/if}}
-
-    <div local-class='file-summary-padding'>
-      <AkButton
-        @variant='text'
-        @underline='always'
-        @color='primary'
-        @typographyVariant='subtitle1'
-        {{on 'click' this.handleFileSummaryToggle}}
-        data-test-fileDetailsSummary-showMoreOrLessBtn
-      >
-        <:default>
-          {{if this.showMoreFileSummary (t 'showLess') (t 'showMore')}}
-        </:default>
-
-        <:rightIcon>
-          <AkIcon
-            @iconName={{if
-              this.showMoreFileSummary
-              'arrow-drop-up'
-              'arrow-drop-down'
-            }}
-            @color='primary'
-          />
-        </:rightIcon>
-      </AkButton>
-    </div>
-  </div>
-
-  <AkMenu
-    @anchorRef={{this.fileMoreMenuRef}}
-    @onClose={{this.handleFileMoreMenuClose}}
-    @arrow={{true}}
-    as |akm|
-  >
-    {{#each this.fileMoreMenuList as |it|}}
-      {{#if it.group}}
-        <AkList::Item
-          @noGutters={{true}}
-          local-class='file-more-menu-item-group'
-        >
-          <AkTypography
-            {{style fontSize='0.857rem'}}
-            @fontWeight='medium'
-            @tag='span'
-            @color='textSecondary'
-          >
-            {{it.group}}
-          </AkTypography>
-        </AkList::Item>
-      {{/if}}
-
-      <akm.listItem
-        data-test-fileDetailsSummary-moreMenuItem
-        @link={{true}}
-        @button={{false}}
-        @route={{it.route}}
-        @model={{it.routeModel}}
-        @divider={{unless it.hideDivider true}}
-        as |li|
-      >
-        <li.leftIcon>
-          <AkIcon @iconName={{it.iconName}} />
-        </li.leftIcon>
-
-        <li.text @primaryText={{it.label}} />
-      </akm.listItem>
-    {{/each}}
-  </AkMenu>
-</div>
\ No newline at end of file
diff --git a/app/components/file-details/summary-old/index.scss b/app/components/file-details/summary-old/index.scss
deleted file mode 100644
index 896488f586..0000000000
--- a/app/components/file-details/summary-old/index.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-.file-summary-root {
-  width: 100%;
-  border: 1px solid var(--file-details-summary-border-color);
-  background-color: var(--file-details-summary-background-color);
-  box-sizing: border-box;
-
-  .file-summary-padding {
-    padding: 0.75em 0;
-  }
-}
-
-.file-more-menu-item-group {
-  padding: 0.5em 1em 0.75em 1em;
-
-  &:not(:first-child) {
-    padding-top: 1em;
-  }
-}
-
-.store-logo-container {
-  display: flex;
-  height: 24px;
-  width: 24px;
-  align-items: center;
-  justify-content: center;
-
-  &:hover {
-    background-color: var(
-      --file-details-summary-store-logo-container-background-color
-    );
-    border: 1px solid
-      var(--file-details-summary-store-logo-container-border-color);
-  }
-}
-
-.appstore-logo-vector {
-  height: 16px;
-  width: 16px;
-}
diff --git a/app/components/file-details/summary-old/index.ts b/app/components/file-details/summary-old/index.ts
deleted file mode 100644
index ccd7700a1b..0000000000
--- a/app/components/file-details/summary-old/index.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-import { capitalize } from '@ember/string';
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import IntlService from 'ember-intl/services/intl';
-
-import FileModel from 'irene/models/file';
-
-dayjs.extend(relativeTime);
-
-export interface FileDetailsSummaryOldSignature {
-  Args: {
-    file: FileModel;
-  };
-}
-
-interface FileMoreMenuItem {
-  group?: string;
-  label: string;
-  iconName: string;
-  route: string;
-  routeModel: string | undefined;
-  hideDivider?: boolean;
-}
-
-export default class FileDetailsSummaryOldComponent extends Component<FileDetailsSummaryOldSignature> {
-  @service declare intl: IntlService;
-
-  @tracked showMoreFileSummary = false;
-  @tracked fileMoreMenuRef: HTMLElement | null = null;
-
-  get packageName() {
-    return this.args.file.project.get('packageName');
-  }
-
-  get fileMoreMenuList() {
-    const hasMultipleFiles = this.args.file.project.get('hasMultipleFiles');
-
-    return [
-      hasMultipleFiles && {
-        group: this.intl.t('fileLevel'),
-        label: this.intl.t('compare'),
-        iconName: 'compare-arrows',
-        route: 'authenticated.dashboard.choose',
-        routeModel: this.args.file.id,
-      },
-      hasMultipleFiles && {
-        group: this.intl.t('projectLevel'),
-        label: this.intl.t('allUploads'),
-        iconName: 'apps',
-        route: 'authenticated.dashboard.project.files',
-        routeModel: this.args.file.project.get('id'),
-      },
-      {
-        label: this.intl.t('settings'),
-        iconName: 'settings',
-        route: 'authenticated.dashboard.project.settings',
-        routeModel: this.args.file.project.get('id'),
-        hideDivider: true,
-      },
-    ].filter(Boolean) as FileMoreMenuItem[];
-  }
-
-  get fileSummary() {
-    return [
-      { label: this.intl.t('version'), value: this.args.file.version },
-      {
-        label: capitalize(this.intl.t('versionCode')),
-        value: this.args.file.versionCode,
-      },
-      {
-        label: this.intl.t('uploadedOn'),
-        value: dayjs(this.args.file.createdOn).fromNow(),
-      },
-    ];
-  }
-
-  @action
-  handleFileMoreMenuOpen(event: MouseEvent) {
-    this.fileMoreMenuRef = event.currentTarget as HTMLElement;
-  }
-
-  @action
-  handleFileMoreMenuClose() {
-    this.fileMoreMenuRef = null;
-  }
-
-  @action
-  handleFileSummaryToggle() {
-    this.showMoreFileSummary = !this.showMoreFileSummary;
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'FileDetails::SummaryOld': typeof FileDetailsSummaryOldComponent;
-  }
-}
diff --git a/app/components/file-details/summary/index.hbs b/app/components/file-details/summary/index.hbs
index 10ab377e95..9c5214083f 100644
--- a/app/components/file-details/summary/index.hbs
+++ b/app/components/file-details/summary/index.hbs
@@ -35,6 +35,7 @@
         {{style padding='0.5em'}}
         {{on 'click' this.handleFileMoreMenuOpen}}
         @variant='outlined'
+        aria-label='file summary more button'
         data-test-fileDetailsSummary-moreMenuBtn
       >
         <AkIcon @iconName='more-vert' />
diff --git a/app/components/file-details/vulnerability-analysis-details/index.ts b/app/components/file-details/vulnerability-analysis-details/index.ts
index 61c0d243e3..e4764c4947 100644
--- a/app/components/file-details/vulnerability-analysis-details/index.ts
+++ b/app/components/file-details/vulnerability-analysis-details/index.ts
@@ -2,9 +2,10 @@ import { inject as service } from '@ember/service';
 import { htmlSafe } from '@ember/template';
 import { isEmpty } from '@ember/utils';
 import Component from '@glimmer/component';
-import IntlService from 'ember-intl/services/intl';
+import type IntlService from 'ember-intl/services/intl';
+import type RouterService from '@ember/routing/router-service';
 
-import AnalysisModel from 'irene/models/analysis';
+import type AnalysisModel from 'irene/models/analysis';
 
 export interface FileDetailsVulnerabilityAnalysisDetailsSignature {
   Args: {
@@ -14,6 +15,15 @@ export interface FileDetailsVulnerabilityAnalysisDetailsSignature {
 
 export default class FileDetailsVulnerabilityAnalysisDetailsComponent extends Component<FileDetailsVulnerabilityAnalysisDetailsSignature> {
   @service declare intl: IntlService;
+  @service declare router: RouterService;
+
+  get fileAnalysisDetailsReferrer() {
+    return this.router.currentRoute?.parent?.queryParams?.['referrer'] as
+      | 'sast'
+      | 'dast'
+      | 'api'
+      | 'manual';
+  }
 
   get breadcrumbItems() {
     const fileId = this.args.analysis.file.get('id');
@@ -29,12 +39,32 @@ export default class FileDetailsVulnerabilityAnalysisDetailsComponent extends Co
         linkTitle: this.intl.t('scanDetails'),
         models: [fileId as string],
       },
+      this.fileAnalysisDetailsReferrer === 'dast' && {
+        route: 'authenticated.dashboard.file.dynamic-scan.results',
+        linkTitle: this.intl.t('dastTabs.dastResults'),
+        models: [fileId as string],
+      },
+      this.fileAnalysisDetailsReferrer === 'sast' && {
+        route: 'authenticated.dashboard.file.static-scan',
+        linkTitle: this.intl.t('sastResults'),
+        models: [fileId as string],
+      },
+      this.fileAnalysisDetailsReferrer === 'api' && {
+        route: 'authenticated.dashboard.file.api-scan.results',
+        linkTitle: this.intl.t('apiScanResults'),
+        models: [fileId as string],
+      },
+      this.fileAnalysisDetailsReferrer === 'manual' && {
+        route: 'authenticated.dashboard.file.manual-scan.results',
+        linkTitle: this.intl.t('manualScanResults'),
+        models: [fileId as string],
+      },
       {
         route: 'authenticated.dashboard.file.analysis',
         linkTitle: this.intl.t('vulnerabilityDetails'),
         models: [fileId as string, analysisId],
       },
-    ];
+    ].filter(Boolean);
   }
 
   get analysis() {
diff --git a/app/components/file-details/vulnerability-analysis/table/index.scss b/app/components/file-details/vulnerability-analysis/table/index.scss
index 011dd1b1ea..5fa437c7c7 100644
--- a/app/components/file-details/vulnerability-analysis/table/index.scss
+++ b/app/components/file-details/vulnerability-analysis/table/index.scss
@@ -13,4 +13,4 @@
   background-color: var(
     --file-details-vulnerability-analysis-table-background-color
   );
-}
\ No newline at end of file
+}
diff --git a/app/components/file-details/vulnerability-analysis/table/index.ts b/app/components/file-details/vulnerability-analysis/table/index.ts
index 88823e5640..49d57d59a5 100644
--- a/app/components/file-details/vulnerability-analysis/table/index.ts
+++ b/app/components/file-details/vulnerability-analysis/table/index.ts
@@ -26,6 +26,7 @@ export interface FileDetailsVulnerabilityAnalysisTableSignature {
     filterVulnerabilityType: string | number;
     updateAnalysesSorts: (sorts: EmberTableSort[]) => void;
     columns?: columnType[];
+    pageReferrer?: 'sast' | 'dast' | 'api' | 'manual';
   };
 }
 
@@ -78,6 +79,10 @@ export default class FileDetailsVulnerabilityAnalysisTableComponent extends Comp
     return this.finalUnsortedAnalyses.length === 0;
   }
 
+  get analysisDetailsPagereferrer() {
+    return this.args.pageReferrer;
+  }
+
   @action
   updateAnalysesSorts(sorts: EmberTableSort[]) {
     if (this.args.sorts[0] && !sorts.length) {
@@ -123,12 +128,15 @@ export default class FileDetailsVulnerabilityAnalysisTableComponent extends Comp
     rowValue: AnalysisModel;
     event: MouseEvent;
   }) {
+    const queryParams = { referrer: this.analysisDetailsPagereferrer };
+
     // temp fix
     if (event.ctrlKey || event.metaKey) {
       const url = this.router.urlFor(
         'authenticated.dashboard.file.analysis',
         this.file.id,
-        rowValue.id
+        rowValue.id,
+        queryParams
       );
 
       window.open(url, '_blank');
@@ -136,7 +144,8 @@ export default class FileDetailsVulnerabilityAnalysisTableComponent extends Comp
       this.router.transitionTo(
         'authenticated.dashboard.file.analysis',
         this.file.id,
-        rowValue.id
+        rowValue.id,
+        { queryParams }
       );
     }
   }
diff --git a/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.hbs b/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.hbs
index 84ce2dd03e..d970af041b 100644
--- a/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.hbs
+++ b/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.hbs
@@ -25,6 +25,8 @@
     </AkChip>
   </AkStack>
 
+  {{! TODO: Uncomment when feature is available }}
+  {{!-- {{#if @featureAvailable}} --}}
   <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::Scenario
     @project={{@project}}
     @profileId={{@profileId}}
@@ -65,4 +67,7 @@
       </AkStack>
     </AkStack>
   </AkStack>
+  {{!-- {{else}}
+    <DynamicscanAutomationUpsellingFeature />
+  {{/if}} --}}
 </AkStack>
\ No newline at end of file
diff --git a/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.ts b/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.ts
index 9de501bf34..21a1f8cc6c 100644
--- a/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.ts
+++ b/app/components/project-settings/general-settings/dynamicscan-automation-settings/index.ts
@@ -14,6 +14,7 @@ export interface ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsSign
   Args: {
     project?: ProjectModel | null;
     profileId?: string | number;
+    featureAvailable: boolean;
   };
 }
 
diff --git a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.hbs b/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.hbs
deleted file mode 100644
index 54fede5bad..0000000000
--- a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.hbs
+++ /dev/null
@@ -1,174 +0,0 @@
-<AkStack
-  @width='full'
-  @direction='column'
-  data-test-projectSettings-genSettings-dynScanAutoSettings-root
->
-  <AkStack @spacing='1' @alignItems='center' class='mb-1'>
-    <AkTypography
-      @variant='h5'
-      data-test-genSettings-dynScanAutoSettings-headerTitle
-    >
-      {{t 'dynamicScanAutomation'}}
-    </AkTypography>
-
-    <AkChip
-      @label={{t 'experimentalFeature'}}
-      @variant='semi-filled'
-      @size='small'
-      @color='warn'
-      data-test-genSettings-dynScanAutoSettings-headerInfoChip
-    >
-      <:icon>
-        <AkIcon @iconName='build' />
-      </:icon>
-    </AkChip>
-  </AkStack>
-
-  <AkTypography
-    @variant='h6'
-    @gutterBottom={{true}}
-    data-test-genSettings-dynScanAutoSettings-headerInfoDescHeader
-  >
-    {{t 'appiumScripts'}}
-  </AkTypography>
-
-  <AkStack
-    @direction='column'
-    @spacing='2'
-    class='mb-2'
-    {{style maxWidth='700px'}}
-  >
-    <AkTypography
-      @variant='body2'
-      @color='textSecondary'
-      data-test-genSettings-dynScanAutoSettings-headerInfoDescText
-    >
-      {{t 'appiumScriptsDescription' htmlSafe=true}}
-    </AkTypography>
-
-    <AkTypography
-      @variant='body3'
-      data-test-genSettings-dynScanAutoSettings-headerInfoDescNote
-    >
-      {{t 'appiumScriptsSchedNote'}}
-    </AkTypography>
-  </AkStack>
-
-  {{#let
-    (file-queue
-      name='uploadDynamicscanAutomationScript'
-      onFileAdded=this.uploadFileWrapper
-    )
-    as |queue|
-  }}
-    <AkButton
-      @tag='label'
-      @variant='outlined'
-      @typographyFontWeight='medium'
-      @disabled={{this.uploadFile.isRunning}}
-      data-test-genSettings-dynScanAutoSettings-uploadZipBtn
-    >
-      {{#if this.uploadFile.isRunning}}
-        {{t 'uploading'}}...
-      {{else}}
-        {{t 'uploadZipFile'}}
-      {{/if}}
-
-      <input
-        data-test-genSettings-dynScanAutoSettings-uploadZipInput
-        type='file'
-        id='upload-dynamicscan-automation-script-input'
-        disabled={{this.uploadFile.isRunning}}
-        {{style display='none'}}
-        {{queue.selectFile}}
-      />
-    </AkButton>
-  {{/let}}
-
-  {{#if this.automationScripts}}
-    <AkStack
-      @width='full'
-      @direction='column'
-      class='mt-2'
-      data-test-genSettings-dynScanAutoSettings-autoScriptsRoot
-    >
-      {{#each this.automationScripts as |script|}}
-        <AkStack
-          @width='full'
-          @direction='column'
-          local-class='script-details-container'
-          data-test-genSettings-dynScanAutoSettings-autoScript='{{script.fileKey}}'
-        >
-          <AkFormControlLabel
-            @label='{{t "appiumScheduledAutomation"}}'
-            @labelTypographyFontWeight='medium'
-            @disabled={{this.toggleDynamicscanMode.isRunning}}
-            class='p-2'
-            data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggleLabel
-            as |fcl|
-          >
-            <AkToggle
-              @size='small'
-              @disabled={{fcl.disabled}}
-              @checked={{this.automationEnabled}}
-              @onClick={{perform this.toggleDynamicscanMode}}
-              data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle
-            />
-          </AkFormControlLabel>
-
-          <AkStack
-            @width='full'
-            @direction='column'
-            @spacing='0.5'
-            local-class='script-file-details'
-            class='p-2'
-          >
-            <AkStack
-              @alignItems='center'
-              @spacing='0.5'
-              local-class='text-with-icon'
-              data-test-genSettings-dynScanAutoSettings-autoScript-fileKey
-            >
-              <AkIcon
-                @iconName='article'
-                @color='textPrimary'
-                @variant='filled'
-                data-test-genSettings-dynScanAutoSettings-autoScript-fileKeyIcon
-              />
-
-              <AkTypography @fontWeight='medium'>
-                {{script.fileKey}}
-              </AkTypography>
-            </AkStack>
-
-            <AkTypography
-              @color='textSecondary'
-              data-test-genSettings-dynScanAutoSettings-autoScript-dateCreated
-            >
-              {{t 'uploaded'}}
-              {{dayjs-from-now script.createdOn}}
-            </AkTypography>
-
-            {{#if (eq script.isValid false)}}
-              <AkStack @alignItems='center' local-class='text-with-icon'>
-                <AkIcon
-                  @iconName='warning'
-                  @color='error'
-                  @variant='filled'
-                  data-test-genSettings-dynScanAutoSettings-autoScript-invalidScript-errorIcon
-                />
-
-                <AkTypography
-                  @color='error'
-                  data-test-genSettings-dynScanAutoSettings-autoScript-invalidScript-text
-                >
-                  {{t 'appiumScriptInvalid'}}
-                </AkTypography>
-              </AkStack>
-            {{/if}}
-          </AkStack>
-        </AkStack>
-      {{/each}}
-    </AkStack>
-  {{/if}}
-</AkStack>
\ No newline at end of file
diff --git a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.scss b/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.scss
deleted file mode 100644
index 5ff739e744..0000000000
--- a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.script-details-container {
-  box-shadow: var(
-    --project-settings-general-settings-dynamicscan-automation-settings-box-shadow
-  );
-  border-radius: var(
-    --project-settings-general-settings-dynamicscan-automation-settings-border-radius
-  );
-  border: 1px solid
-    var(
-      --project-settings-general-settings-dynamicscan-automation-settings-border-color
-    );
-
-  .script-file-details {
-    border-top: 1px solid
-      var(
-        --project-settings-general-settings-dynamicscan-automation-settings-border-color
-      );
-
-    .text-with-icon {
-      gap: 0.2587em;
-    }
-  }
-}
diff --git a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.ts b/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.ts
deleted file mode 100644
index f2d98fe5b7..0000000000
--- a/app/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived/index.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-// eslint-disable-next-line ember/use-ember-data-rfc-395-imports
-import DS from 'ember-data';
-
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
-import { task } from 'ember-concurrency';
-import Store from '@ember-data/store';
-import IntlService from 'ember-intl/services/intl';
-import { UploadFile } from 'ember-file-upload';
-
-import ENV from 'irene/config/environment';
-import ProjectModel from 'irene/models/project';
-import AutomationScriptModel from 'irene/models/automation-script';
-import parseError from 'irene/utils/parse-error';
-
-type DyanmicscanAutomationSettingsQueryResponse =
-  DS.AdapterPopulatedRecordArray<AutomationScriptModel> & {
-    meta: { count: number };
-  };
-
-export interface ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsScriptsSignature {
-  Args: {
-    project?: ProjectModel | null;
-    profileId?: string | number;
-  };
-}
-
-export default class ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsScriptsComponent extends Component<ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsScriptsSignature> {
-  @service declare store: Store;
-  @service declare intl: IntlService;
-  @service declare ajax: any;
-  @service('notifications') declare notify: NotificationService;
-
-  @tracked
-  automationScripts: DyanmicscanAutomationSettingsQueryResponse | null = null;
-
-  @tracked automationEnabled = false;
-
-  constructor(
-    owner: unknown,
-    args: ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsScriptsSignature['Args']
-  ) {
-    super(owner, args);
-
-    this.getAutomationScripts.perform();
-    this.getDynamicscanMode.perform();
-  }
-
-  get profileId() {
-    return this.args.profileId;
-  }
-
-  get tAppiumScheduledAutomationSuccessOn() {
-    return this.intl.t('appiumScheduledAutomationSuccessOn');
-  }
-
-  get tAppiumScheduledAutomationSuccessOff() {
-    return this.intl.t('appiumScheduledAutomationSuccessOff');
-  }
-
-  get tSomethingWentWrong() {
-    return this.intl.t('somethingWentWrong');
-  }
-
-  get tPleaseTryAgain() {
-    return this.intl.t('pleaseTryAgain');
-  }
-
-  getAutomationScripts = task(async () => {
-    try {
-      this.automationScripts = (await this.store.query('automation-script', {
-        profileId: this.profileId,
-      })) as DyanmicscanAutomationSettingsQueryResponse;
-    } catch (error) {
-      this.notify.error(parseError(error, this.tPleaseTryAgain));
-    }
-  });
-
-  getDynamicscanMode = task(async () => {
-    try {
-      const dynScanMode = await this.store.queryRecord('dynamicscan-mode', {
-        id: this.profileId,
-      });
-
-      this.automationEnabled = dynScanMode.dynamicscanMode === 'Automated';
-    } catch (error) {
-      this.notify.error(parseError(error, this.tPleaseTryAgain));
-    }
-  });
-
-  toggleDynamicscanMode = task(async () => {
-    try {
-      this.automationEnabled = !this.automationEnabled;
-
-      const dynamicscanMode = [
-        ENV.endpoints['profiles'],
-        this.profileId,
-        ENV.endpoints['dynamicscanMode'],
-      ].join('/');
-
-      const data = {
-        dynamicscan_mode: this.automationEnabled ? 'Automated' : 'Manual',
-      };
-
-      await this.ajax.put(dynamicscanMode, { data });
-
-      const successMsg = this.automationEnabled
-        ? this.tAppiumScheduledAutomationSuccessOn
-        : this.tAppiumScheduledAutomationSuccessOff;
-
-      this.notify.success(successMsg);
-    } catch (error) {
-      this.automationEnabled = !this.automationEnabled;
-      this.notify.error(parseError(error, this.tSomethingWentWrong));
-    }
-  });
-
-  uploadFile = task(async (file: UploadFile) => {
-    try {
-      const urlGetSignedUrl = [
-        ENV.endpoints['profiles'],
-        this.profileId,
-        ENV.endpoints['uploadAutomationScriptSignedUrl'],
-      ].join('/');
-
-      const signedUrlData = {
-        file_name: file.name,
-      };
-
-      const signedUrlResponse = await this.ajax.post(urlGetSignedUrl, {
-        data: signedUrlData,
-      });
-
-      await file.uploadBinary(signedUrlResponse.url, { method: 'PUT' });
-
-      const urlUploadScript = [
-        ENV.endpoints['profiles'],
-        this.profileId,
-        ENV.endpoints['uploadAutomationScript'],
-      ].join('/');
-
-      const uploadAutomationScriptData = {
-        file_key: signedUrlResponse.file_key,
-        file_key_signed: signedUrlResponse.file_key_signed,
-      };
-
-      await this.ajax.post(urlUploadScript, {
-        data: uploadAutomationScriptData,
-      });
-
-      this.notify.success(this.intl.t('appiumFileUploadedSuccessfully'));
-
-      this.getAutomationScripts.perform();
-    } catch (err) {
-      const error = err as AdapterError;
-      let errMsg = this.intl.t('pleaseTryAgain');
-
-      if (error.payload) {
-        Object.keys(error.payload).forEach((p) => {
-          errMsg = error.payload[p];
-
-          if (typeof errMsg !== 'string') {
-            errMsg = error.payload[p][0];
-          }
-
-          this.notify.error(errMsg);
-        });
-
-        return;
-      }
-
-      this.notify.error(parseError(error, errMsg));
-    }
-  });
-
-  @action
-  uploadFileWrapper(file: UploadFile) {
-    this.uploadFile.perform(file);
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    'ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::ScriptsArchived': typeof ProjectSettingsGeneralSettingsDyanmicscanAutomationSettingsScriptsComponent;
-  }
-}
diff --git a/app/components/project-settings/general-settings/index.hbs b/app/components/project-settings/general-settings/index.hbs
index 3fb027f4a5..3f51459e90 100644
--- a/app/components/project-settings/general-settings/index.hbs
+++ b/app/components/project-settings/general-settings/index.hbs
@@ -88,21 +88,24 @@
 
   <AkDivider @color='dark' />
 
-  {{#if this.organization.selected.features.dynamicscan_automation}}
-    <AkStack @width='9/12' class='px-3'>
-      {{!-- <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::ScriptsArchived
-        @project={{@project}}
-        @profileId={{@profileId}}
-      /> --}}
+  <AkStack @width='9/12' class='px-3'>
+    <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings
+      @profileId={{this.project.activeProfileId}}
+      @project={{this.project}}
+      @featureAvailable={{this.dynamicscanAutomationAvailable}}
+    />
+  </AkStack>
 
-      <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings
-        @profileId={{this.project.activeProfileId}}
-        @project={{this.project}}
-      />
-    </AkStack>
+  {{! TODO:  uncomment when Automated DAST is ready}}
+  {{!-- <AkStack @width='9/12' class='px-3'>
+  <AkDivider @color='dark' />
+
+    <ProjectSettings::GeneralSettings::DevicePreferencesAutomatedDast
+      @project={{@project}}
+    />
+  </AkStack> --}}
 
-    <AkDivider @color='dark' />
-  {{/if}}
+  <AkDivider @color='dark' />
 
   <AkStack @width='9/12' class='px-3'>
     <ProjectSettings::GeneralSettings::GithubProject
diff --git a/app/components/project-settings/general-settings/index.ts b/app/components/project-settings/general-settings/index.ts
index 176538bc2f..87e77f5ab9 100644
--- a/app/components/project-settings/general-settings/index.ts
+++ b/app/components/project-settings/general-settings/index.ts
@@ -36,6 +36,10 @@ export default class ProjectSettingsGeneralSettingsComponent extends Component<P
     return this.args.project;
   }
 
+  get dynamicscanAutomationAvailable() {
+    return !!this.organization.selected?.features?.dynamicscan_automation;
+  }
+
   fetchProfile = task(async () => {
     try {
       const profileId = this.args.project?.activeProfileId;
diff --git a/app/components/proxy-settings-view/index.ts b/app/components/proxy-settings-view/index.ts
deleted file mode 100644
index 10dc849d2d..0000000000
--- a/app/components/proxy-settings-view/index.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { task } from 'ember-concurrency';
-import ENV from 'irene/config/environment';
-import triggerAnalytics from 'irene/utils/trigger-analytics';
-import IntlService from 'ember-intl/services/intl';
-import Store from '@ember-data/store';
-import { tracked } from '@glimmer/tracking';
-import ProxySettingModel from 'irene/models/proxy-setting';
-import { AsyncBelongsTo } from '@ember-data/model';
-import ProfileModel from 'irene/models/profile';
-import ProjectModel from 'irene/models/project';
-
-export interface ProxySettingsViewSignature {
-  Args: {
-    profile: AsyncBelongsTo<ProfileModel>;
-    project: AsyncBelongsTo<ProjectModel>;
-  };
-}
-
-export default class ProxySettingsViewComponent extends Component<ProxySettingsViewSignature> {
-  @service declare intl: IntlService;
-  @service('notifications') declare notify: NotificationService;
-  @service declare store: Store;
-
-  @tracked proxy?: ProxySettingModel;
-
-  constructor(owner: unknown, args: ProxySettingsViewSignature['Args']) {
-    super(owner, args);
-
-    this.fetchProxySetting.perform();
-  }
-
-  get projectId() {
-    return this.args.project.get('id');
-  }
-
-  fetchProxySetting = task(async () => {
-    const profileId = this.args.profile.get('id');
-
-    if (profileId) {
-      this.proxy = await this.store.findRecord('proxy-setting', profileId);
-    }
-  });
-
-  /* Proxy enable or disable */
-  toggleProxy = task(async (event) => {
-    try {
-      const enabled = event.target.checked;
-
-      this.proxy?.set('enabled', enabled);
-
-      await this.proxy?.save();
-
-      const statusText = enabled ? this.intl.t('on') : this.intl.t('off');
-
-      this.notify.info(
-        `${this.intl.t('proxyTurned')} ${statusText.toUpperCase()}`
-      );
-
-      if (enabled) {
-        triggerAnalytics(
-          'feature',
-          ENV.csb['enableProxy'] as CsbAnalyticsFeatureData
-        );
-      } else {
-        triggerAnalytics(
-          'feature',
-          ENV.csb['disableProxy'] as CsbAnalyticsFeatureData
-        );
-      }
-    } catch (error) {
-      const err = error as AdapterError;
-      let errMsg = this.intl.t('plaseTryAgain');
-
-      if (err.errors && err.errors.length) {
-        errMsg = err.errors[0]?.detail || errMsg;
-      } else if (err.message) {
-        errMsg = err.message;
-      }
-
-      this.notify.error(errMsg);
-    }
-  });
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    ProxySettingsView: typeof ProxySettingsViewComponent;
-  }
-}
diff --git a/app/components/vnc-viewer-old/index.hbs b/app/components/vnc-viewer-old/index.hbs
deleted file mode 100644
index 911b54512e..0000000000
--- a/app/components/vnc-viewer-old/index.hbs
+++ /dev/null
@@ -1,83 +0,0 @@
-<div
-  data-test-vncViewer-root
-  local-class='
-    vnc-viewer-root
-    {{if this.isFullscreenView "vnc-viewer-fullscreen"}}'
->
-  {{#if this.isFullscreenView}}
-    <div
-      data-test-vncViewer-backdrop
-      aria-hidden='true'
-      local-class='vnc-viewer-backdrop'
-    />
-  {{/if}}
-
-  <div
-    data-test-vncViewer-fullscreenContainer
-    local-class='{{if this.isFullscreenView "vnc-viewer-fullscreen-container"}}'
-  >
-    <AkStack @justifyContent='center'>
-      <div data-test-vncViewer-device class='marvel-device {{this.deviceType}}'>
-        {{#if this.isTablet}}
-          <div data-test-vncViewer-deviceTopBar class='top-bar' />
-          <div data-test-vncViewer-deviceSleep class='sleep' />
-          <div data-test-vncViewer-deviceVolume class='volume' />
-        {{/if}}
-
-        <div data-test-vncViewer-deviceCamera class='camera' />
-
-        {{#if this.isIOSDevice}}
-          {{#if this.isTablet}}
-            <div data-test-vncViewer-deviceSpeaker class='speaker' />
-          {{/if}}
-        {{/if}}
-
-        <div
-          data-test-vncViewer-deviceScreen
-          class={{if this.screenRequired 'noscreen' 'screen'}}
-        >
-          {{#if (and @file.isReady this.deviceType)}}
-            <NovncRfb
-              @deviceFarmURL={{this.deviceFarmURL}}
-              @deviceFarmPassword={{this.deviceFarmPassword}}
-            />
-          {{/if}}
-        </div>
-
-        {{#if this.isIOSDevice}}
-          <div data-test-vncViewer-deviceHome class='home' />
-
-          {{#if this.isTablet}}
-            <div data-test-vncViewer-deviceBottomBar class='bottom-bar' />
-          {{/if}}
-        {{/if}}
-      </div>
-    </AkStack>
-
-    <AkStack class='mt-4' @justifyContent='center' @spacing='1.5'>
-      <DynamicScan
-        @file={{@file}}
-        @vncViewer={{true}}
-        @onScanShutdown={{this.handleFullscreenClose}}
-        @dynamicScanText={{t 'startDynamicScan'}}
-      />
-
-      {{#if this.showVNCControls}}
-        <AkButton
-          data-test-vncViewer-fullscreenToggleBtn
-          @variant='outlined'
-          @color='neutral'
-          {{on 'click' this.toggleFullscreenView}}
-        >
-          {{this.vncFullscreenText}}
-        </AkButton>
-      {{/if}}
-    </AkStack>
-
-    {{#if @file.isReady}}
-      <AkStack class='mt-2' @justifyContent='center'>
-        <DynamicScan::Expiry @file={{@file}} />
-      </AkStack>
-    {{/if}}
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/components/vnc-viewer-old/index.scss b/app/components/vnc-viewer-old/index.scss
deleted file mode 100644
index 1cc9b55d4d..0000000000
--- a/app/components/vnc-viewer-old/index.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-.vnc-viewer-root {
-  padding: 1.5em;
-}
-
-.vnc-viewer-fullscreen {
-  position: fixed;
-  inset: 0px;
-  z-index: var(--vnc-viewer-modal-zIndex);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.vnc-viewer-backdrop {
-  position: fixed;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  inset: 0px;
-  background-color: var(--vnc-viewer-modal-backdrop-overlay-background);
-  z-index: -1;
-}
-
-.vnc-viewer-fullscreen-container {
-  padding: 2.5em;
-  background-color: var(--vnc-viewer-modal-background);
-  color: var(--vnc-viewer-modal-text-color);
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-  height: calc(100% - 64px);
-  flex: 1 0 auto;
-  z-index: var(--vnc-viewer-modal-zIndex);
-  position: fixed;
-  outline: 0px;
-}
diff --git a/app/components/vnc-viewer-old/index.ts b/app/components/vnc-viewer-old/index.ts
deleted file mode 100644
index 1b49a6a94f..0000000000
--- a/app/components/vnc-viewer-old/index.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import ENV from 'irene/config/environment';
-import ENUMS from 'irene/enums';
-import FileModel from 'irene/models/file';
-import { tracked } from '@glimmer/tracking';
-import IntlService from 'ember-intl/services/intl';
-import Store from '@ember-data/store';
-import { task } from 'ember-concurrency';
-import DevicePreferenceModel from 'irene/models/device-preference';
-import DevicefarmService from 'irene/services/devicefarm';
-
-export interface VncViewerOldSignature {
-  Args: {
-    file: FileModel;
-    profileId?: number;
-  };
-}
-
-export default class VncViewerOldComponent extends Component<VncViewerOldSignature> {
-  @service declare intl: IntlService;
-  @service declare store: Store;
-  @service declare devicefarm: DevicefarmService;
-
-  @tracked rfb: any = null;
-  @tracked devicePreference?: DevicePreferenceModel;
-  @tracked isFullscreenView = false;
-
-  deviceFarmPassword = ENV.deviceFarmPassword;
-
-  constructor(owner: unknown, args: VncViewerOldSignature['Args']) {
-    super(owner, args);
-
-    this.fetchDevicePreference.perform();
-  }
-
-  get deviceFarmURL() {
-    const token = this.args.file.deviceToken;
-
-    return this.devicefarm.getTokenizedWSURL(token);
-  }
-
-  get vncFullscreenText() {
-    if (this.isFullscreenView) {
-      return this.intl.t('closeModal');
-    } else {
-      return this.intl.t('popOutModal');
-    }
-  }
-
-  get showVNCControls() {
-    return this.isFullscreenView || this.args.file.isReady;
-  }
-
-  fetchDevicePreference = task(async () => {
-    const profileId = this.args.profileId;
-
-    if (profileId) {
-      this.devicePreference = await this.store.queryRecord(
-        'device-preference',
-        { id: profileId }
-      );
-    }
-  });
-
-  get screenRequired() {
-    const platform = this.args.file.project.get('platform');
-    const deviceType = this.devicePreference?.deviceType;
-
-    return (
-      platform === ENUMS.PLATFORM.ANDROID &&
-      deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED
-    );
-  }
-
-  get deviceType() {
-    const platform = this.args.file.project.get('platform');
-    const deviceType = this.devicePreference?.deviceType;
-
-    if (platform === ENUMS.PLATFORM.ANDROID) {
-      if (deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED) {
-        return 'tablet';
-      } else {
-        return 'nexus5';
-      }
-    } else if (platform === ENUMS.PLATFORM.IOS) {
-      if (deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED) {
-        return 'ipad black';
-      } else {
-        return 'iphone5s black';
-      }
-    }
-
-    return '';
-  }
-
-  get isTablet() {
-    const deviceType = this.devicePreference?.deviceType;
-
-    return ![
-      ENUMS.DEVICE_TYPE.NO_PREFERENCE,
-      ENUMS.DEVICE_TYPE.PHONE_REQUIRED,
-    ].includes(deviceType as number);
-  }
-
-  get isIOSDevice() {
-    const platform = this.args.file.project.get('platform');
-
-    return platform === ENUMS.PLATFORM.IOS;
-  }
-
-  @action
-  handleFullscreenClose() {
-    this.isFullscreenView = false;
-  }
-
-  @action
-  toggleFullscreenView() {
-    this.isFullscreenView = !this.isFullscreenView;
-  }
-
-  @action
-  setFocus(focus: boolean) {
-    const keyboard = this.rfb?.get_keyboard();
-
-    keyboard.set_focused(focus);
-  }
-
-  @action
-  focusKeyboard() {
-    this.setFocus(true);
-  }
-
-  @action
-  blurKeyboard() {
-    this.setFocus(false);
-  }
-}
-
-declare module '@glint/environment-ember-loose/registry' {
-  export default interface Registry {
-    VncViewerOld: typeof VncViewerOldComponent;
-  }
-}
diff --git a/app/components/vnc-viewer/index.hbs b/app/components/vnc-viewer/index.hbs
index 2a145f84db..1fa4939a2b 100644
--- a/app/components/vnc-viewer/index.hbs
+++ b/app/components/vnc-viewer/index.hbs
@@ -5,9 +5,19 @@
   @direction='column'
   @spacing='3'
 >
-  {{#if @dynamicScan.isDynamicStatusInProgress}}
-    <AkStack @justifyContent='center'>
-      <FileDetails::DynamicScan::Action::Expiry @file={{@file}} />
+  {{!-- {{#if @dynamicScan.isDynamicStatusInProgress}} --}}
+  {{#if @file.isReady}}
+    <AkStack
+      @justifyContent='center'
+      @alignItems='center'
+      @direction='column'
+      @spacing='1.5'
+    >
+      <FileDetails::DynamicScan::ExpiryOld @file={{@file}} />
+
+      {{#if (has-block 'controls')}}
+        {{yield to='controls'}}
+      {{/if}}
     </AkStack>
   {{/if}}
 
@@ -54,7 +64,8 @@
       data-test-vncViewer-deviceScreen
       class={{if this.screenRequired 'noscreen' 'screen'}}
     >
-      {{#if (and @dynamicScan.isReadyOrRunning this.deviceType)}}
+      {{!-- {{#if (and @dynamicScan.isReadyOrRunning this.deviceType)}} --}}
+      {{#if (and @file.isReady this.deviceType)}}
         {{#if this.isAutomated}}
           <AkStack
             data-test-vncViewer-automatedNote
diff --git a/app/components/vnc-viewer/index.scss b/app/components/vnc-viewer/index.scss
index bc650b4757..b94e5d85c3 100644
--- a/app/components/vnc-viewer/index.scss
+++ b/app/components/vnc-viewer/index.scss
@@ -1,14 +1,14 @@
 .automated-scan-vnc-note {
-    background-color: var(--vnc-viewer-note-background);
-    color: var(--vnc-viewer-note-text-color);
-    padding: 1em;
-    margin: 6em 1em;
-    border-radius: var(--vnc-viewer-note-border-radius);
+  background-color: var(--vnc-viewer-note-background);
+  color: var(--vnc-viewer-note-text-color);
+  padding: 1em;
+  margin: 6em 1em;
+  border-radius: var(--vnc-viewer-note-border-radius);
 }
 
 .automated-scan-trigger-info {
-    padding: 1em;
-    background-color: var(--vnc-viewer-info-background);
-    border-radius: var(--vnc-viewer-note-border-radius);
-    border: 1px solid var(--vnc-viewer-info-border-color);
-}
\ No newline at end of file
+  padding: 1em;
+  background-color: var(--vnc-viewer-info-background);
+  border-radius: var(--vnc-viewer-note-border-radius);
+  border: 1px solid var(--vnc-viewer-info-border-color);
+}
diff --git a/app/components/vnc-viewer/index.ts b/app/components/vnc-viewer/index.ts
index 887ded6796..fdfb7cbd80 100644
--- a/app/components/vnc-viewer/index.ts
+++ b/app/components/vnc-viewer/index.ts
@@ -20,6 +20,9 @@ export interface VncViewerSignature {
     profileId?: number;
     isAutomated?: boolean;
   };
+  Blocks: {
+    controls?: [];
+  };
 }
 
 export default class VncViewerComponent extends Component<VncViewerSignature> {
diff --git a/app/controllers/authenticated/dashboard/file/analysis.ts b/app/controllers/authenticated/dashboard/file/analysis.ts
new file mode 100644
index 0000000000..999853767f
--- /dev/null
+++ b/app/controllers/authenticated/dashboard/file/analysis.ts
@@ -0,0 +1,5 @@
+import Controller from '@ember/controller';
+
+export default class AuthenticatedDashboardFileAnalysisCompare extends Controller {
+  queryParams = [{ referrer: { type: 'string' as const } }];
+}
diff --git a/app/router.ts b/app/router.ts
index 896d6cac4b..938ecf568b 100644
--- a/app/router.ts
+++ b/app/router.ts
@@ -168,7 +168,7 @@ Router.map(function () {
 
           this.route('dynamic-scan', function () {
             this.route('manual');
-            this.route('automated');
+            // this.route('automated');
             this.route('results');
           });
         });
diff --git a/app/styles/_component-variables.scss b/app/styles/_component-variables.scss
index 10f3664184..7241d361bf 100644
--- a/app/styles/_component-variables.scss
+++ b/app/styles/_component-variables.scss
@@ -869,21 +869,6 @@ body {
   --file-details-scan-actions-border-color: var(--neutral-grey-200);
   --file-details-scan-actions-background-color: var(--common-white);
 
-  // variables for file-details/scan-actions-old
-  --file-details-scan-actions-old-border-color: var(--border-color-1);
-  --file-details-scan-actions-old-background-color: var(--background-main);
-
-  // variables for file-details/scan-actions/old/manual-scan
-  --file-details-scan-actions-old-manual-scan-textarea-border-color: var(
-    --border-color-1
-  );
-  --file-details-scan-actions-old-manual-scan-textarea-color: var(
-    --text-primary
-  );
-  --file-details-scan-actions-old-manual-scan-textarea-border-radius: var(
-    --border-radius
-  );
-
   // variables for file-details/scan-actions/api-scan
   --file-details-scan-actions-api-scan-border-radius: var(--border-radius);
   --file-details-scan-actions-api-scan-alert-background-color: var(
@@ -903,11 +888,8 @@ body {
     --success-light
   );
 
-  // variables for file-details/scan-actions/api-scan/captured-apis
-  --file-details-scan-actions-api-scan-captured-apis-border-radius: var(
-    --border-radius
-  );
-  --file-details-scan-actions-api-scan-captured-apis-border-color: var(
+  // variables for file-details/vulnerability-analysis/header
+  --file-details-vulnerability-analysis-header-border-color: var(
     --border-color-1
   );
 
@@ -1134,16 +1116,15 @@ body {
   --vnc-viewer-info-border-color: var(--neutral-grey-300);
   --vnc-viewer-info-background: var(--neutral-grey-100);
 
-  // variables for proxy-settings-view
-  --proxy-settings-view-border-color: var(--border-color-1);
-
-  // variables for dynamic-scan/modal
-  --dynamic-scan-modal-border-color: var(--border-color-1);
-  --dynamic-scan-modal-border-radius: var(--border-radius);
-  --dynamic-scan-modal-alert-background-color: var(--warn-light);
-  --dynamic-scan-modal-alert-text-color: var(--warn-dark);
-  --dynamic-scan-modal-alert-border-color: var(--warn-dark);
-  --dynamic-scan-modal-device-settings-warning-text-color: var(
+  // variables for file-details/dynamic-scan/drawer-old
+  --file-details-dynamic-scan-drawer-old-border-color: var(--border-color-1);
+  --file-details-dynamic-scan-drawer-old-border-radius: var(--border-radius);
+  --file-details-dynamic-scan-drawer-old-alert-background-color: var(
+    --warn-light
+  );
+  --file-details-dynamic-scan-drawer-old-alert-text-color: var(--warn-dark);
+  --file-details-dynamic-scan-drawer-old-alert-border-color: var(--warn-dark);
+  --file-details-dynamic-scan-drawer-old-device-settings-warning-text-color: var(
     --neutral-grey-500
   );
 
@@ -1914,9 +1895,13 @@ body {
   --file-details-dynamic-scan-drawer-cta-box-shadow: var(--box-shadow-4);
 
   // variables for file-details/dynamic-scan/action/expiry
-  --dynamic-scan-action-expiry-extend-btn-background: var(--neutral-grey-500);
-  --dynamic-scan-action-expiry-extend-btn-icon-color: var(--common-white);
-  --dynamic-scan-action-expiry-container-background-color: var(
+  --file-details-dynamic-scan-action-expiry-extend-btn-background: var(
+    --neutral-grey-500
+  );
+  --file-details-dynamic-scan-action-expiry-extend-btn-icon-color: var(
+    --common-white
+  );
+  --file-details-dynamic-scan-action-expiry-container-background-color: var(
     --neutral-grey-100
   );
 
@@ -1927,4 +1912,9 @@ body {
   --page-not-found-card-border-radius: var(--border-radius);
   --page-not-found-card-box-shadow: var(--box-shadow-2);
   --page-not-found-border-color: var(--border-color-1);
+
+  // variables for file-details/dynamic-scan/drawer-old/proxy-settings-view
+  --file-details-dynamic-scan-drawer-old-proxy-settings-view-border-color: var(
+    --border-color-1
+  );
 }
diff --git a/app/styles/_icons.scss b/app/styles/_icons.scss
index 599a7c6028..367be42f24 100644
--- a/app/styles/_icons.scss
+++ b/app/styles/_icons.scss
@@ -574,3 +574,7 @@
 .ak-icon-do-not-disturb-on {
   @extend .mi-do-not-disturb-on;
 }
+
+.ak-icon-stop-circle {
+  @extend .mi-stop-circle;
+}
diff --git a/app/templates/authenticated/dashboard/file/index-loading.hbs b/app/templates/authenticated/dashboard/file/index-loading.hbs
index f58d504e2e..6220e0c98c 100644
--- a/app/templates/authenticated/dashboard/file/index-loading.hbs
+++ b/app/templates/authenticated/dashboard/file/index-loading.hbs
@@ -1,3 +1,3 @@
-<div class='w-9/12'>
+<div>
   <FileDetails::SkeletonLoader />
 </div>
\ No newline at end of file
diff --git a/app/templates/authenticated/dashboard/file/index.hbs b/app/templates/authenticated/dashboard/file/index.hbs
index 614f85f3c9..263f2791cf 100644
--- a/app/templates/authenticated/dashboard/file/index.hbs
+++ b/app/templates/authenticated/dashboard/file/index.hbs
@@ -1,9 +1 @@
-<AkStack>
-  <div {{style flexGrow='2'}}>
-    <FileDetails @file={{@model.file}} />
-  </div>
-
-  <div {{style flexGrow='1'}}>
-    <VncViewerOld @file={{@model.file}} @profileId={{@model.profileId}} />
-  </div>
-</AkStack>
\ No newline at end of file
+<FileDetails @file={{@model.file}} />
\ No newline at end of file
diff --git a/tests/acceptance/file-details-test.js b/tests/acceptance/file-details-test.js
index f1cfd6bc7c..3c534609f2 100644
--- a/tests/acceptance/file-details-test.js
+++ b/tests/acceptance/file-details-test.js
@@ -64,6 +64,7 @@ module('Acceptance | file details', function (hooks) {
 
     const project = this.server.create('project', {
       active_profile_id: profile.id,
+      is_manual_scan_available: true,
     });
 
     const file = this.server.create('file', {
@@ -243,4 +244,48 @@ module('Acceptance | file details', function (hooks) {
       `/dashboard/file/${this.file.id}/analysis/${analyses[1].id}`
     );
   });
+
+  test('test sast view details click to navigate to static scan page', async function (assert) {
+    await visit('/dashboard/file/1');
+
+    await click('[data-test-fileDetailScanActions-staticScanViewDetails]');
+
+    assert.strictEqual(
+      currentURL(),
+      `/dashboard/file/${this.file.id}/static-scan`
+    );
+  });
+
+  test('test dast view details click to navigate to dynamic scan page', async function (assert) {
+    await visit('/dashboard/file/1');
+
+    await click('[data-test-fileDetailScanActions-dynamicScanViewDetails]');
+
+    assert.strictEqual(
+      currentURL(),
+      `/dashboard/file/${this.file.id}/dynamic-scan/manual`
+    );
+  });
+
+  test('test api view details click to navigate to api scan page', async function (assert) {
+    await visit('/dashboard/file/1');
+
+    await click('[data-test-fileDetailScanActions-apiScanViewDetails]');
+
+    assert.strictEqual(
+      currentURL(),
+      `/dashboard/file/${this.file.id}/api-scan`
+    );
+  });
+
+  test('test manual view details click to navigate to manual scan page', async function (assert) {
+    await visit('/dashboard/file/1');
+
+    await click('[data-test-fileDetailScanActions-manualScanViewDetails]');
+
+    assert.strictEqual(
+      currentURL(),
+      `/dashboard/file/${this.file.id}/manual-scan`
+    );
+  });
 });
diff --git a/tests/acceptance/file-details/api-scan-test.js b/tests/acceptance/file-details/api-scan-test.js
index 7664fb63bd..532f0e85f3 100644
--- a/tests/acceptance/file-details/api-scan-test.js
+++ b/tests/acceptance/file-details/api-scan-test.js
@@ -131,7 +131,7 @@ module('Acceptance | file-details/api-scan', function (hooks) {
     const breadcrumbItems = [
       t('allProjects'),
       t('scanDetails'),
-      t('apiScanResult'),
+      t('apiScanResults'),
     ];
 
     breadcrumbItems.map((item) => {
@@ -639,7 +639,7 @@ module('Acceptance | file-details/api-scan', function (hooks) {
 
     assert
       .dom(tabLink('api-results'))
-      .hasText(t('apiResults'))
+      .hasText(t('apiScanResults'))
       .hasClass(/active-shadow/);
 
     assert.strictEqual(
diff --git a/tests/acceptance/file-details/dynamic-scan-test.js b/tests/acceptance/file-details/dynamic-scan-test.js
index 3b9f567d56..78739bb9f1 100644
--- a/tests/acceptance/file-details/dynamic-scan-test.js
+++ b/tests/acceptance/file-details/dynamic-scan-test.js
@@ -172,13 +172,108 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
       organization,
       file,
       profile,
+      project,
       store,
       dynamicscan,
       dynamicscanMode,
     });
   });
 
-  test('it renders dynamic scan manual', async function (assert) {
+  test('it visits manual DAST page', async function (assert) {
+    this.file = this.server.create('file', {
+      project: '1',
+      profile: '100',
+      dynamic_status: ENUMS.DYNAMIC_STATUS.READY,
+      is_dynamic_done: false,
+      is_active: true,
+    });
+
+    this.server.create('dynamicscan-old', { id: this.file.id });
+
+    this.server.get('/dynamicscan/:id', (schema, req) => {
+      return schema.dynamicscanOlds.find(`${req.params.id}`)?.toJSON();
+    });
+
+    await visit(`/dashboard/file/${this.file.id}/dynamic-scan/manual`);
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-header-breadcrumbContainer]')
+      .exists();
+
+    const breadcrumbItems = [t('allProjects'), t('scanDetails'), t('dast')];
+
+    breadcrumbItems.map((item) => {
+      assert
+        .dom(
+          `[data-test-fileDetails-dynamicScan-header-breadcrumbItem="${item}"]`
+        )
+        .exists();
+    });
+
+    assert.dom('[data-test-fileDetailsSummary-root]').exists();
+
+    const tabs = [
+      { id: 'manual-dast-tab', label: 'dastTabs.manualDAST' },
+      // { id: 'automated-dast-tab', label: 'dastTabs.automatedDAST' },
+      { id: 'dast-results-tab', label: 'dastTabs.dastResults' },
+    ];
+
+    tabs.map((item) => {
+      assert
+        .dom(`[data-test-fileDetails-dynamicScan-header="${item.id}"]`)
+        .exists();
+
+      assert
+        .dom(`[data-test-fileDetails-dynamicScan-header="${item.id}"]`)
+        .containsText(t(item.label));
+    });
+
+    assert
+      .dom(`[data-test-fileDetails-dynamicScan-manualDast-vncViewer]`)
+      .exists();
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-manualDast-fullscreenBtn]')
+      .exists();
+
+    await click('[data-test-fileDetails-dynamicScan-manualDast-fullscreenBtn]');
+
+    assert
+      .dom('[data-test-vncViewer-root]')
+      .exists()
+      .hasClass(/vnc-viewer-fullscreen/);
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-manualDastFullScreen-title]')
+      .exists()
+      .containsText(t('realDevice'));
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScanAction-stopBtn]')
+      .exists()
+      .containsText(t('stop'));
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-manualDastFullScreen-closeBtn]')
+      .exists();
+
+    assert.dom('[data-test-vncViewer-device]').exists();
+
+    await click(
+      '[data-test-fileDetails-dynamicScan-manualDastFullScreen-closeBtn]'
+    );
+
+    assert
+      .dom('[data-test-vncViewer-root]')
+      .exists()
+      .doesNotHaveClass(/vnc-viewer-fullscreen/);
+
+    assert.dom('[data-test-NovncRfb-canvasContainer]').exists();
+  });
+
+  // TODO: Unskip when final DAST changes are ready
+  // Test for Final DAST Release
+  test.skip('it renders dynamic scan manual', async function (assert) {
     this.server.create('dynamicscan', {
       id: this.profile.id,
       mode: 0,
@@ -210,7 +305,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
 
     const tabs = [
       { id: 'manual-dast-tab', label: 'dastTabs.manualDAST' },
-      { id: 'automated-dast-tab', label: 'dastTabs.automatedDAST' },
+      // { id: 'automated-dast-tab', label: 'dastTabs.automatedDAST' },
       { id: 'dast-results-tab', label: 'dastTabs.dastResults' },
     ];
 
@@ -252,6 +347,48 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
   });
 
   test('it renders expiry correctly', async function (assert) {
+    this.file = this.server.create('file', {
+      project: '1',
+      profile: '100',
+      dynamic_status: ENUMS.DYNAMIC_STATUS.READY,
+      is_dynamic_done: false,
+      is_active: true,
+    });
+
+    this.server.create('dynamicscan-old', {
+      id: this.file.id,
+      expires_on: new Date(Date.now() + 10 * 60 * 1000).toISOString(),
+    });
+
+    this.server.get('/dynamicscan/:id', (schema, req) => {
+      return schema.dynamicscanOlds.find(`${req.params.id}`)?.toJSON();
+    });
+
+    await visit(`/dashboard/file/${this.file.id}/dynamic-scan/manual`);
+
+    assert.dom('[data-test-fileDetailsSummary-root]').exists();
+
+    assert.dom('[data-test-fileDetails-dynamicScan-expiry]').exists();
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-expiry-time]')
+      .hasText(/09:5/i);
+
+    await click('[data-test-fileDetails-dynamicScan-expiry-extendBtn]');
+
+    assert
+      .dom('[data-test-fileDetails-dynamicScan-expiry-extendTime-menu-item]')
+      .exists({ count: 3 });
+
+    assert
+      .dom(`[data-test-fileDetails-dynamicScan-manualDast-vncViewer]`)
+      .exists();
+
+    assert.dom(`[data-test-vncViewer-device]`).exists();
+  });
+
+  // TODO: For completed DAST implementation
+  test.skip('it renders expiry correctly', async function (assert) {
     this.server.create('dynamicscan', {
       id: this.profile.id,
       mode: 0,
@@ -287,7 +424,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
     assert.dom(`[data-test-vncViewer-device]`).exists();
   });
 
-  test('it renders dynamic scan automated', async function (assert) {
+  test.skip('it renders dynamic scan automated', async function (assert) {
     await visit(`/dashboard/file/${this.file.id}/dynamic-scan/automated`);
 
     assert
@@ -343,7 +480,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
       .doesNotExist();
   });
 
-  test.each(
+  test.skip(
     'test: start dynamic scan',
     [{ isAutomated: false }, { isAutomated: true }],
     async function (assert, { isAutomated }) {
@@ -404,12 +541,12 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
       );
 
       assert
-        .dom('[data-test-dynamicscan-startbtn]')
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
         .exists()
         .containsText(`${scanTypeText} DAST`);
 
       // Load dynamic scan drawer
-      await click('[data-test-dynamicScan-startBtn]');
+      await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
 
       assert
         .dom('[data-test-fileDetails-dynamicScanDrawer-drawerContainer-title]')
@@ -472,9 +609,9 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
     }
   );
 
-  test.each(
+  test.skip(
     'test: cancel/stop dynamic scan',
-    [{ isAutomated: false }, { isAutomated: true }],
+    [{ isAutomated: false }],
     async function (assert, { isAutomated }) {
       assert.expect();
 
@@ -490,7 +627,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
         mode: isAutomated ? 1 : 0,
         status: isAutomated
           ? ENUMS.DYNAMIC_STATUS.RUNNING
-          : ENUMS.DYNAMIC_STATUS.READY,
+          : ENUMS.DYNAMIC_STATUS.NONE,
       });
 
       this.server.get('/profiles/:id/api_scan_options', (schema, req) => {
@@ -513,10 +650,11 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
         `/dashboard/file/${this.file.id}/dynamic-scan/${scanTypeText.toLowerCase()}`
       );
 
-      const statusChipSelector = '[data-test-dynamicScan-statusChip]';
-      const stopBtn = '[data-test-dynamicScan-stopBtn]';
-      const cancelBtn = '[data-test-dynamicScan-cancelBtn]';
-      const scanStartBtn = '[data-test-dynamicScan-startBtn]';
+      const statusChipSelector =
+        '[data-test-fileDetails-dynamicScan-statusChip]';
+      const stopBtn = '[data-test-fileDetails-dynamicScanAction-stopBtn]';
+      const cancelBtn = '[data-test-fileDetails-dynamicScanAction-cancelBtn]';
+      const scanStartBtn = '[data-test-fileDetails-dynamicScanAction-startBtn]';
 
       assert.dom(scanStartBtn).doesNotExist();
 
@@ -555,7 +693,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
     }
   );
 
-  test('it should render toggle dast ui if automated dast is not enabled', async function (assert) {
+  test.skip('it should render toggle dast ui if automated dast is not enabled', async function (assert) {
     this.dynamicscanMode.update({ dynamicscan_mode: 'Manual' });
 
     this.server.create('proxy-setting', { id: this.profile.id });
@@ -671,7 +809,7 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
     );
   });
 
-  test('it should render upselling ui if automated dast is not enabled', async function (assert) {
+  test.skip('it should render upselling ui if automated dast is not enabled', async function (assert) {
     this.file.update({ can_run_automated_dynamicscan: false });
 
     this.organization.update({
@@ -696,17 +834,18 @@ module('Acceptance | file-details/dynamic-scan', function (hooks) {
       .hasText(t('dastTabs.manualDAST'))
       .hasClass(/active-shadow/);
 
-    await click(tabLink('automated-dast-tab'));
+    // TODO: Uncomment when full DAST feature is ready
+    // await click(tabLink('automated-dast-tab'));
 
-    assert
-      .dom(tabLink('automated-dast-tab'))
-      .hasText(t('dastTabs.automatedDAST'))
-      .hasClass(/active-shadow/);
-
-    assert.strictEqual(
-      currentURL(),
-      `/dashboard/file/${this.file.id}/dynamic-scan/automated`
-    );
+    // assert
+    //   .dom(tabLink('automated-dast-tab'))
+    //   .hasText(t('dastTabs.automatedDAST'))
+    //   .hasClass(/active-shadow/);
+
+    // assert.strictEqual(
+    //   currentURL(),
+    //   `/dashboard/file/${this.file.id}/dynamic-scan/automated`
+    // );
 
     await click(tabLink('dast-results-tab'));
 
diff --git a/tests/acceptance/file-details/manual-scan-test.js b/tests/acceptance/file-details/manual-scan-test.js
index 6ceee9ceba..c0d0baee98 100644
--- a/tests/acceptance/file-details/manual-scan-test.js
+++ b/tests/acceptance/file-details/manual-scan-test.js
@@ -310,7 +310,7 @@ module('Acceptance | file-details/manual-scan', function (hooks) {
 
     assert
       .dom('[data-test-manualScanBasicInfo-minOSVersionLabel]', accordions[0])
-      .hasText(t('modalCard.manual.minOSVersion'));
+      .hasText(t('minOSVersion'));
 
     assert
       .dom('[data-test-manualScanBasicInfo-minOSVersionInput]', accordions[0])
@@ -784,7 +784,7 @@ module('Acceptance | file-details/manual-scan', function (hooks) {
 
     assert
       .dom(tabLink('manual-results'))
-      .hasText(`${t('manualResults')} ${file.manualVulnerabilityCount}`)
+      .hasText(`${t('manualScanResults')} ${file.manualVulnerabilityCount}`)
       .hasClass(/active-shadow/);
 
     assert.strictEqual(
diff --git a/tests/integration/components/dynamic-scan-test.js b/tests/integration/components/dynamic-scan-test.js
deleted file mode 100644
index 6a1612115f..0000000000
--- a/tests/integration/components/dynamic-scan-test.js
+++ /dev/null
@@ -1,1115 +0,0 @@
-import { click, fillIn, find, findAll, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-import Service from '@ember/service';
-import { Response } from 'miragejs';
-import { selectChoose } from 'ember-power-select/test-support';
-import { faker } from '@faker-js/faker';
-
-import ENUMS from 'irene/enums';
-import { deviceType } from 'irene/helpers/device-type';
-import styles from 'irene/components/ak-select/index.scss';
-
-const classes = {
-  dropdown: styles['ak-select-dropdown'],
-  trigger: styles['ak-select-trigger'],
-  triggerError: styles['ak-select-trigger-error'],
-};
-
-const dynamicScanStatusText = {
-  [ENUMS.DYNAMIC_STATUS.INQUEUE]: 't:deviceInQueue:()',
-  [ENUMS.DYNAMIC_STATUS.BOOTING]: 't:deviceBooting:()',
-  [ENUMS.DYNAMIC_STATUS.DOWNLOADING]: 't:deviceDownloading:()',
-  [ENUMS.DYNAMIC_STATUS.INSTALLING]: 't:deviceInstalling:()',
-  [ENUMS.DYNAMIC_STATUS.LAUNCHING]: 't:deviceLaunching:()',
-  [ENUMS.DYNAMIC_STATUS.HOOKING]: 't:deviceHooking:()',
-  [ENUMS.DYNAMIC_STATUS.SHUTTING_DOWN]: 't:deviceShuttingDown:()',
-  [ENUMS.DYNAMIC_STATUS.COMPLETED]: 't:deviceCompleted:()',
-};
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-  infoMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-
-  success(msg) {
-    this.successMsg = msg;
-  }
-
-  info(msg) {
-    this.infoMsg = msg;
-  }
-}
-
-class PollServiceStub extends Service {
-  callback = null;
-  interval = null;
-
-  startPolling(cb, interval) {
-    function stop() {}
-
-    this.callback = cb;
-    this.interval = interval;
-
-    return stop;
-  }
-}
-
-module('Integration | Component | dynamic-scan', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupIntl(hooks);
-
-  hooks.beforeEach(async function () {
-    this.server.createList('organization', 1);
-
-    const store = this.owner.lookup('service:store');
-
-    const profile = this.server.create('profile', { id: '100' });
-
-    const file = this.server.create('file', {
-      project: '1',
-      profile: profile.id,
-    });
-
-    const project = this.server.create('project', { file: file.id, id: '1' });
-
-    const availableDevices = [
-      ...this.server.createList('project-available-device', 5, {
-        is_tablet: true,
-        platform: 0,
-      }),
-      ...this.server.createList('project-available-device', 5, {
-        is_tablet: true,
-        platform: 1,
-      }),
-      ...this.server.createList('project-available-device', 5, {
-        is_tablet: false,
-        platform: 0,
-      }),
-      ...this.server.createList('project-available-device', 5, {
-        is_tablet: false,
-        platform: 1,
-      }),
-    ];
-
-    // choose a random device for preference
-    const randomDevice = faker.helpers.arrayElement(
-      availableDevices.filter((it) => it.platform === project.platform)
-    );
-
-    const devicePreference = this.server.create('device-preference', {
-      id: profile.id,
-      device_type: randomDevice.is_tablet
-        ? ENUMS.DEVICE_TYPE.TABLET_REQUIRED
-        : ENUMS.DEVICE_TYPE.PHONE_REQUIRED,
-      platform_version: randomDevice.platform_version,
-    });
-
-    this.setProperties({
-      file: store.push(store.normalize('file', file.toJSON())),
-      dynamicScanText: 'Start',
-      devicePreference,
-      availableDevices,
-      store,
-    });
-
-    await this.owner.lookup('service:organization').load();
-    this.owner.register('service:notifications', NotificationsStub);
-    this.owner.register('service:poll', PollServiceStub);
-  });
-
-  test.each(
-    'test different states of dynamic scan',
-    ENUMS.DYNAMIC_STATUS.VALUES,
-    async function (assert, status) {
-      if (status === ENUMS.DYNAMIC_STATUS.COMPLETED) {
-        this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-        this.file.isDynamicDone = true;
-      } else {
-        this.file.dynamicStatus = status;
-        this.file.isDynamicDone = false;
-      }
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      await render(hbs`
-            <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-        `);
-
-      if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.ERROR) {
-        assert.dom('[data-test-dynamicScan-startBtn]').hasText('t:errored:()');
-
-        assert.dom('[data-test-dynamicScan-restartBtn]').isNotDisabled();
-      } else if (
-        this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE &&
-        this.file.isDynamicDone
-      ) {
-        assert
-          .dom('[data-test-dynamicScan-startBtn]')
-          .hasText('t:completed:()');
-
-        assert.dom('[data-test-dynamicScan-restartBtn]').isNotDisabled();
-      } else if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE) {
-        assert
-          .dom('[data-test-dynamicScan-startBtn]')
-          .hasText(this.dynamicScanText);
-
-        assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-      } else if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.READY) {
-        assert.dom('[data-test-dynamicScan-stopBtn]').hasText('t:stop:()');
-
-        assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-      } else {
-        assert.strictEqual(
-          this.file.statusText,
-          dynamicScanStatusText[this.file.dynamicStatus] || 'Unknown Status'
-        );
-
-        assert
-          .dom('[data-test-dynamicScan-startBtn]')
-          .isNotDisabled()
-          .hasText(this.file.statusText);
-
-        if (
-          status === ENUMS.DYNAMIC_STATUS.INQUEUE &&
-          this.file.canRunAutomatedDynamicscan
-        ) {
-          assert.dom('[data-test-dynamicScan-restartBtn]').isNotDisabled();
-        }
-      }
-    }
-  );
-
-  test.each(
-    'it should render dynamic scan modal',
-    [
-      { withApiProxySetting: true },
-      { withApiScan: true },
-      { withDeviceRequirements: true },
-      { withAutomatedDynamicScan: true },
-    ],
-    async function (
-      assert,
-      {
-        withApiProxySetting,
-        withApiScan,
-        withDeviceRequirements,
-        withAutomatedDynamicScan,
-      }
-    ) {
-      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-      this.file.isDynamicDone = false;
-
-      if (withDeviceRequirements) {
-        this.file.minOsVersion = '10.0';
-        this.file.supportedCpuArchitectures = 'arm64';
-        this.file.supportedDeviceTypes = 'iPhone';
-      }
-
-      if (withAutomatedDynamicScan) {
-        this.file.canRunAutomatedDynamicscan = true;
-      }
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/profiles/:id', (schema, req) =>
-        schema.profiles.find(`${req.params.id}`)?.toJSON()
-      );
-
-      this.server.get('/profiles/:id/device_preference', (schema, req) => {
-        return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/projects/:id/available-devices', (schema) => {
-        const results = schema.projectAvailableDevices.all().models;
-
-        return { count: results.length, next: null, previous: null, results };
-      });
-
-      this.server.get('/profiles/:id/api_scan_options', (_, req) => {
-        return { api_url_filters: '', id: req.params.id };
-      });
-
-      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-        return {
-          id: req.params.id,
-          host: withApiProxySetting ? faker.internet.ip() : '',
-          port: withApiProxySetting ? faker.internet.port() : '',
-          enabled: false,
-        };
-      });
-
-      await render(hbs`
-            <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-        `);
-
-      assert
-        .dom('[data-test-dynamicScan-startBtn]')
-        .hasText(this.dynamicScanText);
-
-      assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-      await click('[data-test-dynamicScan-startBtn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.dynamicScan.title:()');
-
-      assert
-        .dom('[data-test-dynamicScanModal-warningAlert]')
-        .hasText('t:modalCard.dynamicScan.warning:()');
-
-      if (this.file.minOsVersion) {
-        assert
-          .dom('[data-test-dynamicScanModal-deviceRequirementContainer]')
-          .exists();
-
-        const deviceRequirements = [
-          {
-            type: 't:modalCard.dynamicScan.osVersion:()',
-            value: `${this.file.project.get('platformDisplay')} ${
-              this.file.minOsVersion
-            } t:modalCard.dynamicScan.orAbove:()`,
-          },
-          this.file.supportedCpuArchitectures && {
-            type: 't:modalCard.dynamicScan.processorArchitecture:()',
-            value: this.file.supportedCpuArchitectures,
-          },
-          this.file.supportedDeviceTypes && {
-            type: 't:modalCard.dynamicScan.deviceTypes:()',
-            value: this.file.supportedDeviceTypes,
-          },
-        ].filter(Boolean);
-
-        deviceRequirements.forEach(({ type, value }) => {
-          const container = find(
-            `[data-test-dynamicScanModal-deviceRequirementGroup="${type}"]`
-          );
-
-          assert
-            .dom(
-              '[data-test-dynamicScanModal-deviceRequirementType]',
-              container
-            )
-            .hasText(type);
-
-          assert
-            .dom(
-              '[data-test-dynamicScanModal-deviceRequirementValue]',
-              container
-            )
-            .hasText(value);
-        });
-      } else {
-        assert
-          .dom('[data-test-dynamicScanModal-deviceRequirementContainer]')
-          .doesNotExist();
-      }
-
-      assert
-        .dom('[data-test-projectPreference-title]')
-        .hasText('t:devicePreferences:()');
-
-      assert
-        .dom('[data-test-projectPreference-description]')
-        .hasText('t:otherTemplates.selectPreferredDevice:()');
-
-      assert
-        .dom(
-          '[data-test-projectPreference-deviceTypeSelect] [data-test-form-label]'
-        )
-        .hasText('t:deviceType:()');
-
-      assert
-        .dom(
-          `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
-        )
-        .hasText(`t:${deviceType([this.devicePreference.device_type])}:()`);
-
-      assert
-        .dom(
-          '[data-test-projectPreference-osVersionSelect] [data-test-form-label]'
-        )
-        .hasText('t:osVersion:()');
-
-      assert
-        .dom(
-          `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
-        )
-        .hasText(this.devicePreference.platform_version);
-
-      assert
-        .dom(
-          '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-ak-form-label]'
-        )
-        .hasText('t:modalCard.dynamicScan.runApiScan:()');
-
-      assert
-        .dom(
-          '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-        )
-        .isNotDisabled()
-        .isNotChecked();
-
-      if (withApiScan) {
-        await click(
-          '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-        );
-
-        assert
-          .dom(
-            '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-          )
-          .isNotDisabled()
-          .isChecked();
-
-        assert
-          .dom('[data-test-dynamicScanModal-apiSettingsContainer]')
-          .exists();
-
-        assert
-          .dom('[data-test-dynamicScanModal-apiSettingScanDescription]')
-          .hasText('t:modalCard.dynamicScan.apiScanDescription:()');
-
-        assert
-          .dom('[data-test-apiFilter-title]')
-          .hasText('t:templates.apiScanURLFilter:()');
-
-        assert
-          .dom('[data-test-apiFilter-description]')
-          .hasText('t:otherTemplates.specifyTheURL:()');
-
-        assert
-          .dom('[data-test-apiFilter-apiEndpointInput]')
-          .isNotDisabled()
-          .hasNoValue();
-
-        assert
-          .dom('[data-test-apiFilter-addApiEndpointBtn]')
-          .isNotDisabled()
-          .hasText('t:templates.addNewUrlFilter:()');
-
-        assert.dom('[data-test-apiFilter-table]').doesNotExist();
-      } else {
-        assert
-          .dom('[data-test-dynamicScanModal-apiSettingsContainer]')
-          .doesNotExist();
-      }
-
-      const proxySetting = this.store.peekRecord(
-        'proxy-setting',
-        this.file.profile.get('id')
-      );
-
-      if (proxySetting.hasProxyUrl) {
-        assert.dom('[data-test-proxySettingsView-container]').exists();
-
-        assert
-          .dom(
-            '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
-          )
-          .isNotDisabled()
-          .isNotChecked();
-
-        assert
-          .dom('[data-test-proxySettingsView-enableApiProxyLabel]')
-          .hasText('t:enable:() t:proxySettingsTitle:()');
-
-        assert
-          .dom('[data-test-proxySettingsView-editSettings]')
-          .hasTagName('a')
-          .hasAttribute('href', '/dashboard/project/1/settings')
-          .hasText('t:edit:()');
-
-        assert
-          .dom('[data-test-proxySettingsView-proxySettingRoute]')
-          .hasText(
-            `t:proxySettingsRouteVia:() ${proxySetting.host}:${proxySetting.port}`
-          );
-      } else {
-        assert.dom('[data-test-proxySettingsView-container]').doesNotExist();
-      }
-
-      if (this.file.canRunAutomatedDynamicscan) {
-        assert
-          .dom('[data-test-dynamicScanModal-device-settings-warning]')
-          .doesNotExist();
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanContainer]')
-          .exists();
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanTitle]')
-          .hasText('t:dynamicScanAutomation:()');
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanChip]')
-          .hasText('t:experimentalFeature:()');
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanDescription]')
-          .hasText('t:scheduleDynamicscanDesc:()');
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanScheduleBtn]')
-          .isNotDisabled()
-          .hasText('t:scheduleDynamicscan:()');
-      } else {
-        assert
-          .dom('[data-test-dynamicScanModal-device-settings-warning]')
-          .hasText(
-            't:note:(): t:modalCard.dynamicScan.deviceSettingsWarning:()'
-          );
-
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanContainer]')
-          .doesNotExist();
-      }
-
-      assert
-        .dom('[data-test-dynamicScanModal-cancelBtn]')
-        .isNotDisabled()
-        .hasText('t:cancel:()');
-
-      assert
-        .dom('[data-test-dynamicScanModal-startBtn]')
-        .isNotDisabled()
-        .hasText('t:modalCard.dynamicScan.start:()');
-    }
-  );
-
-  test('test add & delete of api filter endpoint', async function (assert) {
-    this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-    this.file.isDynamicDone = false;
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/profiles/:id', (schema, req) =>
-      schema.profiles.find(`${req.params.id}`)?.toJSON()
-    );
-
-    this.server.get('/profiles/:id/device_preference', (schema, req) => {
-      return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/projects/:id/available-devices', (schema) => {
-      const results = schema.projectAvailableDevices.all().models;
-
-      return { count: results.length, next: null, previous: null, results };
-    });
-
-    this.server.get('/profiles/:id/api_scan_options', (_, req) => {
-      return { api_url_filters: '', id: req.params.id };
-    });
-
-    this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-      return {
-        id: req.params.id,
-        host: '',
-        port: '',
-        enabled: false,
-      };
-    });
-
-    await render(hbs`
-        <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-      `);
-
-    assert
-      .dom('[data-test-dynamicScan-startBtn]')
-      .hasText(this.dynamicScanText);
-
-    assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-    await click('[data-test-dynamicScan-startBtn]');
-
-    await click(
-      '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-    );
-
-    assert
-      .dom(
-        '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-      )
-      .isNotDisabled()
-      .isChecked();
-
-    assert.dom('[data-test-dynamicScanModal-apiSettingsContainer]').exists();
-
-    assert
-      .dom('[data-test-dynamicScanModal-apiSettingScanDescription]')
-      .hasText('t:modalCard.dynamicScan.apiScanDescription:()');
-
-    assert
-      .dom('[data-test-apiFilter-title]')
-      .hasText('t:templates.apiScanURLFilter:()');
-
-    assert
-      .dom('[data-test-apiFilter-description]')
-      .hasText('t:otherTemplates.specifyTheURL:()');
-
-    assert
-      .dom('[data-test-apiFilter-apiEndpointInput]')
-      .isNotDisabled()
-      .hasNoValue();
-
-    assert
-      .dom('[data-test-apiFilter-addApiEndpointBtn]')
-      .isNotDisabled()
-      .hasText('t:templates.addNewUrlFilter:()');
-
-    assert.dom('[data-test-apiFilter-table]').doesNotExist();
-
-    const notify = this.owner.lookup('service:notifications');
-
-    // empty input
-    await click('[data-test-apiFilter-addApiEndpointBtn]');
-
-    assert.strictEqual(notify.errorMsg, 't:emptyURLFilter:()');
-
-    // invalid url
-    await fillIn(
-      '[data-test-apiFilter-apiEndpointInput]',
-      'https://api.example.com'
-    );
-
-    await click('[data-test-apiFilter-addApiEndpointBtn]');
-
-    assert.strictEqual(
-      notify.errorMsg,
-      'https://api.example.com t:invalidURL:()'
-    );
-
-    await fillIn('[data-test-apiFilter-apiEndpointInput]', 'api.example.com');
-
-    await click('[data-test-apiFilter-addApiEndpointBtn]');
-
-    assert.strictEqual(notify.successMsg, 't:urlUpdated:()');
-    assert.dom('[data-test-apiFilter-table]').exists();
-
-    await fillIn('[data-test-apiFilter-apiEndpointInput]', 'api.example2.com');
-
-    await click('[data-test-apiFilter-addApiEndpointBtn]');
-
-    const headers = findAll('[data-test-apiFilter-thead] th');
-
-    assert.strictEqual(headers.length, 2);
-    assert.dom(headers[0]).hasText('t:apiURLFilter:()');
-    assert.dom(headers[1]).hasText('t:action:()');
-
-    let rows = findAll('[data-test-apiFilter-row]');
-
-    assert.strictEqual(rows.length, 2);
-
-    const firstRowCells = rows[0].querySelectorAll(
-      '[data-test-apiFilter-cell]'
-    );
-
-    assert.dom(firstRowCells[0]).hasText('api.example.com');
-
-    assert
-      .dom('[data-test-apiFilter-deleteBtn]', firstRowCells[1])
-      .isNotDisabled();
-
-    // delete first url
-    await click(
-      firstRowCells[1].querySelector('[data-test-apiFilter-deleteBtn]')
-    );
-
-    // confirm box is 2nd modal
-    assert
-      .dom(findAll('[data-test-ak-modal-header]')[1])
-      .hasText('t:confirm:()');
-
-    assert
-      .dom('[data-test-confirmbox-description]')
-      .hasText('t:confirmBox.removeURL:()');
-
-    assert
-      .dom('[data-test-confirmbox-confirmBtn]')
-      .isNotDisabled()
-      .hasText('t:yes:()');
-
-    await click('[data-test-confirmbox-confirmBtn]');
-
-    rows = findAll('[data-test-apiFilter-row]');
-
-    assert.strictEqual(notify.successMsg, 't:urlUpdated:()');
-    assert.strictEqual(rows.length, 1);
-  });
-
-  test('test enable api proxy toggle', async function (assert) {
-    assert.expect(10);
-
-    this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-    this.file.isDynamicDone = false;
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/profiles/:id', (schema, req) =>
-      schema.profiles.find(`${req.params.id}`)?.toJSON()
-    );
-
-    this.server.get('/profiles/:id/device_preference', (schema, req) => {
-      return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/projects/:id/available-devices', (schema) => {
-      const results = schema.projectAvailableDevices.all().models;
-
-      return { count: results.length, next: null, previous: null, results };
-    });
-
-    this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-      return {
-        id: req.params.id,
-        host: faker.internet.ip(),
-        port: faker.internet.port(),
-        enabled: false,
-      };
-    });
-
-    this.server.put('/profiles/:id/proxy_settings', (_, req) => {
-      const data = JSON.parse(req.requestBody);
-
-      assert.true(data.enabled);
-
-      return {
-        id: req.params.id,
-        ...data,
-      };
-    });
-
-    await render(hbs`
-        <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-      `);
-
-    assert
-      .dom('[data-test-dynamicScan-startBtn]')
-      .hasText(this.dynamicScanText);
-
-    assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-    await click('[data-test-dynamicScan-startBtn]');
-
-    const proxySetting = this.store.peekRecord(
-      'proxy-setting',
-      this.file.profile.get('id')
-    );
-
-    assert.dom('[data-test-proxySettingsView-container]').exists();
-
-    assert
-      .dom(
-        '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
-      )
-      .isNotDisabled()
-      .isNotChecked();
-
-    await click(
-      '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
-    );
-
-    assert
-      .dom(
-        '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
-      )
-      .isNotDisabled()
-      .isChecked();
-
-    assert.true(proxySetting.enabled);
-
-    const notify = this.owner.lookup('service:notifications');
-
-    assert.strictEqual(notify.infoMsg, 't:proxyTurned:() T:ON:()');
-  });
-
-  test.each(
-    'test start dynamic scan',
-    [{ automatedScan: false }, { automatedScan: true }],
-    async function (assert, { automatedScan }) {
-      const file = this.server.create('file', {
-        project: '1',
-        profile: '100',
-        dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
-        is_dynamic_done: false,
-        can_run_automated_dynamicscan: automatedScan,
-        is_active: true,
-      });
-
-      this.set(
-        'file',
-        this.store.push(this.store.normalize('file', file.toJSON()))
-      );
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return {
-          ...schema.projects.find(`${req.params.id}`)?.toJSON(),
-          platform: 0,
-        };
-      });
-
-      this.server.get('/v2/files/:id', (schema, req) => {
-        return schema.files.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/profiles/:id', (schema, req) =>
-        schema.profiles.find(`${req.params.id}`)?.toJSON()
-      );
-
-      this.server.get('/profiles/:id/device_preference', (schema, req) => {
-        return {
-          ...schema.devicePreferences.find(`${req.params.id}`)?.toJSON(),
-          device_type: ENUMS.DEVICE_TYPE.TABLET_REQUIRED,
-        };
-      });
-
-      this.server.put('/profiles/:id/device_preference', (_, req) => {
-        const data = req.requestBody
-          .split('&')
-          .map((it) => it.split('='))
-          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
-
-        this.set('requestBody', data);
-
-        return new Response(200);
-      });
-
-      this.server.get('/projects/:id/available-devices', (schema) => {
-        const results = schema.projectAvailableDevices.all().models;
-
-        return { count: results.length, next: null, previous: null, results };
-      });
-
-      this.server.get('/profiles/:id/api_scan_options', (_, req) => {
-        return {
-          api_url_filters: 'api.example.com,api.example2.com',
-          id: req.params.id,
-        };
-      });
-
-      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-        return {
-          id: req.params.id,
-          host: faker.internet.ip(),
-          port: faker.internet.port(),
-          enabled: false,
-        };
-      });
-
-      this.server.put('/dynamicscan/:id', (schema, req) => {
-        schema.db.files.update(`${req.params.id}`, {
-          dynamic_status: ENUMS.DYNAMIC_STATUS.BOOTING,
-        });
-
-        return new Response(200);
-      });
-
-      this.server.post(
-        '/dynamicscan/:id/schedule_automation',
-        (schema, req) => {
-          schema.db.files.update(`${req.params.id}`, {
-            dynamic_status: ENUMS.DYNAMIC_STATUS.INQUEUE,
-          });
-
-          return new Response(201);
-        }
-      );
-
-      await render(hbs`
-          <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-        `);
-
-      assert
-        .dom('[data-test-dynamicScan-startBtn]')
-        .hasText(this.dynamicScanText);
-
-      assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-      await click('[data-test-dynamicScan-startBtn]');
-
-      // choose device type and os version
-      assert
-        .dom(
-          `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
-        )
-        .hasText(`t:${deviceType([ENUMS.DEVICE_TYPE.TABLET_REQUIRED])}:()`);
-
-      assert
-        .dom(
-          `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
-        )
-        .hasText(`${this.devicePreference.platform_version}`);
-
-      await selectChoose(
-        `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`,
-        `t:${deviceType([ENUMS.DEVICE_TYPE.PHONE_REQUIRED])}:()`
-      );
-
-      // verify ui
-      assert
-        .dom(
-          `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
-        )
-        .hasText(`t:${deviceType([ENUMS.DEVICE_TYPE.PHONE_REQUIRED])}:()`);
-
-      // verify network data
-      assert.strictEqual(
-        this.requestBody.device_type,
-        `${ENUMS.DEVICE_TYPE.PHONE_REQUIRED}`
-      );
-
-      const filteredDevices = this.availableDevices.filter(
-        (it) => it.platform === 0 && !it.is_tablet
-      );
-
-      await selectChoose(
-        `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`,
-        filteredDevices[1].platform_version
-      );
-
-      // verify ui
-      assert
-        .dom(
-          `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
-        )
-        .hasText(`${filteredDevices[1].platform_version}`);
-
-      // verify network data
-      assert.strictEqual(
-        this.requestBody.platform_version,
-        `${filteredDevices[1].platform_version}`
-      );
-
-      // enable api catpure
-      await click(
-        '[data-test-dynamicScanModal-runApiScanFormControl] [data-test-dynamicScanModal-runApiScanCheckbox]'
-      );
-
-      // verify api-filter render
-      let apiFilterRows = findAll('[data-test-apiFilter-row]');
-
-      assert.strictEqual(apiFilterRows.length, 2);
-
-      assert
-        .dom(apiFilterRows[0].querySelectorAll('[data-test-apiFilter-cell]')[0])
-        .hasText('api.example.com');
-
-      assert
-        .dom(apiFilterRows[1].querySelectorAll('[data-test-apiFilter-cell]')[0])
-        .hasText('api.example2.com');
-
-      if (automatedScan) {
-        assert
-          .dom('[data-test-dynamicScanModal-automatedDynamicScanScheduleBtn]')
-          .isNotDisabled()
-          .hasText('t:scheduleDynamicscan:()');
-
-        await click(
-          '[data-test-dynamicScanModal-automatedDynamicScanScheduleBtn]'
-        );
-      } else {
-        assert
-          .dom('[data-test-dynamicScanModal-startBtn]')
-          .isNotDisabled()
-          .hasText('t:modalCard.dynamicScan.start:()');
-
-        await click('[data-test-dynamicScanModal-startBtn]');
-      }
-
-      const notify = this.owner.lookup('service:notifications');
-      const poll = this.owner.lookup('service:poll');
-
-      assert.strictEqual(
-        notify.successMsg,
-        automatedScan ? 't:scheduleDynamicscanSuccess:()' : 't:startingScan:()'
-      );
-
-      // simulate polling
-      if (poll.callback) {
-        await poll.callback();
-      }
-
-      assert.strictEqual(
-        this.file.dynamicStatus,
-        automatedScan
-          ? ENUMS.DYNAMIC_STATUS.INQUEUE
-          : ENUMS.DYNAMIC_STATUS.BOOTING
-      );
-
-      // modal should close
-      assert.dom('[data-test-ak-modal-header]').doesNotExist();
-
-      assert
-        .dom('[data-test-dynamicScan-startBtn]')
-        .hasText(
-          dynamicScanStatusText[
-            automatedScan
-              ? ENUMS.DYNAMIC_STATUS.INQUEUE
-              : ENUMS.DYNAMIC_STATUS.BOOTING
-          ]
-        );
-    }
-  );
-
-  test('test stop dynamic scan', async function (assert) {
-    const file = this.server.create('file', {
-      project: '1',
-      profile: '100',
-      dynamic_status: ENUMS.DYNAMIC_STATUS.READY,
-      is_dynamic_done: false,
-      is_active: true,
-    });
-
-    this.set(
-      'file',
-      this.store.push(this.store.normalize('file', file.toJSON()))
-    );
-
-    this.server.get('/v2/files/:id', (schema, req) => {
-      return schema.files.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.delete('/dynamicscan/:id', (schema, req) => {
-      schema.db.files.update(`${req.params.id}`, {
-        dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
-        is_dynamic_done: true,
-      });
-
-      return new Response(204);
-    });
-
-    await render(hbs`
-        <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-      `);
-
-    assert.dom('[data-test-dynamicScan-stopBtn]').hasText('t:stop:()');
-    assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-    await click('[data-test-dynamicScan-stopBtn]');
-
-    assert
-      .dom('[data-test-dynamicScan-startBtn]')
-      .hasText(dynamicScanStatusText[ENUMS.DYNAMIC_STATUS.SHUTTING_DOWN]);
-
-    const poll = this.owner.lookup('service:poll');
-
-    // simulate polling
-    if (poll.callback) {
-      await poll.callback();
-    }
-
-    assert.dom('[data-test-dynamicScan-startBtn]').hasText('t:completed:()');
-    assert.dom('[data-test-dynamicScan-restartBtn]').exists();
-  });
-
-  test('test when preferred device is not available', async function (assert) {
-    const preferredDeviceType = this.devicePreference.device_type;
-    const preferredPlatformVersion = this.devicePreference.platform_version;
-
-    // there can be duplicates
-    const preferredDeviceList = this.server.db.projectAvailableDevices.where(
-      (ad) =>
-        ad.platform_version === preferredPlatformVersion &&
-        (ad.is_tablet
-          ? preferredDeviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED
-          : preferredDeviceType === ENUMS.DEVICE_TYPE.PHONE_REQUIRED)
-    );
-
-    // simulate preferred device not available
-    preferredDeviceList.forEach(({ id }) => {
-      this.server.db.projectAvailableDevices.remove(id);
-    });
-
-    const file = this.server.create('file', {
-      project: '1',
-      profile: '100',
-      dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
-      is_dynamic_done: false,
-      can_run_automated_dynamicscan: false,
-      is_active: true,
-    });
-
-    this.set(
-      'file',
-      this.store.push(this.store.normalize('file', file.toJSON()))
-    );
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/profiles/:id', (schema, req) =>
-      schema.profiles.find(`${req.params.id}`)?.toJSON()
-    );
-
-    this.server.get('/profiles/:id/device_preference', (schema, req) => {
-      return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/projects/:id/available-devices', (schema) => {
-      const results = schema.projectAvailableDevices.all().models;
-
-      return { count: results.length, next: null, previous: null, results };
-    });
-
-    this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-      return {
-        id: req.params.id,
-        host: '',
-        port: '',
-        enabled: false,
-      };
-    });
-
-    await render(hbs`
-        <DynamicScan @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
-      `);
-
-    assert
-      .dom('[data-test-dynamicScan-startBtn]')
-      .hasText(this.dynamicScanText);
-
-    assert.dom('[data-test-dynamicScanModal-startBtn]').doesNotExist();
-
-    await click('[data-test-dynamicScan-startBtn]');
-
-    assert
-      .dom(`[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`)
-      .hasClass(classes.triggerError);
-
-    assert
-      .dom(`[data-test-projectPreference-osVersionSelect] .${classes.trigger}`)
-      .hasClass(classes.triggerError);
-
-    assert
-      .dom('[data-test-projectPreference-deviceUnavailableError]')
-      .hasText('t:modalCard.dynamicScan.preferredDeviceNotAvailable:()');
-
-    assert.dom('[data-test-dynamicScanModal-startBtn]').isDisabled();
-  });
-});
diff --git a/tests/integration/components/file-details/dynamic-scan/manual-test.js b/tests/integration/components/file-details/dynamic-scan/manual-test.js
new file mode 100644
index 0000000000..627face76a
--- /dev/null
+++ b/tests/integration/components/file-details/dynamic-scan/manual-test.js
@@ -0,0 +1,1283 @@
+import { click, fillIn, find, findAll, render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+import { setupMirage } from 'ember-cli-mirage/test-support';
+import { setupIntl } from 'ember-intl/test-support';
+import { setupRenderingTest } from 'ember-qunit';
+import { module, test } from 'qunit';
+import Service from '@ember/service';
+import { Response } from 'miragejs';
+import { selectChoose } from 'ember-power-select/test-support';
+import { faker } from '@faker-js/faker';
+
+import ENUMS from 'irene/enums';
+import { deviceType } from 'irene/helpers/device-type';
+import styles from 'irene/components/ak-select/index.scss';
+
+const classes = {
+  dropdown: styles['ak-select-dropdown'],
+  trigger: styles['ak-select-trigger'],
+  triggerError: styles['ak-select-trigger-error'],
+};
+
+const dynamicScanStatusText = {
+  [ENUMS.DYNAMIC_STATUS.INQUEUE]: 't:deviceInQueue:()',
+  [ENUMS.DYNAMIC_STATUS.BOOTING]: 't:deviceBooting:()',
+  [ENUMS.DYNAMIC_STATUS.DOWNLOADING]: 't:deviceDownloading:()',
+  [ENUMS.DYNAMIC_STATUS.INSTALLING]: 't:deviceInstalling:()',
+  [ENUMS.DYNAMIC_STATUS.LAUNCHING]: 't:deviceLaunching:()',
+  [ENUMS.DYNAMIC_STATUS.HOOKING]: 't:deviceHooking:()',
+  [ENUMS.DYNAMIC_STATUS.SHUTTING_DOWN]: 't:deviceShuttingDown:()',
+  [ENUMS.DYNAMIC_STATUS.COMPLETED]: 't:deviceCompleted:()',
+};
+
+class NotificationsStub extends Service {
+  errorMsg = null;
+  successMsg = null;
+  infoMsg = null;
+
+  error(msg) {
+    this.errorMsg = msg;
+  }
+
+  success(msg) {
+    this.successMsg = msg;
+  }
+
+  info(msg) {
+    this.infoMsg = msg;
+  }
+}
+
+class PollServiceStub extends Service {
+  callback = null;
+  interval = null;
+
+  startPolling(cb, interval) {
+    function stop() {}
+
+    this.callback = cb;
+    this.interval = interval;
+
+    return stop;
+  }
+}
+
+module(
+  'Integration | Component | file-details/dynamic-scan/manual',
+  function (hooks) {
+    setupRenderingTest(hooks);
+    setupMirage(hooks);
+    setupIntl(hooks);
+
+    hooks.beforeEach(async function () {
+      // Server mocks
+      this.server.get('/dynamicscan/:id', (schema, req) => {
+        return schema.dynamicscanOlds.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/v2/projects/:id', (schema, req) => {
+        return {
+          ...schema.projects.find(`${req.params.id}`)?.toJSON(),
+          platform: 0,
+        };
+      });
+
+      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+        return {
+          id: req.params.id,
+          host: faker.internet.ip(),
+          port: faker.internet.port(),
+          enabled: false,
+        };
+      });
+
+      this.server.get('/v2/files/:id', (schema, req) => {
+        return schema.files.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/profiles/:id', (schema, req) =>
+        schema.profiles.find(`${req.params.id}`)?.toJSON()
+      );
+
+      this.server.get('/profiles/:id/device_preference', (schema, req) => {
+        return {
+          ...schema.devicePreferences.find(`${req.params.id}`)?.toJSON(),
+          device_type: ENUMS.DEVICE_TYPE.TABLET_REQUIRED,
+        };
+      });
+
+      this.server.put('/profiles/:id/device_preference', (_, req) => {
+        const data = req.requestBody
+          .split('&')
+          .map((it) => it.split('='))
+          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+
+        this.set('requestBody', data);
+
+        return new Response(200);
+      });
+
+      this.server.get('/projects/:id/available-devices', (schema) => {
+        const results = schema.projectAvailableDevices.all().models;
+
+        return { count: results.length, next: null, previous: null, results };
+      });
+
+      this.server.get('/profiles/:id/api_scan_options', (_, req) => {
+        return {
+          api_url_filters: 'api.example.com,api.example2.com',
+          id: req.params.id,
+        };
+      });
+
+      this.server.createList('organization', 1);
+      this.server.create('dynamicscan-old');
+
+      const store = this.owner.lookup('service:store');
+
+      const profile = this.server.create('profile', { id: '100' });
+
+      const file = this.server.create('file', {
+        project: '1',
+        profile: profile.id,
+      });
+
+      const project = this.server.create('project', { file: file.id, id: '1' });
+
+      const availableDevices = [
+        ...this.server.createList('project-available-device', 5, {
+          is_tablet: true,
+          platform: 0,
+        }),
+        ...this.server.createList('project-available-device', 5, {
+          is_tablet: true,
+          platform: 1,
+        }),
+        ...this.server.createList('project-available-device', 5, {
+          is_tablet: false,
+          platform: 0,
+        }),
+        ...this.server.createList('project-available-device', 5, {
+          is_tablet: false,
+          platform: 1,
+        }),
+      ];
+
+      // choose a random device for preference
+      const randomDevice = faker.helpers.arrayElement(
+        availableDevices.filter((it) => it.platform === project.platform)
+      );
+
+      const devicePreference = this.server.create('device-preference', {
+        id: profile.id,
+        device_type: randomDevice.is_tablet
+          ? ENUMS.DEVICE_TYPE.TABLET_REQUIRED
+          : ENUMS.DEVICE_TYPE.PHONE_REQUIRED,
+        platform_version: randomDevice.platform_version,
+      });
+
+      this.setProperties({
+        file: store.push(store.normalize('file', file.toJSON())),
+        dynamicScanText: 't:modalCard.dynamicScan.title:()',
+        devicePreference,
+        availableDevices,
+        store,
+      });
+
+      await this.owner.lookup('service:organization').load();
+      this.owner.register('service:notifications', NotificationsStub);
+      this.owner.register('service:poll', PollServiceStub);
+    });
+
+    test.each(
+      'test different states of dynamic scan status and button',
+      ENUMS.DYNAMIC_STATUS.VALUES,
+      async function (assert, status) {
+        if (status === ENUMS.DYNAMIC_STATUS.COMPLETED) {
+          this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
+          this.file.isDynamicDone = true;
+        } else {
+          this.file.dynamicStatus = status;
+          this.file.isDynamicDone = false;
+        }
+
+        // make sure file is active
+        this.file.isActive = true;
+
+        this.server.get('/v2/projects/:id', (schema, req) => {
+          return schema.projects.find(`${req.params.id}`)?.toJSON();
+        });
+
+        await render(hbs`
+          <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+        `);
+
+        if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.ERROR) {
+          assert
+            .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+            .exists()
+            .hasText('t:errored:()');
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+            .exists()
+            .hasText(this.dynamicScanText)
+            .isNotDisabled();
+        } else if (
+          (this.file.isDynamicStatusReady ||
+            this.file.isDynamicStatusInProgress) &&
+          this.file.dynamicStatus !== ENUMS.DYNAMIC_STATUS.READY
+        ) {
+          assert
+            .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+            .exists()
+            .hasText(this.file.statusText);
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+            .doesNotExist();
+        } else if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.READY) {
+          assert
+            .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+            .doesNotExist();
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+            .doesNotExist();
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-stopBtn]')
+            .exists()
+            .hasText('t:stop:()');
+        } else if (
+          this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE &&
+          this.file.isDynamicDone
+        ) {
+          assert
+            .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+            .exists()
+            .hasText('t:completed:()');
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+            .isNotDisabled();
+        } else if (this.file.dynamicStatus === ENUMS.DYNAMIC_STATUS.NONE) {
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+            .hasText(this.dynamicScanText);
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+            .doesNotExist();
+        } else {
+          assert.strictEqual(
+            this.file.statusText,
+            dynamicScanStatusText[this.file.dynamicStatus] || 'Unknown Status'
+          );
+
+          assert
+            .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+            .isNotDisabled()
+            .hasText(this.file.statusText);
+
+          if (
+            status === ENUMS.DYNAMIC_STATUS.INQUEUE &&
+            this.file.canRunAutomatedDynamicscan
+          ) {
+            assert
+              .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+              .isNotDisabled();
+          }
+        }
+      }
+    );
+
+    test.each(
+      'it should render dynamic scan modal',
+      [
+        { withApiProxySetting: true },
+        { withApiScan: true },
+        { withDeviceRequirements: true },
+        { withAutomatedDynamicScan: true },
+      ],
+      async function (
+        assert,
+        {
+          withApiProxySetting,
+          withApiScan,
+          withDeviceRequirements,
+          withAutomatedDynamicScan,
+        }
+      ) {
+        this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
+        this.file.isDynamicDone = false;
+        this.file.isActive = true;
+
+        if (withDeviceRequirements) {
+          this.file.minOsVersion = '10.0';
+          this.file.supportedCpuArchitectures = 'arm64';
+          this.file.supportedDeviceTypes = 'iPhone';
+        }
+
+        if (withAutomatedDynamicScan) {
+          this.file.canRunAutomatedDynamicscan = true;
+        }
+
+        this.server.get('/v2/projects/:id', (schema, req) => {
+          return schema.projects.find(`${req.params.id}`)?.toJSON();
+        });
+
+        this.server.get('/profiles/:id', (schema, req) =>
+          schema.profiles.find(`${req.params.id}`)?.toJSON()
+        );
+
+        this.server.get('/profiles/:id/device_preference', (schema, req) => {
+          return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
+        });
+
+        this.server.get('/projects/:id/available-devices', (schema) => {
+          const results = schema.projectAvailableDevices.all().models;
+
+          return { count: results.length, next: null, previous: null, results };
+        });
+
+        this.server.get('/profiles/:id/api_scan_options', (_, req) => {
+          return { api_url_filters: '', id: req.params.id };
+        });
+
+        this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+          return {
+            id: req.params.id,
+            host: withApiProxySetting ? faker.internet.ip() : '',
+            port: withApiProxySetting ? faker.internet.port() : '',
+            enabled: false,
+          };
+        });
+
+        await render(hbs`
+            <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+        `);
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+          .hasText(this.dynamicScanText);
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+          .doesNotExist();
+
+        await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+        assert
+          .dom('[data-test-ak-appbar]')
+          .hasText('t:modalCard.dynamicScan.title:()');
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanDrawerOld-warningAlert]')
+          .hasText('t:modalCard.dynamicScan.warning:()');
+
+        if (this.file.minOsVersion) {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementContainer]'
+            )
+            .exists();
+
+          const deviceRequirements = [
+            {
+              type: 't:modalCard.dynamicScan.osVersion:()',
+              value: `${this.file.project.get('platformDisplay')} ${
+                this.file.minOsVersion
+              } t:modalCard.dynamicScan.orAbove:()`,
+            },
+            this.file.supportedCpuArchitectures && {
+              type: 't:modalCard.dynamicScan.processorArchitecture:()',
+              value: this.file.supportedCpuArchitectures,
+            },
+            this.file.supportedDeviceTypes && {
+              type: 't:modalCard.dynamicScan.deviceTypes:()',
+              value: this.file.supportedDeviceTypes,
+            },
+          ].filter(Boolean);
+
+          deviceRequirements.forEach(({ type, value }) => {
+            const container = find(
+              `[data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementGroup="${type}"]`
+            );
+
+            assert
+              .dom(
+                '[data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementType]',
+                container
+              )
+              .hasText(type);
+
+            assert
+              .dom(
+                '[data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementValue]',
+                container
+              )
+              .hasText(value);
+          });
+        } else {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-deviceRequirementContainer]'
+            )
+            .doesNotExist();
+        }
+
+        assert
+          .dom('[data-test-projectPreference-title]')
+          .hasText('t:devicePreferences:()');
+
+        assert
+          .dom('[data-test-projectPreference-description]')
+          .hasText('t:otherTemplates.selectPreferredDevice:()');
+
+        assert
+          .dom(
+            '[data-test-projectPreference-deviceTypeSelect] [data-test-form-label]'
+          )
+          .hasText('t:deviceType:()');
+
+        assert
+          .dom(
+            `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
+          )
+          .hasText(`t:${deviceType([this.devicePreference.device_type])}:()`);
+
+        assert
+          .dom(
+            '[data-test-projectPreference-osVersionSelect] [data-test-form-label]'
+          )
+          .hasText('t:osVersion:()');
+
+        assert
+          .dom(
+            `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
+          )
+          .hasText(this.devicePreference.platform_version);
+
+        assert
+          .dom(
+            '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-ak-form-label]'
+          )
+          .hasText('t:modalCard.dynamicScan.runApiScan:()');
+
+        assert
+          .dom(
+            '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+          )
+          .isNotDisabled()
+          .isNotChecked();
+
+        if (withApiScan) {
+          await click(
+            '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+          );
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+            )
+            .isNotDisabled()
+            .isChecked();
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-apiSettingsContainer]'
+            )
+            .exists();
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-apiSettingScanDescription]'
+            )
+            .hasText('t:modalCard.dynamicScan.apiScanDescription:()');
+
+          assert
+            .dom('[data-test-apiFilter-title]')
+            .hasText('t:templates.apiScanURLFilter:()');
+
+          assert
+            .dom('[data-test-apiFilter-description]')
+            .hasText('t:otherTemplates.specifyTheURL:()');
+
+          assert
+            .dom('[data-test-apiFilter-apiEndpointInput]')
+            .isNotDisabled()
+            .hasNoValue();
+
+          assert
+            .dom('[data-test-apiFilter-addApiEndpointBtn]')
+            .isNotDisabled()
+            .hasText('t:templates.addNewUrlFilter:()');
+
+          assert.dom('[data-test-apiFilter-table]').doesNotExist();
+        } else {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-apiSettingsContainer]'
+            )
+            .doesNotExist();
+        }
+
+        const proxySetting = this.store.peekRecord(
+          'proxy-setting',
+          this.file.profile.get('id')
+        );
+
+        if (proxySetting.hasProxyUrl) {
+          assert.dom('[data-test-proxySettingsView-container]').exists();
+
+          assert
+            .dom(
+              '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
+            )
+            .isNotDisabled()
+            .isNotChecked();
+
+          assert
+            .dom('[data-test-proxySettingsView-enableApiProxyLabel]')
+            .hasText('t:enable:() t:proxySettingsTitle:()');
+
+          assert
+            .dom('[data-test-proxySettingsView-editSettings]')
+            .hasTagName('a')
+            .hasAttribute('href', '/dashboard/project/1/settings')
+            .hasText('t:edit:()');
+
+          assert
+            .dom('[data-test-proxySettingsView-proxySettingRoute]')
+            .hasText(
+              `t:proxySettingsRouteVia:() ${proxySetting.host}:${proxySetting.port}`
+            );
+        } else {
+          assert.dom('[data-test-proxySettingsView-container]').doesNotExist();
+        }
+
+        if (this.file.canRunAutomatedDynamicscan) {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-device-settings-warning]'
+            )
+            .doesNotExist();
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanContainer]'
+            )
+            .exists();
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanTitle]'
+            )
+            .hasText('t:dynamicScanAutomation:()');
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanChip]'
+            )
+            .hasText('t:experimentalFeature:()');
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanDescription]'
+            )
+            .hasText('t:scheduleDynamicscanDesc:()');
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanScheduleBtn]'
+            )
+            .isNotDisabled()
+            .hasText('t:scheduleDynamicscan:()');
+        } else {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-device-settings-warning]'
+            )
+            .hasText(
+              't:note:(): t:modalCard.dynamicScan.deviceSettingsWarning:()'
+            );
+
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanContainer]'
+            )
+            .doesNotExist();
+        }
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanDrawerOld-cancelBtn]')
+          .isNotDisabled()
+          .hasText('t:cancel:()');
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]')
+          .isNotDisabled()
+          .hasText('t:modalCard.dynamicScan.start:()');
+      }
+    );
+
+    test('test add & delete of api filter endpoint', async function (assert) {
+      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
+      this.file.isDynamicDone = false;
+      this.file.isActive = true;
+
+      this.server.get('/v2/projects/:id', (schema, req) => {
+        return schema.projects.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/profiles/:id', (schema, req) =>
+        schema.profiles.find(`${req.params.id}`)?.toJSON()
+      );
+
+      this.server.get('/profiles/:id/device_preference', (schema, req) => {
+        return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/projects/:id/available-devices', (schema) => {
+        const results = schema.projectAvailableDevices.all().models;
+
+        return { count: results.length, next: null, previous: null, results };
+      });
+
+      this.server.get('/profiles/:id/api_scan_options', (_, req) => {
+        return { api_url_filters: '', id: req.params.id };
+      });
+
+      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+        return {
+          id: req.params.id,
+          host: '',
+          port: '',
+          enabled: false,
+        };
+      });
+
+      await render(hbs`
+        <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+      `);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+        .hasText(this.dynamicScanText);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+        .doesNotExist();
+
+      await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+      await click(
+        '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+      );
+
+      assert
+        .dom(
+          '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+        )
+        .isNotDisabled()
+        .isChecked();
+
+      assert
+        .dom(
+          '[data-test-fileDetails-dynamicScanDrawerOld-apiSettingsContainer]'
+        )
+        .exists();
+
+      assert
+        .dom(
+          '[data-test-fileDetails-dynamicScanDrawerOld-apiSettingScanDescription]'
+        )
+        .hasText('t:modalCard.dynamicScan.apiScanDescription:()');
+
+      assert
+        .dom('[data-test-apiFilter-title]')
+        .hasText('t:templates.apiScanURLFilter:()');
+
+      assert
+        .dom('[data-test-apiFilter-description]')
+        .hasText('t:otherTemplates.specifyTheURL:()');
+
+      assert
+        .dom('[data-test-apiFilter-apiEndpointInput]')
+        .isNotDisabled()
+        .hasNoValue();
+
+      assert
+        .dom('[data-test-apiFilter-addApiEndpointBtn]')
+        .isNotDisabled()
+        .hasText('t:templates.addNewUrlFilter:()');
+
+      assert.dom('[data-test-apiFilter-table]').doesNotExist();
+
+      const notify = this.owner.lookup('service:notifications');
+
+      // empty input
+      await click('[data-test-apiFilter-addApiEndpointBtn]');
+
+      assert.strictEqual(notify.errorMsg, 't:emptyURLFilter:()');
+
+      // invalid url
+      await fillIn(
+        '[data-test-apiFilter-apiEndpointInput]',
+        'https://api.example.com'
+      );
+
+      await click('[data-test-apiFilter-addApiEndpointBtn]');
+
+      assert.strictEqual(
+        notify.errorMsg,
+        'https://api.example.com t:invalidURL:()'
+      );
+
+      await fillIn('[data-test-apiFilter-apiEndpointInput]', 'api.example.com');
+
+      await click('[data-test-apiFilter-addApiEndpointBtn]');
+
+      assert.strictEqual(notify.successMsg, 't:urlUpdated:()');
+      assert.dom('[data-test-apiFilter-table]').exists();
+
+      await fillIn(
+        '[data-test-apiFilter-apiEndpointInput]',
+        'api.example2.com'
+      );
+
+      await click('[data-test-apiFilter-addApiEndpointBtn]');
+
+      const headers = findAll('[data-test-apiFilter-thead] th');
+
+      assert.strictEqual(headers.length, 2);
+      assert.dom(headers[0]).hasText('t:apiURLFilter:()');
+      assert.dom(headers[1]).hasText('t:action:()');
+
+      let rows = findAll('[data-test-apiFilter-row]');
+
+      assert.strictEqual(rows.length, 2);
+
+      const firstRowCells = rows[0].querySelectorAll(
+        '[data-test-apiFilter-cell]'
+      );
+
+      assert.dom(firstRowCells[0]).hasText('api.example.com');
+
+      assert
+        .dom('[data-test-apiFilter-deleteBtn]', firstRowCells[1])
+        .isNotDisabled();
+
+      // delete first url
+      await click(
+        firstRowCells[1].querySelector('[data-test-apiFilter-deleteBtn]')
+      );
+
+      // confirm box is 2nd modal
+      assert.dom(findAll('[data-test-ak-appbar]')[1]).hasText('t:confirm:()');
+
+      assert
+        .dom('[data-test-confirmbox-description]')
+        .hasText('t:confirmBox.removeURL:()');
+
+      assert
+        .dom('[data-test-confirmbox-confirmBtn]')
+        .isNotDisabled()
+        .hasText('t:yes:()');
+
+      await click('[data-test-confirmbox-confirmBtn]');
+
+      rows = findAll('[data-test-apiFilter-row]');
+
+      assert.strictEqual(notify.successMsg, 't:urlUpdated:()');
+      assert.strictEqual(rows.length, 1);
+    });
+
+    test('test enable api proxy toggle', async function (assert) {
+      assert.expect(10);
+
+      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
+      this.file.isDynamicDone = false;
+      this.file.isActive = true;
+
+      this.server.get('/v2/projects/:id', (schema, req) => {
+        return schema.projects.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/profiles/:id', (schema, req) =>
+        schema.profiles.find(`${req.params.id}`)?.toJSON()
+      );
+
+      this.server.get('/profiles/:id/device_preference', (schema, req) => {
+        return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/projects/:id/available-devices', (schema) => {
+        const results = schema.projectAvailableDevices.all().models;
+
+        return { count: results.length, next: null, previous: null, results };
+      });
+
+      this.server.put('/profiles/:id/proxy_settings', (_, req) => {
+        const data = JSON.parse(req.requestBody);
+
+        assert.true(data.enabled);
+
+        return {
+          id: req.params.id,
+          ...data,
+        };
+      });
+
+      await render(hbs`
+        <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+      `);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+        .hasText(this.dynamicScanText);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+        .doesNotExist();
+
+      await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+      const proxySetting = this.store.peekRecord(
+        'proxy-setting',
+        this.file.profile.get('id')
+      );
+
+      assert.dom('[data-test-proxySettingsView-container]').exists();
+
+      assert
+        .dom(
+          '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
+        )
+        .isNotDisabled()
+        .isNotChecked();
+
+      await click(
+        '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
+      );
+
+      assert
+        .dom(
+          '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
+        )
+        .isNotDisabled()
+        .isChecked();
+
+      assert.true(proxySetting.enabled);
+
+      const notify = this.owner.lookup('service:notifications');
+
+      assert.strictEqual(notify.infoMsg, 't:proxyTurned:() T:ON:()');
+    });
+
+    test.each(
+      'test start dynamic scan',
+      [{ automatedScan: false }, { automatedScan: true }],
+      async function (assert, { automatedScan }) {
+        const file = this.server.create('file', {
+          project: '1',
+          profile: '100',
+          dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
+          is_dynamic_done: false,
+          can_run_automated_dynamicscan: automatedScan,
+          is_active: true,
+        });
+
+        this.set(
+          'file',
+          this.store.push(this.store.normalize('file', file.toJSON()))
+        );
+
+        this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+          return {
+            id: req.params.id,
+            host: faker.internet.ip(),
+            port: faker.internet.port(),
+            enabled: false,
+          };
+        });
+
+        this.server.put('/dynamicscan/:id', (schema, req) => {
+          schema.db.files.update(`${req.params.id}`, {
+            dynamic_status: ENUMS.DYNAMIC_STATUS.BOOTING,
+          });
+
+          return new Response(200);
+        });
+
+        this.server.post(
+          '/dynamicscan/:id/schedule_automation',
+          (schema, req) => {
+            schema.db.files.update(`${req.params.id}`, {
+              dynamic_status: ENUMS.DYNAMIC_STATUS.INQUEUE,
+            });
+
+            return new Response(201);
+          }
+        );
+
+        await render(hbs`
+          <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+        `);
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+          .hasText(this.dynamicScanText);
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+          .doesNotExist();
+
+        await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+        // choose device type and os version
+        assert
+          .dom(
+            `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
+          )
+          .hasText(`t:${deviceType([ENUMS.DEVICE_TYPE.TABLET_REQUIRED])}:()`);
+
+        assert
+          .dom(
+            `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
+          )
+          .hasText(`${this.devicePreference.platform_version}`);
+
+        await selectChoose(
+          `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`,
+          `t:${deviceType([ENUMS.DEVICE_TYPE.PHONE_REQUIRED])}:()`
+        );
+
+        // verify ui
+        assert
+          .dom(
+            `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
+          )
+          .hasText(`t:${deviceType([ENUMS.DEVICE_TYPE.PHONE_REQUIRED])}:()`);
+
+        // verify network data
+        assert.strictEqual(
+          this.requestBody.device_type,
+          `${ENUMS.DEVICE_TYPE.PHONE_REQUIRED}`
+        );
+
+        const filteredDevices = this.availableDevices.filter(
+          (it) => it.platform === 0 && !it.is_tablet
+        );
+
+        await selectChoose(
+          `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`,
+          filteredDevices[1].platform_version
+        );
+
+        // verify ui
+        assert
+          .dom(
+            `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
+          )
+          .hasText(`${filteredDevices[1].platform_version}`);
+
+        // verify network data
+        assert.strictEqual(
+          this.requestBody.platform_version,
+          `${filteredDevices[1].platform_version}`
+        );
+
+        // enable api catpure
+        await click(
+          '[data-test-fileDetails-dynamicScanDrawerOld-runApiScanFormControl] [data-test-fileDetails-dynamicScanDrawerOld-runApiScanCheckbox]'
+        );
+
+        // verify api-filter render
+        let apiFilterRows = findAll('[data-test-apiFilter-row]');
+
+        assert.strictEqual(apiFilterRows.length, 2);
+
+        assert
+          .dom(
+            apiFilterRows[0].querySelectorAll('[data-test-apiFilter-cell]')[0]
+          )
+          .hasText('api.example.com');
+
+        assert
+          .dom(
+            apiFilterRows[1].querySelectorAll('[data-test-apiFilter-cell]')[0]
+          )
+          .hasText('api.example2.com');
+
+        if (automatedScan) {
+          assert
+            .dom(
+              '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanScheduleBtn]'
+            )
+            .isNotDisabled()
+            .hasText('t:scheduleDynamicscan:()');
+
+          await click(
+            '[data-test-fileDetails-dynamicScanDrawerOld-automatedDynamicScanScheduleBtn]'
+          );
+        } else {
+          assert
+            .dom('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]')
+            .isNotDisabled()
+            .hasText('t:modalCard.dynamicScan.start:()');
+
+          await click('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]');
+        }
+
+        const notify = this.owner.lookup('service:notifications');
+        const poll = this.owner.lookup('service:poll');
+
+        assert.strictEqual(
+          notify.successMsg,
+          automatedScan
+            ? 't:scheduleDynamicscanSuccess:()'
+            : 't:startingScan:()'
+        );
+
+        // simulate polling
+        if (poll.callback) {
+          await poll.callback();
+        }
+
+        assert.strictEqual(
+          this.file.dynamicStatus,
+          automatedScan
+            ? ENUMS.DYNAMIC_STATUS.INQUEUE
+            : ENUMS.DYNAMIC_STATUS.BOOTING
+        );
+
+        // modal should close
+        assert.dom('[data-test-ak-appbar]').doesNotExist();
+        assert
+          .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+          .doesNotExist();
+
+        assert
+          .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+          .exists()
+          .hasText(
+            dynamicScanStatusText[
+              automatedScan
+                ? ENUMS.DYNAMIC_STATUS.INQUEUE
+                : ENUMS.DYNAMIC_STATUS.BOOTING
+            ]
+          );
+      }
+    );
+
+    test('test stop dynamic scan', async function (assert) {
+      const file = this.server.create('file', {
+        project: '1',
+        profile: '100',
+        dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
+        is_dynamic_done: false,
+        is_active: true,
+      });
+
+      this.server.create('dynamicscan-old', { id: file.id });
+
+      this.set(
+        'file',
+        this.store.push(this.store.normalize('file', file.toJSON()))
+      );
+
+      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+        return {
+          id: req.params.id,
+          host: faker.internet.ip(),
+          port: faker.internet.port(),
+          enabled: false,
+        };
+      });
+
+      this.server.get('/profiles/:id/device_preference', (schema, req) => {
+        return { device_type: 1, id: req.params.id, platform_version: '0' };
+      });
+
+      this.server.put('/dynamicscan/:id', (schema, req) => {
+        schema.db.files.update(`${req.params.id}`, {
+          dynamic_status: ENUMS.DYNAMIC_STATUS.READY,
+        });
+
+        return new Response(200);
+      });
+
+      this.server.post(
+        '/dynamicscan/:id/schedule_automation',
+        (schema, req) => {
+          schema.db.files.update(`${req.params.id}`, {
+            dynamic_status: ENUMS.DYNAMIC_STATUS.INQUEUE,
+          });
+
+          return new Response(201);
+        }
+      );
+
+      this.server.delete('/dynamicscan/:id', (schema, req) => {
+        schema.db.files.update(`${req.params.id}`, {
+          dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
+          is_dynamic_done: true,
+        });
+
+        return new Response(204);
+      });
+
+      await render(hbs`
+        <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+      `);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+        .hasText(this.dynamicScanText);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+        .doesNotExist();
+
+      // Open dynamic scan drawer
+      await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+      // Start dynamic scan
+      await click('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]');
+
+      const poll = this.owner.lookup('service:poll');
+
+      // simulate polling
+      if (poll.callback) {
+        await poll.callback();
+      }
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-stopBtn]')
+        .hasText('t:stop:()');
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+        .doesNotExist();
+
+      await click('[data-test-fileDetails-dynamicScanAction-stopBtn]');
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+        .doesNotExist();
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+        .exists()
+        .hasText(dynamicScanStatusText[ENUMS.DYNAMIC_STATUS.SHUTTING_DOWN]);
+
+      // simulate polling
+      if (poll.callback) {
+        await poll.callback();
+      }
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+        .hasText('t:completed:()');
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-restartBtn]')
+        .exists()
+        .hasText(this.dynamicScanText);
+    });
+
+    test('test when preferred device is not available', async function (assert) {
+      const preferredDeviceType = this.devicePreference.device_type;
+      const preferredPlatformVersion = this.devicePreference.platform_version;
+
+      // there can be duplicates
+      const preferredDeviceList = this.server.db.projectAvailableDevices.where(
+        (ad) =>
+          ad.platform_version === preferredPlatformVersion &&
+          (ad.is_tablet
+            ? preferredDeviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED
+            : preferredDeviceType === ENUMS.DEVICE_TYPE.PHONE_REQUIRED)
+      );
+
+      // simulate preferred device not available
+      preferredDeviceList.forEach(({ id }) => {
+        this.server.db.projectAvailableDevices.remove(id);
+      });
+
+      const file = this.server.create('file', {
+        project: '1',
+        profile: '100',
+        dynamic_status: ENUMS.DYNAMIC_STATUS.NONE,
+        is_dynamic_done: false,
+        can_run_automated_dynamicscan: false,
+        is_active: true,
+      });
+
+      this.set(
+        'file',
+        this.store.push(this.store.normalize('file', file.toJSON()))
+      );
+
+      this.server.get('/v2/projects/:id', (schema, req) => {
+        return schema.projects.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/profiles/:id', (schema, req) =>
+        schema.profiles.find(`${req.params.id}`)?.toJSON()
+      );
+
+      this.server.get('/profiles/:id/device_preference', (schema, req) => {
+        return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
+      });
+
+      this.server.get('/projects/:id/available-devices', (schema) => {
+        const results = schema.projectAvailableDevices.all().models;
+
+        return { count: results.length, next: null, previous: null, results };
+      });
+
+      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
+        return {
+          id: req.params.id,
+          host: '',
+          port: '',
+          enabled: false,
+        };
+      });
+
+      await render(hbs`
+        <FileDetails::DynamicScan::Manual @file={{this.file}} @dynamicScanText={{this.dynamicScanText}} />
+      `);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanAction-startBtn]')
+        .hasText(this.dynamicScanText);
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]')
+        .doesNotExist();
+
+      await click('[data-test-fileDetails-dynamicScanAction-startBtn]');
+
+      assert
+        .dom(
+          `[data-test-projectPreference-deviceTypeSelect] .${classes.trigger}`
+        )
+        .hasClass(classes.triggerError);
+
+      assert
+        .dom(
+          `[data-test-projectPreference-osVersionSelect] .${classes.trigger}`
+        )
+        .hasClass(classes.triggerError);
+
+      assert
+        .dom('[data-test-projectPreference-deviceUnavailableError]')
+        .hasText('t:modalCard.dynamicScan.preferredDeviceNotAvailable:()');
+
+      assert
+        .dom('[data-test-fileDetails-dynamicScanDrawerOld-startBtn]')
+        .isDisabled();
+    });
+  }
+);
diff --git a/tests/integration/components/file-details/dynamic-scan/status-chip-test.js b/tests/integration/components/file-details/dynamic-scan/status-chip-test.js
index 740823a7c1..3103549357 100644
--- a/tests/integration/components/file-details/dynamic-scan/status-chip-test.js
+++ b/tests/integration/components/file-details/dynamic-scan/status-chip-test.js
@@ -42,7 +42,8 @@ module(
     setupMirage(hooks);
     setupIntl(hooks);
 
-    test.each(
+    // TODO: Unskip when full DAST feature is ready.
+    test.skip(
       'it renders status chip for different dynamic scan status',
       [-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
       async function (assert, status) {
@@ -75,23 +76,27 @@ module(
             />`
         );
 
-        assert.dom('[data-test-dynamicScan-statusChip]').exists();
+        assert.dom('[data-test-fileDetails-dynamicScan-statusChip]').exists();
 
         const expectedText = dynamicScanStatusText[status];
 
-        assert.dom('[data-test-dynamicScan-statusChip]').hasText(expectedText);
+        assert
+          .dom('[data-test-fileDetails-dynamicScan-statusChip]')
+          .hasText(expectedText);
 
         const expectedColor = dynamicScanStatusColor[status];
 
         assert
-          .dom('[data-test-dynamicScan-statusChip]')
+          .dom('[data-test-fileDetails-dynamicScan-statusChip]')
           .hasClass(RegExp(`ak-chip-color-${expectedColor}`));
 
         if (this.dynamicscan.isDynamicStatusInProgress) {
-          assert.dom('[data-test-dynamicScan-statusChip-loader]').exists();
+          assert
+            .dom('[data-test-fileDetails-dynamicScan-statusChip-loader]')
+            .exists();
         } else {
           assert
-            .dom('[data-test-dynamicScan-statusChip-loader]')
+            .dom('[data-test-fileDetails-dynamicScan-statusChip-loader]')
             .doesNotExist();
         }
       }
diff --git a/tests/integration/components/file-details/scan-actions-old-test.js b/tests/integration/components/file-details/scan-actions-old-test.js
deleted file mode 100644
index b8dd8d0b8e..0000000000
--- a/tests/integration/components/file-details/scan-actions-old-test.js
+++ /dev/null
@@ -1,313 +0,0 @@
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-import Service from '@ember/service';
-
-import ENUMS from 'irene/enums';
-
-const staticScanStatus = {
-  completed: 'completed',
-  inProgress: 'inProgress',
-};
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-  infoMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-
-  success(msg) {
-    this.successMsg = msg;
-  }
-
-  info(msg) {
-    this.infoMsg = msg;
-  }
-}
-
-class PollServiceStub extends Service {
-  callback = null;
-  interval = null;
-
-  startPolling(cb, interval) {
-    function stop() {}
-
-    this.callback = cb;
-    this.interval = interval;
-
-    return stop;
-  }
-}
-
-module(
-  'Integration | Component | file-details/scan-actions-old',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupMirage(hooks);
-    setupIntl(hooks);
-
-    hooks.beforeEach(async function () {
-      this.server.createList('organization', 1);
-
-      const store = this.owner.lookup('service:store');
-
-      const file = this.server.create('file', {
-        project: '1',
-      });
-
-      this.server.create('project', { file: file.id, id: '1' });
-
-      this.setProperties({
-        file: store.push(store.normalize('file', file.toJSON())),
-        store,
-      });
-
-      await this.owner.lookup('service:organization').load();
-      this.owner.register('service:notifications', NotificationsStub);
-      this.owner.register('service:poll', PollServiceStub);
-    });
-
-    test('it renders scan actions', async function (assert) {
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return { id: req.params.id };
-      });
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-title]')
-        .hasText('t:scanTypes:()');
-    });
-
-    test.each(
-      'test different states of static scan',
-      [staticScanStatus.completed, staticScanStatus.inProgress],
-      async function (assert, scanStatus) {
-        if (scanStatus === staticScanStatus.completed) {
-          this.file.isStaticDone = true;
-        } else {
-          this.file.isStaticDone = false;
-          this.file.staticScanProgress = 80;
-        }
-
-        this.server.get('/manualscans/:id', (schema, req) => {
-          return { id: req.params.id };
-        });
-
-        this.server.get('/v2/projects/:id', (schema, req) => {
-          return schema.projects.find(`${req.params.id}`)?.toJSON();
-        });
-
-        await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-      `);
-
-        assert
-          .dom('[data-test-fileDetailScanActions-title]')
-          .hasText('t:scanTypes:()');
-
-        assert
-          .dom('[data-test-fileDetailScanActions-staticScanTitle]')
-          .hasText('t:staticScan:()');
-
-        if (scanStatus === staticScanStatus.completed) {
-          assert
-            .dom('[data-test-fileDetailScanActions-staticScanCompletedStatus]')
-            .hasText('t:completed:()');
-
-          assert
-            .dom('[data-test-fileDetailScanActions-staticScanRestartBtn]')
-            .isNotDisabled();
-        } else {
-          assert
-            .dom('[data-test-fileDetailScanActions-staticScanInProgressStatus]')
-            .hasText('t:scanning:() : ' + this.file.staticScanProgress + '%');
-        }
-      }
-    );
-
-    test('test restart static scan', async function (assert) {
-      this.file.isStaticDone = true;
-
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return { id: req.params.id };
-      });
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.post('/rescan', () => {});
-
-      await render(hbs`
-      <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-staticScanCompletedStatus]')
-        .hasText('t:completed:()');
-
-      assert
-        .dom('[data-test-fileDetailScanActions-staticScanRestartBtn]')
-        .isNotDisabled();
-
-      await click('[data-test-fileDetailScanActions-staticScanRestartBtn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.rescan.title:()');
-
-      assert
-        .dom('[data-test-confirmbox-description]')
-        .hasText('t:modalCard.rescan.description:()');
-
-      assert.dom('[data-test-confirmbox-confirmBtn]').hasText('t:yes:()');
-
-      assert.dom('[data-test-confirmbox-cancelBtn]').hasText('t:no:()');
-
-      await click('[data-test-confirmbox-confirmBtn]');
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(notify.infoMsg, 't:rescanInitiated:()');
-    });
-
-    test('it renders dynamic scan title & btn', async function (assert) {
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return { id: req.params.id };
-      });
-
-      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-      this.file.isDynamicDone = false;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-title]')
-        .hasText('t:scanTypes:()');
-
-      assert
-        .dom('[data-test-fileDetailScanActions-dynamicScanTitle]')
-        .hasText('t:dynamicScan:()');
-
-      assert.dom('[data-test-dynamicScan-startBtn]').hasText('t:start:()');
-
-      assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-    });
-
-    test('it renders api scan title & btn', async function (assert) {
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return { id: req.params.id };
-      });
-
-      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-      this.file.isDynamicDone = true;
-      this.file.isApiDone = false;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return {
-          ...schema.projects.find(`${req.params.id}`)?.toJSON(),
-          platform: ENUMS.PLATFORM.ANDROID, // enables api scan
-        };
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-title]')
-        .hasText('t:scanTypes:()');
-
-      assert
-        .dom('[data-test-fileDetailScanActions-apiScanTitle]')
-        .hasText('t:apiScan:()');
-
-      assert
-        .dom('[data-test-apiScan-btn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-    });
-
-    test('it renders manual scan title & btn', async function (assert) {
-      this.server.create('manualscan', { id: this.file.id });
-
-      this.file.manual = ENUMS.MANUAL.NONE;
-      this.file.isManualDone = false;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return {
-          ...schema.projects.find(`${req.params.id}`)?.toJSON(),
-          is_manual_scan_available: true,
-        };
-      });
-
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return schema.manualscans.find(`${req.params.id}`)?.toJSON();
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-title]')
-        .hasText('t:scanTypes:()');
-
-      assert
-        .dom('[data-test-fileDetailScanActions-manualScanTitle]')
-        .hasText('t:manualScan:()');
-
-      assert
-        .dom('[data-test-manualScan-requestBtn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-    });
-
-    test('it renders inactive file icon', async function (assert) {
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return { id: req.params.id };
-      });
-
-      this.file.isActive = false;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld @file={{this.file}} />
-    `);
-
-      assert
-        .dom('[data-test-fileDetailScanActions-title]')
-        .hasText('t:scanTypes:()');
-
-      assert.dom('[data-test-fileDetailScanActions-inactiveFileIcon]').exists();
-    });
-  }
-);
diff --git a/tests/integration/components/file-details/scan-actions-old/api-scan-test.js b/tests/integration/components/file-details/scan-actions-old/api-scan-test.js
deleted file mode 100644
index 83c22e904f..0000000000
--- a/tests/integration/components/file-details/scan-actions-old/api-scan-test.js
+++ /dev/null
@@ -1,496 +0,0 @@
-import { click, findAll, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-import Service from '@ember/service';
-import { Response } from 'miragejs';
-import { faker } from '@faker-js/faker';
-
-import ENUMS from 'irene/enums';
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-  infoMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-
-  success(msg) {
-    this.successMsg = msg;
-  }
-
-  info(msg) {
-    this.infoMsg = msg;
-  }
-}
-
-module(
-  'Integration | Component | file-details/scan-actions-old/api-scan',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupMirage(hooks);
-    setupIntl(hooks);
-
-    hooks.beforeEach(async function () {
-      this.server.createList('organization', 1);
-
-      const store = this.owner.lookup('service:store');
-
-      const profile = this.server.create('profile', { id: '100' });
-
-      const file = this.server.create('file', {
-        project: '1',
-        profile: profile.id,
-      });
-
-      const capturedApis = [
-        ...this.server.createList('capturedapi', 3, { is_active: false }),
-        ...this.server.createList('capturedapi', 7, { is_active: true }),
-      ];
-
-      this.server.create('project', {
-        file: file.id,
-        id: '1',
-        platform: ENUMS.PLATFORM.ANDROID,
-      });
-
-      this.setProperties({
-        file: store.push(store.normalize('file', file.toJSON())),
-        capturedApis,
-        store,
-      });
-
-      await this.owner.lookup('service:organization').load();
-      this.owner.register('service:notifications', NotificationsStub);
-    });
-
-    test.each(
-      'test different states of api scan',
-      [
-        { status: ENUMS.SCAN_STATUS.RUNNING },
-        { status: ENUMS.SCAN_STATUS.COMPLETED },
-        { status: ENUMS.SCAN_STATUS.UNKNOWN },
-        { status: ENUMS.SCAN_STATUS.UNKNOWN, disabled: true },
-      ],
-      async function (assert, { status, disabled }) {
-        this.file.apiScanStatus = status;
-
-        if (status === ENUMS.SCAN_STATUS.COMPLETED) {
-          this.file.isApiDone = true;
-        } else {
-          this.file.isApiDone = false;
-        }
-
-        this.file.isDynamicDone = !disabled;
-
-        // make sure file is active
-        this.file.isActive = true;
-
-        this.server.get('/v2/projects/:id', (schema, req) => {
-          return schema.projects.find(`${req.params.id}`)?.toJSON();
-        });
-
-        await render(hbs`
-            <FileDetails::ScanActionsOld::ApiScan @file={{this.file}} />
-        `);
-
-        if (this.file.isRunningApiScan) {
-          assert
-            .dom('[data-test-apiScan-btn]')
-            .hasText(`t:scanning:() : ${this.file.apiScanProgress}%`);
-        } else if (this.file.isApiDone) {
-          assert.dom('[data-test-apiScan-btn]').hasText('t:completed:()');
-        } else {
-          assert
-            .dom('[data-test-apiScan-btn]')
-            [disabled ? 'isDisabled' : 'isNotDisabled']()
-            .hasText('t:start:()');
-        }
-      }
-    );
-
-    test('it api scan modal with captured api count 0', async function (assert) {
-      this.file.isDynamicDone = true;
-      this.file.isApiDone = false;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/v2/files/1/capturedapis', () => {
-        return [];
-      });
-
-      this.server.get('/profiles/:id', (schema, req) =>
-        schema.profiles.find(`${req.params.id}`)?.toJSON()
-      );
-
-      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-        return { id: req.params.id, host: '', port: '', enabled: false };
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld::ApiScan @file={{this.file}} />
-      `);
-
-      assert
-        .dom('[data-test-apiScan-btn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-
-      await click('[data-test-apiScan-btn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.apiScan.title:()');
-
-      assert
-        .dom('[data-test-capturedApi-emptyTitle]')
-        .hasText('t:capturedApiEmptyTitle:()');
-
-      assert
-        .dom('[data-test-capturedApi-emptyDescription]')
-        .hasText('t:capturedApiEmptyDesc:()');
-
-      assert.dom('[data-test-proxySettingsView-container]').doesNotExist();
-
-      assert.dom('[data-test-apiScanModal-startBtn]').doesNotExist();
-
-      assert
-        .dom('[data-test-apiScanModal-closeBtn]')
-        .isNotDisabled()
-        .hasText('t:close:()');
-
-      await click('[data-test-apiScanModal-closeBtn]');
-
-      assert.dom('[data-test-ak-modal-header]').doesNotExist();
-    });
-
-    test.each(
-      'it api scan modal with captured api count greater than 0',
-      [false, true],
-      async function (assert, withApiProxySetting) {
-        this.file.isDynamicDone = true;
-        this.file.isApiDone = false;
-
-        // make sure file is active
-        this.file.isActive = true;
-
-        this.server.get('/v2/projects/:id', (schema, req) => {
-          return schema.projects.find(`${req.params.id}`)?.toJSON();
-        });
-
-        this.server.get('/v2/files/1/capturedapis', (schema, req) => {
-          const results = req.queryParams.is_active
-            ? schema.db.capturedapis.where({ is_active: true })
-            : schema.capturedapis.all().models;
-
-          return { count: results.length, previous: null, next: null, results };
-        });
-
-        this.server.get('/profiles/:id', (schema, req) =>
-          schema.profiles.find(`${req.params.id}`)?.toJSON()
-        );
-
-        this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-          return {
-            id: req.params.id,
-            host: withApiProxySetting ? faker.internet.ip() : '',
-            port: withApiProxySetting ? faker.internet.port() : '',
-            enabled: false,
-          };
-        });
-
-        await render(hbs`
-        <FileDetails::ScanActionsOld::ApiScan @file={{this.file}} />
-      `);
-
-        assert
-          .dom('[data-test-apiScan-btn]')
-          .isNotDisabled()
-          .hasText('t:start:()');
-
-        await click('[data-test-apiScan-btn]');
-
-        assert
-          .dom('[data-test-ak-modal-header]')
-          .hasText('t:modalCard.apiScan.title:()');
-
-        assert
-          .dom('[data-test-apiScanModal-warnAlert]')
-          .hasText('t:modalCard.apiScan.warning:()');
-
-        assert
-          .dom('[data-test-apiScanModal-description]')
-          .hasText('t:modalCard.apiScan.description:()');
-
-        assert
-          .dom('[data-test-capturedApi-title]')
-          .hasText('t:capturedApiTitle:()');
-
-        const selected = this.capturedApis.filter((it) => it.is_active);
-
-        assert
-          .dom('[data-test-capturedApi-apiCount]')
-          .hasText(
-            `t:selected:() (${selected.length}/${this.capturedApis.length})`
-          );
-
-        const apiEndpoints = findAll(
-          '[data-test-capturedApi-endpointContainer]'
-        );
-
-        assert.strictEqual(apiEndpoints.length, 10);
-
-        // first 3 api not selected
-        assert
-          .dom(
-            '[data-test-capturedApi-endpointSelectCheckbox]',
-            apiEndpoints[0]
-          )
-          .isNotDisabled()
-          .isNotChecked();
-
-        assert
-          .dom('[data-test-capturedApi-endpointMethodChip]', apiEndpoints[0])
-          .hasText(this.capturedApis[0].request.method);
-
-        assert
-          .dom('[data-test-capturedApi-endpointMethodChip]', apiEndpoints[0])
-          .hasText(this.capturedApis[0].request.method);
-
-        const { scheme, path, host, port } = this.capturedApis[0].request;
-
-        assert
-          .dom('[data-test-capturedApi-endpointUrl]', apiEndpoints[0])
-          .hasText(`${scheme}://${host}:${port}${path}`);
-
-        const proxySetting = this.store.peekRecord(
-          'proxy-setting',
-          this.file.profile.get('id')
-        );
-
-        if (proxySetting.hasProxyUrl) {
-          assert.dom('[data-test-proxySettingsView-container]').exists();
-
-          assert
-            .dom(
-              '[data-test-proxySettingsView-enableApiProxyToggle] [data-test-toggle-input]'
-            )
-            .isNotDisabled()
-            .isNotChecked();
-
-          assert
-            .dom('[data-test-proxySettingsView-enableApiProxyLabel]')
-            .hasText('t:enable:() t:proxySettingsTitle:()');
-
-          assert
-            .dom('[data-test-proxySettingsView-editSettings]')
-            .hasTagName('a')
-            .hasAttribute('href', '/dashboard/project/1/settings')
-            .hasText('t:edit:()');
-
-          assert
-            .dom('[data-test-proxySettingsView-proxySettingRoute]')
-            .hasText(
-              `t:proxySettingsRouteVia:() ${proxySetting.host}:${proxySetting.port}`
-            );
-        } else {
-          assert.dom('[data-test-proxySettingsView-container]').doesNotExist();
-        }
-
-        assert
-          .dom('[data-test-apiScanModal-startBtn]')
-          .isNotDisabled()
-          .hasText('t:modalCard.apiScan.start:()');
-
-        assert.dom('[data-test-apiScanModal-closeBtn]').doesNotExist();
-      }
-    );
-
-    test('test toggle api endpoint selection', async function (assert) {
-      this.file.isDynamicDone = true;
-      this.file.isApiDone = false;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/v2/files/1/capturedapis', (schema, req) => {
-        const results = req.queryParams.is_active
-          ? schema.db.capturedapis.where({ is_active: true })
-          : schema.capturedapis.all().models;
-
-        return { count: results.length, previous: null, next: null, results };
-      });
-
-      this.server.put('/capturedapis/:id', (schema, req) => {
-        const data = JSON.parse(req.requestBody);
-
-        schema.db.capturedapis.update(`${req.params.id}`, {
-          is_active: data.is_active,
-        });
-
-        return schema.capturedapis.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/profiles/:id', (schema, req) =>
-        schema.profiles.find(`${req.params.id}`)?.toJSON()
-      );
-
-      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-        return {
-          id: req.params.id,
-          host: '',
-          port: '',
-          enabled: false,
-        };
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld::ApiScan @file={{this.file}} />
-      `);
-
-      assert
-        .dom('[data-test-apiScan-btn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-
-      await click('[data-test-apiScan-btn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.apiScan.title:()');
-
-      const selected = this.capturedApis.filter((it) => it.is_active);
-
-      assert
-        .dom('[data-test-capturedApi-apiCount]')
-        .hasText(
-          `t:selected:() (${selected.length}/${this.capturedApis.length})`
-        );
-
-      const apiEndpoints = findAll('[data-test-capturedApi-endpointContainer]');
-
-      assert.strictEqual(apiEndpoints.length, 10);
-
-      // first 3 api not selected
-      assert
-        .dom('[data-test-capturedApi-endpointSelectCheckbox]', apiEndpoints[0])
-        .isNotDisabled()
-        .isNotChecked();
-
-      await click(
-        apiEndpoints[0].querySelector(
-          '[data-test-capturedApi-endpointSelectCheckbox]'
-        )
-      );
-
-      assert
-        .dom('[data-test-capturedApi-endpointSelectCheckbox]', apiEndpoints[0])
-        .isNotDisabled()
-        .isChecked();
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(notify.successMsg, 't:capturedApiSaveSuccessMsg:()');
-
-      // should be +1
-      assert
-        .dom('[data-test-capturedApi-apiCount]')
-        .hasText(
-          `t:selected:() (${selected.length + 1}/${this.capturedApis.length})`
-        );
-
-      await click(
-        apiEndpoints[0].querySelector(
-          '[data-test-capturedApi-endpointSelectCheckbox]'
-        )
-      );
-
-      assert
-        .dom('[data-test-capturedApi-endpointSelectCheckbox]', apiEndpoints[0])
-        .isNotDisabled()
-        .isNotChecked();
-
-      // should be back to initial state
-      // assert
-      //   .dom('[data-test-capturedApi-apiCount]')
-      //   .hasText(
-      //     `t:selected:() (${selected.length}/${this.capturedApis.length})`
-      //   );
-    });
-
-    test('test run api scan', async function (assert) {
-      this.file.isDynamicDone = true;
-      this.file.isApiDone = false;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/v2/files/1/capturedapis', (schema, req) => {
-        const results = req.queryParams.is_active
-          ? schema.db.capturedapis.where({ is_active: true })
-          : schema.capturedapis.all().models;
-
-        return { count: results.length, previous: null, next: null, results };
-      });
-
-      this.server.get('/profiles/:id', (schema, req) =>
-        schema.profiles.find(`${req.params.id}`)?.toJSON()
-      );
-
-      this.server.get('/profiles/:id/proxy_settings', (_, req) => {
-        return {
-          id: req.params.id,
-          host: '',
-          port: '',
-          enabled: false,
-        };
-      });
-
-      this.server.post('/v2/files/:id/start_apiscan', () => new Response(201));
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld::ApiScan @file={{this.file}} />
-      `);
-
-      assert
-        .dom('[data-test-apiScan-btn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-
-      await click('[data-test-apiScan-btn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.apiScan.title:()');
-
-      assert
-        .dom('[data-test-apiScanModal-startBtn]')
-        .isNotDisabled()
-        .hasText('t:modalCard.apiScan.start:()');
-
-      await click('[data-test-apiScanModal-startBtn]');
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(notify.successMsg, 't:startingApiScan:()');
-      assert.dom('[data-test-ak-modal-header]').doesNotExist();
-    });
-  }
-);
diff --git a/tests/integration/components/file-details/scan-actions-old/manual-scan-test.js b/tests/integration/components/file-details/scan-actions-old/manual-scan-test.js
deleted file mode 100644
index f35d435221..0000000000
--- a/tests/integration/components/file-details/scan-actions-old/manual-scan-test.js
+++ /dev/null
@@ -1,620 +0,0 @@
-import { click, fillIn, findAll, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-import { Response } from 'miragejs';
-import { selectChoose } from 'ember-power-select/test-support';
-import { faker } from '@faker-js/faker';
-
-import ENUMS from 'irene/enums';
-import Service from '@ember/service';
-import { appEnvironment } from 'irene/helpers/app-environment';
-import { appAction } from 'irene/helpers/app-action';
-import styles from 'irene/components/ak-select/index.scss';
-
-const classes = {
-  dropdown: styles['ak-select-dropdown'],
-  trigger: styles['ak-select-trigger'],
-  triggerError: styles['ak-select-trigger-error'],
-};
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-  infoMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-
-  success(msg) {
-    this.successMsg = msg;
-  }
-
-  info(msg) {
-    this.infoMsg = msg;
-  }
-}
-
-module(
-  'Integration | Component | file-details/scan-actions-old/manual-scan',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupMirage(hooks);
-    setupIntl(hooks);
-
-    hooks.beforeEach(async function () {
-      this.server.createList('organization', 1);
-
-      const store = this.owner.lookup('service:store');
-
-      const profile = this.server.create('profile', { id: '100' });
-
-      const file = this.server.create('file', {
-        project: '1',
-        profile: profile.id,
-      });
-
-      this.server.create('project', { file: file.id, id: '1' });
-
-      const manualscan = this.server.create('manualscan', { id: file.id });
-
-      this.setProperties({
-        file: store.push(store.normalize('file', file.toJSON())),
-        manualscan,
-        store,
-      });
-
-      await this.owner.lookup('service:organization').load();
-      this.owner.register('service:notifications', NotificationsStub);
-    });
-
-    test.each(
-      'it renders different states of manual scan button',
-      [
-        { manual: ENUMS.MANUAL.NONE, done: false },
-        { manual: ENUMS.MANUAL.NONE, done: false, disabled: true },
-        { manual: ENUMS.MANUAL.REQUESTED, done: false },
-        { manual: ENUMS.MANUAL.REQUESTED, done: true },
-        { manual: ENUMS.MANUAL.ASSESSING, done: false },
-        { manual: ENUMS.MANUAL.ASSESSING, done: true },
-      ],
-      async function (assert, scan) {
-        this.file.manual = scan.manual;
-        this.file.isManualDone = scan.done;
-
-        this.file.isActive = !scan.disabled;
-
-        this.server.get('/manualscans/:id', (schema, req) => {
-          return schema.manualscans.find(`${req.params.id}`)?.toJSON();
-        });
-
-        await render(hbs`
-            <FileDetails::ScanActionsOld::ManualScan @file={{this.file}} />
-        `);
-
-        if (this.file.manual === ENUMS.MANUAL.ASSESSING) {
-          assert
-            .dom('[data-test-manualScan-statusBtn]')
-            .hasText(
-              this.file.isManualDone ? 't:completed:()' : 't:inProgress:()'
-            );
-        } else if (this.file.isManualRequested) {
-          assert
-            .dom('[data-test-manualScan-statusBtn]')
-            .hasText(
-              this.file.isManualDone ? 't:completed:()' : 't:requested:()'
-            );
-        } else {
-          assert
-            .dom('[data-test-manualScan-requestBtn]')
-            [this.file.isActive ? 'isNotDisabled' : 'isDisabled']()
-            .hasText('t:start:()');
-        }
-      }
-    );
-
-    test('it renders manual scan request access modal & send request', async function (assert) {
-      this.file.manual = ENUMS.MANUAL.NONE;
-      this.file.isManualDone = false;
-      this.file.isActive = true;
-
-      const organization = this.owner.lookup('service:organization');
-      organization.selected.isTrial = true;
-
-      this.server.get('/v2/files/:id', (schema, req) => {
-        return schema.files.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return schema.manualscans.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.post(
-        '/organizations/:id/request_access',
-        () => new Response(201)
-      );
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld::ManualScan @file={{this.file}} />
-      `);
-
-      assert
-        .dom('[data-test-manualScan-requestBtn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-
-      await click('[data-test-manualScan-requestBtn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.requestAccess.title:()');
-
-      assert
-        .dom('[data-test-confirmbox-description]')
-        .hasText('t:modalCard.requestAccess.description:()');
-
-      assert
-        .dom('[data-test-confirmbox-confirmBtn]')
-        .isNotDisabled()
-        .hasText('t:modalCard.requestAccess.button:()');
-
-      assert
-        .dom('[data-test-confirmbox-cancelBtn]')
-        .isNotDisabled()
-        .hasText('t:cancel:()');
-
-      // set manual to requested for reload
-      this.server.db.files.update(this.file.id, {
-        manual: ENUMS.MANUAL.REQUESTED,
-      });
-
-      await click('[data-test-confirmbox-confirmBtn]');
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(notify.successMsg, 't:accessRequested:()');
-      assert.dom('[data-test-ak-modal-header]').doesNotExist();
-      assert.dom('[data-test-manualScan-statusBtn]').hasText('t:requested:()');
-    });
-
-    test('it renders manual scan modal & send request', async function (assert) {
-      assert.expect(77);
-
-      this.file.manual = ENUMS.MANUAL.NONE;
-      this.file.isManualDone = false;
-      this.file.isActive = true;
-
-      const manualscan = this.server.db.manualscans.update(this.file.id, {
-        app_env: ENUMS.APP_ENV.NO_PREFERENCE,
-        min_os_version: '',
-        app_action: ENUMS.APP_ACTION.NO_PREFERENCE,
-        login_required: false,
-        vpn_required: false,
-        additional_comments: '',
-      });
-
-      // values for manualscan request
-      this.setProperties({
-        appEnv: ENUMS.APP_ENV.PRODUCTION,
-        minOsVersion: 10,
-        appAction: ENUMS.APP_ACTION.HALT,
-        contactName: 'test',
-        contactEmail: 'test@mail.com',
-        userRoles: [
-          {
-            role: 'test_role',
-            username: 'test_name',
-            password: faker.internet.password(),
-          },
-        ],
-        vpnDetails: {
-          address: faker.internet.ip(),
-          port: faker.internet.port(),
-          username: 'test_vpn_name',
-          password: faker.internet.password(),
-        },
-        additionalComments: 'comment',
-      });
-
-      this.server.get('/v2/files/:id', (schema, req) => {
-        return schema.files.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/manualscans/:id', (schema, req) => {
-        return schema.manualscans.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.put('manualscans/:id', (_, req) => {
-        const data = JSON.parse(req.requestBody);
-
-        assert.strictEqual(data.app_env, this.appEnv);
-        assert.strictEqual(data.min_os_version, `${this.minOsVersion}`);
-        assert.strictEqual(data.app_action, this.appAction);
-        assert.true(data.login_required);
-
-        this.userRoles.forEach((ur, i) => {
-          assert.strictEqual(data.user_roles[i].role, ur.role);
-          assert.strictEqual(data.user_roles[i].username, ur.username);
-          assert.strictEqual(data.user_roles[i].password, ur.password);
-        });
-
-        assert.true(data.vpn_required);
-        assert.strictEqual(data.contact.name, this.contactName);
-        assert.strictEqual(data.contact.email, this.contactEmail);
-        assert.strictEqual(data.additional_comments, this.additionalComments);
-
-        return new Response(201);
-      });
-
-      await render(hbs`
-        <FileDetails::ScanActionsOld::ManualScan @file={{this.file}} />
-      `);
-
-      assert
-        .dom('[data-test-manualScan-requestBtn]')
-        .isNotDisabled()
-        .hasText('t:start:()');
-
-      await click('[data-test-manualScan-requestBtn]');
-
-      assert
-        .dom('[data-test-ak-modal-header]')
-        .hasText('t:modalCard.manual.title:()');
-
-      assert
-        .dom('[data-test-manualScanModal-description]')
-        .hasText('t:modalCard.manual.description:()');
-
-      const accordions = findAll('[data-test-ak-accordion]');
-
-      assert.strictEqual(accordions.length, 3);
-
-      assert
-        .dom('[data-test-ak-accordion-summary]', accordions[0])
-        .hasText('t:modalCard.manual.basicAppInfo:()');
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-appEnvLabel]', accordions[0])
-        .hasText('t:modalCard.manual.appEnv:()');
-
-      assert
-        .dom(
-          `[data-test-manualScanBasicInfo-appEnvSelect] .${classes.trigger}`,
-          accordions[0]
-        )
-        .hasText(`t:${appEnvironment([ENUMS.APP_ENV.NO_PREFERENCE])}:()`);
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-minOSVersionLabel]', accordions[0])
-        .hasText('t:minOSVersion:()');
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-minOSVersionInput]', accordions[0])
-        .isNotDisabled()
-        .hasValue(`${manualscan.min_os_version}`);
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-appQuestion1Label]', accordions[0])
-        .hasText('t:modalCard.manual.appQuestion1:()');
-
-      assert
-        .dom(
-          `[data-test-manualScanBasicInfo-appQuestion1Select] .${classes.trigger}`,
-          accordions[0]
-        )
-        .hasText(`t:${appAction([ENUMS.APP_ACTION.NO_PREFERENCE])}:()`);
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-pocLabel]', accordions[0])
-        .hasText('t:modalCard.manual.poc:()');
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-pocNameInput]', accordions[0])
-        .isNotDisabled()
-        .hasValue(manualscan.contact.name);
-
-      assert
-        .dom('[data-test-manualScanBasicInfo-pocEmailInput]', accordions[0])
-        .isNotDisabled()
-        .hasValue(manualscan.contact.email);
-
-      // login details
-      assert
-        .dom('[data-test-ak-accordion-summary]', accordions[1])
-        .hasText('t:modalCard.manual.loginDetails:()');
-
-      await click(
-        accordions[1].querySelector('[data-test-ak-accordion-summary]')
-      );
-
-      assert
-        .dom(
-          '[data-test-manualScanLoginDetails-loginRequiredLabel]',
-          accordions[1]
-        )
-        .hasText('t:modalCard.manual.loginRequired:()');
-
-      assert
-        .dom(
-          `[data-test-manualScanLoginDetails-loginRequiredSelect] .${classes.trigger}`,
-          accordions[1]
-        )
-        .hasText('t:no:()');
-
-      assert
-        .dom(
-          '[data-test-manualScanLoginDetails-userRoleDetailsContainer]',
-          accordions[1]
-        )
-        .doesNotExist();
-
-      // vpn detail
-      assert
-        .dom('[data-test-ak-accordion-summary]', accordions[2])
-        .hasText('t:modalCard.manual.vpnDetails:()');
-
-      await click(
-        accordions[2].querySelector('[data-test-ak-accordion-summary]')
-      );
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-vpnRequiredLabel]', accordions[2])
-        .hasText('t:modalCard.manual.vpnRequired:()');
-
-      assert
-        .dom(
-          `[data-test-manualScanVpnDetails-vpnRequiredSelect] .${classes.trigger}`,
-          accordions[2]
-        )
-        .hasText('t:no:()');
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-detailsContainer]', accordions[2])
-        .doesNotExist();
-
-      assert
-        .dom('[data-test-manualScanModal-additionalCommentLabel]')
-        .hasText('t:modalCard.manual.additionalComments:()');
-
-      assert
-        .dom('[data-test-manualScanModal-additionalCommentInput]')
-        .isNotDisabled()
-        .hasValue(manualscan.additional_comments);
-
-      assert
-        .dom('[data-test-manualScanModal-requestBtn]')
-        .isNotDisabled()
-        .hasText('t:modalCard.manual.title:()');
-
-      assert
-        .dom('[data-test-manualScanModal-cancelBtn]')
-        .isNotDisabled()
-        .hasText('t:cancel:()');
-
-      // set manual scan details
-      // basic info
-      await selectChoose(
-        accordions[0].querySelector(
-          `[data-test-manualScanBasicInfo-appEnvSelect] .${classes.trigger}`
-        ),
-        `t:${appEnvironment([this.appEnv])}:()`
-      );
-
-      await fillIn(
-        '[data-test-manualScanBasicInfo-minOSVersionInput]',
-        this.minOsVersion
-      );
-
-      await selectChoose(
-        accordions[0].querySelector(
-          `[data-test-manualScanBasicInfo-appquestion1select] .${classes.trigger}`
-        ),
-        `t:${appAction([this.appAction])}:()`
-      );
-
-      await fillIn(
-        '[data-test-manualScanBasicInfo-pocNameInput]',
-        this.contactName
-      );
-
-      await fillIn(
-        '[data-test-manualScanBasicInfo-pocEmailInput]',
-        this.contactEmail
-      );
-
-      // login details
-      await selectChoose(
-        accordions[1].querySelector(
-          `[data-test-manualScanLoginDetails-loginRequiredSelect] .${classes.trigger}`
-        ),
-        't:yes:()'
-      );
-
-      assert
-        .dom(
-          '[data-test-manualScanLoginDetails-userRoleDetailsContainer]',
-          accordions[1]
-        )
-        .exists();
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-detailsLabel]', accordions[1])
-        .hasText('t:modalCard.manual.enterLoginDetails:()');
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-roleInput]', accordions[1])
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-usernameInput]', accordions[1])
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-passwordInput]', accordions[1])
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-addRoleBtn]', accordions[1])
-        .isNotDisabled()
-        .hasText('t:modalCard.manual.addUserRole:()');
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-userRole-table]', accordions[1])
-        .doesNotExist();
-
-      for (const ur of this.userRoles) {
-        await fillIn(
-          accordions[1].querySelector(
-            '[data-test-manualScanLoginDetails-roleInput]'
-          ),
-          ur.role
-        );
-
-        await fillIn(
-          accordions[1].querySelector(
-            '[data-test-manualScanLoginDetails-usernameInput]'
-          ),
-          ur.username
-        );
-
-        await fillIn(
-          accordions[1].querySelector(
-            '[data-test-manualScanLoginDetails-passwordInput]'
-          ),
-          ur.password
-        );
-
-        await click(
-          accordions[1].querySelector(
-            '[data-test-manualScanLoginDetails-addRoleBtn]'
-          )
-        );
-      }
-
-      assert
-        .dom('[data-test-manualScanLoginDetails-userRole-table]', accordions[1])
-        .exists();
-
-      const userRoleHeaderCells = accordions[1].querySelectorAll(
-        '[data-test-manualScanLoginDetails-userRole-thead] th'
-      );
-
-      assert.strictEqual(userRoleHeaderCells.length, 4);
-
-      assert.dom(userRoleHeaderCells[0]).hasText('t:username:()');
-      assert.dom(userRoleHeaderCells[1]).hasText('t:role:()');
-      assert.dom(userRoleHeaderCells[2]).hasText('t:password:()');
-      assert.dom(userRoleHeaderCells[3]).hasText('t:action:()');
-
-      const userRoleRows = accordions[1].querySelectorAll(
-        '[data-test-manualScanLoginDetails-userRole-row]'
-      );
-
-      assert.strictEqual(userRoleRows.length, this.userRoles.length);
-
-      const firstRowCells = userRoleRows[0].querySelectorAll(
-        '[data-test-manualScanLoginDetails-userRole-cell]'
-      );
-
-      assert.dom(firstRowCells[0]).hasText(this.userRoles[0].username);
-      assert.dom(firstRowCells[1]).hasText(this.userRoles[0].role);
-      assert.dom(firstRowCells[2]).hasText(this.userRoles[0].password);
-
-      assert
-        .dom(
-          '[data-test-manualScanLoginDetails-userRole-deleteBtn]',
-          firstRowCells[3]
-        )
-        .isNotDisabled();
-
-      // vpn details
-      await selectChoose(
-        accordions[2].querySelector(
-          `[data-test-manualScanVpnDetails-vpnRequiredSelect] .${classes.trigger}`
-        ),
-        't:yes:()'
-      );
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-detailsContainer]', accordions[2])
-        .exists();
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-detailsLabel]', accordions[2])
-        .hasText('t:modalCard.manual.enterVPNDetails:()');
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-vpnAddressInput]', accordions[2])
-        .isNotDisabled()
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-vpnPortInput]', accordions[2])
-        .isNotDisabled()
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-credentialsLabel]', accordions[2])
-        .hasText('t:modalCard.manual.enterCredentails:()');
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-usernameInput]', accordions[2])
-        .isNotDisabled()
-        .hasNoValue();
-
-      assert
-        .dom('[data-test-manualScanVpnDetails-passwordInput]', accordions[2])
-        .isNotDisabled()
-        .hasNoValue();
-
-      await fillIn(
-        accordions[2].querySelector(
-          '[data-test-manualScanVpnDetails-vpnAddressInput]'
-        ),
-        this.vpnDetails.address
-      );
-
-      await fillIn(
-        accordions[2].querySelector(
-          '[data-test-manualScanVpnDetails-vpnPortInput]'
-        ),
-        this.vpnDetails.port
-      );
-
-      await fillIn(
-        accordions[2].querySelector(
-          '[data-test-manualScanVpnDetails-usernameInput]'
-        ),
-        this.vpnDetails.username
-      );
-
-      await fillIn(
-        accordions[2].querySelector(
-          '[data-test-manualScanVpnDetails-passwordInput]'
-        ),
-        this.vpnDetails.password
-      );
-
-      await fillIn(
-        '[data-test-manualScanModal-additionalCommentInput]',
-        this.additionalComments
-      );
-
-      // manually set to requested to mimic backend
-      this.server.db.files.update(this.file.id, {
-        manual: ENUMS.MANUAL.REQUESTED,
-      });
-
-      await click('[data-test-manualScanModal-requestBtn]');
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(notify.infoMsg, 't:manualRequested:()');
-      assert.dom('[data-test-ak-modal-header]').doesNotExist();
-      assert.dom('[data-test-manualScan-statusBtn]').hasText('t:requested:()');
-    });
-  }
-);
diff --git a/tests/integration/components/file-details/summary-old-test.js b/tests/integration/components/file-details/summary-old-test.js
deleted file mode 100644
index e67d018694..0000000000
--- a/tests/integration/components/file-details/summary-old-test.js
+++ /dev/null
@@ -1,392 +0,0 @@
-import { click, fillIn, find, findAll, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-
-import { Response } from 'miragejs';
-import Service from '@ember/service';
-import dayjs from 'dayjs';
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-  success(msg) {
-    this.successMsg = msg;
-  }
-}
-
-module('Integration | Component | file-details/summary-old', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupIntl(hooks);
-
-  hooks.beforeEach(async function () {
-    this.server.createList('organization', 1);
-
-    const store = this.owner.lookup('service:store');
-    const tags = this.server.createList('tag', 2);
-
-    const file = this.server.create('file', {
-      project: '1',
-      tags: tags.map((tag) => tag.toJSON()),
-    });
-
-    this.server.create('project', { file: file.id, id: '1' });
-
-    const pushedFile = store.push(store.normalize('file', file.toJSON()));
-
-    this.setProperties({
-      file: pushedFile,
-      tags,
-      store,
-    });
-
-    await this.owner.lookup('service:organization').load();
-    this.owner.register('service:notifications', NotificationsStub);
-  });
-
-  test('it renders file-details/summary-old', async function (assert) {
-    this.file.isStaticDone = true;
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    await render(hbs`
-        <FileDetails::SummaryOld @file={{this.file}} />
-    `);
-
-    assert.dom('[data-test-appLogo-img]').exists();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-appName]')
-      .hasText(this.file.name);
-
-    assert
-      .dom('[data-test-fileDetailsSummary-appPackageName]')
-      .hasText(this.file.project.get('packageName'));
-
-    assert
-      .dom('[data-test-fileReportBtn]')
-      .isNotDisabled()
-      .hasText('t:viewReport:()');
-
-    assert.dom('[data-test-fileDetailsSummary-moreMenuBtn]').isNotDisabled();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-fileId]')
-      .hasText(`t:fileID:() - ${this.file.id}`);
-
-    assert
-      .dom('[data-test-fileDetailsSummary-fileOverview-appPlatform]')
-      .exists();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-showMoreOrLessBtn]')
-      .isNotDisabled()
-      .hasText('t:showMore:()');
-  });
-
-  test('it should toggle show more for file overview', async function (assert) {
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    await render(hbs`
-        <FileDetails::SummaryOld @file={{this.file}} />
-    `);
-
-    const hiddenFileOverviewDetails = [
-      { label: 't:version:()', value: this.file.version },
-      {
-        label: 'T:versionCode:()',
-        value: this.file.versionCode,
-      },
-      {
-        label: 't:uploadedOn:()',
-        value: dayjs(this.file.createdOn).fromNow(),
-      },
-    ];
-
-    hiddenFileOverviewDetails.forEach((fod) => {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileOverviewGroup='${fod.label}']`)
-        .doesNotExist();
-    });
-
-    assert
-      .dom('[data-test-fileDetailsSummary-showMoreOrLessBtn]')
-      .isNotDisabled()
-      .hasText('t:showMore:()');
-
-    await click('[data-test-fileDetailsSummary-showMoreOrLessBtn]');
-
-    assert
-      .dom('[data-test-fileDetailsSummary-showMoreOrLessBtn]')
-      .isNotDisabled()
-      .hasText('t:showLess:()');
-
-    hiddenFileOverviewDetails.forEach((d) => {
-      assert
-        .dom(
-          '[data-test-fileDetailsSummary-fileOverviewLabel]',
-          find(`[data-test-fileDetailsSummary-fileOverviewGroup='${d.label}']`)
-        )
-        .hasText(d.label);
-
-      assert
-        .dom(
-          '[data-test-fileDetailsSummary-fileOverviewValue]',
-          find(`[data-test-fileDetailsSummary-fileOverviewGroup='${d.label}']`)
-        )
-        .hasText(d.value);
-    });
-
-    assert
-      .dom('[data-test-fileDetailsSummary-fileTagTitle]')
-      .hasText('t:tags:()');
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagBtn]')
-      .isNotDisabled()
-      .hasText('t:addTags:()');
-  });
-
-  test('it should render file more menu', async function (assert) {
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    await render(hbs`
-        <FileDetails::SummaryOld @file={{this.file}} />
-    `);
-
-    // set project file count to 3
-    const project = this.store.peekRecord('project', '1');
-    project.fileCount = 3;
-
-    assert.dom('[data-test-fileDetailsSummary-moreMenuBtn]').isNotDisabled();
-
-    await click('[data-test-fileDetailsSummary-moreMenuBtn]');
-
-    let menuItems = findAll('[data-test-fileDetailsSummary-moreMenuItem]');
-
-    // project file count is more than 1
-    assert.strictEqual(menuItems.length, 3);
-
-    assert.dom(menuItems[0]).hasText('t:compare:()');
-    assert.dom(menuItems[1]).hasText('t:allUploads:()');
-    assert.dom(menuItems[2]).hasText('t:settings:()');
-
-    // close menu
-    await click('[data-test-ak-popover-backdrop]');
-
-    // set project file count to 1
-    project.fileCount = 1;
-
-    await click('[data-test-fileDetailsSummary-moreMenuBtn]');
-
-    // refresh menu items
-    menuItems = findAll('[data-test-fileDetailsSummary-moreMenuItem]');
-
-    assert.strictEqual(menuItems.length, 1);
-
-    assert.dom(menuItems[0]).hasText('t:settings:()');
-  });
-
-  test.each('test add tag', [false, true], async function (assert, fail) {
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/v2/files/:id', (schema, req) => {
-      return schema.files.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.post('/v2/files/:id/tags', (schema, req) => {
-      if (fail) {
-        return new Response(500, {}, { errors: ['server error'] });
-      }
-
-      const tag = schema.create('tag', { name: req.requestBody.split('=')[1] });
-      const file = schema.files.find(this.file.id);
-
-      file.tags.push(tag.toJSON());
-      file.save();
-
-      return new Response(201);
-    });
-
-    await render(hbs`
-        <FileDetails::SummaryOld @file={{this.file}} />
-    `);
-
-    assert
-      .dom('[data-test-fileDetailsSummary-showMoreOrLessBtn]')
-      .isNotDisabled()
-      .hasText('t:showMore:()');
-
-    await click('[data-test-fileDetailsSummary-showMoreOrLessBtn]');
-
-    assert
-      .dom('[data-test-fileDetailsSummary-fileTagTitle]')
-      .hasText('t:tags:()');
-
-    this.tags.forEach((tag) => {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='${tag.name}']`)
-        .hasText(tag.name);
-    });
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagBtn]')
-      .isNotDisabled()
-      .hasText('t:addTags:()');
-
-    await click('[data-test-fileDetailsSummary-addTagBtn]');
-
-    assert.dom('[data-test-fileDetailsSummary-addTagBtn]').doesNotExist();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagInput]')
-      .isNotDisabled()
-      .hasNoValue();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagConfirmBtn]')
-      .isNotDisabled();
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagCancelBtn]')
-      .isNotDisabled();
-
-    // test blank state
-    await click('[data-test-fileDetailsSummary-addTagConfirmBtn]');
-
-    const notify = this.owner.lookup('service:notifications');
-
-    assert.strictEqual(notify.errorMsg, 't:fileTag.blankErrorMsg:()');
-
-    await fillIn('[data-test-fileDetailsSummary-addTagInput]', 'testTag');
-
-    await click('[data-test-fileDetailsSummary-addTagConfirmBtn]');
-
-    if (fail) {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='testTag']`)
-        .doesNotExist();
-
-      assert
-        .dom('[data-test-fileDetailsSummary-addTagInput]')
-        .isNotDisabled()
-        .hasValue('testTag');
-
-      assert
-        .dom('[data-test-fileDetailsSummary-addTagConfirmBtn]')
-        .isNotDisabled();
-
-      assert
-        .dom('[data-test-fileDetailsSummary-addTagCancelBtn]')
-        .isNotDisabled();
-
-      assert.dom('[data-test-fileDetailsSummary-addTagBtn]').doesNotExist();
-
-      assert.strictEqual(notify.errorMsg, 'server error');
-    } else {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='testTag']`)
-        .hasText('testTag');
-
-      assert.dom('[data-test-fileDetailsSummary-addTagInput]').doesNotExist();
-
-      assert
-        .dom('[data-test-fileDetailsSummary-addTagConfirmBtn]')
-        .doesNotExist();
-
-      assert
-        .dom('[data-test-fileDetailsSummary-addTagCancelBtn]')
-        .doesNotExist();
-
-      assert.dom('[data-test-fileDetailsSummary-addTagBtn]').exists();
-
-      assert.strictEqual(notify.successMsg, 't:fileTag.addedSuccessMsg:()');
-    }
-  });
-
-  test.each('test delete tag', [false, true], async function (assert, fail) {
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return schema.projects.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/v2/files/:id', (schema, req) => {
-      return schema.files.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.delete('/v2/files/:id/tags/:tagId', (schema, req) => {
-      if (fail) {
-        return new Response(500, {}, { errors: ['server error'] });
-      }
-
-      const file = schema.files.find(this.file.id);
-
-      file.tags = file.tags.filter((t) => t.id !== req.params.tagId);
-      file.save();
-
-      return new Response(204);
-    });
-
-    await render(hbs`
-        <FileDetails::SummaryOld @file={{this.file}} />
-    `);
-
-    assert
-      .dom('[data-test-fileDetailsSummary-showMoreOrLessBtn]')
-      .isNotDisabled()
-      .hasText('t:showMore:()');
-
-    await click('[data-test-fileDetailsSummary-showMoreOrLessBtn]');
-
-    assert
-      .dom('[data-test-fileDetailsSummary-fileTagTitle]')
-      .hasText('t:tags:()');
-
-    this.tags.forEach((tag) => {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='${tag.name}']`)
-        .hasText(tag.name);
-    });
-
-    assert
-      .dom('[data-test-fileDetailsSummary-addTagBtn]')
-      .isNotDisabled()
-      .hasText('t:addTags:()');
-
-    await click(
-      find(
-        `[data-test-fileDetailsSummary-fileTag='${this.tags[0].name}']`
-      ).querySelector('[data-test-chip-delete-btn]')
-    );
-
-    const notify = this.owner.lookup('service:notifications');
-
-    if (fail) {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='${this.tags[0].name}']`)
-        .exists();
-
-      assert.ok(notify.errorMsg);
-    } else {
-      assert
-        .dom(`[data-test-fileDetailsSummary-fileTag='${this.tags[0].name}']`)
-        .doesNotExist();
-
-      assert.strictEqual(notify.successMsg, 't:fileTag.deletedSuccessMsg:()');
-    }
-  });
-});
diff --git a/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/index-test.js b/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/index-test.js
index 70c5ba51b2..5a4bdedf25 100644
--- a/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/index-test.js
+++ b/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/index-test.js
@@ -77,7 +77,8 @@ module(
       await render(hbs`
         <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings 
           @project={{this.project}} 
-          @profileId={{this.project.activeProfileId}} 
+          @profileId={{this.project.activeProfileId}}  
+          @featureAvailable={{true}}
         />
       `);
 
@@ -115,6 +116,7 @@ module(
         <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings 
           @project={{this.project}} 
           @profileId={{this.project.activeProfileId}} 
+          @featureAvailable={{true}}
         />
       `);
 
diff --git a/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived-test.js b/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived-test.js
deleted file mode 100644
index 8cf07b993c..0000000000
--- a/tests/integration/components/project-settings/general-settings/dynamicscan-automation-settings/scripts-archived-test.js
+++ /dev/null
@@ -1,381 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { selectFiles } from 'ember-file-upload/test-support';
-import { Response } from 'miragejs';
-import Service from '@ember/service';
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-
-import { getReqBodyObjFromReqBodyStr } from 'irene/tests/helpers/mirage-utils';
-
-dayjs.extend(relativeTime);
-
-class NotificationsStub extends Service {
-  errorMsg = null;
-  successMsg = null;
-
-  error(msg) {
-    this.errorMsg = msg;
-  }
-
-  success(msg) {
-    this.successMsg = msg;
-  }
-}
-
-module(
-  'Integration | Component | project-settings/general-settings/dynamicscan-automation-settings/scripts-archived',
-  function (hooks) {
-    setupRenderingTest(hooks);
-    setupMirage(hooks);
-    setupIntl(hooks);
-
-    hooks.beforeEach(async function () {
-      // Server mocks
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return schema.projects.find(req.params.id).toJSON();
-      });
-
-      this.server.get('/v2/files/:id', (schema, req) => {
-        return schema.files.find(`${req.params.id}`)?.toJSON();
-      });
-
-      this.server.get('/profiles/:id/automation_scripts', (schema) => {
-        const results = schema.automationScripts.all().models;
-
-        return { count: results.length, next: null, previous: null, results };
-      });
-
-      this.server.get('/profiles/:id/dynamicscan_mode', (schema, req) =>
-        schema.dynamicscanModes.find(`${req.queryParams.id}`)?.toJSON()
-      );
-
-      this.server.put(
-        'https://api.test-upload-url.com',
-        () => new Response(200)
-      );
-
-      this.owner.register('service:notifications', NotificationsStub);
-
-      const store = this.owner.lookup('service:store');
-      const file = this.server.create('file', 1);
-      const project = this.server.create('project', {
-        id: 1,
-        last_file_id: file.id,
-      });
-
-      const normalizedProject = store.normalize('project', {
-        ...project.toJSON(),
-      });
-
-      this.setProperties({
-        project: store.push(normalizedProject),
-      });
-    });
-
-    test('it renders', async function (assert) {
-      this.server.create('dynamicscan-mode', {
-        id: 1,
-        dynamicscan_mode: 'Manual',
-      });
-
-      await render(hbs`
-        <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::ScriptsArchived
-          @project={{this.project}} 
-          @profileId={{this.project.activeProfileId}} 
-        />
-      `);
-
-      assert
-        .dom('[data-test-projectSettings-genSettings-dynScanAutoSettings-root]')
-        .exists();
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-headerTitle]')
-        .exists()
-        .hasText('t:dynamicScanAutomation:()');
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-headerInfoChip]')
-        .exists()
-        .hasText('t:experimentalFeature:()');
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-headerInfoDescHeader]')
-        .exists()
-        .hasText('t:appiumScripts:()');
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-headerInfoDescText]')
-        .exists()
-        .hasText('t:appiumScriptsDescription:()');
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-headerInfoDescNote]')
-        .exists()
-        .hasText('t:appiumScriptsSchedNote:()');
-    });
-
-    test.each(
-      'it uploads an automation script',
-      [
-        { is_valid: false, fail: false },
-        { is_valid: true, fail: false },
-        { is_valid: true, fail: true },
-      ],
-      async function (assert, { is_valid, fail }) {
-        this.server.post(
-          '/profiles/:id/upload_automation_script/signed_url',
-          () => {
-            if (fail) {
-              return new Response(500, {}, { errors: ['server error'] });
-            }
-
-            return {
-              url: 'https://api.test-upload-url.com',
-              file_key: 'test-file-key.zip',
-              file_key_signed: 'signed-test-file-key.zip',
-            };
-          }
-        );
-
-        this.server.post(
-          '/profiles/:id/upload_automation_script',
-          (schema, req) => {
-            const scriptKeys = getReqBodyObjFromReqBodyStr(req);
-
-            const automationScript = this.server.create('automation-script', {
-              id: 1,
-              ...scriptKeys,
-              file_name: this.fileName,
-              is_valid,
-            });
-
-            this.set('automationScript', automationScript);
-
-            return automationScript.toJSON();
-          }
-        );
-
-        this.server.create('dynamicscan-mode', {
-          id: 1,
-          dynamicscan_mode: 'Manual',
-        });
-
-        this.set('fileName', 'test.zip');
-
-        await render(hbs`
-          <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::ScriptsArchived
-            @project={{this.project}} 
-            @profileId={{this.project.activeProfileId}} 
-          />
-        `);
-
-        assert
-          .dom('[data-test-genSettings-dynScanAutoSettings-uploadZipInput]')
-          .exists();
-
-        assert
-          .dom('[data-test-genSettings-dynScanAutoSettings-uploadZipBtn]')
-          .hasText('t:uploadZipFile:()');
-
-        assert
-          .dom('[data-test-genSettings-dynScanAutoSettings-autoScriptsRoot]')
-          .doesNotExist();
-
-        let file = new File(['Test zip file'], this.fileName, {
-          type: 'application/zip',
-        });
-
-        await selectFiles(
-          '[data-test-genSettings-dynScanAutoSettings-uploadZipInput]',
-          file
-        );
-
-        const notify = this.owner.lookup('service:notifications');
-
-        // If upload passes
-        if (!fail) {
-          assert.strictEqual(
-            notify.successMsg,
-            't:appiumFileUploadedSuccessfully:()'
-          );
-
-          assert
-            .dom('[data-test-genSettings-dynScanAutoSettings-autoScriptsRoot]')
-            .exists();
-
-          const uploadedAutoScriptSelector = `[data-test-genSettings-dynScanAutoSettings-autoScript='${this.automationScript.file_key}']`;
-          assert.dom(uploadedAutoScriptSelector).exists();
-
-          assert
-            .dom(
-              '[data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle]'
-            )
-            .exists();
-
-          assert
-            .dom(
-              `${uploadedAutoScriptSelector} [data-test-genSettings-dynScanAutoSettings-autoScript-fileKey]`
-            )
-            .exists()
-            .containsText(this.automationScript.file_key);
-
-          assert
-            .dom(
-              `${uploadedAutoScriptSelector} [data-test-genSettings-dynScanAutoSettings-autoScript-fileKeyIcon]`
-            )
-            .exists();
-
-          assert
-            .dom(
-              `${uploadedAutoScriptSelector} [data-test-genSettings-dynScanAutoSettings-autoScript-dateCreated]`
-            )
-            .exists()
-            .containsText(
-              `${dayjs(this.automationScript.created_on).fromNow()}`
-            );
-        } else {
-          assert.strictEqual(notify.errorMsg, 'server error');
-        }
-
-        // If upload happens and the script is invalid
-        if (!is_valid) {
-          assert
-            .dom(
-              '[data-test-genSettings-dynScanAutoSettings-autoScript-invalidScript-errorIcon]'
-            )
-            .exists();
-
-          assert
-            .dom(
-              '[data-test-genSettings-dynScanAutoSettings-autoScript-invalidScript-text]'
-            )
-            .exists()
-            .containsText('t:appiumScriptInvalid:()');
-        }
-      }
-    );
-
-    test('it toggles scheduled automation', async function (assert) {
-      this.server.post(
-        '/profiles/:id/upload_automation_script/signed_url',
-        () => {
-          return {
-            url: 'https://api.test-upload-url.com',
-            file_key: 'test-file-key.zip',
-            file_key_signed: 'signed-test-file-key.zip',
-          };
-        }
-      );
-
-      this.server.post(
-        '/profiles/:id/upload_automation_script',
-        (schema, req) => {
-          const scriptKeys = getReqBodyObjFromReqBodyStr(req);
-
-          const automationScript = this.server.create('automation-script', {
-            id: 1,
-            ...scriptKeys,
-            file_name: this.fileName,
-            is_valid: true,
-          });
-
-          this.set('automationScript', automationScript);
-
-          return automationScript.toJSON();
-        }
-      );
-
-      this.server.put('/profiles/:id/dynamicscan_mode', (schema, req) => {
-        const reqBody = getReqBodyObjFromReqBodyStr(req);
-
-        this.set('dynamicscan_mode', reqBody.dynamicscan_mode);
-
-        return {
-          dynamicscan_mode: reqBody.dynamicscan_mode,
-          id: req.params.id,
-        };
-      });
-
-      this.server.create('dynamicscan-mode', {
-        id: 1,
-        dynamicscan_mode: 'Manual',
-      });
-
-      this.set('fileName', 'test.zip');
-
-      await render(hbs`
-        <ProjectSettings::GeneralSettings::DynamicscanAutomationSettings::ScriptsArchived
-          @project={{this.project}} 
-          @profileId={{this.project.activeProfileId}} 
-        />
-      `);
-
-      let file = new File(['Test zip file'], this.fileName, {
-        type: 'application/zip',
-      });
-
-      await selectFiles(
-        '[data-test-genSettings-dynScanAutoSettings-uploadZipInput]',
-        file
-      );
-
-      const notify = this.owner.lookup('service:notifications');
-
-      assert.strictEqual(
-        notify.successMsg,
-        't:appiumFileUploadedSuccessfully:()'
-      );
-
-      assert
-        .dom('[data-test-genSettings-dynScanAutoSettings-autoScriptsRoot]')
-        .exists();
-
-      const uploadedAutoScriptSelector = `[data-test-genSettings-dynScanAutoSettings-autoScript='${this.automationScript.file_key}']`;
-      assert.dom(uploadedAutoScriptSelector).exists();
-
-      assert
-        .dom(
-          '[data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggleLabel]'
-        )
-        .exists()
-        .containsText('t:appiumScheduledAutomation:()');
-
-      assert
-        .dom(
-          '[data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle] input'
-        )
-        .exists()
-        .isNotChecked();
-
-      await click(
-        `${uploadedAutoScriptSelector} [data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle]`
-      );
-
-      assert
-        .dom(
-          '[data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle] input'
-        )
-        .isChecked();
-
-      assert.ok(this.dynamicscan_mode, 'Automated');
-
-      await click(
-        `${uploadedAutoScriptSelector} [data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle]`
-      );
-
-      assert
-        .dom(
-          '[data-test-genSettings-dynScanAutoSettings-autoScript-dynamicscanModeToggle] input'
-        )
-        .isNotChecked();
-
-      assert.ok(this.dynamicscan_mode, 'Manual');
-    });
-  }
-);
diff --git a/tests/integration/components/vnc-viewer-old-test.js b/tests/integration/components/vnc-viewer-old-test.js
deleted file mode 100644
index a6c1f7dd35..0000000000
--- a/tests/integration/components/vnc-viewer-old-test.js
+++ /dev/null
@@ -1,253 +0,0 @@
-import { click, render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-import { setupMirage } from 'ember-cli-mirage/test-support';
-import { setupIntl } from 'ember-intl/test-support';
-import { setupRenderingTest } from 'ember-qunit';
-import { module, test } from 'qunit';
-import Service from '@ember/service';
-
-import ENUMS from 'irene/enums';
-
-class PollServiceStub extends Service {
-  callback = null;
-  interval = null;
-
-  startPolling(cb, interval) {
-    function stop() {}
-
-    this.callback = cb;
-    this.interval = interval;
-
-    return stop;
-  }
-}
-
-module('Integration | Component | vnc-viewer-old', function (hooks) {
-  setupRenderingTest(hooks);
-  setupMirage(hooks);
-  setupIntl(hooks);
-
-  hooks.beforeEach(async function () {
-    const store = this.owner.lookup('service:store');
-
-    const profile = this.server.create('profile', { id: '100' });
-
-    const file = this.server.create('file', {
-      project: '1',
-      profile: profile.id,
-    });
-
-    this.server.create('project', {
-      file: file.id,
-      id: '1',
-      active_profile_id: profile.id,
-    });
-
-    const devicePreference = this.server.create('device-preference', {
-      id: profile.id,
-    });
-
-    this.setProperties({
-      file: store.push(store.normalize('file', file.toJSON())),
-      devicePreference,
-      activeProfileId: profile.id,
-      store,
-    });
-
-    this.owner.register('service:poll', PollServiceStub);
-  });
-
-  test.each(
-    'it renders vnc viewer',
-    [
-      {
-        platform: ENUMS.PLATFORM.ANDROID,
-        deviceType: ENUMS.DEVICE_TYPE.TABLET_REQUIRED,
-        deviceClass: 'tablet',
-      },
-      {
-        platform: ENUMS.PLATFORM.IOS,
-        deviceType: ENUMS.DEVICE_TYPE.TABLET_REQUIRED,
-        deviceClass: 'ipad black',
-      },
-      {
-        platform: ENUMS.PLATFORM.ANDROID,
-        deviceType: ENUMS.DEVICE_TYPE.PHONE_REQUIRED,
-        deviceClass: 'nexus5',
-      },
-      {
-        platform: ENUMS.PLATFORM.IOS,
-        deviceType: ENUMS.DEVICE_TYPE.PHONE_REQUIRED,
-        deviceClass: 'iphone5s black',
-      },
-      {
-        platform: ENUMS.PLATFORM.ANDROID,
-        deviceType: ENUMS.DEVICE_TYPE.NO_PREFERENCE,
-        deviceClass: 'nexus5',
-      },
-      {
-        platform: ENUMS.PLATFORM.IOS,
-        deviceType: ENUMS.DEVICE_TYPE.NO_PREFERENCE,
-        deviceClass: 'iphone5s black',
-      },
-    ],
-    async function (assert, { platform, deviceType, deviceClass }) {
-      this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.NONE;
-      this.file.isDynamicDone = true;
-
-      // make sure file is active
-      this.file.isActive = true;
-
-      this.server.get('/v2/projects/:id', (schema, req) => {
-        return {
-          ...schema.projects.find(`${req.params.id}`)?.toJSON(),
-          platform,
-        };
-      });
-
-      this.server.get('/profiles/:id/device_preference', (schema, req) => {
-        return {
-          ...schema.devicePreferences.find(`${req.params.id}`)?.toJSON(),
-          device_type: deviceType,
-        };
-      });
-
-      await render(hbs`
-        <VncViewerOld @file={{this.file}} @profileId={{this.activeProfileId}} />
-      `);
-
-      assert
-        .dom('[data-test-vncViewer-root]')
-        .doesNotHaveClass(/vnc-viewer-fullscreen/);
-
-      assert.dom('[data-test-vncViewer-backdrop]').doesNotExist();
-
-      assert
-        .dom('[data-test-vncViewer-fullscreenContainer]')
-        .doesNotHaveClass(/vnc-viewer-fullscreen-container/);
-
-      deviceClass.split(' ').forEach((val) => {
-        assert.dom('[data-test-vncViewer-device]').hasClass(val);
-      });
-
-      ['TopBar', 'Sleep', 'Volume'].forEach((it) => {
-        if (deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED) {
-          assert.dom(`[data-test-vncViewer-device${it}]`).exists();
-        } else {
-          assert.dom(`[data-test-vncViewer-device${it}]`).doesNotExist();
-        }
-      });
-
-      assert.dom('[data-test-vncViewer-deviceCamera]').exists();
-
-      assert
-        .dom('[data-test-vncViewer-deviceScreen]')
-        .hasClass(
-          platform === ENUMS.PLATFORM.ANDROID &&
-            deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED
-            ? 'noscreen'
-            : 'screen'
-        );
-
-      if (platform === ENUMS.PLATFORM.IOS) {
-        assert.dom('[data-test-vncViewer-deviceHome]').exists();
-
-        ['Speaker', 'BottomBar'].forEach((it) => {
-          if (deviceType === ENUMS.DEVICE_TYPE.TABLET_REQUIRED) {
-            assert.dom(`[data-test-vncViewer-device${it}]`).exists();
-          } else {
-            assert.dom(`[data-test-vncViewer-device${it}]`).doesNotExist();
-          }
-        });
-      }
-
-      assert.dom('[data-test-dynamicScan-startBtn]').hasText('t:completed:()');
-
-      assert.dom('[data-test-dynamicScan-restartBtn]').isNotDisabled();
-
-      assert.dom('[data-test-vncViewer-fullscreenToggleBtn]').doesNotExist();
-    }
-  );
-
-  test('test vnc viewer with status ready', async function (assert) {
-    this.server.create('dynamicscan-old', { expires_on: null });
-
-    this.file.dynamicStatus = ENUMS.DYNAMIC_STATUS.READY;
-
-    // make sure file is active
-    this.file.isActive = true;
-
-    this.server.get('/v2/projects/:id', (schema, req) => {
-      return {
-        ...schema.projects.find(`${req.params.id}`)?.toJSON(),
-        platform: ENUMS.PLATFORM.ANDROID,
-      };
-    });
-
-    this.server.get('/profiles/:id/device_preference', (schema, req) => {
-      return schema.devicePreferences.find(`${req.params.id}`)?.toJSON();
-    });
-
-    this.server.get('/dynamicscan/:id', (schema, req) => {
-      return schema.dynamicscanOlds.find(`${req.params.id}`)?.toJSON();
-    });
-
-    await render(hbs`
-      <VncViewerOld @file={{this.file}} @profileId={{this.activeProfileId}} />
-    `);
-
-    assert
-      .dom('[data-test-vncViewer-root]')
-      .doesNotHaveClass(/vnc-viewer-fullscreen/);
-
-    assert.dom('[data-test-vncViewer-backdrop]').doesNotExist();
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenContainer]')
-      .doesNotHaveClass(/vnc-viewer-fullscreen-container/);
-
-    assert.dom('[data-test-NovncRfb-canvasContainer]').exists();
-
-    assert.dom('[data-test-dynamicScan-stopBtn]').hasText('t:stop:()');
-    assert.dom('[data-test-dynamicScan-restartBtn]').doesNotExist();
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenToggleBtn]')
-      .isNotDisabled()
-      .hasText('t:popOutModal:()');
-
-    // go fullscreen
-    await click('[data-test-vncViewer-fullscreenToggleBtn]');
-
-    assert.dom('[data-test-vncViewer-root]').hasClass(/vnc-viewer-fullscreen/);
-
-    assert.dom('[data-test-vncViewer-backdrop]').exists();
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenContainer]')
-      .hasClass(/vnc-viewer-fullscreen-container/);
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenToggleBtn]')
-      .isNotDisabled()
-      .hasText('t:closeModal:()');
-
-    // exit fullscreen
-    await click('[data-test-vncViewer-fullscreenToggleBtn]');
-
-    assert
-      .dom('[data-test-vncViewer-root]')
-      .doesNotHaveClass(/vnc-viewer-fullscreen/);
-
-    assert.dom('[data-test-vncViewer-backdrop]').doesNotExist();
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenContainer]')
-      .doesNotHaveClass(/vnc-viewer-fullscreen-container/);
-
-    assert
-      .dom('[data-test-vncViewer-fullscreenToggleBtn]')
-      .isNotDisabled()
-      .hasText('t:popOutModal:()');
-  });
-});
diff --git a/translations/en.json b/translations/en.json
index bcfa11776b..9d99bbd1e8 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -69,12 +69,11 @@
   "apiDocumentation": "API Documentation",
   "apis": "APIs",
   "apiKey": "API Key",
-  "apiResults": "API Results",
   "apiScan": "API Scan",
-  "apiScanResult": "API Scan Result",
+  "apiScanResults": "API Scan Results",
   "apiScanResultsDesc": "Here are the data from this particular API scan.",
   "apiScanInProgress": "API Scan in progress",
-  "apiScanProgressStatusHelper": "{status, select, completed {} other {Once the scan is completed.}} View the results in <strong>\"API Results Tab\"</strong>",
+  "apiScanProgressStatusHelper": "{status, select, completed {} other {Once the scan is completed.}} View the results in <strong>API Results Tab</strong>",
   "apiURLFilter": "API URL Filter",
   "app": "app",
   "appCenterPipeline": "App Center Build",
@@ -703,7 +702,7 @@
   "manager": "Manager",
   "manual": "Manual",
   "manualRequested": "Manual assessment requested",
-  "manualResults": "Manual Results",
+  "manualScanResults": "Manual Scan Results",
   "manualScan": "Manual Scan",
   "manualSettings": "Manual Settings",
   "markAnalysis": "Mark Analysis",
@@ -850,7 +849,7 @@
       "scanInProgressDescription": "The file is currently being assessed by our security researchers.",
       "requestSubmittedDescription": "Manual Scan for this file has been requested.",
       "resultsDescription": "Here are the data from this particular Manual Scan.",
-      "viewResultsInTab": "View the results in <strong>\"Manual Results Tab\"</strong>"
+      "viewResultsInTab": "View the results in <strong>Manual Results Tab</strong>"
     },
     "rescan": {
       "title": "Restart Static Scan",
diff --git a/translations/ja.json b/translations/ja.json
index 4af3649dae..92df32239f 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -69,12 +69,11 @@
   "apiDocumentation": "API Documentation",
   "apis": "APIs",
   "apiKey": "API Key",
-  "apiResults": "API Results",
   "apiScan": "API診断",
-  "apiScanResult": "API Scan Result",
+  "apiScanResults": "API Scan Results",
   "apiScanResultsDesc": "Here are the data from this particular API scan.",
   "apiScanInProgress": "API Scan in progress",
-  "apiScanProgressStatusHelper": "{status, select, completed {} other {Once the scan is completed.}} View the results in <strong>\"API Results Tab\"</strong>",
+  "apiScanProgressStatusHelper": "{status, select, completed {} other {Once the scan is completed.}} View the results in <strong>API Results Tab</strong>",
   "apiURLFilter": "API URLフィルタ",
   "app": "アプリ",
   "appCenterPipeline": "App Center Build",
@@ -703,7 +702,7 @@
   "manager": "マネージャー",
   "manual": "手動",
   "manualRequested": "手動診断がリクエストされました",
-  "manualResults": "Manual Results",
+  "manualScanResults": "Manual Scan Results",
   "manualScan": "手動診断",
   "manualSettings": "Manual Settings",
   "markAnalysis": "Mark Analysis",
@@ -850,7 +849,7 @@
       "scanInProgressDescription": "The file is currently being assessed by our security researchers.",
       "requestSubmittedDescription": "Manual Scan for this file has been requested.",
       "resultsDescription": "Here are the data from this particular Manual Scan.",
-      "viewResultsInTab": "View the results in <strong>\"Manual Results Tab\"</strong>"
+      "viewResultsInTab": "View the results in <strong>Manual Results Tab</strong>"
     },
     "rescan": {
       "title": "Restart Static Scan",
diff --git a/types/global.d.ts b/types/global.d.ts
index 21f5482299..f9efcfef98 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -74,6 +74,13 @@ declare module '@glint/environment-ember-loose/registry' {
       Return: boolean;
     }>;
 
+    and: HelperLike<{
+      Args: {
+        Positional: unknown[];
+      };
+      Return: boolean;
+    }>;
+
     not: HelperLike<{
       Args: {
         Positional: [unknown];