diff --git a/packages/admin-portal/src/actions/__tests__/app-categories.ts b/packages/admin-portal/src/actions/__tests__/app-categories.ts
deleted file mode 100644
index 2e8db13a04..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-categories.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { categoriesReceiveData } from '../app-categories'
-import ActionTypes from '@/constants/action-types'
-
-describe('app categories actions', () => {
-  it('should create a categoriesReceiveData action', () => {
-    expect(categoriesReceiveData.type).toEqual(ActionTypes.CATEGORIES_RECEIVE_DATA)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/app-detail-modal.ts b/packages/admin-portal/src/actions/__tests__/app-detail-modal.ts
deleted file mode 100644
index 362b937190..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-detail-modal.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  setAppDetailModalStateBrowse,
-  setAppDetailModalStateInstall,
-  setAppDetailModalStateSuccess,
-} from '../app-detail-modal'
-
-import ActionTypes from '../../constants/action-types'
-
-describe('app permission actions', () => {
-  it('should create a setAppDetailModalStateBrowse action', () => {
-    expect(setAppDetailModalStateBrowse.type).toEqual(ActionTypes.SET_APP_DETAIL_MODAL_STATE_BROWSE)
-  })
-
-  it('should create a setAppDetailModalStateInstall action', () => {
-    expect(setAppDetailModalStateInstall.type).toEqual(ActionTypes.SET_APP_DETAIL_MODAL_STATE_INSTALL)
-  })
-
-  it('should create a setAppDetailModalStateSuccess action', () => {
-    expect(setAppDetailModalStateSuccess.type).toEqual(ActionTypes.SET_APP_DETAIL_MODAL_STATE_SUCCESS)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/app-http-traffic-event.ts b/packages/admin-portal/src/actions/__tests__/app-http-traffic-event.ts
deleted file mode 100644
index 873549e9e5..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-http-traffic-event.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {
-  httpTrafficPerDayRequestData,
-  httpTrafficPerDayReceiveData,
-  httpTrafficPerDayRequestDataFailure,
-} from '../app-http-traffic-event'
-import ActionTypes from '@/constants/action-types'
-import { httpTrafficPerDayStub } from '@/sagas/__stubs__/app-http-traffic-event'
-
-describe('app-http-traffic-per-day actions', () => {
-  it('should create a httpTrafficPerDayRequestData action', () => {
-    expect(httpTrafficPerDayRequestData.type).toEqual(ActionTypes.HTTP_TRAFFIC_PER_DAY_REQUEST_DATA)
-    expect(
-      httpTrafficPerDayRequestData({
-        applicationId: ['1'],
-        dateFrom: '2020-02-17',
-        dateTo: '2020-04-05',
-      }).data,
-    ).toEqual({
-      applicationId: ['1'],
-      dateFrom: '2020-02-17',
-      dateTo: '2020-04-05',
-    })
-  })
-  it('should create a httpTrafficPerDayReceiveData action', () => {
-    expect(httpTrafficPerDayReceiveData.type).toEqual(ActionTypes.HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA)
-    expect(httpTrafficPerDayReceiveData(httpTrafficPerDayStub).data).toEqual(httpTrafficPerDayStub)
-  })
-  it('should create a httpTrafficPerDayRequestDataFailure action', () => {
-    expect(httpTrafficPerDayRequestDataFailure.type).toEqual(ActionTypes.HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/app-installations.ts b/packages/admin-portal/src/actions/__tests__/app-installations.ts
deleted file mode 100644
index f9da5ad1b3..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-installations.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  appInstallationsReceiveData,
-  appInstallationsRequestData,
-  appInstallationsRequestDataFailure,
-  appInstallationsFilterReceiveData,
-  appInstallationsFilterRequestData,
-  appInstallationsFilterRequestDataFailure,
-  appInstallationsRequestInstall,
-  appInstallationsRequestUninstall,
-  appInstallationsSetFormState,
-} from '../app-installations'
-import ActionTypes from '@/constants/action-types'
-import { installationsStub } from '@/sagas/__stubs__/installations'
-
-describe('app install actions', () => {
-  it('should create a appInstallationsReceiveData action', () => {
-    expect(appInstallationsReceiveData.type).toEqual(ActionTypes.APP_INSTALLATIONS_RECEIVE_DATA)
-    expect(appInstallationsReceiveData(installationsStub).data).toEqual(installationsStub)
-  })
-  it('should create a appInstallationsRequestData action', () => {
-    expect(appInstallationsRequestData.type).toEqual(ActionTypes.APP_INSTALLATIONS_REQUEST_DATA)
-    expect(appInstallationsRequestData({ appId: ['1'] }).data).toEqual({ appId: ['1'] })
-  })
-  it('should create a appInstallationsRequestDataFailure action', () => {
-    expect(appInstallationsRequestDataFailure.type).toEqual(ActionTypes.APP_INSTALLATIONS_REQUEST_DATA_FAILURE)
-  })
-
-  it('should create a appInstallationsFilterReceiveData action', () => {
-    expect(appInstallationsFilterReceiveData.type).toEqual(ActionTypes.APP_INSTALLATIONS_FILTER_RECEIVE_DATA)
-    expect(appInstallationsFilterReceiveData(installationsStub).data).toEqual(installationsStub)
-  })
-  it('should create a appInstallationsFilterRequestData action', () => {
-    expect(appInstallationsFilterRequestData.type).toEqual(ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA)
-    expect(appInstallationsFilterRequestData({ appId: ['1'] }).data).toEqual({ appId: ['1'] })
-  })
-  it('should create a appInstallationsFilterRequestDataFailure action', () => {
-    expect(appInstallationsFilterRequestDataFailure.type).toEqual(
-      ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE,
-    )
-  })
-
-  it('should create a appInstallationsRequestInstall action', () => {
-    expect(appInstallationsRequestInstall.type).toEqual(ActionTypes.APP_INSTALLATIONS_REQUEST_INSTALL)
-    expect(appInstallationsRequestInstall({ appId: '1' }).data).toEqual({ appId: '1' })
-  })
-  it('should create a appInstallationsRequestUninstall action', () => {
-    expect(appInstallationsRequestUninstall.type).toEqual(ActionTypes.APP_INSTALLATIONS_REQUEST_UNINSTALL)
-    expect(appInstallationsRequestUninstall({ appId: '1', installationId: '1' }).data).toEqual({
-      appId: '1',
-      installationId: '1',
-    })
-  })
-  it('should create a appInstallationsSetFormState action', () => {
-    expect(appInstallationsSetFormState.type).toEqual(ActionTypes.APP_INSTALLATIONS_SET_FORM_STATE)
-    expect(appInstallationsSetFormState('PENDING').data).toEqual('PENDING')
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/app-integration-types.ts b/packages/admin-portal/src/actions/__tests__/app-integration-types.ts
deleted file mode 100644
index d3f18ff0e7..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-integration-types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { integrationTypesReceiveData } from '../app-integration-types'
-import ActionTypes from '@/constants/action-types'
-
-describe('app integration types actions', () => {
-  it('should create a integrationTypesReceiveData action', () => {
-    expect(integrationTypesReceiveData.type).toEqual(ActionTypes.INTEGRATION_TYPES_RECEIVE_DATA)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/app-usage-stats.ts b/packages/admin-portal/src/actions/__tests__/app-usage-stats.ts
deleted file mode 100644
index e2cb9209e5..0000000000
--- a/packages/admin-portal/src/actions/__tests__/app-usage-stats.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { appUsageStatsReceiveData, appUsageStatsRequestData, appUsageStatsRequestDataFailure } from '../app-usage-stats'
-import ActionTypes from '@/constants/action-types'
-import { usageStatsDataStub } from '@/sagas/__stubs__/app-usage-stats'
-
-describe('app-usage-stats actions', () => {
-  it('should create a appUsageStatsRequestData action', () => {
-    expect(appUsageStatsRequestData.type).toEqual(ActionTypes.APP_USAGE_STATS_REQUEST_DATA)
-    expect(appUsageStatsRequestData({ appId: ['1'] }).data).toEqual({ appId: ['1'] })
-  })
-  it('should create a appUsageStatsReceiveData action', () => {
-    expect(appUsageStatsReceiveData.type).toEqual(ActionTypes.APP_USAGE_STATS_RECEIVE_DATA)
-    expect(appUsageStatsReceiveData(usageStatsDataStub).data).toEqual(usageStatsDataStub)
-  })
-  it('should create a appUsageStatsRequestDataFailure action', () => {
-    expect(appUsageStatsRequestDataFailure.type).toEqual(ActionTypes.APP_USAGE_STATS_REQUEST_DATA_FAILURE)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/client.ts b/packages/admin-portal/src/actions/__tests__/client.ts
deleted file mode 100644
index 02fefa10e6..0000000000
--- a/packages/admin-portal/src/actions/__tests__/client.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {
-  clientFetchAppSummary,
-  clientFetchAppSummarySuccess,
-  clientFetchAppSummaryFailed,
-  clientClearAppSummary,
-  clientFetchWebComponentConfig,
-  clientFetchWebComponentConfigSuccess,
-  clientUpdateWebComponentConfig,
-  clientFetchNegotiatorsSuccess,
-} from '../client'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-import { appDetailDataStub } from '@/sagas/__stubs__/app-detail'
-import { AppDetailModel } from '@reapit/foundations-ts-definitions'
-
-describe('client actions', () => {
-  it('should create a clientFetchAppSummary action', () => {
-    expect(clientFetchAppSummary.type).toEqual(ActionTypes.CLIENT_FETCH_APP_SUMMARY)
-    expect(clientFetchAppSummary({ page: 1 }).data).toEqual({ page: 1 })
-  })
-  it('should create a clientFetchAppSummarySuccess action', () => {
-    expect(clientFetchAppSummarySuccess.type).toEqual(ActionTypes.CLIENT_FETCH_APP_SUMMARY_SUCCESS)
-    expect(
-      clientFetchAppSummarySuccess({ featuredApps: [appDetailDataStub as AppDetailModel], apps: appsDataStub.data })
-        .data,
-    ).toEqual({
-      featuredApps: [appDetailDataStub as AppDetailModel],
-      apps: appsDataStub.data,
-    })
-  })
-  it('should create a clientFetchAppSummaryFailed action', () => {
-    expect(clientFetchAppSummaryFailed.type).toEqual(ActionTypes.CLIENT_FETCH_APP_SUMMARY_FAILED)
-    expect(clientFetchAppSummaryFailed('error').data).toEqual('error')
-  })
-  it('should create a clientClearData action', () => {
-    expect(clientClearAppSummary.type).toEqual(ActionTypes.CLIENT_CLEAR_APP_SUMMARY)
-    expect(clientClearAppSummary(null).data).toEqual(null)
-  })
-  it('should create a clientFetchWebComponentConfig action', () => {
-    expect(clientFetchWebComponentConfig.type).toEqual(ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG)
-    expect(clientFetchWebComponentConfig({ customerId: 'DXX', applicationId: 'applicationId' }).data).toEqual({
-      customerId: 'DXX',
-      applicationId: 'applicationId',
-    })
-  })
-  it('should create a clientFetchWebComponentConfigSuccess action', () => {
-    expect(clientFetchWebComponentConfigSuccess.type).toEqual(ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS)
-  })
-  it('should create a clientPutWebComponentConfig action', () => {
-    expect(clientUpdateWebComponentConfig.type).toEqual(ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG)
-  })
-  it('should create a clientPutWebComponentConfig action', () => {
-    expect(clientFetchNegotiatorsSuccess.type).toEqual(ActionTypes.CLIENT_FETCH_NEGOTIATORS_SUCCESS)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/developer-app-modal.ts b/packages/admin-portal/src/actions/__tests__/developer-app-modal.ts
deleted file mode 100644
index f63a77f223..0000000000
--- a/packages/admin-portal/src/actions/__tests__/developer-app-modal.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  setDeveloperAppModalStateViewDetail,
-  setDeveloperAppModalStateEditDetail,
-  setDeveloperAppModalStateDelete,
-  developerAppShowModal,
-} from '../developer-app-modal'
-import ActionTypes from '@/constants/action-types'
-
-describe('developer app modal actions', () => {
-  it('should create a setDeveloperAppModalStateViewDetail action', () => {
-    expect(setDeveloperAppModalStateViewDetail.type).toEqual(ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_VIEW_DETAIL)
-  })
-
-  it('should create a setDeveloperAppModalStateEditDetail action', () => {
-    expect(setDeveloperAppModalStateEditDetail.type).toEqual(ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_EDIT_DETAIL)
-  })
-
-  it('should create a setDeveloperAppModalStateDelete action', () => {
-    expect(setDeveloperAppModalStateDelete.type).toEqual(ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_DELETE)
-  })
-
-  it('should create a developerAppShowModal action', () => {
-    expect(developerAppShowModal.type).toEqual(ActionTypes.DEVELOPER_SHOW_MODAL)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/developer-subscriptions.ts b/packages/admin-portal/src/actions/__tests__/developer-subscriptions.ts
deleted file mode 100644
index a8e2b53da1..0000000000
--- a/packages/admin-portal/src/actions/__tests__/developer-subscriptions.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import {
-  developerFetchSubscriptions,
-  developerFetchSubscriptionsSuccess,
-  developerDeleteSubscription,
-  developerCreateSubscription,
-  developerCreateSubscriptionFalure,
-  developerCreateSubscriptionSuccess,
-  developerCreateSubscriptionClearError,
-  CreateSubscriptionParams,
-} from '../developer-subscriptions'
-import ActionTypes from '../../constants/action-types'
-import { FetchSubscriptionsListParams } from '@/services/developer-subscriptions'
-import { subscriptionModelStub, listSubscriptionsStub } from '../../sagas/__stubs__/developer-subscriptions'
-
-describe('DeveloperSubscriptions actions', () => {
-  it('should create a developerFetchSubscriptions action', () => {
-    const params: FetchSubscriptionsListParams = {
-      developerId: '123',
-      subscriptionType: 'developerEdition',
-    }
-    expect(developerFetchSubscriptions.type).toEqual(ActionTypes.DEVELOPER_FETCH_SUBSCRIPTIONS)
-    expect(developerFetchSubscriptions(params).data).toEqual(params)
-  })
-
-  it('should create a developerFetchSubscriptionsSuccess action', () => {
-    expect(developerFetchSubscriptionsSuccess.type).toEqual(ActionTypes.DEVELOPER_FETCH_SUBSCRIPTIONS_SUCCESS)
-    expect(developerFetchSubscriptionsSuccess(listSubscriptionsStub).data).toEqual(listSubscriptionsStub)
-  })
-
-  it('should create a developerCreateSubscription action', () => {
-    const params: CreateSubscriptionParams = {
-      params: {
-        developerId: '123',
-        applicationId: '123',
-        user: 'tester@reapit.com',
-        type: 'developerEdition',
-      },
-      onCreated: jest.fn(),
-    }
-    expect(developerCreateSubscription.type).toEqual(ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE)
-    expect(developerCreateSubscription(params).data).toEqual(params)
-  })
-
-  it('should create a developerCreateSubscriptionSuccess action', () => {
-    expect(developerCreateSubscriptionSuccess.type).toEqual(ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE_SUCCESS)
-    expect(developerCreateSubscriptionSuccess(subscriptionModelStub).data).toEqual(subscriptionModelStub)
-  })
-
-  it('should create a developerCreateSubscriptionFalure action', () => {
-    expect(developerCreateSubscriptionFalure.type).toEqual(ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE_FAILURE)
-  })
-
-  it('should create a developerCreateSubscriptionClearError action', () => {
-    expect(developerCreateSubscriptionClearError.type).toEqual(ActionTypes.DEVELOPER_SUBSCRIPTION_CLEAR_CREATE_ERROR)
-  })
-
-  it('should create a developerDeleteSubscription action', () => {
-    expect(developerDeleteSubscription.type).toEqual(ActionTypes.DEVELOPER_DELETE_SUBSCRIPTION)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/developer.ts b/packages/admin-portal/src/actions/__tests__/developer.ts
deleted file mode 100644
index c88c42f16a..0000000000
--- a/packages/admin-portal/src/actions/__tests__/developer.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import {
-  developerLoading,
-  developerReceiveData,
-  developerRequestData,
-  developerClearData,
-  developerCreate,
-  developerSetFormState,
-  fetchBilling,
-  fetchBillingSuccess,
-  fetchBillingFailure,
-  fetchMonthlyBilling,
-  fetchMonthlyBillingSuccess,
-  fetchMonthlyBillingFailure,
-  developerWebhookPing,
-  developerSetWebhookPingStatus,
-  developerApplyAppDetails,
-} from '../developer'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-import { CreateDeveloperModel } from '@reapit/foundations-ts-definitions'
-import { appPermissionStub } from '@/sagas/__stubs__/app-permission'
-import { billing } from '@/sagas/__stubs__/billing'
-import { monthlyBillingData } from '@/sagas/__stubs__/monthly-billing'
-import { PingWebhooksByIdParams } from '@/services/webhooks'
-
-describe('developer actions', () => {
-  it('should create a developerLoading action', () => {
-    expect(developerLoading.type).toEqual(ActionTypes.DEVELOPER_LOADING)
-    expect(developerLoading(true).data).toEqual(true)
-  })
-
-  it('should create a developerReceiveData action', () => {
-    expect(developerReceiveData.type).toEqual(ActionTypes.DEVELOPER_RECEIVE_DATA)
-    expect(developerReceiveData({ ...appsDataStub, scopes: appPermissionStub }).data).toEqual({
-      ...appsDataStub,
-      scopes: appPermissionStub,
-    })
-  })
-
-  it('should create a developerRequestData action', () => {
-    expect(developerRequestData.type).toEqual(ActionTypes.DEVELOPER_REQUEST_DATA)
-    expect(developerRequestData({ page: 1 }).data).toEqual({ page: 1 })
-  })
-
-  it('should create a developerClearData action', () => {
-    expect(developerClearData.type).toEqual(ActionTypes.DEVELOPER_CLEAR_DATA)
-    expect(developerClearData(null).data).toEqual(null)
-  })
-
-  it('should create a developerCreate action', () => {
-    const newDeveloper: CreateDeveloperModel = {
-      name: 'Bob',
-      companyName: 'Acme',
-      email: 'bob@acme.com',
-      telephone: '0123456789',
-    }
-    expect(developerCreate.type).toEqual(ActionTypes.DEVELOPER_CREATE)
-    expect(developerCreate(newDeveloper).data).toEqual(newDeveloper)
-  })
-
-  it('should create a developerSetFormState action', () => {
-    expect(developerSetFormState.type).toEqual(ActionTypes.DEVELOPER_SET_FORM_STATE)
-    expect(developerSetFormState('DONE').data).toEqual('DONE')
-  })
-
-  it('should create a fetchBilling action', () => {
-    expect(fetchBilling.type).toEqual(ActionTypes.DEVELOPER_FETCH_BILLING)
-    expect(fetchBilling({ dateFrom: '2020-01', dateTo: '2020-05', developerId: 'developerId' }).data).toEqual({
-      dateFrom: '2020-01',
-      dateTo: '2020-05',
-      developerId: 'developerId',
-    })
-  })
-
-  it('should create a fetchBillingFailure action', () => {
-    expect(fetchBillingSuccess.type).toEqual(ActionTypes.DEVELOPER_FETCH_BILLING_SUCCESS)
-    expect(fetchBillingSuccess(billing).data).toEqual(billing)
-  })
-
-  it('should create a fetchBillingFailure action', () => {
-    expect(fetchBillingFailure.type).toEqual(ActionTypes.DEVELOPER_FETCH_BILLING_FAILED)
-    expect(fetchBillingFailure('error').data).toEqual('error')
-  })
-
-  it('should create a fetchMonthlyBilling action', () => {
-    const params = {
-      applicationId: ['applicationId'],
-      month: 'month',
-    }
-    expect(fetchMonthlyBilling.type).toEqual(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING)
-    expect(fetchMonthlyBilling(params).data).toEqual(params)
-  })
-
-  it('should create a fetchMonthlyBillingSuccess action', () => {
-    expect(fetchMonthlyBillingSuccess.type).toEqual(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS)
-    expect(fetchMonthlyBillingSuccess(monthlyBillingData).data).toEqual(monthlyBillingData)
-  })
-
-  it('should create a fetchMonthlyBillingFailure action', () => {
-    expect(fetchMonthlyBillingFailure.type).toEqual(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_FAILED)
-    expect(fetchMonthlyBillingFailure('error').data).toEqual('error')
-  })
-
-  it('should create a developerWebhookPing action', () => {
-    const params: PingWebhooksByIdParams = {
-      id: 'id',
-      topicId: 'topicId',
-    }
-    expect(developerWebhookPing.type).toEqual(ActionTypes.DEVELOPER_PING_WEBHOOK)
-    expect(developerWebhookPing(params).data).toEqual(params)
-  })
-  it('should create a developerSetWebhookPingStatus action', () => {
-    expect(developerSetWebhookPingStatus.type).toEqual(ActionTypes.DEVELOPER_SET_PING_WEBHOOK_STATUS)
-    expect(developerSetWebhookPingStatus('SUCCESS').data).toEqual('SUCCESS')
-  })
-  it('should create a developerApplyAppDetails action', () => {
-    expect(developerApplyAppDetails.type).toEqual(ActionTypes.DEVELOPER_APPLY_APP_DETAIL)
-    expect(developerApplyAppDetails({}).data).toEqual({})
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/installed-apps.ts b/packages/admin-portal/src/actions/__tests__/installed-apps.ts
deleted file mode 100644
index 55c1409c15..0000000000
--- a/packages/admin-portal/src/actions/__tests__/installed-apps.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  installedAppsLoading,
-  installedAppsReceiveData,
-  installedAppsRequestData,
-  installedAppsClearData,
-} from '../installed-apps'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-
-describe('installedApps actions', () => {
-  it('should create a installedAppsLoading action', () => {
-    expect(installedAppsLoading.type).toEqual(ActionTypes.INSTALLED_APPS_LOADING)
-    expect(installedAppsLoading(true).data).toEqual(true)
-  })
-
-  it('should create a installedAppsReceiveData action', () => {
-    expect(installedAppsReceiveData.type).toEqual(ActionTypes.INSTALLED_APPS_RECEIVE_DATA)
-    expect(installedAppsReceiveData(appsDataStub).data).toEqual(appsDataStub)
-  })
-
-  it('should create a installedAppsRequestData action', () => {
-    expect(installedAppsRequestData.type).toEqual(ActionTypes.INSTALLED_APPS_REQUEST_DATA)
-    expect(installedAppsRequestData(1).data).toEqual(1)
-  })
-
-  it('should create a installedAppsClearData action', () => {
-    expect(installedAppsClearData.type).toEqual(ActionTypes.INSTALLED_APPS_CLEAR_DATA)
-    expect(installedAppsClearData(null).data).toEqual(null)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/my-apps.ts b/packages/admin-portal/src/actions/__tests__/my-apps.ts
deleted file mode 100644
index 26a7d7cb3f..0000000000
--- a/packages/admin-portal/src/actions/__tests__/my-apps.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { myAppsLoading, myAppsReceiveData, myAppsRequestData, myAppsClearData } from '../my-apps'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-
-describe('myApps actions', () => {
-  it('should create a myAppsLoading action', () => {
-    expect(myAppsLoading.type).toEqual(ActionTypes.MY_APPS_LOADING)
-    expect(myAppsLoading(true).data).toEqual(true)
-  })
-
-  it('should create a myAppsReceiveData action', () => {
-    expect(myAppsReceiveData.type).toEqual(ActionTypes.MY_APPS_RECEIVE_DATA)
-    expect(myAppsReceiveData(appsDataStub).data).toEqual(appsDataStub)
-  })
-
-  it('should create a myAppsRequestData action', () => {
-    expect(myAppsRequestData.type).toEqual(ActionTypes.MY_APPS_REQUEST_DATA)
-    expect(myAppsRequestData(1).data).toEqual(1)
-  })
-
-  it('should create a myAppsClearData action', () => {
-    expect(myAppsClearData.type).toEqual(ActionTypes.MY_APPS_CLEAR_DATA)
-    expect(myAppsClearData(null).data).toEqual(null)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/settings.ts b/packages/admin-portal/src/actions/__tests__/settings.ts
deleted file mode 100644
index 02c1753ed2..0000000000
--- a/packages/admin-portal/src/actions/__tests__/settings.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  requestDeveloperData,
-  requestDeveloperDataSuccess,
-  settingShowLoading,
-  updateDeveloperData,
-  changePassword,
-} from '../settings'
-import ActionTypes from '../../constants/action-types'
-import { developerStub } from '../../sagas/__stubs__/developer'
-
-describe('settings actions', () => {
-  it('should create a requestDeveloperData action', () => {
-    expect(requestDeveloperData.type).toEqual(ActionTypes.SETTING_FETCH_DEVELOPER_INFO)
-    expect(requestDeveloperData().data).toEqual(undefined)
-  })
-
-  it('should create a requestDeveloperDataSuccess action', () => {
-    expect(requestDeveloperDataSuccess.type).toEqual(ActionTypes.SETTING_FETCH_DEVELOPER_INFO_SUCCESS)
-    expect(requestDeveloperDataSuccess(developerStub).data).toEqual(developerStub)
-  })
-
-  it('should create a settingShowLoading action', () => {
-    expect(settingShowLoading.type).toEqual(ActionTypes.SETTING_SHOW_HIDE_LOADING)
-    expect(settingShowLoading(true).data).toEqual(true)
-  })
-  it('should create a updateDeveloperData action', () => {
-    expect(updateDeveloperData.type).toEqual(ActionTypes.SETTING_UPDATE_DEVELOPER)
-    expect(updateDeveloperData(developerStub).data).toEqual(developerStub)
-  })
-  it('should create a changePassword action', () => {
-    expect(changePassword.type).toEqual(ActionTypes.CHANGE_PASSWORD)
-    const mockPassword = { currentPassword: '', password: '', confirmPassword: '' }
-    expect(changePassword(mockPassword).data).toEqual(mockPassword)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/submit-app.ts b/packages/admin-portal/src/actions/__tests__/submit-app.ts
deleted file mode 100644
index a291c2888a..0000000000
--- a/packages/admin-portal/src/actions/__tests__/submit-app.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  submitAppSetFormState,
-  submitApp,
-  submitAppLoading,
-  submitAppRequestData,
-  submitAppReceiveData,
-} from '../submit-app'
-import ActionTypes from '../../constants/action-types'
-
-describe('submitApp actions', () => {
-  it('should create a submitApp action', () => {
-    expect(submitApp.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_APP)
-  })
-
-  it('should create a submitAppSetFormState action', () => {
-    expect(submitAppSetFormState.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_APP_SET_FORM_STATE)
-  })
-
-  it('should create a submitAppLoading action', () => {
-    expect(submitAppLoading.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_APP_LOADING)
-  })
-
-  it('should create a submitAppRequestData action', () => {
-    expect(submitAppRequestData.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_APP_REQUEST_DATA)
-  })
-
-  it('should create a submitAppReceiveData action', () => {
-    expect(submitAppReceiveData.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_APP_RECEIVE_DATA)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/submit-revision.ts b/packages/admin-portal/src/actions/__tests__/submit-revision.ts
deleted file mode 100644
index 669ee33102..0000000000
--- a/packages/admin-portal/src/actions/__tests__/submit-revision.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { submitRevision, submitRevisionSetFormState } from '../submit-revision'
-import ActionTypes from '../../constants/action-types'
-
-describe('submitRevision actions', () => {
-  it('should create a submitRevision action', () => {
-    expect(submitRevision.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_REVISION)
-  })
-
-  it('should create a submitRevisionSetFormState action', () => {
-    expect(submitRevisionSetFormState.type).toEqual(ActionTypes.DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/webhook-edit-modal.ts b/packages/admin-portal/src/actions/__tests__/webhook-edit-modal.ts
deleted file mode 100644
index 73d09bcf1b..0000000000
--- a/packages/admin-portal/src/actions/__tests__/webhook-edit-modal.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {
-  requestWebhookSubcriptionData,
-  requestWebhookSubcriptionReceiveData,
-  createWebhook,
-  CreateWebhookParams,
-  requestWebhookData,
-  deleteWebhook,
-} from '../webhook-edit-modal'
-import ActionTypes from '../../constants/action-types'
-import { webhookDataStub } from '@/sagas/__stubs__/webhook-edit'
-
-describe('developer webhook actions', () => {
-  it('should create a requestDeveloperWebhookData action', () => {
-    expect(requestWebhookSubcriptionData.type).toEqual(ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA)
-  })
-
-  it('should create a developerReceiveData action', () => {
-    expect(requestWebhookSubcriptionReceiveData.type).toEqual(ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_RECEIVE_DATA)
-    expect(requestWebhookSubcriptionReceiveData(webhookDataStub).data).toEqual(webhookDataStub)
-  })
-
-  it('should create a developerCreate action', () => {
-    const newWebhook: CreateWebhookParams = {
-      applicationId: '1161242a-f650-4d1d-aed7-909853fe7ee1',
-      url: 'https://github.com/',
-      description: '',
-      topicIds: ['0a795809-8a41-449f-9865-ae0a536db6b7'],
-      customerIds: ['0a795809-8a41-449f-9865-ae0a536db6b7'],
-      active: true,
-    }
-    expect(createWebhook.type).toEqual(ActionTypes.WEBHOOK_CREATE)
-    expect(createWebhook(newWebhook).data).toEqual(newWebhook)
-  })
-
-  it('should create a requestWebhookData action', () => {
-    expect(requestWebhookData.type).toEqual(ActionTypes.WEBHOOK_REQUEST_DATA)
-  })
-  it('should create a requestWebhookData action', () => {
-    expect(deleteWebhook.type).toEqual(ActionTypes.WEBHOOK_DELETE)
-  })
-})
diff --git a/packages/admin-portal/src/actions/__tests__/webhook-subscriptions.ts b/packages/admin-portal/src/actions/__tests__/webhook-subscriptions.ts
deleted file mode 100644
index cd69507207..0000000000
--- a/packages/admin-portal/src/actions/__tests__/webhook-subscriptions.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {
-  webhookSubscriptionsRequestData,
-  webhookSubscriptionsReceiveData,
-  webhookTopicsRequestData,
-  webhookTopicsReceiveData,
-} from '../webhook-subscriptions'
-import ActionTypes from '../../constants/action-types'
-
-describe('webhookSubscriptions actions', () => {
-  it('should create a webhookSubscriptionsRequestData action', () => {
-    expect(webhookSubscriptionsRequestData.type).toEqual(ActionTypes.WEBHOOK_SUBSCRIPTION_REQUEST_DATA)
-  })
-
-  it('should create a webhookSubscriptionsReceiveData action', () => {
-    expect(webhookSubscriptionsReceiveData.type).toEqual(ActionTypes.WEBHOOK_SUBSCRIPTION_RECEIVE_DATA)
-  })
-
-  it('should create a webhookTopicsRequestData action', () => {
-    expect(webhookTopicsRequestData.type).toEqual(ActionTypes.WEBHOOK_TOPICS_REQUEST_DATA)
-  })
-
-  it('should create a webhookTopicsReceiveData action', () => {
-    expect(webhookTopicsReceiveData.type).toEqual(ActionTypes.WEBHOOK_TOPICS_RECEIVE_DATA)
-  })
-})
diff --git a/packages/admin-portal/src/actions/app-categories.ts b/packages/admin-portal/src/actions/app-categories.ts
deleted file mode 100644
index 976367676a..0000000000
--- a/packages/admin-portal/src/actions/app-categories.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { PagedResultCategoryModel_ } from '@reapit/foundations-ts-definitions'
-
-export const categoriesReceiveData = actionCreator<PagedResultCategoryModel_ | undefined>(
-  ActionTypes.CATEGORIES_RECEIVE_DATA,
-)
diff --git a/packages/admin-portal/src/actions/app-detail-modal.ts b/packages/admin-portal/src/actions/app-detail-modal.ts
deleted file mode 100644
index b60dd40f1a..0000000000
--- a/packages/admin-portal/src/actions/app-detail-modal.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-
-export const setAppDetailModalStateBrowse = actionCreator<void>(ActionTypes.SET_APP_DETAIL_MODAL_STATE_BROWSE)
-export const setAppDetailModalStateInstall = actionCreator<void>(ActionTypes.SET_APP_DETAIL_MODAL_STATE_INSTALL)
-export const setAppDetailModalStateUninstall = actionCreator<void>(ActionTypes.SET_APP_DETAIL_MODAL_STATE_UNINSTALL)
-export const setAppDetailModalStateSuccess = actionCreator<void>(ActionTypes.SET_APP_DETAIL_MODAL_STATE_SUCCESS)
-export const setAppDetailModalStateManage = actionCreator<void>(ActionTypes.SET_APP_DETAIL_MODAL_STATE_MANAGE)
diff --git a/packages/admin-portal/src/actions/app-http-traffic-event.ts b/packages/admin-portal/src/actions/app-http-traffic-event.ts
deleted file mode 100644
index 2fda9d380b..0000000000
--- a/packages/admin-portal/src/actions/app-http-traffic-event.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-
-const {
-  HTTP_TRAFFIC_PER_DAY_REQUEST_DATA,
-  HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA,
-  HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE,
-} = ActionTypes
-
-export interface HttpTrafficPerDayParams {
-  applicationId?: string[]
-  customerId?: string[]
-  dateFrom?: string
-  dateTo?: string
-}
-
-export const httpTrafficPerDayRequestData = actionCreator<HttpTrafficPerDayParams>(HTTP_TRAFFIC_PER_DAY_REQUEST_DATA)
-export const httpTrafficPerDayReceiveData = actionCreator<HttpTrafficPerDayParams>(HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA)
-export const httpTrafficPerDayRequestDataFailure = actionCreator<void>(HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE)
diff --git a/packages/admin-portal/src/actions/app-installations.ts b/packages/admin-portal/src/actions/app-installations.ts
deleted file mode 100644
index 3724af3537..0000000000
--- a/packages/admin-portal/src/actions/app-installations.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { FormState } from '../types/core'
-import {
-  PagedResultInstallationModel_,
-  TerminateInstallationModel,
-  CreateInstallationModel,
-} from '@reapit/foundations-ts-definitions'
-
-export interface InstallationParams {
-  appId?: string[]
-  developerId?: string[]
-  clientId?: string[]
-  externalAppId?: string[]
-  showTerminated?: boolean
-  isInstalled?: boolean
-  installedDateFrom?: string
-  installedDateTo?: string
-  pageSize?: number
-  pageNumber?: number
-}
-
-export type InstallParams = CreateInstallationModel & { callback?: () => void }
-
-export type UninstallParams = {
-  installationId: string
-  callback?: () => void
-} & TerminateInstallationModel
-
-export const appInstallationsRequestData = actionCreator<InstallationParams>(ActionTypes.APP_INSTALLATIONS_REQUEST_DATA)
-export const appInstallationsReceiveData = actionCreator<PagedResultInstallationModel_>(
-  ActionTypes.APP_INSTALLATIONS_RECEIVE_DATA,
-)
-export const appInstallationsRequestDataFailure = actionCreator<void>(
-  ActionTypes.APP_INSTALLATIONS_REQUEST_DATA_FAILURE,
-)
-export const appInstallationsFilterRequestData = actionCreator<InstallationParams>(
-  ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA,
-)
-export const appInstallationsFilterReceiveData = actionCreator<PagedResultInstallationModel_>(
-  ActionTypes.APP_INSTALLATIONS_FILTER_RECEIVE_DATA,
-)
-export const appInstallationsFilterRequestDataFailure = actionCreator<void>(
-  ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE,
-)
-
-export const appInstallationsRequestInstall = actionCreator<InstallParams>(
-  ActionTypes.APP_INSTALLATIONS_REQUEST_INSTALL,
-)
-export const appInstallationsRequestUninstall = actionCreator<UninstallParams>(
-  ActionTypes.APP_INSTALLATIONS_REQUEST_UNINSTALL,
-)
-export const appInstallationsSetFormState = actionCreator<FormState>(ActionTypes.APP_INSTALLATIONS_SET_FORM_STATE)
diff --git a/packages/admin-portal/src/actions/app-usage-stats.ts b/packages/admin-portal/src/actions/app-usage-stats.ts
deleted file mode 100644
index 7b2b8b727e..0000000000
--- a/packages/admin-portal/src/actions/app-usage-stats.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-
-const { APP_USAGE_STATS_REQUEST_DATA, APP_USAGE_STATS_RECEIVE_DATA, APP_USAGE_STATS_REQUEST_DATA_FAILURE } = ActionTypes
-
-export interface AppUsageStatsParams {
-  appId?: string[]
-  dateFrom?: string
-  dateTo?: string
-}
-
-export const appUsageStatsRequestData = actionCreator<AppUsageStatsParams>(APP_USAGE_STATS_REQUEST_DATA)
-export const appUsageStatsReceiveData = actionCreator<AppUsageStatsParams>(APP_USAGE_STATS_RECEIVE_DATA)
-export const appUsageStatsRequestDataFailure = actionCreator<void>(APP_USAGE_STATS_REQUEST_DATA_FAILURE)
diff --git a/packages/admin-portal/src/actions/client.ts b/packages/admin-portal/src/actions/client.ts
deleted file mode 100644
index 26cbdbc2c1..0000000000
--- a/packages/admin-portal/src/actions/client.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { actionCreator } from '@/utils/actions'
-import ActionTypes from '@/constants/action-types'
-import { ClientAppSummary, ClientAppSummaryParams } from '@/reducers/client/app-summary'
-import { AppDetailData } from '@/reducers/client/app-detail'
-import { FetchAppByIdParams } from '@/services/apps'
-import {
-  UpdateWebComponentConfigParams,
-  FetchWebComponentConfigParams,
-  WebComponentConfigResult,
-} from '@/services/web-component'
-import { NegotiatorsResult } from '@/services/negotiators'
-
-export const clientFetchAppSummary = actionCreator<ClientAppSummaryParams>(ActionTypes.CLIENT_FETCH_APP_SUMMARY)
-export const clientFetchAppSummarySuccess = actionCreator<ClientAppSummary | undefined>(
-  ActionTypes.CLIENT_FETCH_APP_SUMMARY_SUCCESS,
-)
-export const clientFetchAppSummaryFailed = actionCreator<string>(ActionTypes.CLIENT_FETCH_APP_SUMMARY_FAILED)
-export const clientClearAppSummary = actionCreator<null>(ActionTypes.CLIENT_CLEAR_APP_SUMMARY)
-
-// Client App Detail
-export const clientFetchAppDetail = actionCreator<FetchAppByIdParams>(ActionTypes.CLIENT_FETCH_APP_DETAIL)
-export const clientFetchAppDetailSuccess = actionCreator<AppDetailData>(ActionTypes.CLIENT_FETCH_APP_DETAIL_SUCCESS)
-export const clientFetchAppDetailFailed = actionCreator<string>(ActionTypes.CLIENT_FETCH_APP_DETAIL_FAILED)
-
-export const clientFetchWebComponentConfig = actionCreator<FetchWebComponentConfigParams>(
-  ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG,
-)
-export const clientFetchWebComponentConfigSuccess = actionCreator<WebComponentConfigResult>(
-  ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS,
-)
-export const clientFetchWebComponentConfigFailed = actionCreator<void>(
-  ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG_FAILED,
-)
-export const clientUpdateWebComponentConfig = actionCreator<UpdateWebComponentConfigParams>(
-  ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG,
-)
-export const clientUpdateWebComponentConfigFailed = actionCreator<void>(
-  ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG_FAILED,
-)
-
-export const clientFetchNegotiatorsSuccess = actionCreator<NegotiatorsResult>(
-  ActionTypes.CLIENT_FETCH_NEGOTIATORS_SUCCESS,
-)
diff --git a/packages/admin-portal/src/actions/developer-app-modal.ts b/packages/admin-portal/src/actions/developer-app-modal.ts
deleted file mode 100644
index 3e88533c1b..0000000000
--- a/packages/admin-portal/src/actions/developer-app-modal.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-
-export const setDeveloperAppModalStateEditDetail = actionCreator<void>(
-  ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_EDIT_DETAIL,
-)
-export const setDeveloperAppModalStateDelete = actionCreator<void>(ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_DELETE)
-export const setDeveloperAppModalStateViewDetail = actionCreator<void>(
-  ActionTypes.SET_DEVELOPER_APP_MODAL_STATE_VIEW_DETAIL,
-)
-export const developerAppShowModal = actionCreator<boolean>(ActionTypes.DEVELOPER_SHOW_MODAL)
diff --git a/packages/admin-portal/src/actions/developer-subscriptions.ts b/packages/admin-portal/src/actions/developer-subscriptions.ts
deleted file mode 100644
index 012ad9c4ca..0000000000
--- a/packages/admin-portal/src/actions/developer-subscriptions.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { FetchSubscriptionsListParams } from '@/services/developer-subscriptions'
-import {
-  SubscriptionModel,
-  CreateSubscriptionModel,
-  PagedResultSubscriptionModel_,
-} from '@reapit/foundations-ts-definitions'
-
-export const developerFetchSubscriptions = actionCreator<FetchSubscriptionsListParams>(
-  ActionTypes.DEVELOPER_FETCH_SUBSCRIPTIONS,
-)
-export const developerFetchSubscriptionsSuccess = actionCreator<PagedResultSubscriptionModel_>(
-  ActionTypes.DEVELOPER_FETCH_SUBSCRIPTIONS_SUCCESS,
-)
-export const developerDeleteSubscription = actionCreator<string>(ActionTypes.DEVELOPER_DELETE_SUBSCRIPTION)
-
-export interface CreateSubscriptionParams {
-  params: CreateSubscriptionModel
-  onCreated: () => void
-}
-
-export const developerCreateSubscription = actionCreator<CreateSubscriptionParams>(
-  ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE,
-)
-export const developerCreateSubscriptionSuccess = actionCreator<SubscriptionModel>(
-  ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE_SUCCESS,
-)
-export const developerCreateSubscriptionFalure = actionCreator<void>(ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE_FAILURE)
-export const developerCreateSubscriptionClearError = actionCreator<void>(
-  ActionTypes.DEVELOPER_SUBSCRIPTION_CLEAR_CREATE_ERROR,
-)
diff --git a/packages/admin-portal/src/actions/developer.ts b/packages/admin-portal/src/actions/developer.ts
deleted file mode 100644
index f1dd6add44..0000000000
--- a/packages/admin-portal/src/actions/developer.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// TODO: WILL MOVE ALL DEVELOPER ACTIONS TO HERE
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { AppDetailData, DeveloperItem, DeveloperRequestParams, WebhookPingTestStatus } from '@/reducers/developer'
-import {
-  CreateDeveloperModel,
-  DeveloperModel,
-  BillingBreakdownForMonthV2Model,
-  BillingOverviewForPeriodV2Model,
-} from '@reapit/foundations-ts-definitions'
-import { FormState } from '@/types/core'
-import { FetchBillingsParams, FetchBillingsByMonthParams } from '@/services/traffic-events'
-import { PingWebhooksByIdParams } from '@/services/webhooks'
-import { FetchAppByIdParams } from '@/services/apps'
-
-// Developer App Detail
-export const developerFetchAppDetail = actionCreator<FetchAppByIdParams>(ActionTypes.DEVELOPER_FETCH_APP_DETAIL)
-export const developerFetchAppDetailSuccess = actionCreator<AppDetailData>(
-  ActionTypes.DEVELOPER_FETCH_APP_DETAIL_SUCCESS,
-)
-export const developerFetchAppDetailFailed = actionCreator<string>(ActionTypes.DEVELOPER_FETCH_APP_DETAIL_FAILED)
-
-export const developerRequestData = actionCreator<DeveloperRequestParams>(ActionTypes.DEVELOPER_REQUEST_DATA)
-export const developerRequestDataFailure = actionCreator<void>(ActionTypes.DEVELOPER_REQUEST_DATA_FAILURE)
-export const developerLoading = actionCreator<boolean>(ActionTypes.DEVELOPER_LOADING)
-export const developerReceiveData = actionCreator<DeveloperItem | undefined>(ActionTypes.DEVELOPER_RECEIVE_DATA)
-export const developerClearData = actionCreator<null>(ActionTypes.DEVELOPER_CLEAR_DATA)
-export const developerCreate = actionCreator<CreateDeveloperModel>(ActionTypes.DEVELOPER_CREATE)
-export const developerSetFormState = actionCreator<FormState>(ActionTypes.DEVELOPER_SET_FORM_STATE)
-export const fetchMyIdentity = actionCreator<void>(ActionTypes.DEVELOPER_FETCH_MY_IDENTITY)
-export const setMyIdentity = actionCreator<DeveloperModel>(ActionTypes.DEVELOPER_SET_MY_IDENTITY)
-export const fetchBilling = actionCreator<FetchBillingsParams>(ActionTypes.DEVELOPER_FETCH_BILLING)
-export const fetchBillingSuccess = actionCreator<BillingOverviewForPeriodV2Model>(
-  ActionTypes.DEVELOPER_FETCH_BILLING_SUCCESS,
-)
-export const fetchBillingFailure = actionCreator<unknown>(ActionTypes.DEVELOPER_FETCH_BILLING_FAILED)
-export const fetchMonthlyBilling = actionCreator<FetchBillingsByMonthParams>(
-  ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING,
-)
-export const fetchMonthlyBillingSuccess = actionCreator<BillingBreakdownForMonthV2Model>(
-  ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS,
-)
-export const fetchMonthlyBillingFailure = actionCreator<unknown>(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_FAILED)
-export const developerWebhookPing = actionCreator<PingWebhooksByIdParams>(ActionTypes.DEVELOPER_PING_WEBHOOK)
-export const developerSetWebhookPingStatus = actionCreator<WebhookPingTestStatus>(
-  ActionTypes.DEVELOPER_SET_PING_WEBHOOK_STATUS,
-)
-export const developerApplyAppDetails = actionCreator<AppDetailData>(ActionTypes.DEVELOPER_APPLY_APP_DETAIL)
diff --git a/packages/admin-portal/src/actions/installed-apps.ts b/packages/admin-portal/src/actions/installed-apps.ts
deleted file mode 100644
index e0cf41bdd1..0000000000
--- a/packages/admin-portal/src/actions/installed-apps.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { InstalledAppsItem } from '../reducers/installed-apps'
-
-export const installedAppsRequestData = actionCreator<number>(ActionTypes.INSTALLED_APPS_REQUEST_DATA)
-export const installedAppsRequestDataFailure = actionCreator<void>(ActionTypes.INSTALLED_APPS_REQUEST_DATA_FAILURE)
-export const installedAppsLoading = actionCreator<boolean>(ActionTypes.INSTALLED_APPS_LOADING)
-export const installedAppsReceiveData = actionCreator<InstalledAppsItem | undefined>(
-  ActionTypes.INSTALLED_APPS_RECEIVE_DATA,
-)
-export const installedAppsClearData = actionCreator<null>(ActionTypes.INSTALLED_APPS_CLEAR_DATA)
diff --git a/packages/admin-portal/src/actions/my-apps.ts b/packages/admin-portal/src/actions/my-apps.ts
deleted file mode 100644
index f5cb60a4eb..0000000000
--- a/packages/admin-portal/src/actions/my-apps.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { MyAppsItem } from '../reducers/my-apps'
-
-export const myAppsRequestData = actionCreator<number>(ActionTypes.MY_APPS_REQUEST_DATA)
-export const myAppsRequestDataFailure = actionCreator<void>(ActionTypes.MY_APPS_REQUEST_DATA_FAILURE)
-export const myAppsLoading = actionCreator<boolean>(ActionTypes.MY_APPS_LOADING)
-export const myAppsReceiveData = actionCreator<MyAppsItem | undefined>(ActionTypes.MY_APPS_RECEIVE_DATA)
-export const myAppsClearData = actionCreator<null>(ActionTypes.MY_APPS_CLEAR_DATA)
diff --git a/packages/admin-portal/src/actions/settings.ts b/packages/admin-portal/src/actions/settings.ts
deleted file mode 100644
index 590d1fee49..0000000000
--- a/packages/admin-portal/src/actions/settings.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { DeveloperModel } from '@reapit/foundations-ts-definitions'
-
-export const requestDeveloperData = actionCreator<void>(ActionTypes.SETTING_FETCH_DEVELOPER_INFO)
-export const requestDeveloperDataSuccess = actionCreator<DeveloperModel>(
-  ActionTypes.SETTING_FETCH_DEVELOPER_INFO_SUCCESS,
-)
-export const settingShowLoading = actionCreator<boolean>(ActionTypes.SETTING_SHOW_HIDE_LOADING)
-export const updateDeveloperData = actionCreator<DeveloperModel>(ActionTypes.SETTING_UPDATE_DEVELOPER)
-
-export type ChangePasswordParams = {
-  currentPassword: string
-  password: string
-  confirmPassword: string
-}
-export const changePassword = actionCreator<ChangePasswordParams>(ActionTypes.CHANGE_PASSWORD)
diff --git a/packages/admin-portal/src/actions/submit-app.ts b/packages/admin-portal/src/actions/submit-app.ts
deleted file mode 100644
index 758501e550..0000000000
--- a/packages/admin-portal/src/actions/submit-app.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { FormikHelpers } from '@reapit/elements'
-import { Dispatch } from 'redux'
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { CreateAppModel, ScopeModel } from '@reapit/foundations-ts-definitions'
-import { FormState } from '@/types/core'
-import { FormStep } from '@/reducers/submit-app'
-
-export type WizardStep =
-  | 'BEFORE_YOU_START'
-  | 'INPUT_APP_NAME'
-  | 'CREATE_NEW_APP'
-  | 'INPUT_AUTHENTICATION_URIS'
-  | 'GRANT_PERMISSION'
-  | 'SUBMIT_APP_SUCCESS'
-  | 'INPUT_ATHENTICATION_TYPE'
-
-export type SetWizardStep = React.Dispatch<React.SetStateAction<WizardStep>>
-
-export type HandleSubmitParams = {
-  dispatch: Dispatch
-  setWizardStep: SetWizardStep
-}
-
-export type SubmitAppFormikActions = FormikHelpers<CustomCreateAppModel>
-
-export type CustomCreateAppModel = Pick<CreateAppModel, 'name' | 'authFlow' | 'scopes'> & {
-  redirectUris?: string
-  signoutUris?: string
-}
-export type SubmitAppArgs = CreateAppModel &
-  Pick<HandleSubmitParams, 'setWizardStep'> &
-  Pick<FormikHelpers<CustomCreateAppModel>, 'setErrors' | 'setFieldValue'>
-
-export type WizardChangeStepModel = {
-  formStep: FormStep
-}
-
-export const submitApp = actionCreator<SubmitAppArgs>(ActionTypes.DEVELOPER_SUBMIT_APP)
-export const submitAppSetFormState = actionCreator<FormState>(ActionTypes.DEVELOPER_SUBMIT_APP_SET_FORM_STATE)
-export const submitAppLoading = actionCreator<boolean>(ActionTypes.DEVELOPER_SUBMIT_APP_LOADING)
-export const submitAppRequestData = actionCreator<void>(ActionTypes.DEVELOPER_SUBMIT_APP_REQUEST_DATA)
-export const submitAppReceiveData = actionCreator<ScopeModel[]>(ActionTypes.DEVELOPER_SUBMIT_APP_RECEIVE_DATA)
diff --git a/packages/admin-portal/src/actions/submit-revision.ts b/packages/admin-portal/src/actions/submit-revision.ts
deleted file mode 100644
index 24269323fe..0000000000
--- a/packages/admin-portal/src/actions/submit-revision.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { CreateAppRevisionModel } from '@reapit/foundations-ts-definitions'
-
-export type SubmitRevisionParams = {
-  params: CreateAppRevisionModel & { id: string }
-  onSuccess: () => void
-  onError: () => void
-}
-
-export const submitRevision = actionCreator<SubmitRevisionParams>(ActionTypes.DEVELOPER_SUBMIT_REVISION)
-export const submitRevisionSetFormState = actionCreator<string>(ActionTypes.DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE)
diff --git a/packages/admin-portal/src/actions/webhook-edit-modal.ts b/packages/admin-portal/src/actions/webhook-edit-modal.ts
deleted file mode 100644
index 703ef8999e..0000000000
--- a/packages/admin-portal/src/actions/webhook-edit-modal.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-import { WebhookModal, WebhookSubscription } from '@/reducers/webhook-edit-modal'
-
-export interface SubscriptionCustomersRequestParams {
-  AppId: string
-}
-export interface SubscriptionTopicsRequestParams {
-  applicationId: string
-}
-
-export interface FetchWebhookRequestParams {
-  webhookId: string
-}
-
-export interface DeleteWebhookRequestParams {
-  webhookId: string
-}
-
-export interface WebhookDataRequestParams {
-  webhookId: string
-}
-
-export interface WebhookSubcriptionDataRequest {
-  appId: string
-}
-
-export interface DeleteWebhookParams {
-  applicationId: string
-  webhookId: string
-}
-export interface CreateWebhookParams {
-  applicationId: string
-  url: string
-  description?: string
-  topicIds: string[]
-  customerIds: string[]
-  active: boolean
-}
-
-export interface EditWebhookParams {
-  applicationId: string
-  webhookId: string
-  url: string
-  description?: string
-  topicIds: string[]
-  customerIds: string[]
-  active: boolean
-}
-
-export const requestWebhookSubcriptionData = actionCreator<string>(ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA)
-export const requestWebhookSubcriptionReceiveData = actionCreator<WebhookSubscription>(
-  ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_RECEIVE_DATA,
-)
-export const requestWebhookSubcriptionReceiveFailure = actionCreator<void>(
-  ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA_FAILURE,
-)
-export const createWebhook = actionCreator<CreateWebhookParams>(ActionTypes.WEBHOOK_CREATE)
-export const editWebhook = actionCreator<EditWebhookParams>(ActionTypes.WEBHOOK_EDIT)
-export const deleteWebhook = actionCreator<DeleteWebhookParams>(ActionTypes.WEBHOOK_DELETE)
-export const requestWebhookData = actionCreator<string>(ActionTypes.WEBHOOK_REQUEST_DATA)
-export const requestWebhookReceiveData = actionCreator<WebhookModal>(ActionTypes.WEBHOOK_RECEIVE_DATA)
-export const requestWebhookReceiveDataFailure = actionCreator<void>(ActionTypes.WEBHOOK_RECEIVE_DATA_FAILURE)
-export const webhookDataClear = actionCreator<void>(ActionTypes.WEBHOOK_DATA_CLEAR)
-export const webhookSetOpenModal = actionCreator<string>(ActionTypes.WEBHOOK_SET_OPEN_MODAL)
diff --git a/packages/admin-portal/src/actions/webhook-subscriptions.ts b/packages/admin-portal/src/actions/webhook-subscriptions.ts
deleted file mode 100644
index 004ae16f0e..0000000000
--- a/packages/admin-portal/src/actions/webhook-subscriptions.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { actionCreator } from '@/utils/actions'
-import ActionTypes from '@/constants/action-types'
-import { PagedResultWebhookModel_, PagedResultTopicModel_ } from '@/reducers/webhook-subscriptions'
-
-export const webhookSubscriptionsRequestData = actionCreator<string>(ActionTypes.WEBHOOK_SUBSCRIPTION_REQUEST_DATA)
-export const webhookSubscriptionsReceiveData = actionCreator<PagedResultWebhookModel_>(
-  ActionTypes.WEBHOOK_SUBSCRIPTION_RECEIVE_DATA,
-)
-export const webhookTopicsRequestData = actionCreator<string>(ActionTypes.WEBHOOK_TOPICS_REQUEST_DATA)
-export const webhookTopicsReceiveData = actionCreator<PagedResultTopicModel_>(ActionTypes.WEBHOOK_TOPICS_RECEIVE_DATA)
-export const setApplicationId = actionCreator<string>(ActionTypes.WEBHOOK_SET_APPLICATION_ID)
diff --git a/packages/admin-portal/src/components/ui/app-installations/__tests__/__snapshots__/app-installations-modal.tsx.snap b/packages/admin-portal/src/components/ui/app-installations/__tests__/__snapshots__/app-installations-modal.tsx.snap
deleted file mode 100644
index 7c2efa8d17..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/__tests__/__snapshots__/app-installations-modal.tsx.snap
+++ /dev/null
@@ -1,9 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AppInstallationsModal should match a snapshot 1`] = `
-<Component
-  afterClose={[MockFunction]}
-  renderChildren={true}
-  visible={true}
-/>
-`;
diff --git a/packages/admin-portal/src/components/ui/app-installations/__tests__/app-installations-modal.tsx b/packages/admin-portal/src/components/ui/app-installations/__tests__/app-installations-modal.tsx
deleted file mode 100644
index 743a720e0d..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/__tests__/app-installations-modal.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import * as React from 'react'
-import { shallow } from 'enzyme'
-
-import {
-  AppInstallationsModal,
-  handleAfterClose,
-  handleUninstall,
-  AppInstallationsModalProps,
-} from '../app-installations-modal'
-import { installationStub } from '@/sagas/__stubs__/installation'
-
-const props: AppInstallationsModalProps = {
-  appId: '1',
-  appName: '1',
-  visible: true,
-  afterClose: jest.fn(),
-  onUninstallSuccess: jest.fn(),
-}
-
-describe('AppInstallationsModal', () => {
-  it('should match a snapshot', () => {
-    expect(shallow(<AppInstallationsModal {...props} />)).toMatchSnapshot()
-  })
-  describe('handleAfterClose have afterClose', () => {
-    it('should run correctly', () => {
-      const afterClose = jest.fn()
-      const setUninstallApp = jest.fn()
-      handleAfterClose({ setUninstallApp, afterClose })()
-      expect(afterClose).toBeCalled()
-      expect(setUninstallApp).toBeCalled()
-    })
-  })
-  describe('handleUninstall', () => {
-    it('should run correctly', () => {
-      const setUninstallApp = jest.fn()
-      handleUninstall(setUninstallApp(installationStub))(installationStub)
-      expect(setUninstallApp).toBeCalled()
-    })
-  })
-})
diff --git a/packages/admin-portal/src/components/ui/app-installations/app-installations-modal.tsx b/packages/admin-portal/src/components/ui/app-installations/app-installations-modal.tsx
deleted file mode 100644
index 38c5a99aee..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/app-installations-modal.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import * as React from 'react'
-import { ModalProps, Modal } from '@reapit/elements'
-import { InstallationModel } from '@reapit/foundations-ts-definitions'
-import ConfirmUninstall from './confirm-uninstall'
-
-interface AppInstallationsModalInnerProps {
-  appId: string
-  appName: string
-  onUninstallSuccess: () => void
-}
-
-export type AppInstallationsModalProps = Pick<ModalProps, 'visible' | 'afterClose'> & AppInstallationsModalInnerProps
-
-interface HandleAfterClose {
-  setUninstallApp: any
-  afterClose?: any
-}
-export const handleAfterClose = ({ setUninstallApp, afterClose }: HandleAfterClose) => () => {
-  setUninstallApp(undefined)
-  if (afterClose) {
-    afterClose()
-  }
-}
-
-export const handleUninstall = (setUninstallApp: (app: InstallationModel) => void) => (
-  app: InstallationModel,
-) => () => {
-  setUninstallApp(app)
-}
-
-export const AppInstallationsModal: React.FC<AppInstallationsModalProps> = ({
-  appName,
-  visible,
-  afterClose,
-  onUninstallSuccess,
-}) => {
-  const [uninstallApp, setUninstallApp] = React.useState<InstallationModel>()
-
-  return (
-    <Modal visible={visible} afterClose={afterClose} renderChildren>
-      <>
-        {uninstallApp && (
-          <ConfirmUninstall
-            appName={appName}
-            installationDetail={uninstallApp}
-            onUninstallSuccess={onUninstallSuccess}
-            afterClose={handleAfterClose({ setUninstallApp, afterClose })}
-          />
-        )}
-      </>
-    </Modal>
-  )
-}
-
-export default AppInstallationsModal
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/__snapshots__/confirm-uninstall.test.tsx.snap b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/__snapshots__/confirm-uninstall.test.tsx.snap
deleted file mode 100644
index 610ca0297e..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/__snapshots__/confirm-uninstall.test.tsx.snap
+++ /dev/null
@@ -1,287 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ConfirmUninstall should match a snapshot 1`] = `
-<Provider
-  store={
-    Object {
-      "clearActions": [Function],
-      "dispatch": [Function],
-      "getActions": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-    }
-  }
->
-  <Component
-    afterClose={[MockFunction]}
-    appName="1"
-    installationDetail={
-      Object {
-        "appId": "062a376c-f5a3-46a0-a64b-e4bc6e5af2c1",
-        "client": "DXX",
-        "created": "2019-12-03T05:33:20",
-        "id": "b3c2f644-3241-4298-b320-b0398ff492f9",
-        "links": Array [
-          Object {
-            "action": "GET",
-            "href": "http://dev.platformmarketplace.reapit.net/installations/b3c2f644-3241-4298-b320-b0398ff492f9",
-            "rel": "self",
-          },
-          Object {
-            "action": "GET",
-            "href": "http://dev.platformmarketplace.reapit.net/apps/062a376c-f5a3-46a0-a64b-e4bc6e5af2c1",
-            "rel": "app",
-          },
-        ],
-        "status": "Active",
-      }
-    }
-    onUninstallSuccess={[MockFunction]}
-  >
-    <Formik
-      initialValues={
-        Object {
-          "terminatedReason": "",
-        }
-      }
-      onSubmit={[Function]}
-      validationSchema={
-        ObjectSchema {
-          "_blacklist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "_conditions": Array [],
-          "_defaultDefault": [Function],
-          "_deps": Array [],
-          "_excludedEdges": Array [],
-          "_exclusive": Object {},
-          "_mutate": undefined,
-          "_nodes": Array [
-            "terminatedReason",
-          ],
-          "_options": Object {
-            "abortEarly": true,
-            "recursive": true,
-          },
-          "_type": "object",
-          "_typeError": [Function],
-          "_whitelist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "fields": Object {
-            "terminatedReason": StringSchema {
-              "_blacklist": RefSet {
-                "list": Set {},
-                "refs": Map {},
-              },
-              "_conditions": Array [],
-              "_deps": Array [],
-              "_exclusive": Object {
-                "min": true,
-                "required": true,
-                "trim": false,
-              },
-              "_mutate": undefined,
-              "_options": Object {
-                "abortEarly": true,
-                "recursive": true,
-              },
-              "_type": "string",
-              "_typeError": [Function],
-              "_whitelist": RefSet {
-                "list": Set {},
-                "refs": Map {},
-              },
-              "tests": Array [
-                [Function],
-                [Function],
-                [Function],
-              ],
-              "transforms": Array [
-                [Function],
-                [Function],
-              ],
-              "type": "string",
-            },
-          },
-          "tests": Array [],
-          "transforms": Array [
-            [Function],
-          ],
-          "type": "object",
-        }
-      }
-    >
-      <Form>
-        <form
-          action="#"
-          onReset={[Function]}
-          onSubmit={[Function]}
-        >
-          <Component
-            afterClose={[MockFunction]}
-            title="Confirm Uninstall"
-          >
-            <header
-              className="modal-card-head"
-            >
-              <h4
-                className="modal-card-title is-4"
-              >
-                Confirm Uninstall
-              </h4>
-              <button
-                aria-label="close"
-                className="delete"
-                data-test="modal-close-button"
-                onClick={[Function]}
-                type="button"
-              />
-            </header>
-          </Component>
-          <Component
-            body={
-              <React.Fragment>
-                <Unknown>
-                  Are you sure you wish to uninstall ‘
-                  1
-                  ’ from ‘
-                  DXX
-                  ’?
-                </Unknown>
-                <Unknown>
-                  *Please confirm reason for uninstalling
-                </Unknown>
-                <Unknown
-                  id="terminatedReason"
-                  name="terminatedReason"
-                />
-              </React.Fragment>
-            }
-          >
-            <section
-              className="modal-card-body"
-            >
-              <Component>
-                <h6
-                  className=""
-                  id=""
-                >
-                  Are you sure you wish to uninstall ‘
-                  1
-                  ’ from ‘
-                  DXX
-                  ’?
-                </h6>
-              </Component>
-              <Component>
-                <h6
-                  className=""
-                  id=""
-                >
-                  *Please confirm reason for uninstalling
-                </h6>
-              </Component>
-              <Component
-                id="terminatedReason"
-                name="terminatedReason"
-              >
-                <Field
-                  name="terminatedReason"
-                  validate={null}
-                >
-                  <div
-                    className="field"
-                  >
-                    <div
-                      className="control"
-                    >
-                      <textarea
-                        className=""
-                        data-test=""
-                        id="terminatedReason"
-                        name="terminatedReason"
-                        onBlur={[Function]}
-                        onChange={[Function]}
-                        placeholder=""
-                        value=""
-                      />
-                    </div>
-                  </div>
-                </Field>
-              </Component>
-            </section>
-          </Component>
-          <Component
-            footerItems={
-              <React.Fragment>
-                <Unknown
-                  className="mx-4"
-                  disabled={false}
-                  fullWidth={true}
-                  loading={false}
-                  type="submit"
-                >
-                  Yes, Uninstall
-                </Unknown>
-                <Unknown
-                  className="mx-4"
-                  disabled={false}
-                  fullWidth={true}
-                  onClick={[MockFunction]}
-                  type="button"
-                  variant="danger"
-                >
-                  Cancel
-                </Unknown>
-              </React.Fragment>
-            }
-          >
-            <footer
-              className="modal-card-foot"
-            >
-              <Component
-                className="mx-4"
-                disabled={false}
-                fullWidth={true}
-                loading={false}
-                type="submit"
-              >
-                <button
-                  className="button mx-4 is-primary is-fullwidth "
-                  data-test=""
-                  disabled={false}
-                  type="submit"
-                >
-                  Yes, Uninstall
-                </button>
-              </Component>
-              <Component
-                className="mx-4"
-                disabled={false}
-                fullWidth={true}
-                onClick={[MockFunction]}
-                type="button"
-                variant="danger"
-              >
-                <button
-                  className="button mx-4 is-danger is-fullwidth "
-                  data-test=""
-                  disabled={false}
-                  onClick={[MockFunction]}
-                  type="button"
-                >
-                  Cancel
-                </button>
-              </Component>
-            </footer>
-          </Component>
-        </form>
-      </Form>
-    </Formik>
-  </Component>
-</Provider>
-`;
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/confirm-uninstall.test.tsx b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/confirm-uninstall.test.tsx
deleted file mode 100644
index 898dab7b52..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/__tests__/confirm-uninstall.test.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import * as React from 'react'
-import { mount } from 'enzyme'
-import * as ReactRedux from 'react-redux'
-import configureStore from 'redux-mock-store'
-import appState from '@/reducers/__stubs__/app-state'
-import ConfirmUninstall, { ConfirmUninstallProps, handleSuccessUninstall, handleSubmit } from '../confirm-uninstall'
-import { installationStub } from '@/sagas/__stubs__/installation'
-import {
-  appInstallationsSetFormState,
-  UninstallParams,
-  appInstallationsRequestUninstall,
-} from '@/actions/app-installations'
-import { setAppDetailStale } from '@/actions/app-detail'
-
-const props: ConfirmUninstallProps = {
-  appName: '1',
-  afterClose: jest.fn(),
-  installationDetail: installationStub,
-  onUninstallSuccess: jest.fn(),
-}
-
-describe('ConfirmUninstall', () => {
-  let store
-  let spyDispatch
-  beforeEach(() => {
-    /* mocking store */
-    const mockStore = configureStore()
-    store = mockStore(appState)
-    spyDispatch = jest.spyOn(ReactRedux, 'useDispatch').mockImplementation(() => store.dispatch)
-  })
-
-  it('should match a snapshot', () => {
-    expect(
-      mount(
-        <ReactRedux.Provider store={store}>
-          <ConfirmUninstall {...props} />
-        </ReactRedux.Provider>,
-      ),
-    ).toMatchSnapshot()
-  })
-
-  describe('handleSuccessUninstall', () => {
-    it('should run correctly', () => {
-      const onUninstallSuccess = jest.fn()
-      const isSetAppDetailStaleAfterUninstallSuccess = true
-      const fn = handleSuccessUninstall(onUninstallSuccess, spyDispatch, isSetAppDetailStaleAfterUninstallSuccess)
-      fn()
-      expect(onUninstallSuccess).toBeCalled()
-      expect(spyDispatch).toBeCalledWith(appInstallationsSetFormState('PENDING'))
-      expect(spyDispatch).toBeCalledWith(setAppDetailStale(true))
-      spyDispatch.mockClear()
-    })
-  })
-
-  describe('handleSuccessUninstall', () => {
-    it('should run correctly', () => {
-      const onUninstallSuccess = jest.fn()
-      const isSetAppDetailStaleAfterUninstallSuccess = false
-      const fn = handleSuccessUninstall(onUninstallSuccess, spyDispatch, isSetAppDetailStaleAfterUninstallSuccess)
-      fn()
-      expect(onUninstallSuccess).toBeCalled()
-      expect(spyDispatch).toBeCalledWith(appInstallationsSetFormState('PENDING'))
-      expect(spyDispatch).not.toBeCalledWith(setAppDetailStale(true))
-    })
-  })
-
-  describe('handleSubmit', () => {
-    it('should run correctly', () => {
-      const { id = '', appId = '' } = props.installationDetail || {}
-      const formValues = {
-        terminatedReason: 'testtttttt',
-      }
-      const fn = handleSubmit(spyDispatch, props.installationDetail)
-      fn(formValues)
-      const params: UninstallParams = {
-        installationId: id,
-        appId: appId,
-        terminatedReason: formValues.terminatedReason,
-      }
-      expect(spyDispatch).toBeCalledWith(appInstallationsRequestUninstall(params))
-    })
-  })
-})
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/confirm-uninstall.tsx b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/confirm-uninstall.tsx
deleted file mode 100644
index 4bbfd3f06e..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/confirm-uninstall.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import * as React from 'react'
-import { Dispatch } from 'redux'
-import { useSelector, useDispatch } from 'react-redux'
-import { InstallationModel } from '@reapit/foundations-ts-definitions'
-import { ModalHeader, ModalBody, TextArea, ModalFooter, Button, SubTitleH6, Formik, Form } from '@reapit/elements'
-import {
-  UninstallParams,
-  appInstallationsRequestUninstall,
-  appInstallationsSetFormState,
-} from '@/actions/app-installations'
-import CallToAction from '@/components/ui/call-to-action'
-import { setAppDetailStale } from '@/actions/app-detail'
-import { selectInstallationFormState } from '@/selector/installations'
-import formFields from './form-schema/form-fields'
-import validationSchema from './form-schema/validation-schema'
-
-const { terminatedReasonField } = formFields
-
-export type ConfirmUninstallProps = {
-  appName: string
-  installationDetail: InstallationModel | undefined
-  onUninstallSuccess: () => void
-  afterClose?: () => void
-  isSetAppDetailStaleAfterUninstallSuccess?: boolean
-}
-
-export type ConfirmUninstallFormValues = {
-  terminatedReason: string
-}
-
-export const initialValues: ConfirmUninstallFormValues = {
-  terminatedReason: '',
-}
-
-export const handleSuccessUninstall = (
-  onUninstallSuccess: () => void,
-  dispatch: Dispatch,
-  isSetAppDetailStaleAfterUninstallSuccess: boolean,
-) => () => {
-  onUninstallSuccess()
-  dispatch(appInstallationsSetFormState('PENDING'))
-  if (isSetAppDetailStaleAfterUninstallSuccess) {
-    dispatch(setAppDetailStale(true))
-  }
-}
-
-export const handleSubmit = (dispatch: Dispatch, installationDetail?: InstallationModel) => {
-  return (values: ConfirmUninstallFormValues) => {
-    const { id = '', appId = '' } = installationDetail || {}
-    const params: UninstallParams = {
-      installationId: id,
-      appId: appId,
-      terminatedReason: values.terminatedReason,
-    }
-    dispatch(appInstallationsRequestUninstall(params))
-  }
-}
-
-export const ConfirmUninstall: React.FC<ConfirmUninstallProps> = ({
-  appName,
-  afterClose,
-  installationDetail,
-  onUninstallSuccess,
-  isSetAppDetailStaleAfterUninstallSuccess = true,
-}) => {
-  const dispatch = useDispatch()
-  const formState = useSelector(selectInstallationFormState)
-  const isSuccess = formState === 'SUCCESS'
-  const isSubmitting = formState === 'SUBMITTING'
-
-  if (isSuccess) {
-    return (
-      <CallToAction
-        title="Success"
-        buttonText="Back to App"
-        dataTest="alertUninstallSuccess"
-        onButtonClick={handleSuccessUninstall(onUninstallSuccess, dispatch, isSetAppDetailStaleAfterUninstallSuccess)}
-        isCenter
-      >
-        <div className="mb-3">
-          &lsquo;{appName}&rsquo; has been successfully uninstalled from &lsquo;{installationDetail?.client}&rsquo;
-        </div>
-      </CallToAction>
-    )
-  }
-
-  return (
-    <Formik
-      initialValues={initialValues}
-      onSubmit={handleSubmit(dispatch, installationDetail)}
-      validationSchema={validationSchema}
-    >
-      <Form>
-        <ModalHeader title="Confirm Uninstall" afterClose={afterClose as () => void} />
-        <ModalBody
-          body={
-            <>
-              <SubTitleH6>
-                Are you sure you wish to uninstall &lsquo;{appName}&rsquo; from ‘{installationDetail?.client}’?
-              </SubTitleH6>
-              <SubTitleH6>&#42;Please confirm reason for uninstalling</SubTitleH6>
-              <TextArea name={terminatedReasonField.name} id={terminatedReasonField.name} />
-            </>
-          }
-        />
-        <ModalFooter
-          footerItems={
-            <>
-              <Button type="submit" loading={isSubmitting} disabled={isSubmitting} className="mx-4" fullWidth>
-                Yes, Uninstall
-              </Button>
-              <Button
-                type="button"
-                variant="danger"
-                disabled={isSubmitting}
-                onClick={afterClose}
-                className="mx-4"
-                fullWidth
-              >
-                Cancel
-              </Button>
-            </>
-          }
-        />
-      </Form>
-    </Formik>
-  )
-}
-
-export default ConfirmUninstall
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/form-fields.ts b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/form-fields.ts
deleted file mode 100644
index 78fec99aef..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/form-fields.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FormFieldInfo } from '@reapit/elements'
-type Field = 'terminatedReasonField'
-
-const formFields: Record<Field, FormFieldInfo> = {
-  terminatedReasonField: {
-    name: 'terminatedReason',
-  },
-}
-
-export default formFields
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/validation-schema.ts b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/validation-schema.ts
deleted file mode 100644
index 91b954c02b..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/form-schema/validation-schema.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import * as Yup from 'yup'
-import formFields from './form-fields'
-import errorMessages from '@/constants/error-messages'
-
-const { FIELD_REQUIRED, MINIMUM_CHARACTER_LENGTH } = errorMessages
-
-const { terminatedReasonField } = formFields
-
-const confirmUninstallValidationSchema = Yup.object().shape({
-  [terminatedReasonField.name]: Yup.string()
-    .trim()
-    .required(FIELD_REQUIRED)
-    .min(10, MINIMUM_CHARACTER_LENGTH(10)),
-})
-
-export default confirmUninstallValidationSchema
diff --git a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/index.ts b/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/index.ts
deleted file mode 100644
index 23b89562de..0000000000
--- a/packages/admin-portal/src/components/ui/app-installations/confirm-uninstall/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import ConfirmUninstall from './confirm-uninstall'
-export default ConfirmUninstall
diff --git a/packages/admin-portal/src/components/ui/app-revision-comparison/app-revision-comparison.tsx b/packages/admin-portal/src/components/ui/app-revision-comparison/app-revision-comparison.tsx
index 788c3bacf9..dbbdca4874 100644
--- a/packages/admin-portal/src/components/ui/app-revision-comparison/app-revision-comparison.tsx
+++ b/packages/admin-portal/src/components/ui/app-revision-comparison/app-revision-comparison.tsx
@@ -1,14 +1,13 @@
 import * as React from 'react'
-import { AppDetailState } from '@/reducers/app-detail'
+import { AppDetailState, DeveloperAppDetailState } from '@/reducers/app-detail'
 import { RevisionDetailState } from '@/reducers/revision-detail'
 import { AppRevisionModel, MediaModel, ScopeModel } from '@reapit/foundations-ts-definitions'
 import DiffMedia from '@/components/ui/diff-media'
 import { AppDetailModel } from '@/types/marketplace-api-schema'
-import { DesktopIntegrationTypeModel, PagedResultDesktopIntegrationTypeModel_ } from '@/actions/app-integration-types'
 import DiffCheckbox from '../diff-checkbox'
 import DiffViewer from '../diff-viewer'
 import DiffRenderHTML from '../diff-render-html'
-import { DeveloperAppDetailState } from '@/reducers/developer'
+import { DesktopIntegrationTypeModel, PagedResultDesktopIntegrationTypeModel_ } from '@/types/desktop-integration-types'
 
 export type AppRevisionComparisonProps = {
   revisionDetailState: RevisionDetailState
diff --git a/packages/admin-portal/src/constants/action-types.ts b/packages/admin-portal/src/constants/action-types.ts
index 3421c62fbd..b98c591465 100644
--- a/packages/admin-portal/src/constants/action-types.ts
+++ b/packages/admin-portal/src/constants/action-types.ts
@@ -7,23 +7,10 @@ const ActionTypes = {
   // DEVELOPER PORTAL
   DEVELOPER_FETCH_MY_IDENTITY: 'DEVELOPER_FETCH_MY_IDENTITY',
   DEVELOPER_SET_MY_IDENTITY: 'DEVELOPER_SET_MY_IDENTITY',
-  DEVELOPER_FETCH_BILLING: 'DEVELOPER_FETCH_BILLING',
-  DEVELOPER_FETCH_BILLING_SUCCESS: 'DEVELOPER_FETCH_BILLING_SUCCESS',
-  DEVELOPER_FETCH_BILLING_FAILED: 'DEVELOPER_FETCH_BILLING_FAILED',
-  DEVELOPER_FETCH_MONTHLY_BILLING: 'DEVELOPER_FETCH_MONTHLY_BILLING',
-  DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS: 'DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS',
-  DEVELOPER_FETCH_MONTHLY_BILLING_FAILED: 'DEVELOPER_FETCH_MONTHLY_BILLING_FAILED',
-  DEVELOPER_PING_WEBHOOK: 'DEVELOPER_PING_WEBHOOK',
-  DEVELOPER_SET_PING_WEBHOOK_STATUS: 'DEVELOPER_SET_PING_WEBHOOK_STATUS',
   // CLIENT PORTAL
 
   // ADMIN PORTAL
 
-  // Developer App Modal
-  SET_DEVELOPER_APP_MODAL_STATE_EDIT_DETAIL: 'SET_DEVELOPER_APP_MODAL_STATE_EDIT_DETAIL',
-  SET_DEVELOPER_APP_MODAL_STATE_VIEW_DETAIL: 'SET_DEVELOPER_APP_MODAL_STATE_VIEW_DETAIL',
-  SET_DEVELOPER_APP_MODAL_STATE_DELETE: 'SET_DEVELOPER_APP_MODAL_STATE_DELETE',
-
   // Delete
   APP_DELETE_SET_INIT_FORM_STATE: 'APP_DELETE_SET_INIT_FORM_STATE',
   APP_DELETE_REQUEST: 'APP_DELETE_REQUEST',
@@ -60,63 +47,6 @@ const ActionTypes = {
   SHOW_NOTIFICATION_MESSAGE: 'SHOW_NOTIFICATION_MESSAGE',
   HIDE_NOTIFICATION_MESSAGE: 'HIDE_NOTIFICATION_MESSAGE',
 
-  // Client actions
-  CLIENT_FETCH_APP_SUMMARY: 'CLIENT_FETCH_APP_SUMMARY',
-  CLIENT_FETCH_APP_SUMMARY_SUCCESS: 'CLIENT_FETCH_APP_SUMMARY_SUCCESS',
-  CLIENT_FETCH_APP_SUMMARY_FAILED: 'CLIENT_FETCH_APP_SUMMARY_FAILED',
-  CLIENT_CLEAR_APP_SUMMARY: 'CLIENT_CLEAR_APP_SUMMARY',
-
-  // Client App Detail
-  CLIENT_FETCH_APP_DETAIL: 'CLIENT_FETCH_APP_DETAIL',
-  CLIENT_FETCH_APP_DETAIL_FAILED: 'CLIENT_FETCH_APP_DETAIL_FAILED',
-  CLIENT_FETCH_APP_DETAIL_SUCCESS: 'CLIENT_FETCH_APP_DETAIL_SUCCESS',
-
-  // Client Web Component Config
-  CLIENT_FETCH_WEB_COMPONENT_CONFIG: 'CLIENT_FETCH_WEB_COMPONENT_CONFIG',
-  CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS: 'CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS',
-  CLIENT_UPDATE_WEB_COMPONENT_CONFIG: 'CLIENT_UPDATE_WEB_COMPONENT_CONFIG',
-  CLIENT_UPDATE_WEB_COMPONENT_CONFIG_FAILED: 'CLIENT_UPDATE_WEB_COMPONENT_CONFIG_FAILED',
-  CLIENT_FETCH_WEB_COMPONENT_CONFIG_FAILED: 'CLIENT_FETCH_WEB_COMPONENT_CONFIG_FAILED',
-  //
-  CLIENT_FETCH_NEGOTIATORS_SUCCESS: 'CLIENT_FETCH_NEGOTIATORS_SUCCESS',
-
-  // Installed apps actions
-  INSTALLED_APPS_REQUEST_DATA: 'INSTALLED_APPS_REQUEST_DATA',
-  INSTALLED_APPS_LOADING: 'INSTALLED_APPS_LOADING',
-  INSTALLED_APPS_REQUEST_DATA_FAILURE: 'INSTALLED_APPS_REQUEST_DATA_FAILURE',
-  INSTALLED_APPS_RECEIVE_DATA: 'INSTALLED_APPS_RECEIVE_DATA',
-  INSTALLED_APPS_CLEAR_DATA: 'INSTALLED_APPS_CLEAR_DATA',
-
-  // app statistics actions
-  APP_USAGE_STATS_REQUEST_DATA: 'APP_USAGE_STATS_REQUEST_DATA',
-  APP_USAGE_STATS_LOADING: 'APP_USAGE_STATS_LOADING',
-  APP_USAGE_STATS_REQUEST_DATA_FAILURE: 'APP_USAGE_STATS_REQUEST_DATA_FAILURE',
-  APP_USAGE_STATS_RECEIVE_DATA: 'APP_USAGE_STATS_RECEIVE_DATA',
-  APP_USAGE_STATS_CLEAR_DATA: 'APP_USAGE_STATS_CLEAR_DATA',
-
-  // My apps actions
-  MY_APPS_REQUEST_DATA: 'MY_APPS_REQUEST_DATA',
-  MY_APPS_LOADING: 'MY_APPS_LOADING',
-  MY_APPS_REQUEST_DATA_FAILURE: 'MY_APPS_REQUEST_DATA_FAILURE',
-  MY_APPS_RECEIVE_DATA: 'MY_APPS_RECEIVE_DATA',
-  MY_APPS_CLEAR_DATA: 'MY_APPS_CLEAR_DATA',
-
-  // Developer actions
-  DEVELOPER_REQUEST_DATA: 'DEVELOPER_REQUEST_DATA',
-  DEVELOPER_REQUEST_DATA_FAILURE: 'DEVELOPER_REQUEST_DATA_FAILURE',
-  DEVELOPER_LOADING: 'DEVELOPER_LOADING',
-  DEVELOPER_RECEIVE_DATA: 'DEVELOPER_RECEIVE_DATA',
-  DEVELOPER_CLEAR_DATA: 'DEVELOPER_CLEAR_DATA',
-  DEVELOPER_CREATE: 'DEVELOPER_CREATE',
-  DEVELOPER_SET_FORM_STATE: 'DEVELOPER_SET_FORM_STATE',
-  DEVELOPER_SHOW_MODAL: 'DEVELOPER_SHOW_MODAL',
-
-  // Client App Detail
-  DEVELOPER_FETCH_APP_DETAIL: 'DEVELOPER_FETCH_APP_DETAIL',
-  DEVELOPER_FETCH_APP_DETAIL_FAILED: 'DEVELOPER_FETCH_APP_DETAIL_FAILED',
-  DEVELOPER_FETCH_APP_DETAIL_SUCCESS: 'DEVELOPER_FETCH_APP_DETAIL_SUCCESS',
-  DEVELOPER_APPLY_APP_DETAIL: 'DEVELOPER_APPLY_APP_DETAIL',
-
   // App Detail actions
   APP_DETAIL_REQUEST_DATA: 'APP_DETAIL_REQUEST_DATA',
   APP_DETAIL_LOADING: 'APP_DETAIL_LOADING',
@@ -138,17 +68,6 @@ const ActionTypes = {
   ADMIN_APPS_REQUEST_FEATURED: 'ADMIN_APPS_REQUEST_FEATURED',
   ADMIN_APPS_SET_FORM_STATE: 'ADMIN_APPS_SET_FORM_STATE',
 
-  // submit app actions
-  DEVELOPER_SUBMIT_APP: 'DEVELOPER_SUBMIT_APP',
-  DEVELOPER_SUBMIT_APP_SET_FORM_STATE: 'DEVELOPER_SUBMIT_APP_SET_FORM_STATE',
-  DEVELOPER_SUBMIT_APP_LOADING: 'DEVELOPER_SUBMIT_APP_LOADING',
-  DEVELOPER_SUBMIT_APP_REQUEST_DATA: 'DEVELOPER_SUBMIT_APP_REQUEST_DATA',
-  DEVELOPER_SUBMIT_APP_RECEIVE_DATA: 'DEVELOPER_SUBMIT_APP_RECEIVE_DATA',
-
-  // submit revision acions
-  DEVELOPER_SUBMIT_REVISION: 'DEVELOPER_SUBMIT_REVISION',
-  DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE: 'DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE',
-
   // Admin Approvals actions
   ADMIN_APPROVALS_REQUEST_DATA: 'ADMIN_APPROVALS_REQUEST_DATA',
   ADMIN_APPROVALS_REQUEST_FAILURE: 'ADMIN_APPROVALS_REQUEST_FAILURE',
@@ -188,84 +107,10 @@ const ActionTypes = {
   REVISIONS_REQUEST_DATA_FAILURE: 'REVISIONS_REQUEST_DATA_FAILURE',
   REVISIONS_CLEAR_DATA: 'REVISIONS_CLEAR_DATA',
 
-  // App detail modal
-  SET_APP_DETAIL_MODAL_STATE_BROWSE: 'SET_APP_DETAIL_MODAL_STATE_BROWSE',
-  SET_APP_DETAIL_MODAL_STATE_MANAGE: 'SET_APP_DETAIL_MODAL_STATE_MANAGE',
-  SET_APP_DETAIL_MODAL_STATE_INSTALL: 'SET_APP_DETAIL_MODAL_STATE_INSTALL',
-  SET_APP_DETAIL_MODAL_STATE_UNINSTALL: 'SET_APP_DETAIL_MODAL_STATE_UNINSTALL',
-  SET_APP_DETAIL_MODAL_STATE_SUCCESS: 'SET_APP_DETAIL_MODAL_STATE_SUCCESS',
-
-  // categories
-  CATEGORIES_RECEIVE_DATA: 'CATEGORIES_RECEIVE_DATA',
-
-  FORGOT_PASSWORD_SUBMIT_EMAIL: 'FORGOT_PASSWORD_SUBMIT_EMAIL',
-  FORGOT_PASSWORD_LOADING: 'FORGOT_PASSWORD_LOADING',
-
-  // setings
-  SETTING_FETCH_DEVELOPER_INFO: 'SETTING_FETCH_DEVELOPER_INFO',
-  SETTING_FETCH_DEVELOPER_INFO_SUCCESS: 'SETTING_FETCH_DEVELOPER_INFO_SUCCESS',
-  SETTING_SHOW_HIDE_LOADING: 'SETTING_SHOW_HIDE_LOADING',
-  SETTING_UPDATE_DEVELOPER: 'SETTING_UPDATE_DEVELOPER',
-  CHANGE_PASSWORD: 'CHANGE_PASSWORD',
-
-  // reset password page
-  RESET_PASSWORD_LOADING: 'RESET_PASSWORD_LOADING',
-  RESET_PASSWORD: 'RESET_PASSWORD',
-
-  // Installations
-  APP_INSTALLATIONS_REQUEST_DATA: 'APP_INSTALLATIONS_REQUEST_DATA',
-  APP_INSTALLATIONS_RECEIVE_DATA: 'APP_INSTALLATIONS_RECEIVE_DATA',
-  APP_INSTALLATIONS_REQUEST_DATA_FAILURE: 'APP_INSTALLATIONS_REQUEST_DATA_FAILURE',
-  APP_INSTALLATIONS_FILTER_REQUEST_DATA: 'APP_INSTALLATIONS_FILTER_REQUEST_DATA',
-  APP_INSTALLATIONS_FILTER_RECEIVE_DATA: 'APP_INSTALLATIONS_FILTER_RECEIVE_DATA',
-  APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE: 'APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE',
-
-  APP_INSTALLATIONS_REQUEST_INSTALL: 'APP_INSTALLATIONS_REQUEST_INSTALL',
-  APP_INSTALLATIONS_REQUEST_UNINSTALL: 'APP_INSTALLATIONS_REQUEST_UNINSTALL',
-  APP_INSTALLATIONS_SET_FORM_STATE: 'APP_INSTALLATIONS_SET_FORM_STATE',
-
   // Admin stats
   ADMIN_STATS_REQUEST_DATA: 'ADMIN_STATS_REQUEST_DATA',
   ADMIN_STATS_RECEIVE_DATA: 'ADMIN_STATS_RECEIVE_DATA',
   ADMIN_STATS_REQUEST_DATA_FAILURE: 'ADMIN_STATS_REQUEST_DATA_FAILURE',
-
-  // HttpTrafficEvent
-  HTTP_TRAFFIC_PER_DAY_REQUEST_DATA: 'HTTP_TRAFFIC_PER_DAY_REQUEST_DATA',
-  HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA: 'HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA',
-  HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE: 'HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE',
-
-  // integration types
-  INTEGRATION_TYPES_RECEIVE_DATA: 'INTEGRATION_TYPES_RECEIVE_DATA',
-
-  //developer webhook
-  WEBHOOK_EDIT_LOADING: 'WEBHOOK_EDIT_LOADING',
-  WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA: 'WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA',
-  WEBHOOK_EDIT_SUBCRIPTION_RECEIVE_DATA: 'WEBHOOK_EDIT_SUBCRIPTION_RECEIVE_DATA',
-  WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA_FAILURE: 'WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA_FAILURE',
-  WEBHOOK_CREATE: 'WEBHOOK_CREATE',
-  WEBHOOK_EDIT: 'WEBHOOK_EDIT',
-  WEBHOOK_DELETE: 'WEBHOOK_DELETE',
-  WEBHOOK_REQUEST_DATA: 'WEBHOOK_REQUEST_DATA',
-  WEBHOOK_RECEIVE_DATA: 'WEBHOOK_RECEIVE_DATA',
-  WEBHOOK_RECEIVE_DATA_FAILURE: 'WEBHOOK_RECEIVE_DATA_FAILURE',
-  WEBHOOK_DATA_CLEAR: 'WEBHOOK_DATA_CLEAR',
-  WEBHOOK_SET_OPEN_MODAL: 'WEBHOOK_SET_OPEN_MODAL',
-
-  // webhook subscriptions
-  WEBHOOK_SUBSCRIPTION_REQUEST_DATA: 'WEBHOOK_SUBSCRIPTION_REQUEST_DATA',
-  WEBHOOK_SUBSCRIPTION_RECEIVE_DATA: 'WEBHOOK_SUBSCRIPTION_RECEIVE_DATA',
-  WEBHOOK_TOPICS_REQUEST_DATA: 'WEBHOOK_TOPICS_REQUEST_DATA',
-  WEBHOOK_TOPICS_RECEIVE_DATA: 'WEBHOOK_TOPICS_RECEIVE_DATA',
-  WEBHOOK_SET_APPLICATION_ID: 'WEBHOOK_SET_APPLICATION_ID',
-
-  // Developer Subscriptions
-  DEVELOPER_FETCH_SUBSCRIPTIONS: 'DEVELOPER_FETCH_SUBSCRIPTIONS',
-  DEVELOPER_FETCH_SUBSCRIPTIONS_SUCCESS: 'DEVELOPER_FETCH_SUBSCRIPTIONS_SUCCESS',
-  DEVELOPER_DELETE_SUBSCRIPTION: 'DEVELOPER_DELETE_SUBSCRIPTION',
-  DEVELOPER_SUBSCRIPTION_CREATE: 'DEVELOPER_SUBSCRIPTION_CREATE',
-  DEVELOPER_SUBSCRIPTION_CREATE_SUCCESS: 'DEVELOPER_SUBSCRIPTION_SUCCESS',
-  DEVELOPER_SUBSCRIPTION_CREATE_FAILURE: 'DEVELOPER_SUBSCRIPTION_FAILURE',
-  DEVELOPER_SUBSCRIPTION_CLEAR_CREATE_ERROR: 'DEVELOPER_SUBSCRIPTION_CLEAR_CREATE_ERROR',
 }
 
 export default ActionTypes
diff --git a/packages/admin-portal/src/core/store.ts b/packages/admin-portal/src/core/store.ts
index a3bf0f77ac..c953b1aeaf 100644
--- a/packages/admin-portal/src/core/store.ts
+++ b/packages/admin-portal/src/core/store.ts
@@ -3,60 +3,29 @@ import createSagaMiddleware from 'redux-saga'
 import { fork, all } from '@redux-saga/core/effects'
 import { ReduxState } from '../types/core'
 import auth from '@/reducers/auth'
-import client from '@/reducers/client'
-import installedApps from '@/reducers/installed-apps'
-import myApps from '@/reducers/my-apps'
-import developer from '@/reducers/developer'
 import appDetail from '@/reducers/app-detail'
 import error from '@/reducers/error'
-import submitApp from '@/reducers/submit-app'
-import submitRevision from '@/reducers/submit-revision'
 import adminApprovals from '@/reducers/admin-approvals'
 import adminDevManagement from '@/reducers/admin-dev-management'
 import developerSetStatus from '@/reducers/developer-set-status'
 import revisionDetail from '@/reducers/revision-detail'
-import appDetailModal from '@/reducers/app-detail-modal'
 import appDeleteReducer from '@/reducers/app-delete'
-import appCategories from '@/reducers/app-categories'
-import settingsReducer from '@/reducers/settings'
 import adminApps from '@/reducers/admin-apps'
-import appInstallationsReducer from '@/reducers/app-installations'
-import appUsageStatsReducer from '@/reducers/app-usage-stats'
 import adminStatsReducer from '@/reducers/admin-stats'
 import revisionsReducer from '@/reducers/revisions'
-import appHttpTrafficEventReducer from '@/reducers/app-http-traffic-event'
-import integrationTypes from '@/reducers/app-integration-types'
-import webhookEditReducer from '../reducers/webhook-edit-modal'
-import webhookSubscriptions from '@/reducers/webhook-subscriptions'
-import developerSubscriptions from '@/reducers/developer-subscriptions'
 
 import authSagas from '@/sagas/auth'
-import appsSaga from '@/sagas/apps/apps'
-import clientSagas from '@/sagas/client'
 import appDetailSagas from '@/sagas/app-detail'
-import installedAppsSagas from '@/sagas/installed-apps'
-import appUsageStatsSagas from '@/sagas/app-usage-stats'
-import appHttpTrafficEventSagas from '@/sagas/app-http-trafic-event'
-import myAppsSagas from '@/sagas/my-apps'
-import developerSagas from '@/sagas/developer'
-// import submitAppSagas from '@/sagas/submit-app'
-import submitRevisionSagas from '@/sagas/submit-revision'
 import adminApprovalSagas from '@/sagas/admin-approvals'
 import adminDevManagementSagas from '@/sagas/admin-dev-management'
 import developerSetStatusSagas from '@/sagas/developer-set-status'
 import revisionDetailSagas from '@/sagas/revision-detail'
 import revisionsSagas from '@/sagas/revisions'
 import appDeleteSagas from '@/sagas/app-delete'
-import settingSagas from '@/sagas/settings'
 import adminAppsSagas from '@/sagas/admin-apps'
-import appInstallationsSagas from '@/sagas/app-installations'
 import noticationMessage from '@/reducers/notification-message'
 import adminStatsSaga from '@/sagas/admin-stats'
-import webhookSubscriptionsSagas from '@/sagas/webhook-subscriptions'
 import { injectSwitchModeToWindow } from '@reapit/elements'
-import webhookEditSagas from '../sagas/webhook-edit-modal'
-import webComponentSagas from '../sagas/web-component'
-import developerSubscriptionsSagas from '../sagas/developer-subscriptions'
 
 export class Store {
   static _instance: Store
@@ -74,63 +43,32 @@ export class Store {
   static sagaMiddleware = createSagaMiddleware()
 
   static reducers = combineReducers<ReduxState>({
-    client,
-    installedApps,
-    myApps,
-    developer,
     auth,
     appDetail,
     error,
-    submitApp,
-    submitRevision,
     adminApps,
     adminApprovals,
     adminDevManagement,
     developerSetStatus,
     revisionDetail,
     revisions: revisionsReducer,
-    appDetailModal,
     appDelete: appDeleteReducer,
-    appCategories,
-    settings: settingsReducer,
-    installations: appInstallationsReducer,
-    appUsageStats: appUsageStatsReducer,
     noticationMessage,
     adminStats: adminStatsReducer,
-    appHttpTraffic: appHttpTrafficEventReducer,
-    desktopIntegrationTypes: integrationTypes,
-    webhookEdit: webhookEditReducer,
-    webhooks: webhookSubscriptions,
-    developerSubscriptions,
   })
 
   static sagas = function*() {
     yield all([
       fork(authSagas),
-      fork(appsSaga),
-      fork(clientSagas),
-      fork(installedAppsSagas),
-      fork(appUsageStatsSagas),
-      fork(myAppsSagas),
-      fork(developerSagas),
       fork(appDetailSagas),
-      // fork(submitAppSagas),
-      fork(submitRevisionSagas),
       fork(adminApprovalSagas),
       fork(adminDevManagementSagas),
       fork(developerSetStatusSagas),
       fork(revisionDetailSagas),
       fork(revisionsSagas),
       fork(appDeleteSagas),
-      fork(settingSagas),
       fork(adminAppsSagas),
-      fork(appInstallationsSagas),
       fork(adminStatsSaga),
-      fork(appHttpTrafficEventSagas),
-      fork(webhookEditSagas),
-      fork(webhookSubscriptionsSagas),
-      fork(webComponentSagas),
-      fork(developerSubscriptionsSagas),
     ])
   }
 
diff --git a/packages/admin-portal/src/reducers/__stubs__/app-state.ts b/packages/admin-portal/src/reducers/__stubs__/app-state.ts
index e7db7836a8..89fa20c6f2 100644
--- a/packages/admin-portal/src/reducers/__stubs__/app-state.ts
+++ b/packages/admin-portal/src/reducers/__stubs__/app-state.ts
@@ -2,51 +2,6 @@ import { ReduxState } from '@/types/core'
 import { COGNITO_GROUP_DEVELOPER_EDITION } from '@/constants/api'
 
 const appState: ReduxState = {
-  client: {
-    appSummary: {
-      isAppSummaryLoading: false,
-      data: null,
-      error: null,
-    },
-    appDetail: {
-      error: null,
-      data: null,
-      isAppDetailLoading: false,
-    },
-    webComponent: {
-      isShowModal: false,
-      data: null,
-      updating: false,
-      loading: false,
-      negotiators: null,
-    },
-  },
-  installedApps: {
-    loading: false,
-    installedAppsData: null,
-  },
-  myApps: {
-    loading: false,
-    myAppsData: null,
-  },
-  developer: {
-    loading: false,
-    developerAppDetail: {
-      error: null,
-      data: null,
-      isAppDetailLoading: false,
-    },
-    developerData: null,
-    formState: 'PENDING',
-    isVisible: false,
-    myIdentity: null,
-    billing: null,
-    isServiceChartLoading: true,
-    error: null,
-    isMonthlyBillingLoading: true,
-    monthlyBilling: null,
-    webhookPingTestStatus: null,
-  },
   auth: {
     error: false,
     loginSession: {
@@ -97,14 +52,6 @@ const appState: ReduxState = {
     componentError: null,
     serverError: null,
   },
-  submitApp: {
-    loading: false,
-    formState: 'PENDING',
-    submitAppData: null,
-  },
-  submitRevision: {
-    formState: 'PENDING',
-  },
   adminApps: {
     loading: false,
     formState: 'PENDING',
@@ -131,32 +78,9 @@ const appState: ReduxState = {
     loading: false,
     revisions: null,
   },
-  appDetailModal: 'VIEW_DETAIL_BROWSE',
   appDelete: {
     formState: 'PENDING',
   },
-  appCategories: {
-    data: [],
-    pageNumber: 1,
-    pageSize: 12,
-    pageCount: 1,
-    totalCount: 0,
-  },
-  settings: {
-    loading: true,
-    developerInfomation: null,
-  },
-  installations: {
-    formState: 'PENDING',
-    loading: false,
-    loadingFilter: false,
-    installationsAppData: null,
-    installationsFilteredAppData: null,
-  },
-  appUsageStats: {
-    loading: false,
-    appUsageStatsData: null,
-  },
   noticationMessage: {
     visible: false,
     variant: '',
@@ -169,73 +93,6 @@ const appState: ReduxState = {
       totalCount: 0,
     },
   },
-  appHttpTraffic: {
-    perDayLoading: false,
-    trafficEvents: null,
-  },
-  desktopIntegrationTypes: {
-    data: [],
-    pageNumber: 0,
-    pageSize: 0,
-    pageCount: 0,
-    totalCount: 0,
-  },
-  webhookEdit: {
-    loading: false,
-    modalType: '',
-    subcriptionCustomers: {
-      data: [],
-      pageNumber: 0,
-      pageSize: 0,
-      pageCount: 0,
-      totalCount: 0,
-    },
-    subcriptionTopics: {
-      _embedded: [],
-      pageNumber: 0,
-      pageSize: 0,
-      pageCount: 0,
-      totalCount: 0,
-    },
-    webhookData: {
-      id: '',
-      applicationId: '',
-      url: '',
-      description: '',
-      topicIds: [],
-      customerIds: [],
-      active: false,
-    },
-  },
-  webhooks: {
-    subscriptions: {
-      loading: false,
-      error: false,
-      subscriptions: {
-        _embedded: [],
-      },
-    },
-    topics: {
-      applicationId: '',
-      loading: false,
-      error: false,
-      topics: {
-        _embedded: [],
-      },
-    },
-  },
-  developerSubscriptions: {
-    create: {
-      loading: false,
-      error: false,
-    },
-    list: {
-      loading: false,
-      data: {
-        data: [],
-      },
-    },
-  },
 }
 
 export default appState
diff --git a/packages/admin-portal/src/reducers/__tests__/app-categories.ts b/packages/admin-portal/src/reducers/__tests__/app-categories.ts
deleted file mode 100644
index acdaa3c86c..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-categories.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import appCaregoriesReducer, { defaultState } from '../app-categories'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { appCategorieStub } from '../../sagas/__stubs__/app-categories'
-
-describe('appCategories reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appCaregoriesReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set state to test when CATEGORIES_RECEIVE_DATA action is called with test', () => {
-    const newState = appCaregoriesReducer(undefined, {
-      type: ActionTypes.CATEGORIES_RECEIVE_DATA as ActionType,
-      data: appCategorieStub,
-    })
-    const expected = {
-      ...defaultState,
-      ...appCategorieStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/app-detail-modal.ts b/packages/admin-portal/src/reducers/__tests__/app-detail-modal.ts
deleted file mode 100644
index 98ac218b26..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-detail-modal.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import appDetailModalReducer, { defaultState } from '../app-detail-modal'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { appDetailDataStub } from '../../sagas/__stubs__/app-detail'
-
-describe('app-detail modal reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appDetailModalReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when SET_APP_DETAIL_MODAL_STATE_BROWSE action is called', () => {
-    const newState = appDetailModalReducer(undefined, {
-      type: ActionTypes.SET_APP_DETAIL_MODAL_STATE_BROWSE as ActionType,
-      data: true,
-    })
-    const expected = 'VIEW_DETAIL_BROWSE'
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set app-detail item data when SET_APP_DETAIL_MODAL_STATE_INSTALL action is called', () => {
-    const newState = appDetailModalReducer(undefined, {
-      type: ActionTypes.SET_APP_DETAIL_MODAL_STATE_INSTALL as ActionType,
-      data: appDetailDataStub,
-    })
-    const expected = 'VIEW_CONFIRM_INSTALL'
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set app-detail item data when SET_APP_DETAIL_MODAL_STATE_SUCCESS action is called', () => {
-    const newState = appDetailModalReducer(undefined, {
-      type: ActionTypes.SET_APP_DETAIL_MODAL_STATE_SUCCESS as ActionType,
-      data: true,
-    })
-    const expected = 'VIEW_DETAIL_ACTION_SUCCESS'
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/app-http-traffic-event.ts b/packages/admin-portal/src/reducers/__tests__/app-http-traffic-event.ts
deleted file mode 100644
index ec7705777a..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-http-traffic-event.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import appHttpTrafficEventReducer, { defaultState } from '../app-http-traffic-event'
-import { ActionType } from '@/types/core'
-import ActionTypes from '@/constants/action-types'
-import { httpTrafficPerDayStub } from '@/sagas/__stubs__/app-http-traffic-event'
-
-describe('app-http-traffic-event reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appHttpTrafficEventReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should return loading true when HTTP_TRAFFIC_PER_DAY_REQUEST_DATA action is called', () => {
-    const newState = appHttpTrafficEventReducer(defaultState, {
-      type: ActionTypes.HTTP_TRAFFIC_PER_DAY_REQUEST_DATA as ActionType,
-      data: {
-        applicationId: ['4fbbb1e8-bad0-43a2-98f9-bfb9bba366e7'],
-        dateFrom: '2020-02-17',
-        dateTo: '2020-04-05',
-      },
-    })
-    const expected = {
-      ...defaultState,
-      perDayLoading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return installationsAppData when HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA action is called', () => {
-    const newState = appHttpTrafficEventReducer(defaultState, {
-      type: ActionTypes.HTTP_TRAFFIC_PER_DAY_RECEIVE_DATA as ActionType,
-      data: httpTrafficPerDayStub,
-    })
-    const expected = {
-      ...defaultState,
-      perDayLoading: false,
-      trafficEvents: httpTrafficPerDayStub,
-      // appHttpTrafficPerDay: httpTrafficPerDayStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return loading false when HTTP_TRAFFIC_PER_DAY_REQUEST_DATA_FAILURE action is called', () => {
-    const newState = appHttpTrafficEventReducer(defaultState, {
-      type: ActionTypes.HTTP_TRAFFIC_PER_DAY_REQUEST_FAILURE as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      perDayLoading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/app-installations.ts b/packages/admin-portal/src/reducers/__tests__/app-installations.ts
deleted file mode 100644
index becada89d2..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-installations.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import appInstallationsReducer, { defaultState } from '../app-installations'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { installationStub } from '@/sagas/__stubs__/installation'
-
-describe('app-installations reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appInstallationsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should return loading true when APP_INSTALLATIONS_REQUEST_DATA action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_REQUEST_DATA as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return installationsAppData when APP_INSTALLATIONS_RECEIVE_DATA action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_RECEIVE_DATA as ActionType,
-      data: installationStub,
-    })
-    const expected = {
-      ...defaultState,
-      installationsAppData: installationStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return loading false when APP_INSTALLATIONS_REQUEST_DATA_FAILURE action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_REQUEST_DATA_FAILURE as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      loading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  '  -------------------------------------------------'
-
-  it('should return loading true when APP_INSTALLATIONS_FILTER_REQUEST_DATA action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      loadingFilter: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return installationsAppData when APP_INSTALLATIONS_FILTER_RECEIVE_DATA action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_FILTER_RECEIVE_DATA as ActionType,
-      data: installationStub,
-    })
-    const expected = {
-      ...defaultState,
-      installationsFilteredAppData: installationStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return loading false when APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA_FAILURE as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      loadingFilter: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  '  -------------------------------------------------'
-
-  it('should return formState when APP_INSTALLATIONS_SET_FORM_STATEL action is called', () => {
-    const newState = appInstallationsReducer(defaultState, {
-      type: ActionTypes.APP_INSTALLATIONS_SET_FORM_STATE as ActionType,
-      data: 'SUCCESS',
-    })
-    const expected = {
-      ...defaultState,
-      formState: 'SUCCESS',
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/app-integration-types.ts b/packages/admin-portal/src/reducers/__tests__/app-integration-types.ts
deleted file mode 100644
index fff99ecbb0..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-integration-types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import integrationTypesReducer, { defaultState } from '../app-integration-types'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { integrationTypesStub } from '@/sagas/__stubs__/integration-types'
-
-describe('integrationTypes reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = integrationTypesReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set state to test when INTEGRATION_TYPES_RECEIVE_DATA action is called with test', () => {
-    const newState = integrationTypesReducer(undefined, {
-      type: ActionTypes.INTEGRATION_TYPES_RECEIVE_DATA as ActionType,
-      data: integrationTypesStub,
-    })
-    const expected = {
-      ...defaultState,
-      ...integrationTypesStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/app-usage-stats.ts b/packages/admin-portal/src/reducers/__tests__/app-usage-stats.ts
deleted file mode 100644
index 3e1ef9b9e8..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/app-usage-stats.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import appUsageStatsReducer, { defaultState } from '../app-usage-stats'
-import { ActionType } from '@/types/core'
-import ActionTypes from '@/constants/action-types'
-import { usageStatsDataStub } from '@/sagas/__stubs__/app-usage-stats'
-
-describe('app-usage-stats reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appUsageStatsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should return loading true when APP_USAGE_STATS_REQUEST_DATA action is called', () => {
-    const newState = appUsageStatsReducer(defaultState, {
-      type: ActionTypes.APP_USAGE_STATS_REQUEST_DATA as ActionType,
-      data: { id: ['123'] },
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return installationsAppData when APP_USAGE_STATS_RECEIVE_DATA action is called', () => {
-    const newState = appUsageStatsReducer(defaultState, {
-      type: ActionTypes.APP_USAGE_STATS_RECEIVE_DATA as ActionType,
-      data: usageStatsDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      appUsageStatsData: usageStatsDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return loading false when APP_USAGE_STATS_REQUEST_DATA_FAILURE action is called', () => {
-    const newState = appUsageStatsReducer(defaultState, {
-      type: ActionTypes.APP_USAGE_STATS_REQUEST_DATA_FAILURE as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      loading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/developer.ts b/packages/admin-portal/src/reducers/__tests__/developer.ts
deleted file mode 100644
index 738ba81acc..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/developer.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import developerReducer, { defaultState } from '../developer'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-import { billing } from '@/sagas/__stubs__/billing'
-import { monthlyBillingData } from '@/sagas/__stubs__/monthly-billing'
-
-describe('developer reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = developerReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when DEVELOPER_LOADING action is called', () => {
-    const newState = developerReducer(undefined, { type: ActionTypes.DEVELOPER_LOADING as ActionType, data: true })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set developer item data when DEVELOPER_RECEIVE_DATA action is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_RECEIVE_DATA as ActionType,
-      data: appsDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      developerData: appsDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should clear developer item data when DEVELOPER_CLEAR_DATA action is called', () => {
-    const newState = developerReducer(undefined, { type: ActionTypes.DEVELOPER_CLEAR_DATA as ActionType, data: null })
-    const expected = {
-      ...defaultState,
-      developerData: null,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set formState when DEVELOPER_SET_FORM_STATE is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SET_FORM_STATE as ActionType,
-      data: 'SUCCESS',
-    })
-    const expected = {
-      ...defaultState,
-      formState: 'SUCCESS',
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set formState when DEVELOPER_SHOW_MODAL is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SHOW_MODAL as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      isVisible: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set isServiceChartLoading when call DEVELOPER_FETCH_BILLING is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_BILLING as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      isServiceChartLoading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set billing and isServiceChartLoading when call DEVELOPER_FETCH_BILLING_SUCCESS is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_BILLING_SUCCESS as ActionType,
-      data: billing,
-    })
-    const expected = {
-      ...defaultState,
-      isServiceChartLoading: false,
-      billing: billing,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set fetchBillingFailure when call DEVELOPER_FETCH_BILLING_FAILED is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_BILLING_FAILED as ActionType,
-      data: 'error',
-    })
-    const expected = {
-      ...defaultState,
-      isServiceChartLoading: false,
-      error: 'error',
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set fetchMonthlyBillingFailure when call DEVELOPER_FETCH_MONTHLY_BILLING_FAILED is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_FAILED as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      isMonthlyBillingLoading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set fetchMonthlyBilling when call DEVELOPER_FETCH_MONTHLY_BILLING is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      isMonthlyBillingLoading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-  it('should set fetchMonthlyBillingSuccess when call DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING_SUCCESS as ActionType,
-      data: monthlyBillingData,
-    })
-    const expected = {
-      ...defaultState,
-      monthlyBilling: monthlyBillingData,
-      isMonthlyBillingLoading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-  it('should set developerSetWebhookPingStatus when call DEVELOPER_SET_PING_WEBHOOK_STATUS is called', () => {
-    const newState = developerReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SET_PING_WEBHOOK_STATUS as ActionType,
-      data: 'SUCCESS',
-    })
-    const expected = {
-      ...defaultState,
-      webhookPingTestStatus: 'SUCCESS',
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/installed-apps.ts b/packages/admin-portal/src/reducers/__tests__/installed-apps.ts
deleted file mode 100644
index 605da8b12c..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/installed-apps.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import installedAppsReducer, { defaultState } from '../installed-apps'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-
-describe('installed-apps reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = installedAppsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when INSTALLED_APPS_LOADING action is called', () => {
-    const newState = installedAppsReducer(undefined, {
-      type: ActionTypes.INSTALLED_APPS_LOADING as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set installed-apps item data when INSTALLED_APPS_RECEIVE_DATA action is called', () => {
-    const newState = installedAppsReducer(undefined, {
-      type: ActionTypes.INSTALLED_APPS_RECEIVE_DATA as ActionType,
-      data: appsDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      installedAppsData: appsDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should clear installed-apps item data when INSTALLED_APPS_CLEAR_DATA action is called', () => {
-    const newState = installedAppsReducer(undefined, {
-      type: ActionTypes.INSTALLED_APPS_CLEAR_DATA as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      installedAppsData: null,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/my-apps.ts b/packages/admin-portal/src/reducers/__tests__/my-apps.ts
deleted file mode 100644
index 20ded2ceec..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/my-apps.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import myAppsReducer, { defaultState } from '../my-apps'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { appsDataStub } from '../../sagas/__stubs__/apps'
-
-describe('my-apps reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = myAppsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when MY_APPS_LOADING action is called', () => {
-    const newState = myAppsReducer(undefined, { type: ActionTypes.MY_APPS_LOADING as ActionType, data: true })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set my-apps item data when MY_APPS_RECEIVE_DATA action is called', () => {
-    const newState = myAppsReducer(undefined, {
-      type: ActionTypes.MY_APPS_RECEIVE_DATA as ActionType,
-      data: appsDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      myAppsData: appsDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should clear my-apps item data when MY_APPS_CLEAR_DATA action is called', () => {
-    const newState = myAppsReducer(undefined, { type: ActionTypes.MY_APPS_CLEAR_DATA as ActionType, data: null })
-    const expected = {
-      ...defaultState,
-      myAppsData: null,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/revision-detail.ts b/packages/admin-portal/src/reducers/__tests__/revision-detail.ts
index 6a3cfbb4fd..7705255f82 100644
--- a/packages/admin-portal/src/reducers/__tests__/revision-detail.ts
+++ b/packages/admin-portal/src/reducers/__tests__/revision-detail.ts
@@ -58,36 +58,4 @@ describe('revision-detail reducer', () => {
     }
     expect(newState).toEqual(expected)
   })
-
-  it(
-    'should set approveFormState to SUBMITTING when DEVELOPER_SUBMIT_APP)' +
-      'SET_FORM_STATE action is called with SUBMITTING',
-    () => {
-      const newState = revisionDetailReducer(undefined, {
-        type: ActionTypes.REVISION_APPROVE_SET_FORM_STATE as ActionType,
-        data: 'SUBMITTING',
-      })
-      const expected = {
-        ...defaultState,
-        approveFormState: 'SUBMITTING',
-      }
-      expect(newState).toEqual(expected)
-    },
-  )
-
-  it(
-    'should set declineFormState to SUBMITTING when DEVELOPER_SUBMIT_APP)' +
-      'SET_FORM_STATE action is called with SUBMITTING',
-    () => {
-      const newState = revisionDetailReducer(undefined, {
-        type: ActionTypes.REVISION_DECLINE_SET_FORM_STATE as ActionType,
-        data: 'SUBMITTING',
-      })
-      const expected = {
-        ...defaultState,
-        declineFormState: 'SUBMITTING',
-      }
-      expect(newState).toEqual(expected)
-    },
-  )
 })
diff --git a/packages/admin-portal/src/reducers/__tests__/settings.ts b/packages/admin-portal/src/reducers/__tests__/settings.ts
deleted file mode 100644
index 21b688a5be..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/settings.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import settingReducer, { defaultState } from '../settings'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { developerStub } from '@/sagas/__stubs__/developer'
-
-describe('submitApp reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = settingReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set formState to test when SETTING_SHOW_HIDE_LOADING action is called with test', () => {
-    const newState = settingReducer(undefined, {
-      type: ActionTypes.SETTING_SHOW_HIDE_LOADING as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set loading to test when SETTING_FETCH_DEVELOPER_INFO_SUCCESS action is called with true', () => {
-    const newState = settingReducer(undefined, {
-      type: ActionTypes.SETTING_FETCH_DEVELOPER_INFO_SUCCESS as ActionType,
-      data: developerStub,
-    })
-    const expected = {
-      ...defaultState,
-      developerInfomation: developerStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/submit-app.ts b/packages/admin-portal/src/reducers/__tests__/submit-app.ts
deleted file mode 100644
index ef8cbe8bf1..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/submit-app.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import submitReducer, { defaultState } from '../submit-app'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-
-describe('submitApp reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = submitReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set formState to test when DEVELOPER_SUBMIT_APP_SET_FORM_STATE action is called with test', () => {
-    const newState = submitReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SUBMIT_APP_SET_FORM_STATE as ActionType,
-      data: 'test',
-    })
-    const expected = {
-      ...defaultState,
-      formState: 'test',
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set loading to test when DEVELOPER_SUBMIT_APP_LOADING action is called with true', () => {
-    const newState = submitReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SUBMIT_APP_LOADING as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set submitAppData to test when DEVELOPER_SUBMIT_APP_RECEIVE_DATA action is called with scopes', () => {
-    const newState = submitReducer(undefined, {
-      type: ActionTypes.DEVELOPER_SUBMIT_APP_RECEIVE_DATA as ActionType,
-      data: [{ name: 'mockName', description: 'mockDescription' }],
-    })
-    const expected = {
-      ...defaultState,
-      submitAppData: {
-        scopes: [{ name: 'mockName', description: 'mockDescription' }],
-      },
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/submit-revision.ts b/packages/admin-portal/src/reducers/__tests__/submit-revision.ts
deleted file mode 100644
index 9e1d11b56b..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/submit-revision.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import submitRevisionReducer, { defaultState } from '../submit-revision'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-
-describe('submitRevision reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = submitRevisionReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it(
-    'should set formState to SUBMITTING when DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE' +
-      'action is called with SUBMITTING',
-    () => {
-      const newState = submitRevisionReducer(undefined, {
-        type: ActionTypes.DEVELOPER_SUBMIT_REVISION_SET_FORM_STATE as ActionType,
-        data: 'SUBMITTING',
-      })
-      const expected = {
-        ...defaultState,
-        formState: 'SUBMITTING',
-      }
-      expect(newState).toEqual(expected)
-    },
-  )
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/webhook-edit-modal.ts b/packages/admin-portal/src/reducers/__tests__/webhook-edit-modal.ts
deleted file mode 100644
index 2c9fb2613b..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/webhook-edit-modal.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import DeveloperWebhookReducer, { defaultState } from '../webhook-edit-modal'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { webhookDataStub, webhookItemDataStub } from '@/sagas/__stubs__/webhook-edit'
-
-describe('developer webhook reducer', () => {
-  it('should return default state', () => {
-    const newState = DeveloperWebhookReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should return default state', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_DATA_CLEAR as ActionType,
-      data: undefined,
-    })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should return new state when reveice data', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_RECEIVE_DATA as ActionType,
-      data: webhookDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      ...webhookDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set loading to test when WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA_FAILURE action is called with true', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA_FAILURE as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-  it('should return new state when reveice webhook item data', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_RECEIVE_DATA as ActionType,
-      data: webhookItemDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      webhookData: webhookItemDataStub,
-      loading: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return loading requestWebhookSubcriptionData, requestWebhookData', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should return new state webhookSetOpenModal', () => {
-    const newState = DeveloperWebhookReducer(undefined, {
-      type: ActionTypes.WEBHOOK_SET_OPEN_MODAL as ActionType,
-      data: 'TEST',
-    })
-    const expected = {
-      ...defaultState,
-      modalType: 'TEST',
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/__tests__/webhook-subscriptions.ts b/packages/admin-portal/src/reducers/__tests__/webhook-subscriptions.ts
deleted file mode 100644
index 4377084852..0000000000
--- a/packages/admin-portal/src/reducers/__tests__/webhook-subscriptions.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { webhookSubscriptionsReducer, webhookTopicsReducer, defaultState } from '../webhook-subscriptions'
-import { ActionType } from '../../types/core'
-import ActionTypes from '../../constants/action-types'
-import { subscriptions, topics } from '@/sagas/__stubs__/webhooks'
-
-describe('webhookReducer', () => {
-  describe('webhookSubscriptions reducer', () => {
-    it('should return default state if action not matched', () => {
-      const newState = webhookSubscriptionsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-      expect(newState).toEqual(defaultState.subscriptions)
-    })
-
-    it('should set state to test when WEBHOOK_SUBSCRIPTION_REQUEST_DATA action is called with test', () => {
-      const newState = webhookSubscriptionsReducer(undefined, {
-        type: ActionTypes.WEBHOOK_SUBSCRIPTION_REQUEST_DATA as ActionType,
-        data: {},
-      })
-
-      const expected = { error: false, loading: true, subscriptions: { _embedded: [] } }
-      expect(newState).toEqual(expected)
-    })
-
-    it('should set state to test when WEBHOOK_SUBSCRIPTION_RECEIVE_DATA action is called with test', () => {
-      const newState = webhookSubscriptionsReducer(undefined, {
-        type: ActionTypes.WEBHOOK_SUBSCRIPTION_RECEIVE_DATA as ActionType,
-        data: subscriptions,
-      })
-      const expected = { error: false, loading: false, subscriptions: subscriptions }
-      expect(newState).toEqual(expected)
-    })
-  })
-
-  describe('webhookTopicsReducer', () => {
-    it('should return default state if action not matched', () => {
-      const newState = webhookTopicsReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-      expect(newState).toEqual(defaultState.topics)
-    })
-
-    it('should set state to test when WEBHOOK_TOPICS_REQUEST_DATA action is called with test', () => {
-      const newState = webhookTopicsReducer(undefined, {
-        type: ActionTypes.WEBHOOK_TOPICS_REQUEST_DATA as ActionType,
-        data: '1',
-      })
-      const expected = { error: false, loading: true, topics: { _embedded: [] }, applicationId: '' }
-      expect(newState).toEqual(expected)
-    })
-
-    it('should set state to test when WEBHOOK_TOPICS_RECEIVE_DATA action is called with test', () => {
-      const newState = webhookTopicsReducer(undefined, {
-        type: ActionTypes.WEBHOOK_TOPICS_RECEIVE_DATA as ActionType,
-        data: topics,
-      })
-      const expected = { error: false, loading: false, topics, applicationId: '' }
-      expect(newState).toEqual(expected)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/reducers/app-categories.ts b/packages/admin-portal/src/reducers/app-categories.ts
deleted file mode 100644
index 40291d61f6..0000000000
--- a/packages/admin-portal/src/reducers/app-categories.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import { categoriesReceiveData } from '../actions/app-categories'
-import { PagedResultCategoryModel_ } from '@reapit/foundations-ts-definitions'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-
-export type AppCategoriesState = PagedResultCategoryModel_
-
-export const defaultState: AppCategoriesState = {
-  data: [],
-  pageNumber: 1,
-  pageSize: APPS_PER_PAGE,
-  pageCount: 1,
-  totalCount: 0,
-}
-
-const appCategoriesReducer = (state: AppCategoriesState = defaultState, action: Action<any>): AppCategoriesState => {
-  if (isType(action, categoriesReceiveData)) {
-    return {
-      ...state,
-      ...action.data,
-    }
-  }
-
-  return state
-}
-
-export default appCategoriesReducer
diff --git a/packages/admin-portal/src/reducers/app-detail-modal.ts b/packages/admin-portal/src/reducers/app-detail-modal.ts
deleted file mode 100644
index c89a701a86..0000000000
--- a/packages/admin-portal/src/reducers/app-detail-modal.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  setAppDetailModalStateBrowse,
-  setAppDetailModalStateInstall,
-  setAppDetailModalStateSuccess,
-  setAppDetailModalStateUninstall,
-  setAppDetailModalStateManage,
-} from '../actions/app-detail-modal'
-
-export type AppDetailModalState =
-  | 'VIEW_DETAIL_BROWSE'
-  | 'VIEW_DETAIL_MANAGE'
-  | 'VIEW_CONFIRM_INSTALL'
-  | 'VIEW_CONFIRM_UNINSTALL'
-  | 'VIEW_DETAIL_ACTION_SUCCESS'
-
-export const defaultState: AppDetailModalState = 'VIEW_DETAIL_BROWSE'
-
-const appDetailModalReducer = (state: AppDetailModalState = defaultState, action: Action<any>): AppDetailModalState => {
-  if (isType(action, setAppDetailModalStateBrowse)) {
-    return 'VIEW_DETAIL_BROWSE'
-  }
-
-  if (isType(action, setAppDetailModalStateManage)) {
-    return 'VIEW_DETAIL_MANAGE'
-  }
-
-  if (isType(action, setAppDetailModalStateInstall)) {
-    return 'VIEW_CONFIRM_INSTALL'
-  }
-
-  if (isType(action, setAppDetailModalStateSuccess)) {
-    return 'VIEW_DETAIL_ACTION_SUCCESS'
-  }
-
-  if (isType(action, setAppDetailModalStateUninstall)) {
-    return 'VIEW_CONFIRM_UNINSTALL'
-  }
-
-  return state
-}
-
-export default appDetailModalReducer
diff --git a/packages/admin-portal/src/reducers/app-detail.ts b/packages/admin-portal/src/reducers/app-detail.ts
index 19a009ba24..fcc8bf089c 100644
--- a/packages/admin-portal/src/reducers/app-detail.ts
+++ b/packages/admin-portal/src/reducers/app-detail.ts
@@ -43,6 +43,14 @@ export const defaultState: AppDetailState = {
   isStale: true,
 }
 
+export type AppDetailData = (AppDetailModel & { apiKey?: string }) | null
+
+export interface DeveloperAppDetailState {
+  data: AppDetailData
+  isAppDetailLoading: boolean
+  error?: string | null
+}
+
 const appDetailReducer = (state: AppDetailState = defaultState, action: Action<any>): AppDetailState => {
   if (isType(action, setAppDetailStale)) {
     return {
diff --git a/packages/admin-portal/src/reducers/app-http-traffic-event.ts b/packages/admin-portal/src/reducers/app-http-traffic-event.ts
deleted file mode 100644
index 11a7e2e236..0000000000
--- a/packages/admin-portal/src/reducers/app-http-traffic-event.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  httpTrafficPerDayRequestData,
-  httpTrafficPerDayReceiveData,
-  httpTrafficPerDayRequestDataFailure,
-} from '@/actions/app-http-traffic-event'
-
-export interface RequestByEndpointModel {
-  endpoint: string
-  requestCount: number
-}
-
-export interface RequestByDateModel {
-  date: string
-  requestCount: number
-}
-
-export interface RequestByCustomerModel {
-  customerId: string
-  requestCount: number
-}
-export interface TrafficEventsModel {
-  from?: string
-  to?: string
-  totalRequestCount?: number
-  totalEndpointCount?: number
-  requestsByEndpoint?: RequestByEndpointModel[]
-  requestsByDate?: RequestByDateModel[]
-  requestsByCustomer?: RequestByCustomerModel[]
-  applicationId?: string[]
-  customerId?: string[]
-  dateFrom?: string
-  dateTo?: string
-}
-
-export interface AppHttpTrafficEventState {
-  perDayLoading: boolean
-  trafficEvents: TrafficEventsModel | null
-}
-
-export const defaultState: AppHttpTrafficEventState = {
-  perDayLoading: false,
-  trafficEvents: null,
-}
-
-const appHttpTrafficEventReducer = (
-  state: AppHttpTrafficEventState = defaultState,
-  action: Action<any>,
-): AppHttpTrafficEventState => {
-  if (isType(action, httpTrafficPerDayRequestData)) {
-    return { ...state, perDayLoading: true }
-  }
-
-  if (isType(action, httpTrafficPerDayReceiveData)) {
-    return { ...state, perDayLoading: false, trafficEvents: action.data }
-  }
-
-  if (isType(action, httpTrafficPerDayRequestDataFailure)) {
-    return { ...state, perDayLoading: false }
-  }
-
-  return state
-}
-
-export default appHttpTrafficEventReducer
diff --git a/packages/admin-portal/src/reducers/app-installations.ts b/packages/admin-portal/src/reducers/app-installations.ts
deleted file mode 100644
index b83d5cc738..0000000000
--- a/packages/admin-portal/src/reducers/app-installations.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Action, FormState } from '../types/core'
-import { isType } from '../utils/actions'
-import { PagedResultInstallationModel_ } from '@reapit/foundations-ts-definitions'
-import {
-  appInstallationsSetFormState,
-  appInstallationsReceiveData,
-  appInstallationsRequestData,
-  appInstallationsRequestDataFailure,
-  appInstallationsFilterReceiveData,
-  appInstallationsFilterRequestData,
-  appInstallationsFilterRequestDataFailure,
-} from '@/actions/app-installations'
-
-export interface AppInstallationsState {
-  formState: FormState
-  loading: boolean
-  loadingFilter: boolean
-  installationsAppData: PagedResultInstallationModel_ | null
-  installationsFilteredAppData: PagedResultInstallationModel_ | null
-}
-
-export const defaultState: AppInstallationsState = {
-  formState: 'PENDING',
-  loading: false,
-  loadingFilter: false,
-  installationsAppData: null,
-  installationsFilteredAppData: null,
-}
-
-const appInstallationsReducer = (
-  state: AppInstallationsState = defaultState,
-  action: Action<any>,
-): AppInstallationsState => {
-  if (isType(action, appInstallationsRequestData)) {
-    return { ...state, loading: true }
-  }
-
-  if (isType(action, appInstallationsReceiveData)) {
-    return { ...state, loading: false, installationsAppData: action.data }
-  }
-
-  if (isType(action, appInstallationsRequestDataFailure)) {
-    return { ...state, loading: false }
-  }
-
-  if (isType(action, appInstallationsFilterRequestData)) {
-    return { ...state, loadingFilter: true }
-  }
-
-  if (isType(action, appInstallationsFilterReceiveData)) {
-    return { ...state, loadingFilter: false, installationsFilteredAppData: action.data }
-  }
-
-  if (isType(action, appInstallationsFilterRequestDataFailure)) {
-    return { ...state, loadingFilter: false }
-  }
-
-  if (isType(action, appInstallationsSetFormState)) {
-    return { ...state, formState: action.data }
-  }
-
-  return state
-}
-
-export default appInstallationsReducer
diff --git a/packages/admin-portal/src/reducers/app-integration-types.ts b/packages/admin-portal/src/reducers/app-integration-types.ts
deleted file mode 100644
index 5c81b59301..0000000000
--- a/packages/admin-portal/src/reducers/app-integration-types.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Action } from '@/types/core'
-import { isType } from '@/utils/actions'
-import { integrationTypesReceiveData, PagedResultDesktopIntegrationTypeModel_ } from '@/actions/app-integration-types'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-
-export type IntegrationTypeState = PagedResultDesktopIntegrationTypeModel_
-
-export const defaultState: IntegrationTypeState = {
-  data: [],
-  pageNumber: 1,
-  pageSize: APPS_PER_PAGE,
-  pageCount: 1,
-  totalCount: 0,
-}
-
-const integrationTypesReducer = (
-  state: IntegrationTypeState = defaultState,
-  action: Action<any>,
-): IntegrationTypeState => {
-  if (isType(action, integrationTypesReceiveData)) {
-    return {
-      ...state,
-      ...action.data,
-    }
-  }
-
-  return state
-}
-
-export default integrationTypesReducer
diff --git a/packages/admin-portal/src/reducers/app-usage-stats.ts b/packages/admin-portal/src/reducers/app-usage-stats.ts
deleted file mode 100644
index 9b235f276f..0000000000
--- a/packages/admin-portal/src/reducers/app-usage-stats.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import { UsageStatsModel } from '@reapit/foundations-ts-definitions'
-import {
-  appUsageStatsRequestData,
-  appUsageStatsReceiveData,
-  appUsageStatsRequestDataFailure,
-} from '@/actions/app-usage-stats'
-
-export interface AppUsageStatsState {
-  loading: boolean
-  appUsageStatsData: UsageStatsModel | null
-}
-
-export const defaultState: AppUsageStatsState = {
-  loading: false,
-  appUsageStatsData: null,
-}
-
-const appUsageStatsReducer = (state: AppUsageStatsState = defaultState, action: Action<any>): AppUsageStatsState => {
-  if (isType(action, appUsageStatsRequestData)) {
-    return { ...state, loading: true }
-  }
-
-  if (isType(action, appUsageStatsReceiveData)) {
-    return { ...state, loading: false, appUsageStatsData: action.data }
-  }
-
-  if (isType(action, appUsageStatsRequestDataFailure)) {
-    return { ...state, loading: false }
-  }
-
-  return state
-}
-
-export default appUsageStatsReducer
diff --git a/packages/admin-portal/src/reducers/client/__test__/app-detail.test.ts b/packages/admin-portal/src/reducers/client/__test__/app-detail.test.ts
deleted file mode 100644
index bf0b00a5af..0000000000
--- a/packages/admin-portal/src/reducers/client/__test__/app-detail.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import appDetailReducer, { defaultState } from '../app-detail'
-import { ActionType } from '../../../types/core'
-import ActionTypes from '../../../constants/action-types'
-import { appDetailDataStub } from '@/sagas/__stubs__/app-detail'
-
-describe('client app detail reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appDetailReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when CLIENT_FETCH_APP_DETAIL action is called', () => {
-    const newState = appDetailReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_DETAIL as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      isAppDetailLoading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set client item data when CLIENT_FETCH_APP_DETAIL_SUCCESS action is called', () => {
-    const newState = appDetailReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_DETAIL_SUCCESS as ActionType,
-      data: appDetailDataStub.data,
-    })
-    const expected = {
-      ...defaultState,
-      isAppDetailLoading: false,
-      data: appDetailDataStub.data,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set error data when CLIENT_FETCH_APP_DETAIL_FAILED is called', () => {
-    const newState = appDetailReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_DETAIL_FAILED as ActionType,
-      data: 'error',
-    })
-    const expected = {
-      ...defaultState,
-      isAppDetailLoading: false,
-      error: 'error',
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/client/__test__/app-summary.test.ts b/packages/admin-portal/src/reducers/client/__test__/app-summary.test.ts
deleted file mode 100644
index 18f14805ee..0000000000
--- a/packages/admin-portal/src/reducers/client/__test__/app-summary.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import appSummaryReducer, { defaultState } from '../app-summary'
-import { ActionType } from '../../../types/core'
-import ActionTypes from '../../../constants/action-types'
-import { appsDataStub } from '../../../sagas/__stubs__/apps'
-
-describe('appsumar reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = appSummaryReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when CLIENT_FETCH_APP_SUMMARY action is called', () => {
-    const newState = appSummaryReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_SUMMARY as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      isAppSummaryLoading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set client item data when CLIENT_FETCH_APP_SUMMARY_SUCCESS action is called', () => {
-    const newState = appSummaryReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_SUMMARY_SUCCESS as ActionType,
-      data: appsDataStub,
-    })
-    const expected = {
-      ...defaultState,
-      isAppSummaryLoading: false,
-      data: appsDataStub,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set error data when CLIENT_FETCH_APP_SUMMARY_FAILED action is called', () => {
-    const newState = appSummaryReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_APP_SUMMARY_FAILED as ActionType,
-      data: 'error',
-    })
-    const expected = {
-      ...defaultState,
-      isAppSummaryLoading: false,
-      error: 'error',
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should clear client item data when CLIENT_CLEAR_APP_SUMMARY action is called', () => {
-    const newState = appSummaryReducer(undefined, {
-      type: ActionTypes.CLIENT_CLEAR_APP_SUMMARY as ActionType,
-      data: null,
-    })
-    const expected = {
-      ...defaultState,
-      data: null,
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/client/__test__/web-component.test.ts b/packages/admin-portal/src/reducers/client/__test__/web-component.test.ts
deleted file mode 100644
index f4341717ca..0000000000
--- a/packages/admin-portal/src/reducers/client/__test__/web-component.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import webComponentReducer, { defaultState } from '../web-component'
-import { ActionType } from '../../../types/core'
-import ActionTypes from '../../../constants/action-types'
-
-describe('client app detail reducer', () => {
-  it('should return default state if action not matched', () => {
-    const newState = webComponentReducer(undefined, { type: 'UNKNOWN' as ActionType, data: undefined })
-    expect(newState).toEqual(defaultState)
-  })
-
-  it('should set loading to true when CLIENT_FETCH_WEB_COMPONENT_CONFIG action is called', () => {
-    const newState = webComponentReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      loading: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set updating to true when CLIENT_PUT_WEB_COMPONENT_CONFIG action is called', () => {
-    const newState = webComponentReducer(undefined, {
-      type: ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG as ActionType,
-      data: true,
-    })
-    const expected = {
-      ...defaultState,
-      updating: true,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set updating to true when CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS action is called', () => {
-    const newState = webComponentReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG_SUCCESS as ActionType,
-      data: {},
-    })
-    const expected = {
-      ...defaultState,
-      data: {},
-      loading: false,
-      updating: false,
-    }
-    expect(newState).toEqual(expected)
-  })
-
-  it('should set negotiators to {} when CLIENT_FETCH_NEGOTIATORS_SUCCESS action is called', () => {
-    const newState = webComponentReducer(undefined, {
-      type: ActionTypes.CLIENT_FETCH_NEGOTIATORS_SUCCESS as ActionType,
-      data: {},
-    })
-    const expected = {
-      ...defaultState,
-      negotiators: {},
-    }
-    expect(newState).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/reducers/client/app-detail.ts b/packages/admin-portal/src/reducers/client/app-detail.ts
deleted file mode 100644
index 03c373e2a8..0000000000
--- a/packages/admin-portal/src/reducers/client/app-detail.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { AppDetailModel } from '@reapit/foundations-ts-definitions'
-import { Action } from '@/types/core'
-import { clientFetchAppDetail, clientFetchAppDetailSuccess, clientFetchAppDetailFailed } from '@/actions/client'
-import { isType } from '@/utils/actions'
-
-export type AppDetailDataNotNull = AppDetailModel & {
-  apiKey?: string
-}
-
-export type AppDetailData = AppDetailDataNotNull | null
-
-export interface ClientAppDetailState {
-  data: AppDetailData
-  isAppDetailLoading: boolean
-  error?: string | null
-}
-
-export const defaultState: ClientAppDetailState = {
-  error: null,
-  data: null,
-  isAppDetailLoading: false,
-}
-
-const appDetailReducer = (state: ClientAppDetailState = defaultState, action: Action<any>): ClientAppDetailState => {
-  if (isType(action, clientFetchAppDetail)) {
-    return {
-      ...state,
-      isAppDetailLoading: true,
-    }
-  }
-
-  if (isType(action, clientFetchAppDetailSuccess)) {
-    return {
-      ...state,
-      isAppDetailLoading: false,
-      data: action.data,
-    }
-  }
-
-  if (isType(action, clientFetchAppDetailFailed)) {
-    return {
-      ...state,
-      isAppDetailLoading: false,
-      error: action.data,
-    }
-  }
-
-  return state
-}
-
-export default appDetailReducer
diff --git a/packages/admin-portal/src/reducers/client/app-summary.ts b/packages/admin-portal/src/reducers/client/app-summary.ts
deleted file mode 100644
index f3c9337ebc..0000000000
--- a/packages/admin-portal/src/reducers/client/app-summary.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Action } from '@/types/core'
-import { isType } from '@/utils/actions'
-import {
-  clientFetchAppSummary,
-  clientFetchAppSummarySuccess,
-  clientClearAppSummary,
-  clientFetchAppSummaryFailed,
-} from '@/actions/client'
-import { PagedResultAppSummaryModel_, AppSummaryModel } from '@reapit/foundations-ts-definitions'
-
-export interface ClientAppSummary {
-  apps: PagedResultAppSummaryModel_
-  featuredApps: AppSummaryModel[] | null
-}
-
-export interface ClientAppSummaryParams {
-  page?: number
-  search?: string
-  searchBy?: string
-  category?: string
-}
-
-export interface ClientAppSummaryState {
-  isAppSummaryLoading: boolean
-  data: ClientAppSummary | null
-  error?: string | null
-}
-
-export const defaultState: ClientAppSummaryState = {
-  isAppSummaryLoading: false,
-  data: null,
-  error: null,
-}
-
-const appSummaryReducer = (state: ClientAppSummaryState = defaultState, action: Action<any>): ClientAppSummaryState => {
-  if (isType(action, clientFetchAppSummary)) {
-    return {
-      ...state,
-      isAppSummaryLoading: true,
-    }
-  }
-
-  if (isType(action, clientFetchAppSummarySuccess)) {
-    return {
-      ...state,
-      isAppSummaryLoading: false,
-      data: action.data || null,
-    }
-  }
-
-  if (isType(action, clientClearAppSummary)) {
-    return {
-      ...state,
-      isAppSummaryLoading: false,
-      data: null,
-    }
-  }
-
-  if (isType(action, clientFetchAppSummaryFailed)) {
-    return {
-      ...state,
-      isAppSummaryLoading: false,
-      error: action.data,
-    }
-  }
-
-  return state
-}
-
-export default appSummaryReducer
diff --git a/packages/admin-portal/src/reducers/client/index.ts b/packages/admin-portal/src/reducers/client/index.ts
deleted file mode 100644
index 97cecbafc9..0000000000
--- a/packages/admin-portal/src/reducers/client/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { combineReducers } from 'redux'
-import appDetailReducer, { ClientAppDetailState } from './app-detail'
-import clientReducer, { ClientAppSummaryState } from './app-summary'
-import webComponentReducer, { WebComponentState } from './web-component'
-
-export interface ClientRootState {
-  appSummary: ClientAppSummaryState
-  appDetail: ClientAppDetailState
-  webComponent: WebComponentState
-}
-
-export default combineReducers<ClientRootState>({
-  appSummary: clientReducer,
-  appDetail: appDetailReducer,
-  webComponent: webComponentReducer,
-})
diff --git a/packages/admin-portal/src/reducers/client/web-component.ts b/packages/admin-portal/src/reducers/client/web-component.ts
deleted file mode 100644
index 5a51f834d9..0000000000
--- a/packages/admin-portal/src/reducers/client/web-component.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { Action } from '@/types/core'
-import { isType } from '@/utils/actions'
-import {
-  clientFetchWebComponentConfig,
-  clientUpdateWebComponentConfig,
-  clientFetchWebComponentConfigSuccess,
-  clientFetchNegotiatorsSuccess,
-  clientFetchWebComponentConfigFailed,
-  clientUpdateWebComponentConfigFailed,
-} from '@/actions/client'
-import { WebComponentConfigResult } from '@/services/web-component'
-import { NegotiatorsResult } from '@/services/negotiators'
-
-export interface WebComponentState {
-  isShowModal: boolean
-  data: WebComponentConfigResult
-  loading: boolean
-  updating: boolean
-  negotiators: NegotiatorsResult
-}
-export const defaultState: WebComponentState = {
-  isShowModal: false,
-  data: null,
-  loading: true,
-  updating: false,
-  negotiators: null,
-}
-
-const webComponentReducer = (state: WebComponentState = defaultState, action: Action<any>): WebComponentState => {
-  if (isType(action, clientFetchWebComponentConfig)) {
-    return {
-      ...state,
-      loading: true,
-    }
-  }
-  if (isType(action, clientUpdateWebComponentConfig)) {
-    return {
-      ...state,
-      updating: true,
-    }
-  }
-  if (isType(action, clientFetchWebComponentConfigSuccess)) {
-    return {
-      ...state,
-      data: action.data,
-      loading: false,
-      updating: false,
-    }
-  }
-
-  if (isType(action, clientFetchWebComponentConfigFailed)) {
-    return {
-      ...state,
-      data: null,
-      loading: false,
-    }
-  }
-
-  if (isType(action, clientUpdateWebComponentConfigFailed)) {
-    return {
-      ...state,
-      updating: false,
-    }
-  }
-
-  if (isType(action, clientFetchNegotiatorsSuccess)) {
-    return {
-      ...state,
-      negotiators: action.data as NegotiatorsResult,
-    }
-  }
-
-  return state
-}
-
-export default webComponentReducer
diff --git a/packages/admin-portal/src/reducers/developer-subscriptions.ts b/packages/admin-portal/src/reducers/developer-subscriptions.ts
deleted file mode 100644
index dd18f2199c..0000000000
--- a/packages/admin-portal/src/reducers/developer-subscriptions.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  developerFetchSubscriptions,
-  developerFetchSubscriptionsSuccess,
-  developerCreateSubscription,
-  developerCreateSubscriptionSuccess,
-  developerCreateSubscriptionFalure,
-  developerCreateSubscriptionClearError,
-} from '@/actions/developer-subscriptions'
-import { PagedResultSubscriptionModel_ } from '@reapit/foundations-ts-definitions'
-
-export type DeveloperSubscriptionsState = {
-  create: CreateDeveloperSubscriptionsState
-  list: ListDeveloperSubscriptionsState
-}
-
-export type CreateDeveloperSubscriptionsState = {
-  loading: boolean
-  error: boolean
-}
-
-export type ListDeveloperSubscriptionsState = {
-  data: PagedResultSubscriptionModel_ | null
-  loading: boolean
-}
-
-export const defaultState: DeveloperSubscriptionsState = {
-  create: {
-    loading: false,
-    error: false,
-  },
-  list: {
-    loading: false,
-    data: null,
-  },
-}
-
-const developerSubscriptionsReducer = (
-  state: DeveloperSubscriptionsState = defaultState,
-  action: Action<any>,
-): DeveloperSubscriptionsState => {
-  if (isType(action, developerCreateSubscription)) {
-    return {
-      ...state,
-      create: {
-        loading: true,
-        error: false,
-      },
-    }
-  }
-
-  if (isType(action, developerCreateSubscriptionSuccess)) {
-    return {
-      ...state,
-      create: {
-        loading: false,
-        error: false,
-      },
-    }
-  }
-
-  if (isType(action, developerCreateSubscriptionFalure)) {
-    return {
-      ...state,
-      create: {
-        loading: false,
-        error: true,
-      },
-    }
-  }
-
-  if (isType(action, developerCreateSubscriptionClearError)) {
-    return {
-      ...state,
-      create: {
-        ...state.create,
-        error: false,
-      },
-    }
-  }
-
-  if (isType(action, developerFetchSubscriptions)) {
-    return {
-      ...state,
-      list: {
-        ...state.list,
-        loading: true,
-      },
-    }
-  }
-
-  if (isType(action, developerFetchSubscriptionsSuccess)) {
-    const { data = null } = action
-    return {
-      ...state,
-      list: {
-        loading: false,
-        data,
-      },
-    }
-  }
-
-  return state
-}
-
-export default developerSubscriptionsReducer
diff --git a/packages/admin-portal/src/reducers/developer.ts b/packages/admin-portal/src/reducers/developer.ts
deleted file mode 100644
index 795ed0505f..0000000000
--- a/packages/admin-portal/src/reducers/developer.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import { Action, FormState } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  developerLoading,
-  developerReceiveData,
-  developerClearData,
-  developerSetFormState,
-  setMyIdentity,
-  fetchBilling,
-  fetchBillingSuccess,
-  fetchBillingFailure,
-  developerFetchAppDetail,
-  developerFetchAppDetailSuccess,
-  developerFetchAppDetailFailed,
-  fetchMonthlyBilling,
-  fetchMonthlyBillingSuccess,
-  fetchMonthlyBillingFailure,
-  developerSetWebhookPingStatus,
-} from '@/actions/developer'
-import {
-  PagedResultAppSummaryModel_,
-  ScopeModel,
-  DeveloperModel,
-  AppDetailModel,
-  BillingBreakdownForMonthV2Model,
-  BillingOverviewForPeriodV2Model,
-} from '@reapit/foundations-ts-definitions'
-import { developerAppShowModal } from '@/actions/developer-app-modal'
-
-export interface DeveloperRequestParams {
-  page: number
-  appsPerPage?: number
-}
-
-export interface DeveloperItem {
-  data: PagedResultAppSummaryModel_
-  scopes: ScopeModel[]
-}
-
-export type RequestByPeriod = {
-  period: string
-  periodStart: string
-  periodEnd: string
-  periodName: string
-  requestCount: number
-  endpointCount: number
-  netAmount: number
-  grossAmount: number
-  vatAmount: number
-}
-
-export type Billing = {
-  from: string
-  to: string
-  requestsByPeriod: RequestByPeriod[]
-}
-
-export type WebhookPingTestStatus = 'SUCCESS' | 'FAILED' | 'LOADING' | null
-
-export interface DeveloperState {
-  loading: boolean
-  developerAppDetail: DeveloperAppDetailState
-  developerData: DeveloperItem | null
-  formState: FormState
-  isVisible: boolean
-  myIdentity: DeveloperModel | null
-  billing: BillingOverviewForPeriodV2Model | null
-  isServiceChartLoading: boolean
-  error: unknown
-  isMonthlyBillingLoading: boolean
-  monthlyBilling: BillingBreakdownForMonthV2Model | null
-  webhookPingTestStatus: WebhookPingTestStatus
-}
-
-export type AppDetailData = (AppDetailModel & { apiKey?: string }) | null
-
-export interface DeveloperAppDetailState {
-  data: AppDetailData
-  isAppDetailLoading: boolean
-  error?: string | null
-}
-
-export const defaultState: DeveloperState = {
-  loading: false,
-  developerAppDetail: {
-    error: null,
-    data: null,
-    isAppDetailLoading: false,
-  },
-  developerData: null,
-  formState: 'PENDING',
-  isVisible: false,
-  myIdentity: null,
-  billing: null,
-  isServiceChartLoading: false,
-  error: null,
-  isMonthlyBillingLoading: false,
-  monthlyBilling: null,
-  webhookPingTestStatus: null,
-}
-
-const developerReducer = (state: DeveloperState = defaultState, action: Action<any>): DeveloperState => {
-  if (isType(action, developerFetchAppDetail)) {
-    return {
-      ...state,
-      developerAppDetail: {
-        ...state.developerAppDetail,
-        isAppDetailLoading: true,
-      },
-    }
-  }
-
-  if (isType(action, developerFetchAppDetailSuccess)) {
-    return {
-      ...state,
-      developerAppDetail: {
-        ...state.developerAppDetail,
-        data: action.data,
-        isAppDetailLoading: false,
-      },
-    }
-  }
-
-  if (isType(action, developerFetchAppDetailFailed)) {
-    return {
-      ...state,
-      developerAppDetail: {
-        ...state.developerAppDetail,
-        isAppDetailLoading: false,
-        error: action.data,
-      },
-    }
-  }
-
-  if (isType(action, developerLoading)) {
-    return {
-      ...state,
-      loading: action.data,
-    }
-  }
-
-  if (isType(action, developerReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      developerData: action.data || null,
-    }
-  }
-
-  if (isType(action, developerClearData)) {
-    return {
-      ...state,
-      loading: false,
-      developerData: action.data,
-    }
-  }
-
-  if (isType(action, developerSetFormState)) {
-    return {
-      ...state,
-      formState: action.data,
-    }
-  }
-
-  if (isType(action, developerAppShowModal)) {
-    return {
-      ...state,
-      isVisible: action.data,
-    }
-  }
-
-  if (isType(action, setMyIdentity)) {
-    return {
-      ...state,
-      myIdentity: action.data || null,
-    }
-  }
-
-  if (isType(action, fetchBilling)) {
-    return {
-      ...state,
-      isServiceChartLoading: true,
-    }
-  }
-
-  if (isType(action, fetchBillingSuccess)) {
-    return {
-      ...state,
-      billing: action.data,
-      isServiceChartLoading: false,
-    }
-  }
-
-  if (isType(action, fetchMonthlyBilling)) {
-    return {
-      ...state,
-      isMonthlyBillingLoading: true,
-    }
-  }
-
-  if (isType(action, developerSetWebhookPingStatus)) {
-    return {
-      ...state,
-      webhookPingTestStatus: action.data,
-    }
-  }
-
-  if (isType(action, fetchMonthlyBillingSuccess)) {
-    return {
-      ...state,
-      isMonthlyBillingLoading: false,
-      monthlyBilling: action.data || null,
-    }
-  }
-
-  if (isType(action, fetchBillingFailure)) {
-    return {
-      ...state,
-      isServiceChartLoading: false,
-      error: action.data,
-    }
-  }
-
-  if (isType(action, fetchMonthlyBillingFailure)) {
-    return {
-      ...state,
-      isMonthlyBillingLoading: false,
-    }
-  }
-
-  return state
-}
-
-export default developerReducer
diff --git a/packages/admin-portal/src/reducers/installed-apps.ts b/packages/admin-portal/src/reducers/installed-apps.ts
deleted file mode 100644
index 413ef002e0..0000000000
--- a/packages/admin-portal/src/reducers/installed-apps.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  installedAppsLoading,
-  installedAppsReceiveData,
-  installedAppsClearData,
-  installedAppsRequestDataFailure,
-} from '../actions/installed-apps'
-import { PagedResultAppSummaryModel_ } from '@reapit/foundations-ts-definitions'
-
-export interface InstalledAppsItem {
-  data: PagedResultAppSummaryModel_
-}
-
-export interface InstalledAppsState {
-  loading: boolean
-  installedAppsData: InstalledAppsItem | null
-}
-
-export const defaultState: InstalledAppsState = {
-  loading: false,
-  installedAppsData: null,
-}
-
-const installedAppsReducer = (state: InstalledAppsState = defaultState, action: Action<any>): InstalledAppsState => {
-  if (isType(action, installedAppsLoading)) {
-    return {
-      ...state,
-      loading: action.data,
-    }
-  }
-
-  if (isType(action, installedAppsReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      installedAppsData: action.data || null,
-    }
-  }
-
-  if (isType(action, installedAppsClearData)) {
-    return {
-      ...state,
-      loading: false,
-      installedAppsData: action.data,
-    }
-  }
-
-  if (isType(action, installedAppsRequestDataFailure)) {
-    return {
-      ...state,
-      loading: false,
-    }
-  }
-
-  return state
-}
-
-export default installedAppsReducer
diff --git a/packages/admin-portal/src/reducers/my-apps.ts b/packages/admin-portal/src/reducers/my-apps.ts
deleted file mode 100644
index edb0c69475..0000000000
--- a/packages/admin-portal/src/reducers/my-apps.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import { myAppsLoading, myAppsReceiveData, myAppsClearData, myAppsRequestDataFailure } from '../actions/my-apps'
-import { PagedResultAppSummaryModel_ } from '@reapit/foundations-ts-definitions'
-
-export interface MyAppsItem {
-  data: PagedResultAppSummaryModel_
-}
-
-export interface MyAppsState {
-  loading: boolean
-  myAppsData: MyAppsItem | null
-}
-
-export const defaultState: MyAppsState = {
-  loading: false,
-  myAppsData: null,
-}
-
-const myAppsReducer = (state: MyAppsState = defaultState, action: Action<any>): MyAppsState => {
-  if (isType(action, myAppsLoading)) {
-    return {
-      ...state,
-      loading: action.data,
-    }
-  }
-
-  if (isType(action, myAppsReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      myAppsData: action.data || null,
-    }
-  }
-
-  if (isType(action, myAppsClearData)) {
-    return {
-      ...state,
-      loading: false,
-      myAppsData: action.data,
-    }
-  }
-
-  if (isType(action, myAppsRequestDataFailure)) {
-    return {
-      ...state,
-      loading: false,
-    }
-  }
-
-  return state
-}
-
-export default myAppsReducer
diff --git a/packages/admin-portal/src/reducers/revision-detail.ts b/packages/admin-portal/src/reducers/revision-detail.ts
index 631ac21def..a9be0629db 100644
--- a/packages/admin-portal/src/reducers/revision-detail.ts
+++ b/packages/admin-portal/src/reducers/revision-detail.ts
@@ -9,7 +9,7 @@ import {
   approveRevisionSetFormState,
   declineRevisionSetFormState,
 } from '../actions/revision-detail'
-import { PagedResultDesktopIntegrationTypeModel_ } from '@/actions/app-integration-types'
+import { PagedResultDesktopIntegrationTypeModel_ } from '@/types/desktop-integration-types'
 
 export interface RevisionDetailItem {
   data: AppRevisionModel
diff --git a/packages/admin-portal/src/reducers/settings.ts b/packages/admin-portal/src/reducers/settings.ts
deleted file mode 100644
index 3a1c513f98..0000000000
--- a/packages/admin-portal/src/reducers/settings.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import { DeveloperModel } from '@reapit/foundations-ts-definitions'
-import { requestDeveloperDataSuccess, settingShowLoading } from '@/actions/settings'
-
-export interface SettingsState {
-  loading: boolean
-  developerInfomation: DeveloperModel | null
-}
-
-export const defaultState: SettingsState = {
-  loading: false,
-  developerInfomation: null,
-}
-
-const settingReducer = (state: SettingsState = defaultState, action: Action<any>): SettingsState => {
-  if (isType(action, settingShowLoading)) {
-    return {
-      ...state,
-      loading: action.data,
-    }
-  }
-
-  if (isType(action, requestDeveloperDataSuccess)) {
-    return {
-      ...state,
-      developerInfomation: action.data,
-    }
-  }
-
-  return state
-}
-
-export default settingReducer
diff --git a/packages/admin-portal/src/reducers/submit-app.ts b/packages/admin-portal/src/reducers/submit-app.ts
deleted file mode 100644
index 5120e1da97..0000000000
--- a/packages/admin-portal/src/reducers/submit-app.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Action, FormState } from '../types/core'
-import { isType } from '../utils/actions'
-import { submitAppSetFormState, submitAppLoading, submitAppReceiveData } from '../actions/submit-app'
-import { ScopeModel } from '@reapit/foundations-ts-definitions'
-
-export type FormStep = 'BEFORE_YOU_START' | 'INPUT_APP_NAME'
-
-export interface SubmitAppState {
-  loading: boolean
-  formState: FormState
-  submitAppData: {
-    scopes: ScopeModel[]
-  } | null
-}
-
-export const defaultState: SubmitAppState = {
-  loading: false,
-  formState: 'PENDING',
-  submitAppData: null,
-}
-
-const submitAppReducer = (state: SubmitAppState | undefined = defaultState, action: Action<any>): SubmitAppState => {
-  if (isType(action, submitAppSetFormState)) {
-    return {
-      ...state,
-      formState: action.data || null,
-    }
-  }
-
-  if (isType(action, submitAppLoading)) {
-    return {
-      ...state,
-      loading: action.data,
-    }
-  }
-
-  if (isType(action, submitAppReceiveData)) {
-    return {
-      ...state,
-      submitAppData: {
-        scopes: action.data,
-      },
-    }
-  }
-
-  return state
-}
-
-export default submitAppReducer
diff --git a/packages/admin-portal/src/reducers/submit-revision.ts b/packages/admin-portal/src/reducers/submit-revision.ts
deleted file mode 100644
index 72db2aaa0d..0000000000
--- a/packages/admin-portal/src/reducers/submit-revision.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Action, FormState } from '../types/core'
-import { isType } from '../utils/actions'
-import { submitRevisionSetFormState } from '../actions/submit-revision'
-
-export interface SubmitRevisionState {
-  formState: FormState
-}
-
-export const defaultState: SubmitRevisionState = {
-  formState: 'PENDING',
-}
-
-const submitRevisionReducer = (
-  state: SubmitRevisionState | undefined = defaultState,
-  action: Action<any>,
-): SubmitRevisionState => {
-  if (isType(action, submitRevisionSetFormState)) {
-    return {
-      ...state,
-      formState: (action.data as FormState) || null,
-    }
-  }
-
-  return state
-}
-
-export default submitRevisionReducer
diff --git a/packages/admin-portal/src/reducers/webhook-edit-modal.ts b/packages/admin-portal/src/reducers/webhook-edit-modal.ts
deleted file mode 100644
index d76f780e75..0000000000
--- a/packages/admin-portal/src/reducers/webhook-edit-modal.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { Action } from '../types/core'
-import { isType } from '../utils/actions'
-import {
-  requestWebhookSubcriptionReceiveData,
-  requestWebhookSubcriptionReceiveFailure,
-  requestWebhookReceiveData,
-  webhookDataClear,
-  webhookSetOpenModal,
-  requestWebhookSubcriptionData,
-  requestWebhookData,
-} from '../actions/webhook-edit-modal'
-
-export interface WebhookModal {
-  id: string
-  applicationId: string
-  url: string
-  description: string
-  topicIds: string[]
-  customerIds: string[]
-  active: boolean
-}
-
-export interface CustomerItem {
-  id: string
-  appId: string
-  created: string
-  client: string
-  status: string
-  authFlow: string
-}
-
-export interface TopicItem {
-  id: string
-  created: string
-  modified?: boolean
-  name: string
-  description: string
-  url: string
-  active: boolean
-  example: string
-  associatedScope: string
-}
-
-export interface SubcriptionCustomers {
-  data: CustomerItem[]
-  pageNumber: number
-  pageSize: number
-  pageCount: number
-  totalCount: number
-}
-
-export interface SubcriptionTopics {
-  _embedded: TopicItem[]
-  pageNumber: number
-  pageSize: number
-  pageCount: number
-  totalCount: number
-  _links?: []
-}
-
-export interface WebhookSubscription {
-  subcriptionCustomers: SubcriptionCustomers
-  subcriptionTopics: SubcriptionTopics
-}
-
-export type WebhookEditState = WebhookSubscription & {
-  loading: boolean
-  modalType: string
-  webhookData: WebhookModal
-}
-
-export const defaultState: WebhookEditState = {
-  loading: false,
-  modalType: '',
-  subcriptionCustomers: {
-    data: [],
-    pageNumber: 0,
-    pageSize: 0,
-    pageCount: 0,
-    totalCount: 0,
-  },
-  subcriptionTopics: {
-    _embedded: [],
-    pageNumber: 0,
-    pageSize: 0,
-    pageCount: 0,
-    totalCount: 0,
-  },
-  webhookData: {
-    id: '',
-    applicationId: '',
-    url: '',
-    description: '',
-    topicIds: [],
-    customerIds: [],
-    active: false,
-  },
-}
-
-const WebhookEditReducer = (state: WebhookEditState = defaultState, action: Action<any>): WebhookEditState => {
-  if (isType(action, requestWebhookSubcriptionData) || isType(action, requestWebhookData)) {
-    return {
-      ...state,
-      loading: true,
-    }
-  }
-  if (isType(action, requestWebhookSubcriptionReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      ...action.data,
-    }
-  }
-  if (isType(action, requestWebhookSubcriptionReceiveFailure)) {
-    return {
-      ...state,
-      loading: false,
-    }
-  }
-  if (isType(action, requestWebhookReceiveData)) {
-    return {
-      ...state,
-      webhookData: action.data,
-    }
-  }
-  if (isType(action, webhookDataClear)) {
-    return defaultState
-  }
-  if (isType(action, webhookSetOpenModal)) {
-    return {
-      ...state,
-      modalType: action.data,
-    }
-  }
-  return state
-}
-
-export default WebhookEditReducer
diff --git a/packages/admin-portal/src/reducers/webhook-subscriptions.ts b/packages/admin-portal/src/reducers/webhook-subscriptions.ts
deleted file mode 100644
index 81bf35848c..0000000000
--- a/packages/admin-portal/src/reducers/webhook-subscriptions.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { combineReducers } from 'redux'
-import { Action } from '@/types/core'
-import { isType } from '@/utils/actions'
-import {
-  webhookSubscriptionsRequestData,
-  webhookSubscriptionsReceiveData,
-  webhookTopicsRequestData,
-  webhookTopicsReceiveData,
-  setApplicationId,
-} from '@/actions/webhook-subscriptions'
-
-export interface WebhookModel {
-  id: string
-  created: string
-  modified: string
-  applicationId: string
-  url: string
-  topicIds: string[]
-  customerIds: string[]
-  active: boolean
-  deleted: boolean
-}
-
-export interface TopicModel {
-  id: string
-  created: string
-  modified: string
-  name: string
-  description: string
-  url: string
-  active: boolean
-  associatedScope: string
-  example: string
-}
-
-/**
- * Model to handle paged data and information
- */
-export interface PagedResultWebhookModel_ {
-  /**
-   * List of paged data
-   */
-  _embedded?: WebhookModel[]
-  pageNumber?: number // int32
-  pageSize?: number // int32
-  pageCount?: number // int32
-  totalCount?: number // int32
-}
-
-/**
- * Model to handle paged data and information
- */
-export interface PagedResultTopicModel_ {
-  /**
-   * List of paged data
-   */
-  _embedded?: TopicModel[]
-  pageNumber?: number // int32
-  pageSize?: number // int32
-  pageCount?: number // int32
-  totalCount?: number // int32
-}
-
-export interface WebhookSubscriptionsState {
-  loading: boolean
-  error: boolean
-  subscriptions: PagedResultWebhookModel_
-}
-
-export interface WebhookTopicsState {
-  applicationId: string
-  loading: boolean
-  error: boolean
-  topics: PagedResultTopicModel_
-}
-
-export interface WebhookState {
-  subscriptions: WebhookSubscriptionsState
-  topics: WebhookTopicsState
-}
-
-export const defaultState: WebhookState = {
-  subscriptions: {
-    loading: false,
-    error: false,
-    subscriptions: {
-      _embedded: [],
-    },
-  },
-  topics: {
-    applicationId: '',
-    loading: false,
-    error: false,
-    topics: {
-      _embedded: [],
-    },
-  },
-}
-
-export const webhookSubscriptionsReducer = (
-  state: WebhookSubscriptionsState = defaultState.subscriptions,
-  action: Action<any>,
-): WebhookSubscriptionsState => {
-  if (isType(action, webhookSubscriptionsRequestData)) {
-    return {
-      ...state,
-      loading: true,
-      error: false,
-    }
-  }
-
-  if (isType(action, webhookSubscriptionsReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      error: false,
-      subscriptions: action.data,
-    }
-  }
-
-  return state
-}
-
-export const webhookTopicsReducer = (
-  state: WebhookTopicsState = defaultState.topics,
-  action: Action<any>,
-): WebhookTopicsState => {
-  if (isType(action, webhookTopicsRequestData)) {
-    return {
-      ...state,
-      loading: true,
-      error: false,
-    }
-  }
-
-  if (isType(action, webhookTopicsReceiveData)) {
-    return {
-      ...state,
-      loading: false,
-      error: false,
-      topics: action.data,
-    }
-  }
-  if (isType(action, setApplicationId)) {
-    return {
-      ...state,
-      applicationId: action.data,
-    }
-  }
-
-  return state
-}
-
-export default combineReducers<WebhookState>({
-  subscriptions: webhookSubscriptionsReducer,
-  topics: webhookTopicsReducer,
-})
diff --git a/packages/admin-portal/src/sagas/__stubs__/app-http-traffic-event.ts b/packages/admin-portal/src/sagas/__stubs__/app-http-traffic-event.ts
deleted file mode 100644
index df560e7e28..0000000000
--- a/packages/admin-portal/src/sagas/__stubs__/app-http-traffic-event.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { TrafficEventsModel } from '@/reducers/app-http-traffic-event'
-
-export const httpTrafficPerDayStub: TrafficEventsModel = {
-  from: '2020-02-17',
-  to: '2020-04-05',
-  totalRequestCount: 178,
-  totalEndpointCount: 2,
-  requestsByEndpoint: [
-    {
-      endpoint: 'properties',
-      requestCount: 90,
-    },
-    {
-      endpoint: 'propertyImages',
-      requestCount: 88,
-    },
-  ],
-  requestsByDate: [
-    {
-      date: '2020-04-04',
-      requestCount: 4,
-    },
-    {
-      date: '2020-04-05',
-      requestCount: 65,
-    },
-  ],
-  requestsByCustomer: [
-    {
-      customerId: 'DXX',
-      requestCount: 178,
-    },
-  ],
-}
diff --git a/packages/admin-portal/src/sagas/__stubs__/apps-submit.ts b/packages/admin-portal/src/sagas/__stubs__/apps-submit.ts
deleted file mode 100644
index 3f53b7d28f..0000000000
--- a/packages/admin-portal/src/sagas/__stubs__/apps-submit.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { CreateAppModel } from '@reapit/foundations-ts-definitions'
-import { SubmitAppArgs } from '@/actions/submit-app'
-
-export const appSubmitStub: { data: CreateAppModel } = {
-  data: {
-    categoryId: '',
-    description: 'Lorem ipsum',
-    homePage: 'https://reapit.com',
-    iconImageUrl: 'https://some-s3-image-link.com',
-    name: 'My app',
-    launchUri: 'https://reapit.com',
-    screen1ImageUrl: 'https://some-s3-image-link.com',
-    screen2ImageUrl: 'https://some-s3-image-link.com',
-    screen3ImageUrl: 'https://some-s3-image-link.com',
-    screen4ImageUrl: 'https://some-s3-image-link.com',
-    screen5ImageUrl: 'https://some-s3-image-link.com',
-    summary: 'Lorem ipsum',
-    supportEmail: 'support@reapit.com',
-    telephone: '999999999',
-  },
-}
-
-export const appSubmitStubWithActions: { data: SubmitAppArgs } = {
-  data: ({
-    ...appSubmitStub.data,
-    setErrors: errors => errors,
-    setWizardStep: jest.fn(),
-    setFieldValue: jest.fn(),
-  } as unknown) as SubmitAppArgs,
-}
-
-export const appSubmitStubFailed: { data: CreateAppModel } = {
-  data: {
-    description: 'Lorem ipsum',
-    homePage: 'https://reapit.com',
-    iconImageUrl: 'https://some-s3-image-link.com',
-    name: 'My app',
-    launchUri: 'https://reapit.com',
-    screen1ImageUrl: 'https://some-s3-image-link.com',
-    screen2ImageUrl: 'https://some-s3-image-link.com',
-    screen3ImageUrl: 'https://some-s3-image-link.com',
-    screen4ImageUrl: 'https://some-s3-image-link.com',
-    screen5ImageUrl: 'https://some-s3-image-link.com',
-    summary: 'Lorem ipsum',
-    supportEmail: 'support@reapit.com',
-    telephone: '999999999',
-  },
-}
-
-export const appSubmitStubFailedWithActions: { data: SubmitAppArgs } = {
-  data: {
-    ...appSubmitStubFailed.data,
-    // @ts-ignore
-    actions: {
-      setStatus: status => status,
-      setErrors: errors => errors,
-    },
-  },
-}
diff --git a/packages/admin-portal/src/sagas/__stubs__/developer-subscriptions.ts b/packages/admin-portal/src/sagas/__stubs__/developer-subscriptions.ts
index 5720f52268..6f3e7ae98e 100644
--- a/packages/admin-portal/src/sagas/__stubs__/developer-subscriptions.ts
+++ b/packages/admin-portal/src/sagas/__stubs__/developer-subscriptions.ts
@@ -1,23 +1,23 @@
-import { SubscriptionModel, PagedResultSubscriptionModel_ } from '@reapit/foundations-ts-definitions'
+// import { SubscriptionModel, PagedResultSubscriptionModel_ } from '@reapit/foundations-ts-definitions'
 
-export const subscriptionModelStub: SubscriptionModel = {
-  id: '123',
-  created: '',
-  cancelled: 'cancelled',
-  renews: 'reviews',
-  developerId: '123',
-  applicationId: '123',
-  user: 'tester@reapit.com',
-  type: 'developerEdition',
-  summary: 'summary',
-  cost: 123,
-  frequency: '1',
-}
+// export const subscriptionModelStub: SubscriptionModel = {
+//   id: '123',
+//   created: '',
+//   cancelled: 'cancelled',
+//   renews: 'reviews',
+//   developerId: '123',
+//   applicationId: '123',
+//   user: 'tester@reapit.com',
+//   type: 'developerEdition',
+//   summary: 'summary',
+//   cost: 123,
+//   frequency: '1',
+// }
 
-export const listSubscriptionsStub: PagedResultSubscriptionModel_ = {
-  data: [subscriptionModelStub],
-  pageCount: 1,
-  pageNumber: 1,
-  pageSize: 12,
-  totalCount: 12,
-}
+// export const listSubscriptionsStub: PagedResultSubscriptionModel_ = {
+//   data: [subscriptionModelStub],
+//   pageCount: 1,
+//   pageNumber: 1,
+//   pageSize: 12,
+//   totalCount: 12,
+// }
diff --git a/packages/admin-portal/src/sagas/__stubs__/developer.ts b/packages/admin-portal/src/sagas/__stubs__/developer.ts
index 67c1148f6e..3b9c3d9bca 100644
--- a/packages/admin-portal/src/sagas/__stubs__/developer.ts
+++ b/packages/admin-portal/src/sagas/__stubs__/developer.ts
@@ -1,7 +1,7 @@
-import { DeveloperState } from '@/reducers/developer'
-import { developerIdentity } from './developer-identity'
-import { billing } from './billing'
-import { appDetailDataStub } from './app-detail'
+// import { DeveloperState } from '@/reducers/developer'
+// import { developerIdentity } from './developer-identity'
+// import { billing } from './billing'
+// import { appDetailDataStub } from './app-detail'
 
 export const developerStub = {
   id: '7a96e6b2-3778-4118-9c9b-6450851e5608',
@@ -15,95 +15,95 @@ export const developerStub = {
   isInactive: false,
 }
 
-export const developerState: DeveloperState = {
-  loading: false,
-  error: null,
-  developerAppDetail: {
-    data: appDetailDataStub.data,
-    isAppDetailLoading: false,
-  },
-  developerData: {
-    data: {
-      data: [
-        {
-          id: '1161242a-f650-4d1d-aed7-909853fe7ee1',
-          externalId: '1oqavb76nprc6v9um5ai8sf7o8',
-          created: '2020-03-20T10:24:28',
-          developerId: '47a37635-5044-4f20-b981-4f25970ac9cf',
-          name: 'Dont Approve This',
-          summary: 'The section below relates to the fields that comprise the listing of your application as it w',
-          developer: 'Reapit Ltd',
-          homePage: 'https://asd.com',
-          isListed: false,
-          isSandbox: false,
-          isFeatured: false,
-          isDirectApi: true,
-          iconUri: 'https://reapit-dev-app-store-media.s3.eu-west-2.amazonaws.com/Dont-Approve-This-icon.png',
-          authFlow: 'client_credentials',
-          launchUri: 'https://asd.com',
-          pendingRevisions: true,
-          links: [
-            {
-              rel: 'self',
-              href: 'https://dev.platformmarketplace.reapit.net/apps/1161242a-f650-4d1d-aed7-909853fe7ee1',
-              action: 'GET',
-            },
-            {
-              rel: 'developer',
-              href: 'https://dev.platformmarketplace.reapit.net/developers/47a37635-5044-4f20-b981-4f25970ac9cf',
-              action: 'GET',
-            },
-          ],
-        },
-        {
-          id: 'f6f6278b-7e73-46f3-97fd-baf278cec38d',
-          externalId: '1u6h1njrb4url2u8oubq20jo1r',
-          created: '2020-03-20T03:57:37',
-          developerId: '47a37635-5044-4f20-b981-4f25970ac9cf',
-          name: 'T Testing React App',
-          summary: 'The section below relates to the fields that comprise the listing of your application',
-          developer: 'Reapit Ltd',
-          homePage: 'https://testingreactapp.com',
-          isListed: true,
-          isSandbox: false,
-          isFeatured: false,
-          isDirectApi: true,
-          iconUri: 'https://reapit-dev-app-store-media.s3.eu-west-2.amazonaws.com/Testing-React-App-icon.png',
-          authFlow: 'client_credentials',
-          launchUri: 'https://testingreactapp.com',
-          pendingRevisions: false,
-          links: [
-            {
-              rel: 'self',
-              href: 'https://dev.platformmarketplace.reapit.net/apps/f6f6278b-7e73-46f3-97fd-baf278cec38d',
-              action: 'GET',
-            },
-            {
-              rel: 'developer',
-              href: 'https://dev.platformmarketplace.reapit.net/developers/47a37635-5044-4f20-b981-4f25970ac9cf',
-              action: 'GET',
-            },
-          ],
-        },
-      ],
-      pageNumber: 1,
-      pageSize: 9999,
-      pageCount: 2,
-      totalCount: 2,
-    },
-    scopes: [
-      {
-        name: 'agencyCloud/applicants.read',
-        description: 'Read applicants',
-      },
-    ],
-  },
-  myIdentity: developerIdentity,
-  formState: 'PENDING',
-  isVisible: false,
-  billing: billing,
-  isServiceChartLoading: false,
-  isMonthlyBillingLoading: false,
-  monthlyBilling: null,
-  webhookPingTestStatus: null,
-}
+// export const developerState: DeveloperState = {
+//   loading: false,
+//   error: null,
+//   developerAppDetail: {
+//     data: appDetailDataStub.data,
+//     isAppDetailLoading: false,
+//   },
+//   developerData: {
+//     data: {
+//       data: [
+//         {
+//           id: '1161242a-f650-4d1d-aed7-909853fe7ee1',
+//           externalId: '1oqavb76nprc6v9um5ai8sf7o8',
+//           created: '2020-03-20T10:24:28',
+//           developerId: '47a37635-5044-4f20-b981-4f25970ac9cf',
+//           name: 'Dont Approve This',
+//           summary: 'The section below relates to the fields that comprise the listing of your application as it w',
+//           developer: 'Reapit Ltd',
+//           homePage: 'https://asd.com',
+//           isListed: false,
+//           isSandbox: false,
+//           isFeatured: false,
+//           isDirectApi: true,
+//           iconUri: 'https://reapit-dev-app-store-media.s3.eu-west-2.amazonaws.com/Dont-Approve-This-icon.png',
+//           authFlow: 'client_credentials',
+//           launchUri: 'https://asd.com',
+//           pendingRevisions: true,
+//           links: [
+//             {
+//               rel: 'self',
+//               href: 'https://dev.platformmarketplace.reapit.net/apps/1161242a-f650-4d1d-aed7-909853fe7ee1',
+//               action: 'GET',
+//             },
+//             {
+//               rel: 'developer',
+//               href: 'https://dev.platformmarketplace.reapit.net/developers/47a37635-5044-4f20-b981-4f25970ac9cf',
+//               action: 'GET',
+//             },
+//           ],
+//         },
+//         {
+//           id: 'f6f6278b-7e73-46f3-97fd-baf278cec38d',
+//           externalId: '1u6h1njrb4url2u8oubq20jo1r',
+//           created: '2020-03-20T03:57:37',
+//           developerId: '47a37635-5044-4f20-b981-4f25970ac9cf',
+//           name: 'T Testing React App',
+//           summary: 'The section below relates to the fields that comprise the listing of your application',
+//           developer: 'Reapit Ltd',
+//           homePage: 'https://testingreactapp.com',
+//           isListed: true,
+//           isSandbox: false,
+//           isFeatured: false,
+//           isDirectApi: true,
+//           iconUri: 'https://reapit-dev-app-store-media.s3.eu-west-2.amazonaws.com/Testing-React-App-icon.png',
+//           authFlow: 'client_credentials',
+//           launchUri: 'https://testingreactapp.com',
+//           pendingRevisions: false,
+//           links: [
+//             {
+//               rel: 'self',
+//               href: 'https://dev.platformmarketplace.reapit.net/apps/f6f6278b-7e73-46f3-97fd-baf278cec38d',
+//               action: 'GET',
+//             },
+//             {
+//               rel: 'developer',
+//               href: 'https://dev.platformmarketplace.reapit.net/developers/47a37635-5044-4f20-b981-4f25970ac9cf',
+//               action: 'GET',
+//             },
+//           ],
+//         },
+//       ],
+//       pageNumber: 1,
+//       pageSize: 9999,
+//       pageCount: 2,
+//       totalCount: 2,
+//     },
+//     scopes: [
+//       {
+//         name: 'agencyCloud/applicants.read',
+//         description: 'Read applicants',
+//       },
+//     ],
+//   },
+//   myIdentity: developerIdentity,
+//   formState: 'PENDING',
+//   isVisible: false,
+//   billing: billing,
+//   isServiceChartLoading: false,
+//   isMonthlyBillingLoading: false,
+//   monthlyBilling: null,
+//   webhookPingTestStatus: null,
+// }
diff --git a/packages/admin-portal/src/sagas/__stubs__/integration-types.ts b/packages/admin-portal/src/sagas/__stubs__/integration-types.ts
index 6487144923..14ad4fe991 100644
--- a/packages/admin-portal/src/sagas/__stubs__/integration-types.ts
+++ b/packages/admin-portal/src/sagas/__stubs__/integration-types.ts
@@ -1,4 +1,4 @@
-import { PagedResultDesktopIntegrationTypeModel_ } from '@/actions/app-integration-types'
+import { PagedResultDesktopIntegrationTypeModel_ } from '@/types/desktop-integration-types'
 
 export const integrationTypesStub: PagedResultDesktopIntegrationTypeModel_ = {
   data: [
@@ -18,7 +18,7 @@ export const integrationTypesStub: PagedResultDesktopIntegrationTypeModel_ = {
       id: 'VendorMarketing',
       name: 'Vendor Marketing Report',
       description: 'Replaces the vendor marketing report',
-      url: 'https://foundations-documentation.reapit.cloud/api/desktop-api#vendor-marketing-report',
+      url: 'https://foundations-adocumentation.reapit.cloud/api/desktop-api#vendor-marketing-report',
     },
     {
       id: 'PrintWizard',
diff --git a/packages/admin-portal/src/sagas/__stubs__/webhook-edit.ts b/packages/admin-portal/src/sagas/__stubs__/webhook-edit.ts
deleted file mode 100644
index 6b3696d349..0000000000
--- a/packages/admin-portal/src/sagas/__stubs__/webhook-edit.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { WebhookSubscription, WebhookModal, WebhookEditState } from '@/reducers/webhook-edit-modal'
-import { CreateWebhookParams } from '@/actions/webhook-edit-modal'
-
-export const webhookDataStub: WebhookSubscription = {
-  subcriptionCustomers: {
-    data: [],
-    pageCount: 1,
-    pageNumber: 1,
-    pageSize: 15,
-    totalCount: 1,
-  },
-  subcriptionTopics: {
-    pageCount: 0,
-    pageNumber: 1,
-    pageSize: 25,
-    totalCount: 0,
-    _embedded: [],
-  },
-}
-
-export const webhookItemDataStub: WebhookModal = {
-  id: '',
-  applicationId: '',
-  url: '',
-  description: '',
-  topicIds: [],
-  customerIds: [],
-  active: false,
-}
-export const webhookEditDataStub: WebhookEditState = {
-  ...webhookDataStub,
-  webhookData: webhookItemDataStub,
-  loading: false,
-  modalType: '',
-}
-
-export const createWebhookItem: CreateWebhookParams = {
-  applicationId: '',
-  url: '',
-  description: '',
-  topicIds: [],
-  customerIds: [],
-  active: true,
-}
diff --git a/packages/admin-portal/src/sagas/__stubs__/webhooks.ts b/packages/admin-portal/src/sagas/__stubs__/webhooks.ts
deleted file mode 100644
index 2a2dc3879d..0000000000
--- a/packages/admin-portal/src/sagas/__stubs__/webhooks.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { PagedResultWebhookModel_, PagedResultTopicModel_ } from '@/reducers/webhook-subscriptions'
-
-export const subscriptions: PagedResultWebhookModel_ = {
-  _embedded: [
-    {
-      id: '08d7e2b8-bc76-0139-54a3-e0310fc130a8',
-      created: '2020-04-17T10:18:56',
-      modified: '2020-04-22T08:43:52',
-      applicationId: '313f831d-f589-415e-b778-b1a28b6778b8',
-      url: 'https://en7u51gyc2mf7.x.pipedream.net',
-      topicIds: ['contacts.created', 'contacts.modified'],
-      customerIds: ['KNS'],
-      active: true,
-      deleted: true,
-    },
-  ],
-  pageNumber: 1,
-  pageSize: 25,
-  pageCount: 1,
-  totalCount: 1,
-}
-
-export const topics: PagedResultTopicModel_ = {
-  _embedded: [
-    {
-      id: 'properties.created',
-      created: '2020-04-17T09:48:24',
-      modified: '2020-04-17T09:48:24',
-      name: 'Property created',
-      description: 'An event which occurs when a new property is created',
-      url: 'https://www.hooksinfo.me',
-      active: true,
-      associatedScope: 'agencyCloud/properties.read',
-      example: '',
-    },
-    {
-      id: 'properties.modified',
-      created: '2020-04-17T09:48:15',
-      modified: '2020-04-17T09:48:15',
-      name: 'Property modified',
-      description: 'An event which occurs when an existing property is modified',
-      url: 'https://www.hooksinfo.me',
-      active: true,
-      associatedScope: 'agencyCloud/properties.read',
-      example: '',
-    },
-  ],
-  pageNumber: 1,
-  pageSize: 25,
-  pageCount: 4,
-  totalCount: 4,
-}
diff --git a/packages/admin-portal/src/sagas/__tests__/app-http-traffic-event.ts b/packages/admin-portal/src/sagas/__tests__/app-http-traffic-event.ts
deleted file mode 100644
index eabba80d51..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/app-http-traffic-event.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import appHttpTrafficEventSagas, { appHttpTrafficEventListen, apphttpTrafficEventSaga } from '../app-http-trafic-event'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call } from '@redux-saga/core/effects'
-import { Action, ActionType } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  HttpTrafficPerDayParams,
-  httpTrafficPerDayReceiveData,
-  httpTrafficPerDayRequestDataFailure,
-} from '@/actions/app-http-traffic-event'
-import { httpTrafficPerDayStub } from '../__stubs__/app-http-traffic-event'
-import { fetchTrafficStatistics } from '@/services/traffic-events'
-
-jest.mock('@/services/traffic-events')
-jest.mock('@reapit/elements')
-
-const params = {
-  type: 'HTTP_TRAFFIC_PER_DAY_REQUEST_DATA' as ActionType,
-  data: {
-    applicationId: ['4fbbb1e8-bad0-43a2-98f9-bfb9bba366e7'],
-    dateFrom: '2020-02-17T10:27:44Z',
-  },
-}
-
-describe('app-http-traffic-per-day sagas', () => {
-  describe('appHttpTrafficSaga', () => {
-    const gen = cloneableGenerator(apphttpTrafficEventSaga)(params)
-    expect(gen.next().value).toEqual(call(fetchTrafficStatistics, params.data))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(httpTrafficPerDayStub).value).toEqual(put(httpTrafficPerDayReceiveData(httpTrafficPerDayStub)))
-    })
-
-    test('api fail sagas', () => {
-      const clone = gen.clone()
-      if (clone.throw) {
-        expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(
-          put(httpTrafficPerDayRequestDataFailure()),
-        )
-        expect(clone.next().value).toEqual(
-          put(
-            errorThrownServer({
-              type: 'SERVER',
-              message: errorMessages.DEFAULT_SERVER_ERROR,
-            }),
-          ),
-        )
-      }
-      expect(clone.next().done).toBe(true)
-    })
-  })
-
-  describe('app-http-traffic-per-day thunks', () => {
-    describe('appHttpTrafficEventListen', () => {
-      it('should trigger saga function when called', () => {
-        const gen = appHttpTrafficEventListen()
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<HttpTrafficPerDayParams>>(
-            ActionTypes.HTTP_TRAFFIC_PER_DAY_REQUEST_DATA,
-            apphttpTrafficEventSaga,
-          ),
-        )
-
-        expect(gen.next().done).toBe(true)
-      })
-    })
-
-    describe('appHttpTrafficEventSagas', () => {
-      it('should listen data request', () => {
-        const gen = appHttpTrafficEventSagas()
-
-        expect(gen.next().value).toEqual(all([fork(appHttpTrafficEventListen)]))
-        expect(gen.next().done).toBe(true)
-      })
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/app-installations.ts b/packages/admin-portal/src/sagas/__tests__/app-installations.ts
deleted file mode 100644
index 2978f8f132..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/app-installations.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-import appInstallationsSagas, {
-  appInstallationsListen,
-  appInstallSaga,
-  appUninstallSaga,
-  installationsSaga,
-  installationsFilterSaga,
-} from '../app-installations'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call, select } from '@redux-saga/core/effects'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  InstallationParams,
-  UninstallParams,
-  InstallParams,
-  appInstallationsReceiveData,
-  appInstallationsRequestDataFailure,
-  appInstallationsSetFormState,
-  appInstallationsFilterReceiveData,
-  appInstallationsFilterRequestDataFailure,
-} from '@/actions/app-installations'
-import { installationsStub } from '../__stubs__/installations'
-import { selectClientId, selectLoggedUserEmail } from '@/selector/client'
-import { selectDeveloperId } from '@/selector/developer'
-import { fetchInstallationsList, createInstallation, removeAccessToAppById } from '@/services/installations'
-
-jest.mock('@/services/installations')
-jest.mock('@reapit/elements')
-
-const installationsParams = {
-  data: {
-    appId: ['1'],
-  },
-}
-
-const installParams = {
-  data: {
-    appId: '1',
-  },
-}
-
-const uninstallParams = {
-  data: {
-    appId: '1',
-    installationId: '1',
-  },
-}
-
-describe('app-installations sagas', () => {
-  describe('installationsFetchData', () => {
-    const gen = cloneableGenerator(installationsSaga)(installationsParams)
-    expect(gen.next().value).toEqual(select(selectDeveloperId))
-    expect(gen.next().value).toEqual(call(fetchInstallationsList, { ...installationsParams.data }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(installationsStub).value).toEqual(put(appInstallationsReceiveData(installationsStub)))
-    })
-
-    test('api fail sagas', () => {
-      const clone = gen.clone()
-      if (clone.throw) {
-        expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(put(appInstallationsRequestDataFailure()))
-        expect(clone.next().value).toEqual(
-          put(
-            errorThrownServer({
-              type: 'SERVER',
-              message: errorMessages.DEFAULT_SERVER_ERROR,
-            }),
-          ),
-        )
-      }
-      expect(clone.next().done).toBe(true)
-    })
-  })
-
-  describe('installationsFilterFetchData', () => {
-    const gen = cloneableGenerator(installationsFilterSaga)(installationsParams)
-    expect(gen.next().value).toEqual(select(selectDeveloperId))
-    expect(gen.next().value).toEqual(call(fetchInstallationsList, installationsParams.data))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(installationsStub).value).toEqual(put(appInstallationsFilterReceiveData(installationsStub)))
-    })
-
-    test('api fail sagas', () => {
-      const clone = gen.clone()
-      if (clone.throw) {
-        expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(
-          put(appInstallationsFilterRequestDataFailure()),
-        )
-        expect(clone.next().value).toEqual(
-          put(
-            errorThrownServer({
-              type: 'SERVER',
-              message: errorMessages.DEFAULT_SERVER_ERROR,
-            }),
-          ),
-        )
-      }
-      expect(clone.next().done).toBe(true)
-    })
-  })
-
-  describe('appInstallSaga', () => {
-    const gen = cloneableGenerator(appInstallSaga)(installParams)
-    expect(gen.next().value).toEqual(put(appInstallationsSetFormState('SUBMITTING')))
-    expect(gen.next().value).toEqual(select(selectLoggedUserEmail))
-    expect(gen.next('1').value).toEqual(select(selectClientId))
-
-    test('clientId not exist', () => {
-      const clone = gen.clone()
-      expect(clone.next().value).toEqual(put(appInstallationsSetFormState('ERROR')))
-      expect(clone.next().value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-    })
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next('1').value).toEqual(
-        call(createInstallation, { ...installParams.data, clientId: '1', approvedBy: '1' }),
-      )
-      expect(clone.next().value).toEqual(put(appInstallationsSetFormState('SUCCESS')))
-    })
-  })
-
-  describe('appUninstallSaga', () => {
-    const gen = cloneableGenerator(appUninstallSaga)(uninstallParams)
-    expect(gen.next().value).toEqual(put(appInstallationsSetFormState('SUBMITTING')))
-    expect(gen.next().value).toEqual(select(selectLoggedUserEmail))
-
-    expect(gen.next('1').value).toEqual(call(removeAccessToAppById, { ...uninstallParams.data, terminatedBy: '1' }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next().value).toEqual(put(appInstallationsSetFormState('SUCCESS')))
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api fail sagas', () => {
-      const clone = gen.clone()
-      if (clone.throw) {
-        expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(
-          put(appInstallationsSetFormState('ERROR')),
-        )
-        expect(clone.next().value).toEqual(
-          put(
-            errorThrownServer({
-              type: 'SERVER',
-              message: errorMessages.DEFAULT_SERVER_ERROR,
-            }),
-          ),
-        )
-      }
-      expect(clone.next().done).toBe(true)
-    })
-  })
-
-  describe('app-install thunks', () => {
-    describe('appInstallDataListen', () => {
-      it('should trigger app install when called', () => {
-        const gen = appInstallationsListen()
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<InstallationParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_DATA, installationsSaga),
-        )
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<InstallationParams>>(
-            ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA,
-            installationsFilterSaga,
-          ),
-        )
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<UninstallParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_UNINSTALL, appUninstallSaga),
-        )
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<InstallParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_INSTALL, appInstallSaga),
-        )
-        expect(gen.next().done).toBe(true)
-      })
-    })
-
-    describe('appDetailSagas', () => {
-      it('should listen data request', () => {
-        const gen = appInstallationsSagas()
-
-        expect(gen.next().value).toEqual(all([fork(appInstallationsListen)]))
-        expect(gen.next().done).toBe(true)
-      })
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/app-usage-stats.ts b/packages/admin-portal/src/sagas/__tests__/app-usage-stats.ts
deleted file mode 100644
index 6c9124d1b8..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/app-usage-stats.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import appUsageStatsSagas, { appUsageStatsListen, appUsageStatsSaga } from '../app-usage-stats'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call } from '@redux-saga/core/effects'
-import { Action, ActionType } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  AppUsageStatsParams,
-  appUsageStatsReceiveData,
-  appUsageStatsRequestDataFailure,
-} from '@/actions/app-usage-stats'
-import { usageStatsDataStub } from '../__stubs__/app-usage-stats'
-import { fetchStatisticsList } from '@/services/statistics'
-
-jest.mock('@/services/statistics')
-jest.mock('@reapit/elements')
-
-const params = {
-  type: 'APP_USAGE_STATS_REQUEST_DATA' as ActionType,
-  data: {
-    appId: ['1'],
-  },
-}
-
-describe('app-usage-stats sagas', () => {
-  describe('appUsageStatsSaga', () => {
-    const gen = cloneableGenerator(appUsageStatsSaga)(params)
-    expect(gen.next().value).toEqual(call(fetchStatisticsList, params.data))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(usageStatsDataStub).value).toEqual(put(appUsageStatsReceiveData(usageStatsDataStub)))
-    })
-
-    test('api fail sagas', () => {
-      const clone = gen.clone()
-      if (clone.throw) {
-        expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(put(appUsageStatsRequestDataFailure()))
-        expect(clone.next().value).toEqual(
-          put(
-            errorThrownServer({
-              type: 'SERVER',
-              message: errorMessages.DEFAULT_SERVER_ERROR,
-            }),
-          ),
-        )
-      }
-      expect(clone.next().done).toBe(true)
-    })
-  })
-
-  describe('app-usage-stats thunks', () => {
-    describe('appUsageStatsListen', () => {
-      it('should trigger saga function when called', () => {
-        const gen = appUsageStatsListen()
-        expect(gen.next().value).toEqual(
-          takeLatest<Action<AppUsageStatsParams>>(ActionTypes.APP_USAGE_STATS_REQUEST_DATA, appUsageStatsSaga),
-        )
-
-        expect(gen.next().done).toBe(true)
-      })
-    })
-
-    describe('appUsageStatsSagas', () => {
-      it('should listen data request', () => {
-        const gen = appUsageStatsSagas()
-
-        expect(gen.next().value).toEqual(all([fork(appUsageStatsListen)]))
-        expect(gen.next().done).toBe(true)
-      })
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/client.ts b/packages/admin-portal/src/sagas/__tests__/client.ts
deleted file mode 100644
index c90eab3b62..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/client.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import clientSagas, { clientDataFetch, clientDataListen } from '../client'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call, select } from '@redux-saga/core/effects'
-import { clientFetchAppSummarySuccess } from '@/actions/client'
-import { categoriesReceiveData } from '@/actions/app-categories'
-import { featuredAppsDataStub, appsDataStub } from '../__stubs__/apps'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-import { Action } from '@/types/core'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { selectClientId, selectFeaturedApps, selectDeveloperEditionId } from '@/selector/client'
-import { selectCategories } from '@/selector/app-categories'
-import {
-  PagedResultCategoryModel_,
-  PagedResultAppSummaryModel_,
-  AppSummaryModel,
-} from '@reapit/foundations-ts-definitions'
-import { appCategorieStub } from '../__stubs__/app-categories'
-import { fetchAppsList } from '@/services/apps'
-
-jest.mock('@/services/apps')
-jest.mock('@/services/categories')
-jest.mock('@reapit/elements')
-
-const params = { data: { page: 1, search: 'app1', category: 'category1', searchBy: 'appName' } }
-const clientId = 'DXX'
-const developerId = '1234'
-
-describe('clientDataFetch', () => {
-  const gen = cloneableGenerator(clientDataFetch as any)(params)
-
-  it('should work in success case', () => {
-    const clone = gen.clone()
-    expect(clone.next().value).toEqual(select(selectClientId))
-    expect(clone.next(clientId).value).toEqual(select(selectCategories))
-    expect(clone.next(appCategorieStub.data).value).toEqual(select(selectFeaturedApps))
-    expect(clone.next(featuredAppsDataStub.data).value).toEqual(select(selectDeveloperEditionId))
-
-    const response = [appsDataStub.data, featuredAppsDataStub.data, appCategorieStub]
-    expect(clone.next(developerId).value).toEqual(
-      all([
-        call(fetchAppsList, {
-          clientId,
-          developerId: [developerId],
-          category: params.data.category as any,
-          appName: params.data.search,
-          pageNumber: params.data.page,
-          pageSize: APPS_PER_PAGE,
-          isFeatured: false,
-          isDirectApi: undefined,
-        }),
-        featuredAppsDataStub.data,
-        appCategorieStub.data,
-      ]),
-    )
-    expect(clone.next(response).value).toEqual(
-      put(
-        clientFetchAppSummarySuccess({
-          apps: response[0] as PagedResultAppSummaryModel_,
-          featuredApps: response[1].data as AppSummaryModel[],
-        }),
-      ),
-    )
-    expect(clone.next().value).toEqual(put(categoriesReceiveData(response[2] as PagedResultCategoryModel_)))
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('client fetch data error', () => {
-  const gen = cloneableGenerator(clientDataFetch as any)(params)
-
-  expect(gen.next('').value).toEqual(select(selectClientId))
-
-  if (!gen.throw) throw new Error('Generator object cannot throw')
-  expect(gen.throw('error').value).toEqual(
-    put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    ),
-  )
-})
-
-describe('client thunks', () => {
-  describe('clientListen', () => {
-    it('should request data when called', () => {
-      const gen = clientDataListen()
-
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<number>>(ActionTypes.CLIENT_FETCH_APP_SUMMARY, clientDataFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('clientSagas', () => {
-    it('should listen data request', () => {
-      const gen = clientSagas()
-
-      expect(gen.next().value).toEqual(all([fork(clientDataListen)]))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/developer-subscriptions.ts b/packages/admin-portal/src/sagas/__tests__/developer-subscriptions.ts
deleted file mode 100644
index a0778d24cd..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/developer-subscriptions.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { put, call, select } from 'redux-saga/effects'
-import { errorThrownServer } from '@/actions/error'
-import { Action } from '@/types/core'
-import { selectDeveloperId } from '@/selector/auth'
-import errorMessages from '@/constants/error-messages'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  developerFetchSubcriptionsList,
-  developerDeleteSubcription,
-  developerCreateSubscription,
-} from '../developer-subscriptions'
-import {
-  FetchSubscriptionsListParams,
-  fetchSubscriptionsList,
-  deleteSubscription,
-  createDeveloperSubscription,
-} from '@/services/developer-subscriptions'
-import { PagedResultSubscriptionModel_ } from '@reapit/foundations-ts-definitions'
-import { subscriptionModelStub } from '@/sagas/__stubs__/developer-subscriptions'
-import {
-  developerFetchSubscriptionsSuccess,
-  developerFetchSubscriptions,
-  developerCreateSubscriptionSuccess,
-  developerCreateSubscriptionFalure,
-  CreateSubscriptionParams,
-} from '@/actions/developer-subscriptions'
-
-jest.mock('@reapit/elements')
-jest.mock('@/services/developer-subscriptions')
-
-describe('developerSubscriptionsSagas', () => {
-  describe('developerFetchSubcriptionsList fetch data', () => {
-    const params: Action<FetchSubscriptionsListParams> = {
-      data: { developerId: 'developerId' },
-      type: 'DEVELOPER_FETCH_SUBSCRIPTIONS',
-    }
-    const gen = cloneableGenerator(developerFetchSubcriptionsList)(params)
-
-    expect(gen.next().value).toEqual(call(fetchSubscriptionsList, { developerId: params.data.developerId }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next({}).value).toEqual(put(developerFetchSubscriptionsSuccess({} as PagedResultSubscriptionModel_)))
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-    })
-  })
-
-  describe('developerCreateSubcriptionListen', () => {
-    const actionData: CreateSubscriptionParams = {
-      params: {
-        developerId: '123',
-        applicationId: '123',
-        user: 'tester@reapit.com',
-        type: 'developerEdition',
-      },
-      onCreated: jest.fn(),
-    }
-    const params: Action<CreateSubscriptionParams> = {
-      data: actionData,
-      type: 'DEVELOPER_SUBSCRIPTION_CREATE',
-    }
-    const gen = cloneableGenerator(developerCreateSubscription)(params)
-
-    expect(gen.next().value).toEqual(call(createDeveloperSubscription, params.data.params))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(subscriptionModelStub).value).toEqual(
-        put(developerCreateSubscriptionSuccess(subscriptionModelStub)),
-      )
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(put(developerCreateSubscriptionFalure()))
-    })
-  })
-
-  describe('developerDeleteSubcription', () => {
-    const params: Action<string> = {
-      data: 'ID',
-      type: 'DEVELOPER_FETCH_SUBSCRIPTIONS',
-    }
-    const gen = cloneableGenerator(developerDeleteSubcription)(params)
-
-    expect(gen.next().value).toEqual(call(deleteSubscription, { id: params.data }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next({}).value).toEqual(select(selectDeveloperId))
-      expect(clone.next('ID').value).toEqual(put(developerFetchSubscriptions({ developerId: 'ID' })))
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/developer.ts b/packages/admin-portal/src/sagas/__tests__/developer.ts
deleted file mode 100644
index d6317b9dfd..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/developer.ts
+++ /dev/null
@@ -1,317 +0,0 @@
-import { CreateDeveloperModel } from '@reapit/foundations-ts-definitions'
-import { call, put, takeLatest, all, fork, select } from '@redux-saga/core/effects'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  developerLoading,
-  developerReceiveData,
-  developerRequestDataFailure,
-  developerSetFormState,
-  setMyIdentity,
-  fetchBillingFailure,
-  fetchBillingSuccess,
-  fetchMonthlyBillingSuccess,
-  fetchMonthlyBillingFailure,
-  developerSetWebhookPingStatus,
-} from '@/actions/developer'
-import developerSagas, {
-  developerDataFetch,
-  developerRequestDataListen,
-  developerCreate,
-  developerCreateListen,
-  fetchMyIdentitySagasListen,
-  fetchBillingSagasListen,
-  fetchMyIdentitySagas,
-  fetchBillingSagas,
-  fetchMonthlyBillingSagasListen,
-  fetchMonthlyBillingSagas,
-  developerWebhookPingListen,
-  developerWebhookPing,
-} from '../developer'
-import ActionTypes from '@/constants/action-types'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-import { appsDataStub } from '../__stubs__/apps'
-import { appPermissionStub } from '../__stubs__/app-permission'
-import { Action } from '@/types/core'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { selectDeveloperId } from '@/selector/developer'
-import { developerIdentity } from '../__stubs__/developer-identity'
-import { billing } from '../__stubs__/billing'
-import { monthlyBillingData } from '../__stubs__/monthly-billing'
-import { pingWebhooksById, PingWebhooksByIdParams } from '@/services/webhooks'
-import { fetchAppsList } from '@/services/apps'
-import { fetchScopesList } from '@/services/scopes'
-import { createDeveloper, fetchDeveloperById } from '@/services/developers'
-import {
-  fetchBillings,
-  FetchBillingsParams,
-  FetchBillingsByMonthParams,
-  fetchBillingsByMonth,
-} from '@/services/traffic-events'
-
-jest.mock('@/services/apps')
-jest.mock('@/services/scopes')
-jest.mock('@/services/developers')
-jest.mock('@/services/traffic-events')
-
-jest.mock('@reapit/elements')
-
-const params = { data: { page: 1 } }
-
-describe('developer fetch data', () => {
-  const gen = cloneableGenerator(developerDataFetch as any)(params)
-  const developerId = '72ad4ed6-0df0-4a28-903c-55899cffee85'
-
-  expect(gen.next().value).toEqual(put(developerLoading(true)))
-  expect(gen.next().value).toEqual(select(selectDeveloperId))
-  expect(gen.next(developerId).value).toEqual(
-    all([
-      call(fetchAppsList, { developerId: [developerId], pageNumber: params.data.page, pageSize: APPS_PER_PAGE }),
-      call(fetchScopesList),
-    ]),
-  )
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next([appsDataStub.data, appPermissionStub]).value).toEqual(
-      put(developerReceiveData({ ...appsDataStub, scopes: appPermissionStub })),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-
-  it('api call fail when data undefined', () => {
-    const clone = gen.clone()
-    expect(clone.next([undefined, appPermissionStub]).value).toEqual(put(developerRequestDataFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-
-  it('api call fail when scopes undefined', () => {
-    const clone = gen.clone()
-    expect(clone.next([appsDataStub.data, undefined]).value).toEqual(put(developerRequestDataFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-  it('api call fail when all scopes undefined', () => {
-    const clone = gen.clone()
-    expect(clone.next([undefined, undefined]).value).toEqual(put(developerRequestDataFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('developer create', () => {
-  const params: CreateDeveloperModel = { name: '123' }
-  const gen = cloneableGenerator(developerCreate as any)({ data: params })
-  expect(gen.next().value).toEqual(put(developerSetFormState('SUBMITTING')))
-  expect(gen.next().value).toEqual(call(createDeveloper, params))
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next('SUCCESS').value).toEqual(put(developerSetFormState('SUCCESS')))
-    expect(clone.next().done).toEqual(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(put(developerSetFormState('ERROR')))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toEqual(true)
-  })
-})
-
-describe('fetchMyIdentitySagas', () => {
-  const developerId = '1'
-  const gen = cloneableGenerator(fetchMyIdentitySagas as any)({ data: params })
-  expect(gen.next().value).toEqual(put(developerLoading(true)))
-  expect(gen.next().value).toEqual(select(selectDeveloperId))
-  expect(gen.next(developerId).value).toEqual(call(fetchDeveloperById, { id: developerId }))
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(developerIdentity).value).toEqual(put(setMyIdentity(developerIdentity)))
-    expect(clone.next().value).toEqual(put(developerLoading(false)))
-    expect(clone.next().done).toEqual(true)
-  })
-
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(put(developerLoading(false)))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toEqual(true)
-  })
-})
-
-describe('fetchBillingSagas', () => {
-  const params = {
-    dateFrom: '2020-01',
-    dateTo: '2020-05',
-    applicationId: ['1', '2'],
-  } as FetchBillingsParams
-  const gen = cloneableGenerator(fetchBillingSagas as any)({ data: params })
-  expect(gen.next().value).toEqual(call(fetchBillings, params))
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(billing).value).toEqual(put(fetchBillingSuccess(billing)))
-    expect(clone.next().done).toEqual(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(put(fetchBillingFailure('error')))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toEqual(true)
-  })
-})
-
-describe('fetchMonthlyBillingSagas', () => {
-  const params = {
-    month: '2020-01',
-    applicationId: ['1', '2'],
-  } as FetchBillingsByMonthParams
-  const gen = cloneableGenerator(fetchMonthlyBillingSagas as any)({ data: params })
-  expect(gen.next().value).toEqual(call(fetchBillingsByMonth, params))
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(monthlyBillingData).value).toEqual(put(fetchMonthlyBillingSuccess(monthlyBillingData)))
-    expect(clone.next().done).toEqual(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(put(fetchMonthlyBillingFailure('error')))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toEqual(true)
-  })
-})
-
-describe('developerWebhookPing', () => {
-  const params = {
-    id: '2020-01',
-    topicId: 'topicid',
-  } as PingWebhooksByIdParams
-  const gen = cloneableGenerator(developerWebhookPing as any)({ data: params })
-  expect(gen.next().value).toEqual(put(developerSetWebhookPingStatus('LOADING')))
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next().value).toEqual(call(pingWebhooksById, params))
-    expect(clone.next().value).toEqual(put(developerSetWebhookPingStatus('SUCCESS')))
-    expect(clone.next().done).toEqual(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('error').value).toEqual(put(developerSetWebhookPingStatus('FAILED')))
-    expect(clone.next().done).toEqual(true)
-  })
-})
-
-describe('developer thunks', () => {
-  describe('developerRequestDataListen', () => {
-    it('should request data listen', () => {
-      const gen = developerRequestDataListen()
-
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<number>>(ActionTypes.DEVELOPER_REQUEST_DATA, developerDataFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerCreateListen', () => {
-    it('should trigger developerCreact action', () => {
-      const gen = fetchMyIdentitySagasListen()
-      expect(gen.next().value).toEqual(takeLatest(ActionTypes.DEVELOPER_FETCH_MY_IDENTITY, fetchMyIdentitySagas))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerCreateListen', () => {
-    it('should trigger developerCreact action', () => {
-      const gen = fetchBillingSagasListen()
-      expect(gen.next().value).toEqual(takeLatest(ActionTypes.DEVELOPER_FETCH_BILLING, fetchBillingSagas))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerCreateListen', () => {
-    it('should trigger developerCreact action', () => {
-      const gen = developerCreateListen()
-      expect(gen.next().value).toEqual(takeLatest(ActionTypes.DEVELOPER_CREATE, developerCreate))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('fetchMonthlyBillingSagasListen', () => {
-    it('should trigger developerCreact action', () => {
-      const gen = fetchMonthlyBillingSagasListen()
-      expect(gen.next().value).toEqual(
-        takeLatest(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING, fetchMonthlyBillingSagas),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerWebhookPingListen', () => {
-    it('should trigger developerWebhookPing action', () => {
-      const gen = developerWebhookPingListen()
-      expect(gen.next().value).toEqual(takeLatest(ActionTypes.DEVELOPER_PING_WEBHOOK, developerWebhookPing))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerSagas', () => {
-    it('should listen developer request data & create app action', () => {
-      const gen = developerSagas()
-
-      expect(gen.next().value).toEqual(
-        all([
-          fork(developerRequestDataListen),
-          fork(developerCreateListen),
-          fork(fetchMyIdentitySagasListen),
-          fork(fetchBillingSagasListen),
-          fork(fetchMonthlyBillingSagasListen),
-          fork(developerWebhookPingListen),
-        ]),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/installed-apps.ts b/packages/admin-portal/src/sagas/__tests__/installed-apps.ts
deleted file mode 100644
index fb22d4454f..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/installed-apps.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import installedAppsSagas, { installedAppsDataFetch, installedAppsDataListen } from '../installed-apps'
-import { appsDataStub } from '../__stubs__/apps'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call, select } from '@redux-saga/core/effects'
-import {
-  installedAppsLoading,
-  installedAppsReceiveData,
-  installedAppsRequestDataFailure,
-} from '@/actions/installed-apps'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { selectClientId, selectDeveloperEditionId } from '@/selector/client'
-import { fetchAppsList } from '@/services/apps'
-import { INSTALLED_APPS_PERPAGE } from '@/constants/paginator'
-
-jest.mock('@/services/apps')
-jest.mock('@reapit/elements')
-
-const params = { data: 1 }
-
-describe('installed-apps fetch data', () => {
-  const gen = cloneableGenerator(installedAppsDataFetch)(params)
-  const clientId = 'DAC'
-  const developerId = '1234'
-
-  expect(gen.next().value).toEqual(put(installedAppsLoading(true)))
-  expect(gen.next().value).toEqual(select(selectClientId))
-  expect(gen.next(clientId).value).toEqual(select(selectDeveloperEditionId))
-  expect(gen.next(developerId).value).toEqual(
-    call(fetchAppsList, {
-      clientId,
-      developerId: [developerId],
-      pageNumber: params.data,
-      pageSize: INSTALLED_APPS_PERPAGE,
-      onlyInstalled: true,
-      isDirectApi: false,
-    }),
-  )
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appsDataStub.data).value).toEqual(put(installedAppsReceiveData(appsDataStub)))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    expect(clone.next(undefined).value).toEqual(put(installedAppsRequestDataFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('installed-apps fetch data error', () => {
-  const gen = cloneableGenerator(installedAppsDataFetch)(params)
-
-  expect(gen.next().value).toEqual(put(installedAppsLoading(true)))
-  expect(gen.next().value).toEqual(select(selectClientId))
-  if (!gen.throw) throw new Error('Generator object cannot throw')
-  expect(gen.throw('Client id is not exists').value).toEqual(
-    put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    ),
-  )
-})
-
-describe('installed-apps thunks', () => {
-  describe('installedAppsDataListen', () => {
-    it('should request data when called', () => {
-      const gen = installedAppsDataListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<number>>(ActionTypes.INSTALLED_APPS_REQUEST_DATA, installedAppsDataFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('installedAppsSagas', () => {
-    it('should listen request data', () => {
-      const gen = installedAppsSagas()
-
-      expect(gen.next().value).toEqual(all([fork(installedAppsDataListen)]))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/my-apps.ts b/packages/admin-portal/src/sagas/__tests__/my-apps.ts
deleted file mode 100644
index ccf73b8c5f..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/my-apps.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import myAppsSagas, { myAppsDataFetch, myAppsDataListen } from '../my-apps'
-import { appsDataStub } from '../__stubs__/apps'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call, select } from '@redux-saga/core/effects'
-import { myAppsLoading, myAppsReceiveData, myAppsRequestDataFailure } from '@/actions/my-apps'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-import errorMessages from '@/constants/error-messages'
-import { selectClientId, selectDeveloperEditionId } from '@/selector/client'
-import { errorThrownServer } from '@/actions/error'
-import { fetchAppsList } from '@/services/apps'
-
-jest.mock('@/services/apps')
-jest.mock('@reapit/elements')
-const params = { data: 1 }
-
-describe('my-apps fetch data', () => {
-  const gen = cloneableGenerator(myAppsDataFetch)(params)
-  const clientId = 'DAC'
-  const developerId = '1234'
-
-  expect(gen.next().value).toEqual(put(myAppsLoading(true)))
-  expect(gen.next().value).toEqual(select(selectClientId))
-  expect(gen.next(clientId).value).toEqual(select(selectDeveloperEditionId))
-  expect(gen.next(developerId).value).toEqual(
-    call(fetchAppsList, {
-      clientId,
-      developerId: [developerId],
-      onlyInstalled: true,
-      pageNumber: params.data,
-      pageSize: APPS_PER_PAGE,
-    }),
-  )
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appsDataStub.data).value).toEqual(put(myAppsReceiveData(appsDataStub)))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    expect(clone.next(undefined).value).toEqual(put(myAppsRequestDataFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('my-apps fetch data error', () => {
-  const gen = cloneableGenerator(myAppsDataFetch)(params)
-
-  expect(gen.next().value).toEqual(put(myAppsLoading(true)))
-  expect(gen.next().value).toEqual(select(selectClientId))
-
-  if (!gen.throw) throw new Error('Generator object cannot throw')
-  expect(gen.throw('Client id is not exists').value).toEqual(
-    put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    ),
-  )
-})
-
-describe('my-apps thunks', () => {
-  describe('myAppsDataListen', () => {
-    it('should request data when called', () => {
-      const gen = myAppsDataListen()
-      expect(gen.next().value).toEqual(takeLatest<Action<number>>(ActionTypes.MY_APPS_REQUEST_DATA, myAppsDataFetch))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('myAppsSagas', () => {
-    it('should listen request data', () => {
-      const gen = myAppsSagas()
-
-      expect(gen.next().value).toEqual(all([fork(myAppsDataListen)]))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/settings.ts b/packages/admin-portal/src/sagas/__tests__/settings.ts
deleted file mode 100644
index d9e0a5cd99..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/settings.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { put, fork, all, call, takeLatest, select } from '@redux-saga/core/effects'
-import settingsSagas, {
-  developerInformationFetchListen,
-  developerInformationFetch,
-  developerInformationChangeListen,
-  developerInfomationChange,
-  developerPasswordChange,
-  developerPasswordChangeListen,
-} from '../settings'
-import { Action } from '@/types/core'
-import ActionTypes from '@/constants/action-types'
-import { DeveloperModel } from '@reapit/foundations-ts-definitions'
-import { ChangePasswordParams, settingShowLoading, requestDeveloperDataSuccess } from '@/actions/settings'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { selectDeveloperId, selectDeveloperEmail } from '@/selector/developer'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import messages from '@/constants/messages'
-import { developerStub } from '../__stubs__/developer'
-import { removeSession, changePassword } from '@reapit/cognito-auth'
-import { authLogout } from '@/actions/auth'
-import { showNotificationMessage } from '@/actions/notification-message'
-import { fetchDeveloperById, updateDeveloperById } from '@/services/developers'
-
-jest.mock('@/services/developers')
-jest.mock('@reapit/elements')
-jest.mock('../../core/router', () => ({
-  history: {
-    push: jest.fn(),
-    replace: jest.fn(),
-  },
-}))
-
-describe('settings', () => {
-  describe('developerInformationFetch', () => {
-    const gen = cloneableGenerator(developerInformationFetch)()
-    expect(gen.next().value).toEqual(put(settingShowLoading(true)))
-    expect(gen.next().value).toEqual(select(selectDeveloperId))
-    it('should return', () => {
-      const clone = gen.clone()
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-    expect(gen.next('123').value).toEqual(call(fetchDeveloperById, { id: '123' }))
-    it('should call api success', () => {
-      const clone = gen.clone()
-      expect(clone.next({}).value).toEqual(put(requestDeveloperDataSuccess({})))
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-    })
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-  })
-
-  describe('developerInfomationChange', () => {
-    const gen = cloneableGenerator(developerInfomationChange)({
-      type: 'SETTING_UPDATE_DEVELOPER',
-      data: { company: '123' },
-    })
-    expect(gen.next().value).toEqual(put(settingShowLoading(true)))
-    expect(gen.next().value).toEqual(select(selectDeveloperId))
-    it('should call api success', () => {
-      const clone = gen.clone()
-      expect(clone.next('123').value).toEqual(call(updateDeveloperById, { id: '123', companyName: '123' }))
-      expect(clone.next({ message: 'SUCCESS' }).value).toEqual(
-        put(
-          showNotificationMessage({
-            variant: 'info',
-            message: messages.CHANGE_SAVE_SUCCESSFULLY,
-          }),
-        ),
-      )
-      expect(clone.next({ message: 'SUCCESS' }).value).toEqual(call(fetchDeveloperById, { id: '123' }))
-      expect(clone.next(developerStub).value).toEqual(put(requestDeveloperDataSuccess(developerStub)))
-    })
-
-    it('should return when no developerId', () => {
-      const clone = gen.clone()
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-
-    it('should call api not success', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-  })
-
-  describe('developerPasswordChange', () => {
-    const data = { currentPassword: '123', password: '456', confirmPassword: '456' }
-    const gen = cloneableGenerator(developerPasswordChange)({
-      type: 'CHANGE_PASSWORD',
-      data,
-    })
-    expect(gen.next().value).toEqual(put(settingShowLoading(true)))
-    expect(gen.next().value).toEqual(select(selectDeveloperEmail))
-
-    it('should call API success', () => {
-      const clone = gen.clone()
-      expect(clone.next('abc@gmail.com').value).toEqual(
-        call(changePassword, {
-          password: '123',
-          newPassword: '456',
-          userName: 'abc@gmail.com',
-          cognitoClientId: window.reapit.config.cognitoClientId || '',
-        }),
-      )
-      expect(clone.next('SUCCESS').value).toEqual(call(removeSession))
-      expect(clone.next().value).toEqual(put(authLogout()))
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-
-    it('should fail if API response !== "SUCCESS" ', () => {
-      const clone = gen.clone()
-      expect(clone.next('abc@gmail.com').value).toEqual(
-        call(changePassword, {
-          password: '123',
-          newPassword: '456',
-          userName: 'abc@gmail.com',
-          cognitoClientId: window.reapit.config.cognitoClientId || '',
-        }),
-      )
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('FAIL').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-
-    it('should call API fail', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-      expect(clone.next().value).toEqual(put(settingShowLoading(false)))
-      expect(clone.next().done).toEqual(true)
-    })
-  })
-})
-
-describe('settings thunks', () => {
-  describe('developerInformationFetchListen', () => {
-    it('should submit data when called', () => {
-      const gen = developerInformationFetchListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<string>>(ActionTypes.SETTING_FETCH_DEVELOPER_INFO, developerInformationFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerInformationChangeListen', () => {
-    it('should submit data when called', () => {
-      const gen = developerInformationChangeListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<DeveloperModel>>(ActionTypes.SETTING_UPDATE_DEVELOPER, developerInfomationChange),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerPasswordChangeListen', () => {
-    it('should submit data when called', () => {
-      const gen = developerPasswordChangeListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<ChangePasswordParams>>(ActionTypes.CHANGE_PASSWORD, developerPasswordChange),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('settingsSagas', () => {
-    it('should listen saga', () => {
-      const gen = settingsSagas()
-
-      expect(gen.next().value).toEqual(
-        all([
-          fork(developerInformationFetchListen),
-          fork(developerInformationChangeListen),
-          fork(developerPasswordChangeListen),
-        ]),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/submit-revision.ts b/packages/admin-portal/src/sagas/__tests__/submit-revision.ts
deleted file mode 100644
index ef69cf1089..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/submit-revision.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { submitRevision as submitRevisionSaga, submitRevisionDataListen, submitRevisionSagas } from '../submit-revision'
-import ActionTypes from '@/constants/action-types'
-import { put, fork, all, call, takeLatest } from '@redux-saga/core/effects'
-import { SubmitRevisionParams } from '@/actions/submit-revision'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { revisionSubmitStub } from '../__stubs__/revision-submit'
-import { appDetailRequestData } from '@/actions/app-detail'
-import { createAppRevision } from '@/services/apps'
-
-jest.mock('@/services/apps')
-jest.mock('@reapit/elements')
-
-const params: Action<SubmitRevisionParams> = {
-  data: { params: { ...revisionSubmitStub.data, id: '1' }, onSuccess: jest.fn(), onError: jest.fn() },
-  type: 'DEVELOPER_SUBMIT_REVISION',
-}
-
-const generateDumpPromise = () => new Promise(() => null)
-
-describe('submit-revision post data', () => {
-  const imageUploaderRequests = [
-    generateDumpPromise(),
-    generateDumpPromise(),
-    generateDumpPromise(),
-    generateDumpPromise(),
-    generateDumpPromise(),
-    generateDumpPromise(),
-  ]
-  const imageUploaderResults = [
-    { Url: 'base64 string...' },
-    { Url: 'base64 string...' },
-    { Url: 'base64 string...' },
-    { Url: 'base64 string...' },
-    { Url: 'base64 string...' },
-    { Url: 'base64 string...' },
-  ]
-  const updatedData = {
-    ...revisionSubmitStub.data,
-    iconImageUrl: 'base64 string...',
-    screen1ImageUrl: 'base64 string...',
-    screen2ImageUrl: 'base64 string...',
-    screen3ImageUrl: 'base64 string...',
-    screen4ImageUrl: 'base64 string...',
-    screen5ImageUrl: 'base64 string...',
-  }
-
-  const gen = cloneableGenerator(submitRevisionSaga)(params)
-  const { id } = params.data.params
-
-  expect(gen.next().value).toEqual(all(imageUploaderRequests))
-  expect(gen.next(imageUploaderResults).value).toEqual(
-    call(createAppRevision, { id, ...updatedData, categoryId: undefined }),
-  )
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next({}).value).toEqual(put(appDetailRequestData({ id })))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('submit-revision thunks', () => {
-  describe('submitRevisionDataListen', () => {
-    it('should submit data when called', () => {
-      const gen = submitRevisionDataListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<SubmitRevisionParams>>(ActionTypes.DEVELOPER_SUBMIT_REVISION, submitRevisionSaga),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('submitRevisionSagas', () => {
-    it('should listen saga', () => {
-      const gen = submitRevisionSagas()
-
-      expect(gen.next().value).toEqual(all([fork(submitRevisionDataListen)]))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/web-component.ts b/packages/admin-portal/src/sagas/__tests__/web-component.ts
deleted file mode 100644
index afa229b87f..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/web-component.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import webComponentSagas, {
-  updateWebComponentConfigListen,
-  fetchWebComponentConfigListen,
-  updateWebComponentConfigSaga,
-  fetchWebComponentConfigSaga,
-} from '../web-component'
-import { call, put, all, fork, takeLatest } from '@redux-saga/core/effects'
-import { Action } from '@/types/core'
-import {
-  UpdateWebComponentConfigParams,
-  FetchWebComponentConfigParams,
-  updateWebComponentConfig,
-  fetchWebComponentConfig,
-  WebComponentConfigResult,
-} from '@/services/web-component'
-import ActionTypes from '@/constants/action-types'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import {
-  clientFetchWebComponentConfigSuccess,
-  clientFetchNegotiatorsSuccess,
-  clientFetchWebComponentConfigFailed,
-  clientUpdateWebComponentConfigFailed,
-} from '@/actions/client'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '../../../../elements/src/utils/validators/error-messages'
-import { fetchNegotiators, NegotiatorsResult } from '@/services/negotiators'
-
-describe('webComponentSagas', () => {
-  it('should listen request data', () => {
-    const gen = webComponentSagas()
-
-    expect(gen.next().value).toEqual(all([fork(fetchWebComponentConfigListen), fork(updateWebComponentConfigListen)]))
-
-    expect(gen.next().done).toBe(true)
-  })
-})
-
-describe('updateWebComponentConfigListen', () => {
-  it('should editWebhook when called', () => {
-    const gen = updateWebComponentConfigListen()
-    expect(gen.next().value).toEqual(
-      takeLatest<Action<UpdateWebComponentConfigParams>>(
-        ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG,
-        updateWebComponentConfigSaga,
-      ),
-    )
-    expect(gen.next().done).toBe(true)
-  })
-})
-
-describe('fetchWebComponentConfigListen', () => {
-  it('should editWebhook when called', () => {
-    const gen = fetchWebComponentConfigListen()
-    expect(gen.next().value).toEqual(
-      takeLatest<Action<FetchWebComponentConfigParams>>(
-        ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG,
-        fetchWebComponentConfigSaga,
-      ),
-    )
-    expect(gen.next().done).toBe(true)
-  })
-})
-
-describe('putWebComponentConfigSaga', () => {
-  const params = {
-    appointmentLength: 12,
-    appointmentTimeGap: 21,
-    customerId: 'string',
-    daysOfWeek: ['1'],
-    negotiatorIds: ['1'],
-    appId: 'appId',
-  } as UpdateWebComponentConfigParams
-
-  const gen = cloneableGenerator(updateWebComponentConfigSaga as any)({ data: params })
-  expect(gen.next().value).toEqual(call(updateWebComponentConfig, params))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(params as any).value).toEqual(put(clientFetchWebComponentConfigSuccess(params)))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(put(clientUpdateWebComponentConfigFailed()))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('fetchWebComponentConfigSaga', () => {
-  const params = {
-    customerId: 'string',
-  } as FetchWebComponentConfigParams
-
-  const respone = {
-    appointmentLength: 12,
-    appointmentTimeGap: 21,
-    customerId: 'string',
-    daysOfWeek: ['1'],
-    negotiatorIds: ['1'],
-  } as WebComponentConfigResult
-
-  const list = {
-    pageCount: 99,
-    pageNumber: 99,
-    pageSize: 9,
-    totalCount: 99,
-    _embedded: [
-      {
-        active: true,
-        created: 'string',
-        email: 'string',
-        id: 'string',
-        jobTitle: 'string',
-        metadata: 'any',
-        mobilePhone: 'string',
-        modified: 'string',
-        name: 'string',
-        officeId: 'string',
-        workPhone: 'string',
-      },
-    ],
-  } as NegotiatorsResult
-
-  const gen = cloneableGenerator(fetchWebComponentConfigSaga as any)({ data: params })
-  expect(gen.next().value).toEqual(all([call(fetchWebComponentConfig, params), call(fetchNegotiators, {})]))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next([respone, list]).value).toEqual(put(clientFetchWebComponentConfigSuccess(respone)))
-    expect(clone.next().value).toEqual(put(clientFetchNegotiatorsSuccess(list)))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw(errorMessages.DEFAULT_SERVER_ERROR).value).toEqual(put(clientFetchWebComponentConfigFailed()))
-    expect(clone.next().done).toBe(true)
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/webhook-edit-modal.ts b/packages/admin-portal/src/sagas/__tests__/webhook-edit-modal.ts
deleted file mode 100644
index acc5b0fcb0..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/webhook-edit-modal.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import developerWebhookSagas, {
-  requestSupcriptionData,
-  createWebhookListen,
-  editWebhook,
-  editWebhookListen,
-  requestWebhookData,
-  requestWebhookSupcriptionDataListen,
-  requestWebhookDataListen,
-  deleteWebhookListen,
-  deleteWebhook,
-  createNewWebhook,
-} from '../webhook-edit-modal'
-import { call, put, all, fork, takeLatest } from '@redux-saga/core/effects'
-import {
-  requestWebhookSubcriptionReceiveData,
-  requestWebhookReceiveData,
-  requestWebhookSubcriptionReceiveFailure,
-  DeleteWebhookParams,
-  EditWebhookParams,
-  CreateWebhookParams,
-  requestWebhookSubcriptionData,
-  requestWebhookReceiveDataFailure,
-  webhookSetOpenModal,
-} from '@/actions/webhook-edit-modal'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { webhookDataStub, webhookItemDataStub } from '../__stubs__/webhook-edit'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '../../../../elements/src/utils/validators/error-messages'
-import { setApplicationId, webhookSubscriptionsReceiveData } from '@/actions/webhook-subscriptions'
-import ActionTypes from '@/constants/action-types'
-import { Action } from '@/types/core'
-import { subscriptions } from '../__stubs__/webhooks'
-import {
-  fetchWebhooksTopicsList,
-  createWebhooksSubscription,
-  updateWebhooksSubscriptionById,
-  deleteWebhooksSubscriptionById,
-  fetchWebhooksSubscriptionsList,
-  fetchWebhooksSubscriptionById,
-} from '@/services/webhooks'
-import { fetchInstallationsList } from '@/services/installations'
-
-jest.mock('@/services/webhooks')
-jest.mock('@/services/installations')
-jest.mock('@reapit/elements')
-const applicationId = '1161242a-f650-4d1d-aed7-909853fe7ee1'
-const params = { data: applicationId }
-
-describe('developer fetch subscription data', () => {
-  const gen = cloneableGenerator(requestSupcriptionData as any)(params)
-  expect(gen.next().value).toEqual(put(setApplicationId(applicationId)))
-
-  expect(gen.next().value).toEqual(
-    all([call(fetchWebhooksTopicsList, { applicationId }), call(fetchInstallationsList, { appId: [applicationId] })]),
-  )
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next([webhookDataStub.subcriptionTopics, webhookDataStub.subcriptionCustomers] as any).value).toEqual(
-      put(requestWebhookSubcriptionReceiveData(webhookDataStub)),
-    )
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    expect(clone.next([undefined, undefined]).value).toEqual(put(requestWebhookSubcriptionReceiveFailure()))
-    expect(clone.next().done).toBe(true)
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('Call API Failed').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('developer fetch webhook data', () => {
-  const webhookId = ''
-  const applicationId = ''
-  const gen = cloneableGenerator(requestWebhookData as any)({ data: webhookId })
-  expect(gen.next().value).toEqual(call(fetchWebhooksSubscriptionById, { id: webhookId }))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(webhookItemDataStub as any).value).toEqual(put(requestWebhookReceiveData(webhookItemDataStub)))
-    expect(clone.next(applicationId).value).toEqual(put(requestWebhookSubcriptionData(applicationId)))
-  })
-
-  test('api call fail', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('Call API Failed').value).toEqual(put(requestWebhookReceiveDataFailure()))
-    expect(clone.next().value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
-describe('developerWebhookSagas', () => {
-  it('should listen request data', () => {
-    const gen = developerWebhookSagas()
-
-    expect(gen.next().value).toEqual(
-      all([
-        fork(requestWebhookSupcriptionDataListen),
-        fork(createWebhookListen),
-        fork(editWebhookListen),
-        fork(requestWebhookDataListen),
-        fork(deleteWebhookListen),
-      ]),
-    )
-    expect(gen.next().done).toBe(true)
-  })
-})
-describe('webhook edit thunks', () => {
-  describe('deleteWebhookListen', () => {
-    it('should deleteWebhook when called', () => {
-      const gen = deleteWebhookListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<DeleteWebhookParams>>(ActionTypes.WEBHOOK_DELETE, deleteWebhook),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-  describe('requestWebhookDataListen', () => {
-    it('should requestWebhookData when called', () => {
-      const gen = requestWebhookDataListen()
-      expect(gen.next().value).toEqual(takeLatest<Action<string>>(ActionTypes.WEBHOOK_REQUEST_DATA, requestWebhookData))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-  describe('editWebhookListen', () => {
-    it('should editWebhook when called', () => {
-      const gen = editWebhookListen()
-      expect(gen.next().value).toEqual(takeLatest<Action<EditWebhookParams>>(ActionTypes.WEBHOOK_EDIT, editWebhook))
-      expect(gen.next().done).toBe(true)
-    })
-  })
-  describe('createWebhookListen', () => {
-    it('should createNewWebhook when called', () => {
-      const gen = createWebhookListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<CreateWebhookParams>>(ActionTypes.WEBHOOK_CREATE, createNewWebhook),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-  describe('requestWebhookSupcriptionDataListen', () => {
-    it('should createNewWebhook when called', () => {
-      const gen = requestWebhookSupcriptionDataListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<string>>(ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA, requestSupcriptionData),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
-
-describe('deleteWebhook', () => {
-  const webhookId = 'webhookId'
-  const applicationId = 'applicationId'
-  const gen = cloneableGenerator(deleteWebhook as any)({ data: { applicationId, webhookId } })
-  expect(gen.next().value).toEqual(call(deleteWebhooksSubscriptionById, { id: webhookId }))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(true).value).toEqual(put(webhookSetOpenModal('')))
-    expect(clone.next().value).toEqual(call(fetchWebhooksSubscriptionsList, { applicationId: [applicationId] }))
-    expect(clone.next(subscriptions).value).toEqual(put(webhookSubscriptionsReceiveData(subscriptions)))
-    expect(clone.next().done).toBe(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('Call API Failed').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('editWebhook', () => {
-  const data = {
-    applicationId: 'applicationId',
-    webhookId: 'webhookId',
-    url: 'url',
-    topicIds: [],
-    customerIds: [],
-    active: true,
-  }
-  const gen = cloneableGenerator(editWebhook as any)({ data })
-  expect(gen.next().value).toEqual(call(updateWebhooksSubscriptionById, { id: data.webhookId, ...data }))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(true).value).toEqual(put(webhookSetOpenModal('')))
-    expect(clone.next().value).toEqual(call(fetchWebhooksSubscriptionsList, { applicationId: [data.applicationId] }))
-    expect(clone.next(subscriptions).value).toEqual(put(webhookSubscriptionsReceiveData(subscriptions)))
-    expect(clone.next().done).toBe(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('Call API Failed').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
-
-describe('createNewWebhook', () => {
-  const data = {
-    applicationId: 'applicationId',
-    webhookId: 'webhookId',
-    url: 'url',
-    topicIds: [],
-    customerIds: [],
-    active: true,
-  }
-  const gen = cloneableGenerator(createNewWebhook as any)({ data })
-  expect(gen.next().value).toEqual(call(createWebhooksSubscription, data))
-
-  it('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(true).value).toEqual(put(webhookSetOpenModal('')))
-    expect(clone.next().value).toEqual(call(fetchWebhooksSubscriptionsList, { applicationId: [data.applicationId] }))
-    expect(clone.next(subscriptions).value).toEqual(put(webhookSubscriptionsReceiveData(subscriptions)))
-    expect(clone.next().done).toBe(true)
-  })
-  it('api call error', () => {
-    const clone = gen.clone()
-    if (!clone.throw) throw new Error('Generator object cannot throw')
-    expect(clone.throw('Call API Failed').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-    expect(clone.next().done).toBe(true)
-  })
-})
diff --git a/packages/admin-portal/src/sagas/__tests__/webhook-subscriptions.ts b/packages/admin-portal/src/sagas/__tests__/webhook-subscriptions.ts
deleted file mode 100644
index b2b287593c..0000000000
--- a/packages/admin-portal/src/sagas/__tests__/webhook-subscriptions.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import webhookSubscriptionsSagas, {
-  webhookSubscriptionsFetch,
-  webhookTopicsFetch,
-  webhookSubscriptionsListen,
-  webhookTopicsListen,
-} from '../webhook-subscriptions'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { put, call, fork, all, takeLatest } from '@redux-saga/core/effects'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { subscriptions, topics } from '../__stubs__/webhooks'
-import {
-  webhookSubscriptionsReceiveData,
-  webhookTopicsReceiveData,
-  setApplicationId,
-} from '@/actions/webhook-subscriptions'
-import ActionTypes from '@/constants/action-types'
-import { fetchWebhooksSubscriptionsList, fetchWebhooksTopicsList } from '@/services/webhooks'
-
-jest.mock('@/services/webhooks')
-jest.mock('@reapit/elements')
-
-describe('webhook sagas', () => {
-  describe('webhookSubscriptions fetch data', () => {
-    const applicationIdParam: Action<string> = {
-      data: 'applicationId',
-      type: 'WEBHOOK_SUBSCRIPTION_REQUEST_DATA',
-    }
-    const gen = cloneableGenerator(webhookSubscriptionsFetch)(applicationIdParam)
-    expect(gen.next().value).toEqual(put(setApplicationId(applicationIdParam.data)))
-    expect(gen.next().value).toEqual(call(fetchWebhooksSubscriptionsList, { applicationId: [applicationIdParam.data] }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(subscriptions).value).toEqual(put(webhookSubscriptionsReceiveData(subscriptions)))
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-    })
-  })
-
-  describe('webhookTopics fetch data', () => {
-    const applicationIdParam: Action<string> = {
-      data: 'applicationId',
-      type: 'WEBHOOK_SUBSCRIPTION_REQUEST_DATA',
-    }
-    const gen = cloneableGenerator(webhookTopicsFetch)(applicationIdParam)
-    expect(gen.next().value).toEqual(call(fetchWebhooksTopicsList, { applicationId: applicationIdParam.data }))
-
-    test('api call success', () => {
-      const clone = gen.clone()
-      expect(clone.next(topics).value).toEqual(put(webhookTopicsReceiveData(topics)))
-      expect(clone.next().done).toBe(true)
-    })
-
-    test('api call error', () => {
-      const clone = gen.clone()
-      if (!clone.throw) throw new Error('Generator object cannot throw')
-      expect(clone.throw('error').value).toEqual(
-        put(
-          errorThrownServer({
-            type: 'SERVER',
-            message: errorMessages.DEFAULT_SERVER_ERROR,
-          }),
-        ),
-      )
-    })
-  })
-})
-describe('developerWebhookSagas', () => {
-  it('should listen request data', () => {
-    const gen = webhookSubscriptionsSagas()
-
-    expect(gen.next().value).toEqual(all([fork(webhookSubscriptionsListen), fork(webhookTopicsListen)]))
-    expect(gen.next().done).toBe(true)
-  })
-})
-
-describe('developerWebhook thunks', () => {
-  describe('webhookSubscriptionsListen', () => {
-    it('should webhookSubscriptionsFetch when called', () => {
-      const gen = webhookSubscriptionsListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<string>>(ActionTypes.WEBHOOK_SUBSCRIPTION_REQUEST_DATA, webhookSubscriptionsFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-  describe('webhookTopicsListen', () => {
-    it('should webhookTopicsFetch when called', () => {
-      const gen = webhookTopicsListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<string>>(ActionTypes.WEBHOOK_TOPICS_REQUEST_DATA, webhookTopicsFetch),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/app-http-trafic-event.ts b/packages/admin-portal/src/sagas/app-http-trafic-event.ts
deleted file mode 100644
index 2fbf400d4f..0000000000
--- a/packages/admin-portal/src/sagas/app-http-trafic-event.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { put, fork, all, call, takeLatest } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { Action } from '../types/core'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import {
-  HttpTrafficPerDayParams,
-  httpTrafficPerDayReceiveData,
-  httpTrafficPerDayRequestDataFailure,
-} from '@/actions/app-http-traffic-event'
-import { logger } from '@reapit/utils'
-import { fetchTrafficStatistics, FetchTrafficStatisticsParams } from '@/services/traffic-events'
-
-const { HTTP_TRAFFIC_PER_DAY_REQUEST_DATA } = ActionTypes
-
-export const apphttpTrafficEventSaga = function*({ data }: Action<FetchTrafficStatisticsParams>) {
-  try {
-    const response = yield call(fetchTrafficStatistics, data)
-    yield put(httpTrafficPerDayReceiveData(response))
-  } catch (err) {
-    logger(err)
-    yield put(httpTrafficPerDayRequestDataFailure())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const appHttpTrafficEventListen = function*() {
-  yield takeLatest<Action<HttpTrafficPerDayParams>>(HTTP_TRAFFIC_PER_DAY_REQUEST_DATA, apphttpTrafficEventSaga)
-}
-
-export const appHttpTrafficEventSagas = function*() {
-  yield all([fork(appHttpTrafficEventListen)])
-}
-
-export default appHttpTrafficEventSagas
diff --git a/packages/admin-portal/src/sagas/app-installations.ts b/packages/admin-portal/src/sagas/app-installations.ts
deleted file mode 100644
index 79d4c30423..0000000000
--- a/packages/admin-portal/src/sagas/app-installations.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { put, fork, all, call, takeLatest, select } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { Action } from '../types/core'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import {
-  appInstallationsReceiveData,
-  InstallationParams,
-  appInstallationsSetFormState,
-  UninstallParams,
-  InstallParams,
-  appInstallationsRequestDataFailure,
-  appInstallationsFilterReceiveData,
-  appInstallationsFilterRequestDataFailure,
-} from '@/actions/app-installations'
-import { selectDeveloperId } from '@/selector/developer'
-import { selectLoggedUserEmail, selectClientId } from '@/selector/client'
-import { logger } from '@reapit/utils'
-import { fetchInstallationsList, createInstallation, removeAccessToAppById } from '@/services/installations'
-
-export const installationsSaga = function*({ data }) {
-  try {
-    const developerId = yield select(selectDeveloperId)
-    const response = yield call(fetchInstallationsList, { ...data, developerId })
-    yield put(appInstallationsReceiveData(response))
-  } catch (err) {
-    logger(err)
-    yield put(appInstallationsRequestDataFailure())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const installationsFilterSaga = function*({ data }) {
-  try {
-    const developerId = yield select(selectDeveloperId)
-    const response = yield call(fetchInstallationsList, { ...data, developerId })
-    yield put(appInstallationsFilterReceiveData(response))
-  } catch (err) {
-    logger(err)
-    yield put(appInstallationsFilterRequestDataFailure())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const appInstallSaga = function*(options) {
-  const data: InstallParams = options.data
-  try {
-    yield put(appInstallationsSetFormState('SUBMITTING'))
-
-    const email = yield select(selectLoggedUserEmail)
-    const clientId = yield select(selectClientId)
-
-    if (!clientId) {
-      throw new Error('ClientId not exist')
-    }
-
-    yield call(createInstallation, { ...data, clientId, approvedBy: email })
-    if (data.callback) {
-      data.callback()
-    }
-    yield put(appInstallationsSetFormState('SUCCESS'))
-  } catch (err) {
-    logger(err)
-    yield put(appInstallationsSetFormState('ERROR'))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const appUninstallSaga = function*(options) {
-  const data: UninstallParams = options.data
-  try {
-    yield put(appInstallationsSetFormState('SUBMITTING'))
-    const email = yield select(selectLoggedUserEmail)
-
-    yield call(removeAccessToAppById, { ...data, terminatedBy: email })
-    if (data.callback) {
-      data.callback()
-    }
-    yield put(appInstallationsSetFormState('SUCCESS'))
-  } catch (err) {
-    logger(err)
-    yield put(appInstallationsSetFormState('ERROR'))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const appInstallationsListen = function*() {
-  yield takeLatest<Action<InstallationParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_DATA, installationsSaga)
-  yield takeLatest<Action<InstallationParams>>(
-    ActionTypes.APP_INSTALLATIONS_FILTER_REQUEST_DATA,
-    installationsFilterSaga,
-  )
-  yield takeLatest<Action<UninstallParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_UNINSTALL, appUninstallSaga)
-  yield takeLatest<Action<InstallParams>>(ActionTypes.APP_INSTALLATIONS_REQUEST_INSTALL, appInstallSaga)
-}
-
-export const appInstallationsSagas = function*() {
-  yield all([fork(appInstallationsListen)])
-}
-
-export default appInstallationsSagas
diff --git a/packages/admin-portal/src/sagas/app-usage-stats.ts b/packages/admin-portal/src/sagas/app-usage-stats.ts
deleted file mode 100644
index 01d310f0a2..0000000000
--- a/packages/admin-portal/src/sagas/app-usage-stats.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { put, fork, all, call, takeLatest } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { Action } from '../types/core'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import {
-  AppUsageStatsParams,
-  appUsageStatsReceiveData,
-  appUsageStatsRequestDataFailure,
-} from '@/actions/app-usage-stats'
-import { logger } from '@reapit/utils'
-import { fetchStatisticsList, FetchStatisticsListParams } from '@/services/statistics'
-
-const { APP_USAGE_STATS_REQUEST_DATA } = ActionTypes
-
-export const appUsageStatsSaga = function*({ data }: Action<FetchStatisticsListParams>) {
-  try {
-    const response = yield call(fetchStatisticsList, data)
-    yield put(appUsageStatsReceiveData(response))
-  } catch (err) {
-    logger(err)
-    yield put(appUsageStatsRequestDataFailure())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const appUsageStatsListen = function*() {
-  yield takeLatest<Action<AppUsageStatsParams>>(APP_USAGE_STATS_REQUEST_DATA, appUsageStatsSaga)
-}
-
-export const appUsageStatsSagas = function*() {
-  yield all([fork(appUsageStatsListen)])
-}
-
-export default appUsageStatsSagas
diff --git a/packages/admin-portal/src/sagas/apps/__test__/apps.test.ts b/packages/admin-portal/src/sagas/apps/__test__/apps.test.ts
deleted file mode 100644
index 87b74dc9bb..0000000000
--- a/packages/admin-portal/src/sagas/apps/__test__/apps.test.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-import { integrationTypesReceiveData } from '@/actions/app-integration-types'
-import appDetailSagas, {
-  fetchClientAppDetailSaga,
-  clientAppDetailDataListen,
-  fetchDeveloperAppDetailSaga,
-  developerAppDetailDataListen,
-  developerApplyAppDetailsSaga,
-  developerApplyAppDetailsListen,
-} from '../apps'
-import { fetchDesktopIntegrationTypes } from '@/services/apps'
-import ActionTypes from '@/constants/action-types'
-import { put, takeLatest, all, fork, call } from '@redux-saga/core/effects'
-import { Action } from '@/types/core'
-import { cloneableGenerator } from '@redux-saga/testing-utils'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { FetchAppByIdParams, fetchAppById } from '@/services/apps'
-import { fetchApiKeyInstallationById } from '@/services/installations'
-import { clientFetchAppDetailSuccess } from '@/actions/client'
-import { appDetailDataStub } from '@/sagas/__stubs__/app-detail'
-import { integrationTypesStub } from '@/sagas/__stubs__/integration-types'
-import { developerFetchAppDetailSuccess } from '@/actions/developer'
-import { AppDetailData } from '@/reducers/client/app-detail'
-
-jest.mock('@reapit/elements')
-
-const paramsClientId: Action<FetchAppByIdParams> = {
-  data: { id: '9b6fd5f7-2c15-483d-b925-01b650538e52', clientId: 'DAC' },
-  type: 'CLIENT_FETCH_APP_DETAIL',
-}
-
-const params: Action<FetchAppByIdParams> = {
-  data: { id: '9b6fd5f7-2c15-483d-b925-01b650538e52' },
-  type: 'CLIENT_FETCH_APP_DETAIL',
-}
-
-describe('fetch client app detail with clientId', () => {
-  const gen = cloneableGenerator(fetchClientAppDetailSaga)(paramsClientId)
-  expect(gen.next().value).toEqual(
-    call(fetchAppById, { id: paramsClientId.data.id, clientId: paramsClientId.data.clientId }),
-  )
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appDetailDataStub.data).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(put(clientFetchAppDetailSuccess(appDetailDataStub.data)))
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('fetch client app detail without clientId', () => {
-  const gen = cloneableGenerator(fetchClientAppDetailSaga)(params)
-  expect(gen.next().value).toEqual(call(fetchAppById, { id: paramsClientId.data.id, clientId: undefined }))
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appDetailDataStub.data).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(put(clientFetchAppDetailSuccess(appDetailDataStub.data)))
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('client app detail fetch data and fetch apiKey', () => {
-  const gen = cloneableGenerator(fetchClientAppDetailSaga)(params)
-  expect(gen.next().value).toEqual(call(fetchAppById, { id: params.data.id, clientId: undefined }))
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    const installationId = '09682122-0811-4f36-9bfa-05e337de3065'
-    const isWebComponent = true
-    const apiKey = 'mockApiKey'
-    expect(
-      clone.next({
-        ...appDetailDataStub.data,
-        isWebComponent,
-        installationId,
-      }).value,
-    ).toMatchObject(call(fetchApiKeyInstallationById, { installationId }))
-    expect(clone.next({ apiKey }).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toMatchObject(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(
-      put(
-        clientFetchAppDetailSuccess({
-          ...appDetailDataStub.data,
-          apiKey,
-          isWebComponent,
-          installationId,
-        }),
-      ),
-    )
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('fetch developer app detail with clientId', () => {
-  const gen = cloneableGenerator(fetchDeveloperAppDetailSaga)(paramsClientId)
-  expect(gen.next().value).toEqual(
-    call(fetchAppById, { id: paramsClientId.data.id, clientId: paramsClientId.data.clientId }),
-  )
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appDetailDataStub.data).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(put(developerFetchAppDetailSuccess(appDetailDataStub.data)))
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('fetch developer app detail without clientId', () => {
-  const gen = cloneableGenerator(fetchDeveloperAppDetailSaga)(params)
-  expect(gen.next().value).toEqual(call(fetchAppById, { id: paramsClientId.data.id, clientId: undefined }))
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(appDetailDataStub.data).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(put(developerFetchAppDetailSuccess(appDetailDataStub.data)))
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('client app detail fetch data and fetch apiKey', () => {
-  const gen = cloneableGenerator(fetchDeveloperAppDetailSaga)(params)
-  expect(gen.next().value).toEqual(call(fetchAppById, { id: params.data.id, clientId: undefined }))
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    const installationId = '09682122-0811-4f36-9bfa-05e337de3065'
-    const isWebComponent = true
-    const apiKey = 'mockApiKey'
-    // keep getting "serialize the same string here - jest bug"
-    expect(
-      JSON.stringify(
-        clone.next({
-          ...appDetailDataStub.data,
-          isWebComponent,
-          installationId,
-        }).value,
-      ),
-    ).toBe(JSON.stringify(call(fetchApiKeyInstallationById, { installationId })))
-    expect(clone.next({ apiKey }).value).toEqual(call(fetchDesktopIntegrationTypes))
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(
-      put(developerFetchAppDetailSuccess({ ...appDetailDataStub.data, isWebComponent, installationId, apiKey })),
-    )
-  })
-
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('client app detail fetch data from local storage', () => {
-  const params: Action<AppDetailData> = {
-    data: appDetailDataStub.data as AppDetailData,
-    type: 'DEVELOPER_APPLY_APP_DETAIL',
-  }
-  const gen = cloneableGenerator(developerApplyAppDetailsSaga)(params)
-  expect(gen.next().value).toEqual(call(fetchDesktopIntegrationTypes))
-
-  test('api call success', () => {
-    const clone = gen.clone()
-    expect(clone.next(integrationTypesStub).value).toEqual(put(integrationTypesReceiveData(integrationTypesStub)))
-    expect(clone.next().value).toEqual(put(clientFetchAppDetailSuccess(appDetailDataStub.data)))
-  })
-  test('api call error', () => {
-    const clone = gen.clone()
-    // @ts-ignore
-    expect(clone.throw('error').value).toEqual(
-      put(
-        errorThrownServer({
-          type: 'SERVER',
-          message: errorMessages.DEFAULT_SERVER_ERROR,
-        }),
-      ),
-    )
-  })
-})
-
-describe('client app detail thunks', () => {
-  describe('clientAppDetailDataListen', () => {
-    it('should trigger request data when called', () => {
-      const gen = clientAppDetailDataListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<FetchAppByIdParams>>(ActionTypes.CLIENT_FETCH_APP_DETAIL, fetchClientAppDetailSaga),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerAppDetailDataListen', () => {
-    it('should trigger request data when called', () => {
-      const gen = developerAppDetailDataListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<FetchAppByIdParams>>(ActionTypes.DEVELOPER_FETCH_APP_DETAIL, fetchDeveloperAppDetailSaga),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('developerApplyAppDetailsListen', () => {
-    it('should trigger request data when called', () => {
-      const gen = developerApplyAppDetailsListen()
-      expect(gen.next().value).toEqual(
-        takeLatest<Action<AppDetailData>>(ActionTypes.DEVELOPER_APPLY_APP_DETAIL, developerApplyAppDetailsSaga),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-
-  describe('appDetailSagas', () => {
-    it('should listen data request', () => {
-      const gen = appDetailSagas()
-
-      expect(gen.next().value).toEqual(
-        all([
-          fork(clientAppDetailDataListen),
-          fork(developerAppDetailDataListen),
-          fork(developerApplyAppDetailsListen),
-        ]),
-      )
-      expect(gen.next().done).toBe(true)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/sagas/apps/apps.ts b/packages/admin-portal/src/sagas/apps/apps.ts
deleted file mode 100644
index 6bef42e7ca..0000000000
--- a/packages/admin-portal/src/sagas/apps/apps.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { clientFetchAppDetailSuccess } from '@/actions/client'
-import { integrationTypesReceiveData } from '@/actions/app-integration-types'
-import { put, call, fork, takeLatest, all } from '@redux-saga/core/effects'
-import ActionTypes from '@/constants/action-types'
-import { errorThrownServer } from '@/actions/error'
-import errorMessages from '@/constants/error-messages'
-import { Action } from '@/types/core'
-import { logger } from '@reapit/utils'
-import { fetchAppById, fetchDesktopIntegrationTypes, FetchAppByIdParams } from '@/services/apps'
-import { developerFetchAppDetailSuccess } from '@/actions/developer'
-import { fetchApiKeyInstallationById } from '@/services/installations'
-import { AppDetailData } from '@/reducers/client/app-detail'
-
-export const fetchClientAppDetailSaga = function*({ data }: Action<FetchAppByIdParams>) {
-  try {
-    const appDetailResponse = yield call(fetchAppById, { clientId: data.clientId, id: data.id })
-    if (appDetailResponse?.isWebComponent && appDetailResponse?.installationId) {
-      const apiKeyResponse = yield call(fetchApiKeyInstallationById, {
-        installationId: appDetailResponse.installationId,
-      })
-      appDetailResponse.apiKey = apiKeyResponse?.apiKey || ''
-    }
-
-    const desktopIntegrationTypes = yield call(fetchDesktopIntegrationTypes)
-    yield put(integrationTypesReceiveData(desktopIntegrationTypes))
-    yield put(clientFetchAppDetailSuccess(appDetailResponse))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const developerApplyAppDetailsSaga = function*({ data }: Action<AppDetailData>) {
-  try {
-    const desktopIntegrationTypes = yield call(fetchDesktopIntegrationTypes)
-    yield put(integrationTypesReceiveData(desktopIntegrationTypes))
-    yield put(clientFetchAppDetailSuccess(data))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const fetchDeveloperAppDetailSaga = function*({ data }: Action<FetchAppByIdParams>) {
-  try {
-    const appDetailResponse = yield call(fetchAppById, { clientId: data.clientId, id: data.id })
-    if (appDetailResponse?.isWebComponent && appDetailResponse?.installationId) {
-      const apiKeyResponse = yield call(fetchApiKeyInstallationById, {
-        installationId: appDetailResponse.installationId,
-      })
-      appDetailResponse.apiKey = apiKeyResponse?.apiKey || ''
-    }
-    const desktopIntegrationTypes = yield call(fetchDesktopIntegrationTypes)
-    yield put(integrationTypesReceiveData(desktopIntegrationTypes))
-    yield put(developerFetchAppDetailSuccess(appDetailResponse))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const clientAppDetailDataListen = function*() {
-  yield takeLatest<Action<FetchAppByIdParams>>(ActionTypes.CLIENT_FETCH_APP_DETAIL, fetchClientAppDetailSaga)
-}
-
-export const developerAppDetailDataListen = function*() {
-  yield takeLatest<Action<FetchAppByIdParams>>(ActionTypes.DEVELOPER_FETCH_APP_DETAIL, fetchDeveloperAppDetailSaga)
-}
-
-export const developerApplyAppDetailsListen = function*() {
-  yield takeLatest<Action<AppDetailData>>(ActionTypes.DEVELOPER_APPLY_APP_DETAIL, developerApplyAppDetailsSaga)
-}
-
-const appDetailSagas = function*() {
-  yield all([fork(clientAppDetailDataListen), fork(developerAppDetailDataListen), fork(developerApplyAppDetailsListen)])
-}
-
-export default appDetailSagas
diff --git a/packages/admin-portal/src/sagas/client.ts b/packages/admin-portal/src/sagas/client.ts
deleted file mode 100644
index c0a2187a79..0000000000
--- a/packages/admin-portal/src/sagas/client.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { clientFetchAppSummarySuccess } from '../actions/client'
-import { categoriesReceiveData } from '@/actions/app-categories'
-import { put, fork, takeLatest, all, call, select } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import { APPS_PER_PAGE, FEATURED_APPS } from '@/constants/paginator'
-import { Action } from '@/types/core'
-import { selectClientId, selectFeaturedApps, selectDeveloperEditionId } from '@/selector/client'
-import { selectCategories } from '@/selector/app-categories'
-import { ClientAppSummary, ClientAppSummaryParams } from '@/reducers/client/app-summary'
-import { logger } from '@reapit/utils'
-import { fetchAppsList } from '@/services/apps'
-import { fetchCategoriesList } from '@/services/categories'
-
-const DEFAULT_CATEGORY_LENGTH = 1
-
-export const clientDataFetch = function*({ data }) {
-  try {
-    const { page, search, category, searchBy } = data
-    const clientId = yield select(selectClientId)
-    if (!clientId) {
-      return
-    }
-    const currentCategories = yield select(selectCategories)
-    const currentFeaturedApps = yield select(selectFeaturedApps)
-    const developerId = yield select(selectDeveloperEditionId)
-
-    // because the https://dev.platformmarketplace.reapit.net/categories endpoint does not return a filter for Direct API so
-    // we will have to manually check it here
-    // TODO: have the endpoint return a category id for Direct API apps as well
-    const isFilteringForDirectApiApps = category === 'DIRECT_API_APPS_FILTER'
-
-    const [apps, featuredApps, categories] = yield all([
-      call(fetchAppsList, {
-        clientId,
-        developerId: developerId ? [developerId] : [],
-        category: isFilteringForDirectApiApps ? undefined : category,
-        [searchBy]: search,
-        pageNumber: page,
-        pageSize: APPS_PER_PAGE,
-        isFeatured: isFilteringForDirectApiApps ? undefined : false,
-        isDirectApi: isFilteringForDirectApiApps ? true : undefined,
-      }),
-      !!search || !!category
-        ? currentFeaturedApps
-        : call(fetchAppsList, {
-            clientId,
-            developerId: developerId ? [developerId] : [],
-            pageNumber: 1,
-            pageSize: FEATURED_APPS,
-            isFeatured: true,
-          }),
-      currentCategories.length > DEFAULT_CATEGORY_LENGTH ? currentCategories : call(fetchCategoriesList, {}),
-    ])
-    const clientItem: ClientAppSummary = { apps: apps, featuredApps: featuredApps?.data }
-    yield put(clientFetchAppSummarySuccess(clientItem))
-    yield put(categoriesReceiveData(categories))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const clientDataListen = function*() {
-  yield takeLatest<Action<ClientAppSummaryParams>>(ActionTypes.CLIENT_FETCH_APP_SUMMARY, clientDataFetch)
-}
-
-const clientSagas = function*() {
-  yield all([fork(clientDataListen)])
-}
-
-export default clientSagas
diff --git a/packages/admin-portal/src/sagas/developer-subscriptions.ts b/packages/admin-portal/src/sagas/developer-subscriptions.ts
deleted file mode 100644
index a6d132f405..0000000000
--- a/packages/admin-portal/src/sagas/developer-subscriptions.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { put, takeLatest, all, fork, call } from 'redux-saga/effects'
-import { errorThrownServer } from '@/actions/error'
-import ActionTypes from '@/constants/action-types'
-import { Action } from '@/types/core'
-import { select } from 'redux-saga/effects'
-import { selectDeveloperId } from '@/selector/auth'
-import errorMessages from '@/constants/error-messages'
-import { logger } from '@reapit/utils'
-import {
-  developerFetchSubscriptions,
-  developerFetchSubscriptionsSuccess,
-  developerCreateSubscriptionSuccess,
-  developerCreateSubscriptionFalure,
-  CreateSubscriptionParams,
-} from '@/actions/developer-subscriptions'
-import {
-  createDeveloperSubscription,
-  fetchSubscriptionsList,
-  FetchSubscriptionsListParams,
-  deleteSubscription,
-} from '@/services/developer-subscriptions'
-
-export const developerFetchSubcriptionsList = function*({ data }: Action<FetchSubscriptionsListParams>) {
-  try {
-    const { developerId } = data
-    if (!developerId) {
-      throw new Error('developerId is not exist')
-    }
-    const response = yield call(fetchSubscriptionsList, { developerId })
-    yield put(developerFetchSubscriptionsSuccess(response))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const developerCreateSubscription = function*({ data }: Action<CreateSubscriptionParams>) {
-  try {
-    const response = yield call(createDeveloperSubscription, data.params)
-    if (response) {
-      yield put(developerCreateSubscriptionSuccess(response))
-      data.onCreated()
-    } else {
-      yield put(developerCreateSubscriptionFalure())
-    }
-  } catch (err) {
-    logger(err)
-    yield put(developerCreateSubscriptionFalure())
-  }
-}
-
-export const developerDeleteSubcription = function*({ data: id }: Action<string>) {
-  try {
-    yield call(deleteSubscription, { id })
-    const developerId = yield select(selectDeveloperId)
-    yield put(developerFetchSubscriptions({ developerId }))
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const developerFetchSubcriptionsListListen = function*() {
-  yield takeLatest<Action<FetchSubscriptionsListParams>>(
-    ActionTypes.DEVELOPER_FETCH_SUBSCRIPTIONS,
-    developerFetchSubcriptionsList,
-  )
-}
-
-export const developerCreateSubcriptionListen = function*() {
-  yield takeLatest<Action<CreateSubscriptionParams>>(
-    ActionTypes.DEVELOPER_SUBSCRIPTION_CREATE,
-    developerCreateSubscription,
-  )
-}
-
-export const developerDeleteSubcriptionListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.DEVELOPER_DELETE_SUBSCRIPTION, developerDeleteSubcription)
-}
-
-export const developerSubcriptionsListSagas = function*() {
-  yield all([
-    fork(developerFetchSubcriptionsListListen),
-    fork(developerCreateSubcriptionListen),
-    fork(developerDeleteSubcriptionListen),
-  ])
-}
-
-export default developerSubcriptionsListSagas
diff --git a/packages/admin-portal/src/sagas/developer.ts b/packages/admin-portal/src/sagas/developer.ts
deleted file mode 100644
index 2ec5ec9cba..0000000000
--- a/packages/admin-portal/src/sagas/developer.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { put, fork, takeLatest, all, call, select } from '@redux-saga/core/effects'
-import { CreateDeveloperModel } from '@reapit/foundations-ts-definitions'
-import { logger } from '@reapit/utils'
-import {
-  developerLoading,
-  developerReceiveData,
-  developerSetFormState,
-  developerRequestDataFailure,
-  setMyIdentity,
-  fetchBillingSuccess,
-  fetchBillingFailure,
-  fetchMonthlyBillingSuccess,
-  fetchMonthlyBillingFailure,
-  developerSetWebhookPingStatus,
-} from '@/actions/developer'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-import { DeveloperItem, DeveloperRequestParams } from '@/reducers/developer'
-import { errorThrownServer } from '@/actions/error'
-import ActionTypes from '@/constants/action-types'
-import errorMessages from '@/constants/error-messages'
-import { Action } from '@/types/core'
-import { selectDeveloperId } from '@/selector'
-import { PingWebhooksByIdParams, pingWebhooksById } from '@/services/webhooks'
-import { fetchAppsList } from '@/services/apps'
-import { fetchScopesList } from '@/services/scopes'
-import { createDeveloper, fetchDeveloperById } from '@/services/developers'
-import {
-  fetchBillings,
-  fetchBillingsByMonth,
-  FetchBillingsParams,
-  FetchBillingsByMonthParams,
-} from '@/services/traffic-events'
-
-export const developerDataFetch = function*({ data }) {
-  yield put(developerLoading(true))
-
-  try {
-    const developerId = yield select(selectDeveloperId)
-    if (!developerId) {
-      return
-    }
-    const { page, appsPerPage = APPS_PER_PAGE } = data
-    const [appsData, scopes] = yield all([
-      call(fetchAppsList, { developerId: [developerId], pageNumber: page, pageSize: appsPerPage }),
-      call(fetchScopesList),
-    ])
-    const developerData: DeveloperItem = {
-      data: appsData,
-      scopes,
-    }
-    if (developerData.data && developerData.scopes) {
-      yield put(developerReceiveData(developerData))
-    } else {
-      yield put(developerRequestDataFailure())
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const developerCreate = function*({ data }: Action<CreateDeveloperModel>) {
-  yield put(developerSetFormState('SUBMITTING'))
-
-  try {
-    const regResponse = yield call(createDeveloper, data)
-    const status = regResponse ? 'SUCCESS' : 'ERROR'
-    yield put(developerSetFormState(status))
-  } catch (err) {
-    logger(err)
-    yield put(developerSetFormState('ERROR'))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: err?.response?.description || errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const fetchMyIdentitySagas = function*() {
-  try {
-    yield put(developerLoading(true))
-    const developerId = yield select(selectDeveloperId)
-    if (!developerId) {
-      return
-    }
-    const developerIdentity = yield call(fetchDeveloperById, { id: developerId })
-    if (developerIdentity) {
-      yield put(setMyIdentity(developerIdentity))
-    }
-    yield put(developerLoading(false))
-  } catch (err) {
-    logger(err)
-    yield put(developerLoading(false))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const fetchBillingSagas = function*({ data }: Action<FetchBillingsParams>) {
-  try {
-    const billingResponse = yield call(fetchBillings, data)
-    yield put(fetchBillingSuccess(billingResponse))
-  } catch (err) {
-    logger(err)
-    yield put(fetchBillingFailure(err))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const fetchMonthlyBillingSagas = function*({ data }: Action<FetchBillingsByMonthParams>) {
-  try {
-    const billingResponse = yield call(fetchBillingsByMonth, data)
-    yield put(fetchMonthlyBillingSuccess(billingResponse))
-  } catch (err) {
-    logger(err)
-    yield put(fetchMonthlyBillingFailure(err))
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const developerWebhookPing = function*({ data }: Action<PingWebhooksByIdParams>) {
-  try {
-    yield put(developerSetWebhookPingStatus('LOADING'))
-    yield call(pingWebhooksById, data)
-    yield put(developerSetWebhookPingStatus('SUCCESS'))
-  } catch (err) {
-    logger(err)
-    yield put(developerSetWebhookPingStatus('FAILED'))
-  }
-}
-
-export const developerRequestDataListen = function*() {
-  yield takeLatest<Action<DeveloperRequestParams>>(ActionTypes.DEVELOPER_REQUEST_DATA, developerDataFetch)
-}
-
-export const developerCreateListen = function*() {
-  yield takeLatest(ActionTypes.DEVELOPER_CREATE, developerCreate)
-}
-
-export const fetchMyIdentitySagasListen = function*() {
-  yield takeLatest(ActionTypes.DEVELOPER_FETCH_MY_IDENTITY, fetchMyIdentitySagas)
-}
-
-export const fetchBillingSagasListen = function*() {
-  yield takeLatest(ActionTypes.DEVELOPER_FETCH_BILLING, fetchBillingSagas)
-}
-
-export const fetchMonthlyBillingSagasListen = function*() {
-  yield takeLatest(ActionTypes.DEVELOPER_FETCH_MONTHLY_BILLING, fetchMonthlyBillingSagas)
-}
-
-export const developerWebhookPingListen = function*() {
-  yield takeLatest(ActionTypes.DEVELOPER_PING_WEBHOOK, developerWebhookPing)
-}
-
-const developerSagas = function*() {
-  yield all([
-    fork(developerRequestDataListen),
-    fork(developerCreateListen),
-    fork(fetchMyIdentitySagasListen),
-    fork(fetchBillingSagasListen),
-    fork(fetchMonthlyBillingSagasListen),
-    fork(developerWebhookPingListen),
-  ])
-}
-
-export default developerSagas
diff --git a/packages/admin-portal/src/sagas/installed-apps.ts b/packages/admin-portal/src/sagas/installed-apps.ts
deleted file mode 100644
index 4e51bec42e..0000000000
--- a/packages/admin-portal/src/sagas/installed-apps.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import {
-  installedAppsLoading,
-  installedAppsReceiveData,
-  installedAppsRequestDataFailure,
-} from '../actions/installed-apps'
-import { put, fork, takeLatest, call, all, select } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import { Action } from '@/types/core'
-import { INSTALLED_APPS_PERPAGE } from '@/constants/paginator'
-import { selectClientId, selectDeveloperEditionId } from '@/selector/client'
-import { logger } from '@reapit/utils'
-import { fetchAppsList } from '@/services/apps'
-
-export const installedAppsDataFetch = function*({ data: page }) {
-  yield put(installedAppsLoading(true))
-
-  try {
-    const clientId = yield select(selectClientId)
-    if (!clientId) {
-      return
-    }
-    const developerId = yield select(selectDeveloperEditionId)
-    const response = yield call(fetchAppsList, {
-      clientId,
-      developerId: developerId ? [developerId] : [],
-      pageNumber: page,
-      pageSize: INSTALLED_APPS_PERPAGE,
-      onlyInstalled: true,
-      isDirectApi: false,
-    })
-    if (response) {
-      yield put(installedAppsReceiveData({ data: response }))
-    } else {
-      yield put(installedAppsRequestDataFailure())
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const installedAppsDataListen = function*() {
-  yield takeLatest<Action<number>>(ActionTypes.INSTALLED_APPS_REQUEST_DATA, installedAppsDataFetch)
-}
-
-const installedAppsSagas = function*() {
-  yield all([fork(installedAppsDataListen)])
-}
-
-export default installedAppsSagas
diff --git a/packages/admin-portal/src/sagas/my-apps.ts b/packages/admin-portal/src/sagas/my-apps.ts
deleted file mode 100644
index d85ff0c781..0000000000
--- a/packages/admin-portal/src/sagas/my-apps.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { myAppsLoading, myAppsReceiveData, myAppsRequestDataFailure } from '../actions/my-apps'
-import { put, fork, takeLatest, call, all, select } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import { Action } from '@/types/core'
-import { APPS_PER_PAGE } from '@/constants/paginator'
-import { selectClientId, selectDeveloperEditionId } from '@/selector/client'
-import { logger } from '@reapit/utils'
-import { fetchAppsList } from '@/services/apps'
-
-export const myAppsDataFetch = function*({ data: page }) {
-  yield put(myAppsLoading(true))
-
-  try {
-    const clientId = yield select(selectClientId)
-    if (!clientId) {
-      return
-    }
-    const developerId = yield select(selectDeveloperEditionId)
-    const response = yield call(fetchAppsList, {
-      clientId,
-      developerId: developerId ? [developerId] : [],
-      onlyInstalled: true,
-      pageNumber: page,
-      pageSize: APPS_PER_PAGE,
-    })
-    if (response) {
-      yield put(myAppsReceiveData({ data: response }))
-    } else {
-      yield put(myAppsRequestDataFailure())
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const myAppsDataListen = function*() {
-  yield takeLatest<Action<number>>(ActionTypes.MY_APPS_REQUEST_DATA, myAppsDataFetch)
-}
-
-const myAppsSagas = function*() {
-  yield all([fork(myAppsDataListen)])
-}
-
-export default myAppsSagas
diff --git a/packages/admin-portal/src/sagas/settings.ts b/packages/admin-portal/src/sagas/settings.ts
deleted file mode 100644
index 1cb5fe96b6..0000000000
--- a/packages/admin-portal/src/sagas/settings.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { put, fork, all, call, takeLatest, select } from '@redux-saga/core/effects'
-import { removeSession, changePassword } from '@reapit/cognito-auth'
-import { Action } from '@/types/core'
-import ActionTypes from '@/constants/action-types'
-import errorMessages from '@/constants/error-messages'
-import messages from '@/constants/messages'
-import { settingShowLoading, requestDeveloperDataSuccess, ChangePasswordParams } from '@/actions/settings'
-import { errorThrownServer } from '@/actions/error'
-import { showNotificationMessage } from '@/actions/notification-message'
-import { DeveloperModel } from '@reapit/foundations-ts-definitions'
-import { selectDeveloperId, selectDeveloperEmail } from '@/selector/developer'
-import { authLogout } from '@/actions/auth'
-import { logger } from '@reapit/utils'
-import { fetchDeveloperById, updateDeveloperById } from '@/services/developers'
-
-export const developerInformationFetch = function*() {
-  yield put(settingShowLoading(true))
-  try {
-    const developerId = yield select(selectDeveloperId)
-    if (!developerId) {
-      return
-    }
-    const response = yield call(fetchDeveloperById, { id: developerId })
-    if (response) {
-      yield put(requestDeveloperDataSuccess(response))
-    }
-  } catch (error) {
-    logger(error)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  } finally {
-    yield put(settingShowLoading(false))
-  }
-}
-
-export type UpdateDeveloperInfoParams = {
-  developerId: string
-  values: DeveloperModel
-}
-
-export const developerInfomationChange = function*({ data }: Action<DeveloperModel>) {
-  yield put(settingShowLoading(true))
-  try {
-    const developerId = yield select(selectDeveloperId)
-    if (!developerId) {
-      return
-    }
-    const { company: companyName, ...rest } = data
-    const response = yield call(updateDeveloperById, { id: developerId, companyName, ...rest })
-    if (response) {
-      yield put(
-        showNotificationMessage({
-          variant: 'info',
-          message: messages.CHANGE_SAVE_SUCCESSFULLY,
-        }),
-      )
-      const newResponse = yield call(fetchDeveloperById, { id: developerId })
-      yield put(requestDeveloperDataSuccess(newResponse))
-    }
-  } catch (error) {
-    logger(error)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  } finally {
-    yield put(settingShowLoading(false))
-  }
-}
-
-export type CallChangePasswordParams = {
-  values: ChangePasswordParams
-  email: string
-}
-
-export const developerPasswordChange = function*({ data }: Action<ChangePasswordParams>) {
-  yield put(settingShowLoading(true))
-  try {
-    const email = yield select(selectDeveloperEmail)
-    /* rename for compatible reason */
-    const { currentPassword: password, password: newPassword } = data
-    const cognitoClientId = window.reapit.config.cognitoClientId
-    const response = yield call(changePassword, {
-      userName: email,
-      password,
-      newPassword,
-      cognitoClientId,
-    })
-    const isCallAPISuccess = response === 'SUCCESS'
-    if (!isCallAPISuccess) {
-      throw new Error('Server error')
-    }
-    localStorage.setItem('isPasswordChanged', 'true')
-    yield call(removeSession)
-    yield put(authLogout())
-  } catch (error) {
-    logger(error)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  } finally {
-    yield put(settingShowLoading(false))
-  }
-}
-
-export const developerInformationFetchListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.SETTING_FETCH_DEVELOPER_INFO, developerInformationFetch)
-}
-
-export const developerInformationChangeListen = function*() {
-  yield takeLatest<Action<DeveloperModel>>(ActionTypes.SETTING_UPDATE_DEVELOPER, developerInfomationChange)
-}
-
-export const developerPasswordChangeListen = function*() {
-  yield takeLatest<Action<ChangePasswordParams>>(ActionTypes.CHANGE_PASSWORD, developerPasswordChange)
-}
-
-export const settingsSagas = function*() {
-  yield all([
-    fork(developerInformationFetchListen),
-    fork(developerInformationChangeListen),
-    fork(developerPasswordChangeListen),
-  ])
-}
-
-export default settingsSagas
diff --git a/packages/admin-portal/src/sagas/submit-revision.ts b/packages/admin-portal/src/sagas/submit-revision.ts
deleted file mode 100644
index 2980d86caa..0000000000
--- a/packages/admin-portal/src/sagas/submit-revision.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { imageUploaderHelper } from '@/services/upload'
-import { SubmitRevisionParams } from '../actions/submit-revision'
-import { put, fork, all, call, takeLatest } from '@redux-saga/core/effects'
-import ActionTypes from '../constants/action-types'
-import { Action } from '../types/core'
-import { errorThrownServer } from '../actions/error'
-import errorMessages from '../constants/error-messages'
-import { appDetailRequestData } from '@/actions/app-detail'
-import { logger } from '@reapit/utils'
-import { createAppRevision } from '@/services/apps'
-
-export const submitRevision = function*({ data }: Action<SubmitRevisionParams>) {
-  // TODO: for this situation we need check the value of imageData
-  // upload and also update into imageUrl as new property from backend
-  const { params, onSuccess, onError } = data
-  try {
-    const {
-      id,
-      name,
-      iconImageUrl,
-      screen1ImageUrl,
-      screen2ImageUrl,
-      screen3ImageUrl,
-      screen4ImageUrl,
-      screen5ImageUrl,
-      categoryId,
-      ...body
-    } = params
-
-    const formatedName = name ? name.replace(/\s+/g, '-') : ''
-    const imageUploaderReqs = [
-      imageUploaderHelper({ name: `${formatedName}-icon`, imageData: iconImageUrl }),
-      imageUploaderHelper({ name: `${formatedName}-screen1ImageUrl`, imageData: screen1ImageUrl }),
-      imageUploaderHelper({ name: `${formatedName}-screen2ImageUrl`, imageData: screen2ImageUrl }),
-      imageUploaderHelper({ name: `${formatedName}-screen3ImageUrl`, imageData: screen3ImageUrl }),
-      imageUploaderHelper({ name: `${formatedName}-screen4ImageUrl`, imageData: screen4ImageUrl }),
-      imageUploaderHelper({ name: `${formatedName}-screen5ImageUrl`, imageData: screen5ImageUrl }),
-    ]
-
-    const imageUploaderResults = yield all(imageUploaderReqs)
-    const updatedValues = {
-      ...body,
-      iconImageUrl: imageUploaderResults[0] ? imageUploaderResults[0].Url : iconImageUrl,
-      screen1ImageUrl: imageUploaderResults[1] ? imageUploaderResults[1].Url : screen1ImageUrl,
-      screen2ImageUrl: imageUploaderResults[2] ? imageUploaderResults[2].Url : screen2ImageUrl,
-      screen3ImageUrl: imageUploaderResults[3] ? imageUploaderResults[3].Url : screen3ImageUrl,
-      screen4ImageUrl: imageUploaderResults[4] ? imageUploaderResults[4].Url : screen4ImageUrl,
-      screen5ImageUrl: imageUploaderResults[5] ? imageUploaderResults[5].Url : screen5ImageUrl,
-      name,
-    }
-
-    const updatedValuesAfterValidatingCategoryId = {
-      ...updatedValues,
-      categoryId: categoryId === '' ? undefined : categoryId,
-    }
-
-    const regResponse: true | undefined = yield call(createAppRevision, {
-      id,
-      ...updatedValuesAfterValidatingCategoryId,
-    })
-
-    const status = regResponse ? 'SUCCESS' : 'ERROR'
-    if (status === 'SUCCESS') {
-      yield put(appDetailRequestData({ id }))
-      onSuccess()
-    } else {
-      onError()
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-    onError()
-  }
-}
-
-export const submitRevisionDataListen = function*() {
-  yield takeLatest<Action<SubmitRevisionParams>>(ActionTypes.DEVELOPER_SUBMIT_REVISION, submitRevision)
-}
-
-export const submitRevisionSagas = function*() {
-  yield all([fork(submitRevisionDataListen)])
-}
-
-export default submitRevisionSagas
diff --git a/packages/admin-portal/src/sagas/web-component.ts b/packages/admin-portal/src/sagas/web-component.ts
deleted file mode 100644
index eb4f1eed05..0000000000
--- a/packages/admin-portal/src/sagas/web-component.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { put, fork, takeLatest, all, call } from '@redux-saga/core/effects'
-import { Action } from '../types/core'
-import ActionTypes from '../constants/action-types'
-import {
-  fetchWebComponentConfig,
-  FetchWebComponentConfigParams,
-  UpdateWebComponentConfigParams,
-  updateWebComponentConfig,
-} from '@/services/web-component'
-import errorMessages from '../../../elements/src/utils/validators/error-messages'
-import { errorThrownServer } from '@/actions/error'
-import {
-  clientFetchWebComponentConfigSuccess,
-  clientFetchNegotiatorsSuccess,
-  clientFetchWebComponentConfigFailed,
-  clientUpdateWebComponentConfigFailed,
-} from '@/actions/client'
-import { fetchNegotiators } from '@/services/negotiators'
-
-export const fetchWebComponentConfigSaga = function*({ data }: Action<FetchWebComponentConfigParams>) {
-  try {
-    const [webComponentConfig, negotiators] = yield all([
-      call(fetchWebComponentConfig, data),
-      call(fetchNegotiators, {}),
-    ])
-    if (webComponentConfig.message) throw Error(webComponentConfig.message)
-    yield put(clientFetchWebComponentConfigSuccess(webComponentConfig))
-    yield put(clientFetchNegotiatorsSuccess(negotiators))
-  } catch (err) {
-    yield put(clientFetchWebComponentConfigFailed())
-  }
-}
-
-export const updateWebComponentConfigSaga = function*({ data }: Action<UpdateWebComponentConfigParams>) {
-  try {
-    const { callback, ...restParams } = data
-    const respone = yield call(updateWebComponentConfig, restParams)
-    yield put(clientFetchWebComponentConfigSuccess(respone))
-    callback && callback()
-  } catch (err) {
-    yield put(clientUpdateWebComponentConfigFailed())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const fetchWebComponentConfigListen = function*() {
-  yield takeLatest<Action<FetchWebComponentConfigParams>>(
-    ActionTypes.CLIENT_FETCH_WEB_COMPONENT_CONFIG,
-    fetchWebComponentConfigSaga,
-  )
-}
-export const updateWebComponentConfigListen = function*() {
-  yield takeLatest<Action<UpdateWebComponentConfigParams>>(
-    ActionTypes.CLIENT_UPDATE_WEB_COMPONENT_CONFIG,
-    updateWebComponentConfigSaga,
-  )
-}
-
-const webComponentSagas = function*() {
-  yield all([fork(fetchWebComponentConfigListen), fork(updateWebComponentConfigListen)])
-}
-
-export default webComponentSagas
diff --git a/packages/admin-portal/src/sagas/webhook-edit-modal.ts b/packages/admin-portal/src/sagas/webhook-edit-modal.ts
deleted file mode 100644
index 793ba3a131..0000000000
--- a/packages/admin-portal/src/sagas/webhook-edit-modal.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { put, fork, takeLatest, all, call } from '@redux-saga/core/effects'
-import { Action } from '../types/core'
-import ActionTypes from '../constants/action-types'
-import { WebhookModal } from '@/reducers/webhook-edit-modal'
-import {
-  requestWebhookSubcriptionReceiveFailure,
-  requestWebhookSubcriptionReceiveData,
-  CreateWebhookParams,
-  EditWebhookParams,
-  requestWebhookReceiveData,
-  requestWebhookReceiveDataFailure,
-  requestWebhookSubcriptionData,
-  DeleteWebhookParams,
-  webhookSetOpenModal,
-} from '@/actions/webhook-edit-modal'
-import { logger } from '@reapit/utils'
-import errorMessages from '../constants/error-messages'
-import { errorThrownServer } from '../actions/error'
-import { webhookSubscriptionsReceiveData, setApplicationId } from '@/actions/webhook-subscriptions'
-import { PagedResultWebhookModel_ } from '@/reducers/webhook-subscriptions'
-import {
-  fetchWebhooksTopicsList,
-  createWebhooksSubscription,
-  updateWebhooksSubscriptionById,
-  deleteWebhooksSubscriptionById,
-  fetchWebhooksSubscriptionsList,
-  fetchWebhooksSubscriptionById,
-} from '@/services/webhooks'
-import { fetchInstallationsList } from '@/services/installations'
-
-export const requestSupcriptionData = function*({ data: applicationId }: Action<string>) {
-  yield put(setApplicationId(applicationId))
-  try {
-    const [subcriptionTopics, subcriptionCustomers] = yield all([
-      call(fetchWebhooksTopicsList, { applicationId }),
-      call(fetchInstallationsList, { appId: [applicationId] }),
-    ])
-    if (subcriptionCustomers && subcriptionTopics) {
-      yield put(
-        requestWebhookSubcriptionReceiveData({
-          subcriptionCustomers,
-          subcriptionTopics,
-        }),
-      )
-    } else {
-      yield put(requestWebhookSubcriptionReceiveFailure())
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const createNewWebhook = function*({ data }: Action<CreateWebhookParams>) {
-  try {
-    const createResponse = yield call(createWebhooksSubscription, data)
-    let newListResponse = false
-    if (createResponse) {
-      yield put(webhookSetOpenModal(''))
-      const { applicationId } = data
-      newListResponse = yield call(fetchWebhooksSubscriptionsList, { applicationId: [applicationId] })
-    }
-    if (newListResponse) {
-      yield put(webhookSubscriptionsReceiveData(newListResponse as PagedResultWebhookModel_))
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const editWebhook = function*({ data }: Action<EditWebhookParams>) {
-  try {
-    const editResponse = yield call(updateWebhooksSubscriptionById, { id: data.webhookId, ...data })
-    let newListResponse = false
-    if (editResponse) {
-      yield put(webhookSetOpenModal(''))
-      const { applicationId } = data
-      newListResponse = yield call(fetchWebhooksSubscriptionsList, { applicationId: [applicationId] })
-    }
-    if (newListResponse) {
-      yield put(webhookSubscriptionsReceiveData(newListResponse as PagedResultWebhookModel_))
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const deleteWebhook = function*({ data }: Action<DeleteWebhookParams>) {
-  try {
-    const { webhookId, applicationId } = data
-    const deleteResponse = yield call(deleteWebhooksSubscriptionById, { id: webhookId })
-    let newListResponse = false
-    if (deleteResponse) {
-      yield put(webhookSetOpenModal(''))
-      newListResponse = yield call(fetchWebhooksSubscriptionsList, { applicationId: [applicationId] })
-    }
-    if (newListResponse) {
-      yield put(webhookSubscriptionsReceiveData(newListResponse as PagedResultWebhookModel_))
-    }
-  } catch (err) {
-    logger(err)
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const requestWebhookData = function*({ data: webhookId }: Action<string>) {
-  try {
-    const data: WebhookModal = yield call(fetchWebhooksSubscriptionById, { id: webhookId })
-    const { applicationId } = data
-    yield put(requestWebhookReceiveData(data))
-    yield put(requestWebhookSubcriptionData(applicationId))
-  } catch (err) {
-    logger(err)
-    yield put(requestWebhookReceiveDataFailure())
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const requestWebhookSupcriptionDataListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.WEBHOOK_EDIT_SUBCRIPTION_REQUEST_DATA, requestSupcriptionData)
-}
-
-export const createWebhookListen = function*() {
-  yield takeLatest<Action<CreateWebhookParams>>(ActionTypes.WEBHOOK_CREATE, createNewWebhook)
-}
-
-export const editWebhookListen = function*() {
-  yield takeLatest<Action<EditWebhookParams>>(ActionTypes.WEBHOOK_EDIT, editWebhook)
-}
-
-export const requestWebhookDataListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.WEBHOOK_REQUEST_DATA, requestWebhookData)
-}
-
-export const deleteWebhookListen = function*() {
-  yield takeLatest<Action<DeleteWebhookParams>>(ActionTypes.WEBHOOK_DELETE, deleteWebhook)
-}
-
-const developerWebhookSagas = function*() {
-  yield all([
-    fork(requestWebhookSupcriptionDataListen),
-    fork(createWebhookListen),
-    fork(editWebhookListen),
-    fork(requestWebhookDataListen),
-    fork(deleteWebhookListen),
-  ])
-}
-
-export default developerWebhookSagas
diff --git a/packages/admin-portal/src/sagas/webhook-subscriptions.ts b/packages/admin-portal/src/sagas/webhook-subscriptions.ts
deleted file mode 100644
index c0972b5036..0000000000
--- a/packages/admin-portal/src/sagas/webhook-subscriptions.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { all, fork, takeLatest, call, put } from 'redux-saga/effects'
-import ActionTypes from '@/constants/action-types'
-import { Action } from '@/types/core'
-import errorMessages from '@/constants/error-messages'
-import { errorThrownServer } from '@/actions/error'
-import {
-  webhookSubscriptionsReceiveData,
-  webhookTopicsReceiveData,
-  setApplicationId,
-} from '@/actions/webhook-subscriptions'
-import { fetchWebhooksSubscriptionsList, fetchWebhooksTopicsList } from '@/services/webhooks'
-
-export const webhookSubscriptionsFetch = function*({ data: applicationId }: Action<string>) {
-  try {
-    yield put(setApplicationId(applicationId))
-    const response = yield call(fetchWebhooksSubscriptionsList, { applicationId: [applicationId] })
-    if (response) {
-      yield put(webhookSubscriptionsReceiveData(response))
-    }
-  } catch (error) {
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const webhookTopicsFetch = function*({ data: applicationId }: Action<string>) {
-  try {
-    const response = yield call(fetchWebhooksTopicsList, { applicationId })
-    if (response) {
-      yield put(webhookTopicsReceiveData(response))
-    }
-  } catch (error) {
-    yield put(
-      errorThrownServer({
-        type: 'SERVER',
-        message: errorMessages.DEFAULT_SERVER_ERROR,
-      }),
-    )
-  }
-}
-
-export const webhookSubscriptionsListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.WEBHOOK_SUBSCRIPTION_REQUEST_DATA, webhookSubscriptionsFetch)
-}
-
-export const webhookTopicsListen = function*() {
-  yield takeLatest<Action<string>>(ActionTypes.WEBHOOK_TOPICS_REQUEST_DATA, webhookTopicsFetch)
-}
-
-const webhookSubscriptionsSagas = function*() {
-  yield all([fork(webhookSubscriptionsListen), fork(webhookTopicsListen)])
-}
-
-export default webhookSubscriptionsSagas
diff --git a/packages/admin-portal/src/selector/__tests__/app-categories.ts b/packages/admin-portal/src/selector/__tests__/app-categories.ts
deleted file mode 100644
index aebdb27c37..0000000000
--- a/packages/admin-portal/src/selector/__tests__/app-categories.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { selectCategories } from '../app-categories'
-import { appCategorieStub } from '../../sagas/__stubs__/app-categories'
-
-describe('selectCategories', () => {
-  it('should run correctly', () => {
-    const input = {
-      appCategories: appCategorieStub,
-    } as ReduxState
-    const result = selectCategories(input)
-    expect(result).toEqual(appCategorieStub.data)
-  })
-
-  it('should run correctly and return []', () => {
-    const input = {} as ReduxState
-    const expected = []
-    const result = selectCategories(input)
-    expect(result).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/client.ts b/packages/admin-portal/src/selector/__tests__/client.ts
deleted file mode 100644
index a5b83fb564..0000000000
--- a/packages/admin-portal/src/selector/__tests__/client.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { ReduxState } from '@/types/core'
-import {
-  selectClientId,
-  selectDeveloperEditionId,
-  selectLoggedUserEmail,
-  selectFeaturedApps,
-  selectWebComponentOpen,
-  selectWebComponentData,
-  selectWebComponentLoading,
-  selectWebComponentUpdating,
-  selectWebComponentNegotiators,
-  selectAppDetail,
-  selectMyApps,
-  selectInstalledApps,
-} from '../client'
-import { featuredAppsDataStub } from '@/sagas/__stubs__/apps'
-
-describe('selectClientId', () => {
-  it('should run correctly', () => {
-    const input = {
-      auth: {
-        loginSession: {
-          loginIdentity: {
-            clientId: '123',
-            email: 'abc@gmail.com',
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectClientId(input)
-    expect(result).toEqual('123')
-  })
-
-  it('should run correctly and return undefined', () => {
-    const input = {} as ReduxState
-    const result = selectClientId(input)
-    expect(result).toEqual('')
-  })
-})
-
-describe('selectDeveloperEditionId', () => {
-  it('should run correctly when user in AgencyCloudDeveloperEdition group', () => {
-    const input = {
-      auth: {
-        loginSession: {
-          loginIdentity: {
-            clientId: '123',
-            email: 'abc@gmail.com',
-            developerId: '1234',
-            groups: ['AgencyCloudDeveloperEdition'],
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectDeveloperEditionId(input)
-    expect(result).toEqual('1234')
-  })
-
-  it('should run correctly when user NOT in AgencyCloudDeveloperEdition group', () => {
-    const input = {
-      auth: {
-        loginSession: {
-          loginIdentity: {
-            clientId: '123',
-            email: 'abc@gmail.com',
-            developerId: '1234',
-            groups: [''],
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectDeveloperEditionId(input)
-    expect(result).toEqual(null)
-  })
-})
-
-describe('selectLoggedUserEmail', () => {
-  it('should run correctly', () => {
-    const input = {
-      auth: {
-        loginSession: {
-          loginIdentity: {
-            clientId: '',
-            email: 'abc@gmail.com',
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectLoggedUserEmail(input)
-    expect(result).toEqual('abc@gmail.com')
-  })
-
-  it('should run correctly and return ""', () => {
-    const input = {} as ReduxState
-    const result = selectLoggedUserEmail(input)
-    expect(result).toEqual('')
-  })
-})
-
-describe('selectFeaturedApps', () => {
-  it('should run correctly', () => {
-    const input = {
-      client: {
-        appSummary: {
-          data: {
-            featuredApps: featuredAppsDataStub.data,
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectFeaturedApps(input)
-    expect(result).toEqual(featuredAppsDataStub.data)
-  })
-
-  it('should run correctly and return [', () => {
-    const input = {
-      client: {
-        appSummary: {
-          data: null,
-        },
-      },
-    } as ReduxState
-    const result = selectFeaturedApps(input)
-    expect(result).toEqual([])
-  })
-
-  it('should selectInstalledApps run correctly and return true', () => {
-    const input = {
-      installedApps: {},
-    } as ReduxState
-    const result = selectInstalledApps(input)
-    expect(result).toEqual({})
-  })
-
-  it('should selectIsWebComponentOpen run correctly and return true', () => {
-    const input = {
-      client: {
-        webComponent: {
-          isShowModal: true,
-        },
-      },
-    } as ReduxState
-    const result = selectWebComponentOpen(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should selectIsWebComponentData run correctly and return {}', () => {
-    const input = {
-      client: {
-        webComponent: {
-          data: {},
-        },
-      },
-    } as ReduxState
-    const result = selectWebComponentData(input)
-    expect(result).toEqual({})
-  })
-
-  it('should selectIsWebComponentLoading run correctly and return true', () => {
-    const input = {
-      client: {
-        webComponent: {
-          loading: true,
-        },
-      },
-    } as ReduxState
-    const result = selectWebComponentLoading(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should selectIsWebComponentUpdating run correctly and return true', () => {
-    const input = {
-      client: {
-        webComponent: {
-          updating: true,
-        },
-      },
-    } as ReduxState
-    const result = selectWebComponentUpdating(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should selectIsWebComponentNegotiators run correctly and return true', () => {
-    const input = {
-      client: {
-        webComponent: {
-          updating: true,
-          negotiators: null,
-        },
-      },
-    } as ReduxState
-    const result = selectWebComponentNegotiators(input)
-    expect(result).toEqual([])
-  })
-  it('should run correctly and return {}', () => {
-    const input = {
-      appDetail: {},
-    } as ReduxState
-    const result = selectAppDetail(input)
-    expect(result).toEqual(input.appDetail)
-  })
-  it('should run correctly and return {}', () => {
-    const input = {
-      myApps: {},
-    } as ReduxState
-    const result = selectMyApps(input)
-    expect(result).toEqual(input.myApps)
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/developer-subscriptions.ts b/packages/admin-portal/src/selector/__tests__/developer-subscriptions.ts
deleted file mode 100644
index ad05d8dac5..0000000000
--- a/packages/admin-portal/src/selector/__tests__/developer-subscriptions.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { listSubscriptionsStub } from '@/sagas/__stubs__/developer-subscriptions'
-import {
-  selectCreateDeveloperSubscriptionLoading,
-  selectCreateDeveloperSubscriptionError,
-  selectSubscriptions,
-  selectSubscriptionsLoading,
-} from '../developer-subscriptions'
-import appState from '@/reducers/__stubs__/app-state'
-
-describe('DeveloperSubscription', () => {
-  const mockState = {
-    ...appState,
-    developerSubscriptions: {
-      create: {
-        loading: false,
-        error: false,
-      },
-      list: {
-        loading: false,
-        data: listSubscriptionsStub,
-      },
-    },
-  } as ReduxState
-
-  describe('selectCreateDeveloperSubscriptionLoading', () => {
-    it('should run correctly', () => {
-      const output = selectCreateDeveloperSubscriptionLoading(mockState)
-      expect(output).toEqual(mockState.developerSubscriptions.create.loading)
-    })
-  })
-
-  describe('selectCreateDeveloperSubscriptionError', () => {
-    it('should run correctly', () => {
-      const output = selectCreateDeveloperSubscriptionError(mockState)
-      expect(output).toEqual(mockState.developerSubscriptions.create.error)
-    })
-  })
-
-  describe('selectSubscriptions', () => {
-    it('should run correctly', () => {
-      const result = selectSubscriptions(mockState)
-      expect(result).toEqual(mockState.developerSubscriptions.list.data)
-    })
-  })
-
-  describe('selectSubscriptionsLoading', () => {
-    it('should run correctly', () => {
-      const result = selectSubscriptionsLoading(mockState)
-      expect(result).toEqual(false)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/developer.ts b/packages/admin-portal/src/selector/__tests__/developer.ts
deleted file mode 100644
index 421681ecec..0000000000
--- a/packages/admin-portal/src/selector/__tests__/developer.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-import { ReduxState } from '@/types/core'
-import {
-  selectDeveloperId,
-  selectDeveloperEmail,
-  selectDeveloper,
-  selectDeveloperApps,
-  selectMyIdentity,
-  selectBilling,
-  selectDeveloperLoading,
-  selectIsServiceChartLoading,
-  selectMonthlyBilling,
-  selectMonthlyBillingLoading,
-  selectWebhookTestStatus,
-} from '../developer'
-
-describe('selectDeveloperId', () => {
-  it('should run correctly', () => {
-    const input = {
-      auth: {
-        loginSession: {
-          loginIdentity: {
-            clientId: '',
-            email: 'abc@gmail.com',
-            developerId: '123',
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectDeveloperId(input)
-    expect(result).toEqual('123')
-  })
-
-  it('should run correctly and return undefined', () => {
-    const input = { auth: {} } as ReduxState
-    const result = selectDeveloperId(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectDeveloperEmail', () => {
-  it('should run correctly', () => {
-    const input = {
-      settings: {
-        developerInfomation: {
-          email: 'abc@gmail.com',
-        },
-      },
-    } as ReduxState
-    const result = selectDeveloperEmail(input)
-    expect(result).toEqual('abc@gmail.com')
-  })
-
-  it('should run correctly and return undefined', () => {
-    const input = {} as ReduxState
-    const result = selectDeveloperEmail(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectDeveloper', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: false,
-        developerData: {},
-      },
-    } as ReduxState
-    const result = selectDeveloper(input)
-    expect(result).toEqual(input.developer)
-  })
-
-  it('should run correctly and return undefined', () => {
-    const input = {} as ReduxState
-    const result = selectDeveloper(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectDeveloperApps', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: false,
-        developerData: {
-          data: {
-            data: [{}],
-          },
-        },
-      },
-    } as ReduxState
-    const result = selectDeveloperApps(input)
-    expect(result).toEqual(input.developer.developerData?.data.data)
-  })
-
-  it('should run correctly and return []', () => {
-    const input = {} as ReduxState
-    const result = selectDeveloperApps(input)
-    expect(result).toEqual([])
-  })
-})
-
-describe('selectMyIdentity', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: false,
-        myIdentity: {},
-      },
-    } as ReduxState
-    const result = selectMyIdentity(input)
-    expect(result).toEqual(input.developer.myIdentity)
-  })
-
-  it('should run correctly and return {}', () => {
-    const input = {} as ReduxState
-    const result = selectMyIdentity(input)
-    expect(result).toEqual({})
-  })
-})
-
-describe('selectBilling', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: false,
-        billing: {},
-      },
-    } as ReduxState
-    const result = selectBilling(input)
-    expect(result).toEqual(input.developer.billing)
-  })
-
-  it('should run correctly and return null', () => {
-    const input = {} as ReduxState
-    const result = selectBilling(input)
-    expect(result).toEqual(null)
-  })
-})
-
-describe('selectDeveloperLoading', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        loading: true,
-      },
-    } as ReduxState
-    const result = selectDeveloperLoading(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should run correctly and return null', () => {
-    const input = {} as ReduxState
-    const result = selectDeveloperLoading(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectIsServiceChartLoading', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: true,
-      },
-    } as ReduxState
-    const result = selectIsServiceChartLoading(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should run correctly and return null', () => {
-    const input = {} as ReduxState
-    const result = selectIsServiceChartLoading(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectMonthlyBillingLoading', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isMonthlyBillingLoading: true,
-      },
-    } as ReduxState
-    const result = selectMonthlyBillingLoading(input)
-    expect(result).toEqual(true)
-  })
-
-  it('should run correctly and return null', () => {
-    const input = {} as ReduxState
-    const result = selectMonthlyBillingLoading(input)
-    expect(result).toEqual(undefined)
-  })
-})
-
-describe('selectMonthlyBilling', () => {
-  it('should run correctly', () => {
-    const input = {
-      developer: {
-        isServiceChartLoading: false,
-        monthlyBilling: {},
-      },
-    } as ReduxState
-    const result = selectMonthlyBilling(input)
-    expect(result).toEqual(input.developer.monthlyBilling)
-  })
-
-  it('should run correctly and return undefined', () => {
-    const input = {} as ReduxState
-    const result = selectMonthlyBilling(input)
-    expect(result).toEqual({})
-  })
-})
-
-describe('selectWebhookTestStatus', () => {
-  it('should run correctly and return status', () => {
-    const input = {
-      developer: {
-        webhookPingTestStatus: 'SUCCESS',
-      },
-    } as ReduxState
-    const result = selectWebhookTestStatus(input)
-    expect(result).toEqual('SUCCESS')
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/integration-types.ts b/packages/admin-portal/src/selector/__tests__/integration-types.ts
deleted file mode 100644
index 72caaebab1..0000000000
--- a/packages/admin-portal/src/selector/__tests__/integration-types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { selectIntegrationTypes } from '../integration-types'
-import { integrationTypesStub } from '@/sagas/__stubs__/integration-types'
-
-describe('selectIntegrationTypes', () => {
-  it('should run correctly', () => {
-    const input = {
-      desktopIntegrationTypes: integrationTypesStub,
-    } as ReduxState
-    const result = selectIntegrationTypes(input)
-    expect(result).toEqual(integrationTypesStub.data)
-  })
-
-  it('should run correctly and return []', () => {
-    const input = {} as ReduxState
-    const expected = []
-    const result = selectIntegrationTypes(input)
-    expect(result).toEqual(expected)
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/settings.ts b/packages/admin-portal/src/selector/__tests__/settings.ts
deleted file mode 100644
index 52fd7b65c4..0000000000
--- a/packages/admin-portal/src/selector/__tests__/settings.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { selectSettingsPageIsLoading, selectSettingsPageDeveloperInformation } from '../settings'
-import appState from '@/reducers/__stubs__/app-state'
-import { developerStub } from '@/sagas/__stubs__/developer'
-
-describe('settings selectors', () => {
-  const mockState = {
-    ...appState,
-    settings: {
-      developerInfomation: developerStub,
-      loading: true,
-    },
-  } as ReduxState
-
-  describe('selectSettingsPageDeveloperInformation', () => {
-    it('should run correctly', () => {
-      const result = selectSettingsPageDeveloperInformation(mockState)
-      expect(result).toEqual(developerStub)
-    })
-
-    it('return empty object when redux state is empty', () => {
-      const input = {} as ReduxState
-      const result = selectSettingsPageDeveloperInformation(input)
-      expect(result).toEqual({})
-    })
-  })
-
-  describe('selectSettingsPageIsLoading', () => {
-    it('should run correctly', () => {
-      const result = selectSettingsPageIsLoading(mockState)
-      expect(result).toEqual(true)
-    })
-
-    it('return false when redux state is empty', () => {
-      const input = {} as ReduxState
-      const result = selectSettingsPageIsLoading(input)
-      expect(result).toEqual(false)
-    })
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/submit-app.test.ts b/packages/admin-portal/src/selector/__tests__/submit-app.test.ts
deleted file mode 100644
index 5bf00c781b..0000000000
--- a/packages/admin-portal/src/selector/__tests__/submit-app.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { selectSubmitAppRevisionState, selectSubmitAppState } from '../submit-app'
-import appState from '@/reducers/__stubs__/app-state'
-
-const mockState: ReduxState = {
-  ...appState,
-  submitRevision: {
-    formState: 'PENDING',
-  },
-  submitApp: {
-    formState: 'PENDING',
-    loading: false,
-    submitAppData: {
-      scopes: [
-        {
-          description: 'test',
-          name: 'test',
-        },
-      ],
-    },
-  },
-}
-
-describe('selectSubmitAppRevisionState', () => {
-  it('should run correctly', () => {
-    const result = selectSubmitAppRevisionState(mockState)
-    expect(result).toEqual({
-      formState: 'PENDING',
-    })
-  })
-})
-
-describe('selectSubmitAppState', () => {
-  it('should run correctly', () => {
-    const result = selectSubmitAppState(mockState)
-    expect(result).toEqual({
-      formState: 'PENDING',
-      loading: false,
-      submitAppData: {
-        scopes: [
-          {
-            description: 'test',
-            name: 'test',
-          },
-        ],
-      },
-    })
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/webhook-edit.ts b/packages/admin-portal/src/selector/__tests__/webhook-edit.ts
deleted file mode 100644
index f051e0c39d..0000000000
--- a/packages/admin-portal/src/selector/__tests__/webhook-edit.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { webhookEditDataStub } from '@/sagas/__stubs__/webhook-edit'
-import {
-  selectCustomers,
-  selectTopics,
-  selectLoading,
-  selectWebhookData,
-  selectWebhookTopicsSubcription,
-} from '../webhook-edit'
-
-const input = { webhookEdit: webhookEditDataStub } as ReduxState
-
-describe('selectWebhookEdit', () => {
-  it('should run correctly selectTopics', () => {
-    const result = selectTopics(input)
-    expect(result).toEqual(webhookEditDataStub.subcriptionTopics._embedded)
-  })
-
-  it('should run correctly selectCustomers', () => {
-    const result = selectCustomers(input)
-    expect(result).toEqual(webhookEditDataStub.subcriptionCustomers.data)
-  })
-
-  it('should run correctly selectLoading', () => {
-    const result = selectLoading(input)
-    expect(result).toEqual(webhookEditDataStub.loading)
-  })
-
-  it('should run correctly selectWebhookData', () => {
-    const result = selectWebhookData(input)
-    expect(result).toEqual(webhookEditDataStub.webhookData)
-  })
-
-  it('should run correctly selectWebhookTopicsSubcription', () => {
-    const result = selectWebhookTopicsSubcription(input)
-    expect(result).toEqual(webhookEditDataStub.webhookData.topicIds)
-  })
-})
diff --git a/packages/admin-portal/src/selector/__tests__/webhooks.ts b/packages/admin-portal/src/selector/__tests__/webhooks.ts
deleted file mode 100644
index 5f7cfea2a4..0000000000
--- a/packages/admin-portal/src/selector/__tests__/webhooks.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { selectSubscriptionsData, selectSubscriptionsLoading, selectTopicsData, selectTopicsLoading } from '../wehooks'
-import { subscriptions, topics } from '@/sagas/__stubs__/webhooks'
-
-const input = {
-  webhooks: {
-    subscriptions: {
-      loading: false,
-      error: false,
-      subscriptions,
-    },
-    topics: {
-      loading: false,
-      error: false,
-      topics,
-    },
-  },
-} as ReduxState
-
-describe('selectWebhooks', () => {
-  it('should run correctly selectSubscriptionsData', () => {
-    const result = selectSubscriptionsData(input)
-    expect(result).toEqual(subscriptions._embedded)
-  })
-
-  it('should run correctly selectSubscriptionsLoading', () => {
-    const result = selectSubscriptionsLoading(input)
-    expect(result).toEqual(false)
-  })
-
-  it('should run correctly selectTopicsData', () => {
-    const result = selectTopicsData(input)
-    expect(result).toEqual(topics._embedded)
-  })
-
-  it('should run correctly selectTopicsLoading', () => {
-    const result = selectTopicsLoading(input)
-    expect(result).toEqual(false)
-  })
-})
diff --git a/packages/admin-portal/src/selector/analytics.ts b/packages/admin-portal/src/selector/analytics.ts
deleted file mode 100644
index 8bc9f23ec0..0000000000
--- a/packages/admin-portal/src/selector/analytics.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const getAppUsageStats = (state: ReduxState) => {
-  return state.appUsageStats
-}
-
-export const getAppHttpTraffic = (state: ReduxState) => {
-  return state.appHttpTraffic
-}
diff --git a/packages/admin-portal/src/selector/app-categories.ts b/packages/admin-portal/src/selector/app-categories.ts
deleted file mode 100644
index 50a59a91c9..0000000000
--- a/packages/admin-portal/src/selector/app-categories.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectCategories = (state: ReduxState) => {
-  return state?.appCategories?.data || []
-}
diff --git a/packages/admin-portal/src/selector/client-app-detail.ts b/packages/admin-portal/src/selector/client-app-detail.ts
deleted file mode 100644
index af512c8e37..0000000000
--- a/packages/admin-portal/src/selector/client-app-detail.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectAppDetailState = (state: ReduxState) => {
-  return state.client || {}
-}
-
-export const selectAppDetailData = (state: ReduxState) => {
-  return state.client.appDetail.data || {}
-}
-
-export const selectAppDetailAuthentication = (state: ReduxState) => {
-  return state.appDetail.authentication
-}
-
-export const selectAppDetailLoading = (state: ReduxState) => {
-  return state.client.appDetail.isAppDetailLoading
-}
-
-export const selectAppDetailError = (state: ReduxState): string | null => {
-  return state?.client?.appDetail?.error || null
-}
diff --git a/packages/admin-portal/src/selector/client.ts b/packages/admin-portal/src/selector/client.ts
deleted file mode 100644
index 7c274f7f80..0000000000
--- a/packages/admin-portal/src/selector/client.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { MyAppsState } from '@/reducers/my-apps'
-import { AppDetailState } from '@/reducers/app-detail'
-import { NegotiatorItem } from '@/services/negotiators'
-import { WebComponentConfigResult } from '@/services/web-component'
-import { InstalledAppsState } from '@/reducers/installed-apps'
-import { AppSummaryModel } from '@reapit/foundations-ts-definitions'
-import { ClientAppSummaryState } from '@/reducers/client/app-summary'
-import { selectLoginIdentity } from '@/selector/auth'
-import { COGNITO_GROUP_DEVELOPER_EDITION } from '@/constants/api'
-
-export const selectClientId = (state: ReduxState) => {
-  return state?.auth?.loginSession?.loginIdentity?.clientId || ''
-}
-
-/**
- * Need get developer id to filter apps list if this user belong to
- * AgencyCloudDeveloperEdition group, if not just return null
- * refer to this ticket https://github.com/reapit/foundations/issues/1848
- */
-export const selectDeveloperEditionId = (state: ReduxState) => {
-  const loginIdentity = selectLoginIdentity(state)
-  if (loginIdentity?.groups.includes(COGNITO_GROUP_DEVELOPER_EDITION)) {
-    return state?.auth?.loginSession?.loginIdentity?.developerId || ''
-  }
-  return null
-}
-
-export const selectLoggedUserEmail = (state: ReduxState): string => {
-  return state?.auth?.loginSession?.loginIdentity?.email || ''
-}
-
-export const selectAppSummary = (state: ReduxState): ClientAppSummaryState => {
-  return state?.client.appSummary
-}
-
-export const selectFeaturedApps = (state: ReduxState): AppSummaryModel[] => {
-  return state?.client.appSummary.data?.featuredApps || []
-}
-
-export const selectInstalledApps = (state: ReduxState): InstalledAppsState => {
-  return state?.installedApps
-}
-
-export const selectWebComponentOpen = (state: ReduxState): boolean => {
-  return state?.client.webComponent?.isShowModal
-}
-
-export const selectWebComponentData = (state: ReduxState): WebComponentConfigResult => {
-  return state?.client.webComponent?.data
-}
-
-export const selectWebComponentLoading = (state: ReduxState): boolean => {
-  return state?.client.webComponent?.loading
-}
-
-export const selectWebComponentUpdating = (state: ReduxState): boolean => {
-  return state?.client.webComponent?.updating
-}
-
-export const selectWebComponentNegotiators = (state: ReduxState): NegotiatorItem[] => {
-  return state?.client.webComponent?.negotiators?._embedded || []
-}
-
-export const selectAppDetail = (state: ReduxState): AppDetailState => {
-  return state.appDetail
-}
-
-export const selectMyApps = (state: ReduxState): MyAppsState => {
-  return state.myApps || {}
-}
diff --git a/packages/admin-portal/src/selector/developer-app-detail.ts b/packages/admin-portal/src/selector/developer-app-detail.ts
deleted file mode 100644
index 9231997163..0000000000
--- a/packages/admin-portal/src/selector/developer-app-detail.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectAppDetailState = (state: ReduxState) => {
-  return state.developer.developerAppDetail || {}
-}
-
-export const selectAppDetailData = (state: ReduxState) => {
-  return state.developer.developerAppDetail.data || {}
-}
-
-export const selectAppDetailAuthentication = (state: ReduxState) => {
-  return state.appDetail.authentication
-}
-
-export const selectAppDetailLoading = (state: ReduxState) => {
-  return state.developer.developerAppDetail.isAppDetailLoading
-}
diff --git a/packages/admin-portal/src/selector/developer-detail.tsx b/packages/admin-portal/src/selector/developer-detail.tsx
deleted file mode 100644
index cd9a53f5a2..0000000000
--- a/packages/admin-portal/src/selector/developer-detail.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectDeveloperDetailLoading = (state: ReduxState) => {
-  return state.appDetail.loading
-}
diff --git a/packages/admin-portal/src/selector/developer-subscriptions.ts b/packages/admin-portal/src/selector/developer-subscriptions.ts
deleted file mode 100644
index 2a175b8f14..0000000000
--- a/packages/admin-portal/src/selector/developer-subscriptions.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { PagedResultSubscriptionModel_ } from '@reapit/foundations-ts-definitions'
-
-export const selectCreateDeveloperSubscriptionLoading = (state: ReduxState): boolean => {
-  return state.developerSubscriptions.create.loading
-}
-
-export const selectCreateDeveloperSubscriptionError = (state: ReduxState): boolean => {
-  return state.developerSubscriptions.create.error
-}
-
-export const selectSubscriptions = (state: ReduxState): PagedResultSubscriptionModel_ => {
-  return state.developerSubscriptions?.list?.data || ({} as PagedResultSubscriptionModel_)
-}
-
-export const selectSubscriptionsLoading = (state: ReduxState): boolean => {
-  return state.developerSubscriptions?.list?.loading
-}
diff --git a/packages/admin-portal/src/selector/developer.ts b/packages/admin-portal/src/selector/developer.ts
deleted file mode 100644
index eb9806b78c..0000000000
--- a/packages/admin-portal/src/selector/developer.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// TODO: Will move all developerSelector to here for reusable
-import { ReduxState, FormState } from '@/types/core'
-import {
-  BillingBreakdownForMonthV2Model,
-  BillingOverviewForPeriodV2Model,
-  AppSummaryModel,
-  DeveloperModel,
-} from '@reapit/foundations-ts-definitions'
-import { WebhookPingTestStatus } from '@/reducers/developer'
-
-export const selectDeveloperId = (state: ReduxState) => {
-  return state.auth.loginSession?.loginIdentity.developerId
-}
-
-export const selectDeveloperEmail = (state: ReduxState) => {
-  return state?.settings?.developerInfomation?.email
-}
-
-export const selectDeveloper = (state: ReduxState) => {
-  return state.developer
-}
-
-export const selectDeveloperAppModalVisible = (state: ReduxState) => {
-  return state.developer.isVisible
-}
-
-export const selectDeveloperApps = (state: ReduxState): AppSummaryModel[] => {
-  return state.developer?.developerData?.data.data || ([] as AppSummaryModel[])
-}
-
-export const selectMyIdentity = (state: ReduxState): DeveloperModel => {
-  return state.developer?.myIdentity || {}
-}
-
-export const selectBilling = (state: ReduxState): BillingOverviewForPeriodV2Model | null => {
-  return state.developer?.billing || null
-}
-
-export const selectDeveloperLoading = (state: ReduxState): boolean => {
-  return state.developer?.loading
-}
-
-export const selectIsServiceChartLoading = (state: ReduxState): boolean => {
-  return state.developer?.isServiceChartLoading
-}
-
-export const selectMonthlyBilling = (state: ReduxState): BillingBreakdownForMonthV2Model => {
-  return state.developer?.monthlyBilling || {}
-}
-
-export const selectMonthlyBillingLoading = (state: ReduxState): boolean => {
-  return state.developer?.isMonthlyBillingLoading
-}
-
-export const selectWebhookTestStatus = (state: ReduxState): WebhookPingTestStatus => {
-  return state.developer?.webhookPingTestStatus
-}
-
-export const selectDeveloperFormState = (state: ReduxState): FormState => {
-  return state.developer?.formState
-}
diff --git a/packages/admin-portal/src/selector/index.ts b/packages/admin-portal/src/selector/index.ts
deleted file mode 100644
index 9aab0d3c22..0000000000
--- a/packages/admin-portal/src/selector/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './developer'
diff --git a/packages/admin-portal/src/selector/installations.ts b/packages/admin-portal/src/selector/installations.ts
deleted file mode 100644
index b3cad2f7ec..0000000000
--- a/packages/admin-portal/src/selector/installations.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const getInstallations = (state: ReduxState) => {
-  return state.installations
-}
-
-export const selectInstallAppLoading = (state: ReduxState) => {
-  return state.installations.loading
-}
-
-export const selectInstallationFormState = (state: ReduxState) => {
-  return state.installations.formState
-}
-
-export const selectInstallationAppData = (state: ReduxState) => {
-  return state.installations.installationsAppData
-}
diff --git a/packages/admin-portal/src/selector/integration-types.ts b/packages/admin-portal/src/selector/integration-types.ts
deleted file mode 100644
index 8ff1299d99..0000000000
--- a/packages/admin-portal/src/selector/integration-types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectIntegrationTypes = (state: ReduxState) => {
-  return state?.desktopIntegrationTypes?.data || []
-}
diff --git a/packages/admin-portal/src/selector/settings.ts b/packages/admin-portal/src/selector/settings.ts
deleted file mode 100644
index e8f926382d..0000000000
--- a/packages/admin-portal/src/selector/settings.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectSettingsPageIsLoading = (state: ReduxState) => {
-  return state?.settings?.loading || false
-}
-
-export const selectSettingsPageDeveloperInformation = (state: ReduxState) => {
-  return state?.settings?.developerInfomation || {}
-}
diff --git a/packages/admin-portal/src/selector/submit-app.ts b/packages/admin-portal/src/selector/submit-app.ts
deleted file mode 100644
index 5aa1eee10d..0000000000
--- a/packages/admin-portal/src/selector/submit-app.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ReduxState, FormState } from '@/types/core'
-import { SubmitAppState } from '@/reducers/submit-app'
-import { SubmitRevisionState } from '@/reducers/submit-revision'
-import { ScopeModel } from '@reapit/foundations-ts-definitions'
-
-export const selectSubmitAppScopes = (state: ReduxState): ScopeModel[] => {
-  return state.submitApp.submitAppData?.scopes || []
-}
-
-export const selectSubmitAppState = (state: ReduxState): SubmitAppState => {
-  return state.submitApp
-}
-
-export const selectSubmitAppLoadingState = (state: ReduxState): boolean => {
-  return state.submitApp.loading
-}
-
-export const selectSubmitAppFormState = (state: ReduxState): FormState => {
-  return state.submitApp.formState
-}
-
-export const selectSubmitAppRevisionState = (state: ReduxState): SubmitRevisionState => {
-  return state.submitRevision
-}
diff --git a/packages/admin-portal/src/selector/webhook-edit.ts b/packages/admin-portal/src/selector/webhook-edit.ts
deleted file mode 100644
index 0b703ff8e7..0000000000
--- a/packages/admin-portal/src/selector/webhook-edit.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ReduxState } from '@/types/core'
-
-export const selectTopics = (state: ReduxState) => {
-  return state.webhookEdit?.subcriptionTopics?._embedded || []
-}
-export const selectCustomers = (state: ReduxState) => {
-  return state.webhookEdit?.subcriptionCustomers?.data || []
-}
-
-export const selectLoading = (state: ReduxState) => {
-  return state.webhookEdit?.loading
-}
-
-export const selectWebhookData = (state: ReduxState) => {
-  return state.webhookEdit?.webhookData
-}
-
-export const selectWebhookTopicsSubcription = (state: ReduxState) => {
-  return state.webhookEdit?.webhookData?.topicIds
-}
diff --git a/packages/admin-portal/src/selector/wehooks.ts b/packages/admin-portal/src/selector/wehooks.ts
deleted file mode 100644
index 8710b02e61..0000000000
--- a/packages/admin-portal/src/selector/wehooks.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ReduxState } from '@/types/core'
-import { TopicModel, WebhookModel } from '@/reducers/webhook-subscriptions'
-
-export const selectSubscriptionsData = (state: ReduxState): WebhookModel[] => {
-  return state?.webhooks?.subscriptions?.subscriptions?._embedded || []
-}
-
-export const selectSubscriptionsLoading = (state: ReduxState): boolean => {
-  return state?.webhooks?.subscriptions?.loading
-}
-
-export const selectTopicsData = (state: ReduxState): TopicModel[] => {
-  return state?.webhooks?.topics?.topics?._embedded || []
-}
-
-export const selectTopicsLoading = (state: ReduxState): boolean => {
-  return state?.webhooks?.topics?.loading
-}
-
-export const selectApplicationId = (state: ReduxState): string => {
-  return state?.webhooks?.topics?.applicationId
-}
-
-export const selectWebhookEditModalType = (state: ReduxState): string => {
-  return state.webhookEdit.modalType
-}
diff --git a/packages/admin-portal/src/types/core.ts b/packages/admin-portal/src/types/core.ts
index aaa31776b6..c69076fe67 100644
--- a/packages/admin-portal/src/types/core.ts
+++ b/packages/admin-portal/src/types/core.ts
@@ -1,31 +1,15 @@
 import { AdminDevManamgenetState } from './../reducers/admin-dev-management'
 import Routes from '../constants/routes'
 import ActionTypes from '../constants/action-types'
-import { InstalledAppsState } from '../reducers/installed-apps'
-import { MyAppsState } from '../reducers/my-apps'
-import { DeveloperState } from '../reducers/developer'
 import { AuthState } from '../reducers/auth'
 import { AppDetailState } from '../reducers/app-detail'
 import { ErrorState } from '../reducers/error'
-import { SubmitAppState } from '../reducers/submit-app'
-import { SubmitRevisionState } from '@/reducers/submit-revision'
 import { AdminApprovalsState } from '@/reducers/admin-approvals'
 import { RevisionDetailState } from '@/reducers/revision-detail'
 import { RevisionsState } from '@/reducers/revisions'
-import { AppDetailModalState } from '@/reducers/app-detail-modal'
-import { AppCategoriesState } from '@/reducers/app-categories'
-import { SettingsState } from '@/reducers/settings'
 import { AdminAppsState } from '@/reducers/admin-apps'
-import { AppInstallationsState } from '@/reducers/app-installations'
-import { AppUsageStatsState } from '@/reducers/app-usage-stats'
 import { NotificationMessageState } from '@/reducers/notification-message'
 import { AdminStatsState } from '@/reducers/admin-stats'
-import { AppHttpTrafficEventState } from '@/reducers/app-http-traffic-event'
-import { IntegrationTypeState } from '@/reducers/app-integration-types'
-import { WebhookEditState } from '@/reducers/webhook-edit-modal'
-import { WebhookState } from '@/reducers/webhook-subscriptions'
-import { ClientRootState } from '@/reducers/client'
-import { DeveloperSubscriptionsState } from '@/reducers/developer-subscriptions'
 
 export type ModalProps = { visible: boolean; afterClose: () => void }
 
@@ -65,32 +49,16 @@ export interface FetcherParams<T> {
 }
 
 export interface ReduxState {
-  client: ClientRootState
-  installedApps: InstalledAppsState
-  myApps: MyAppsState
   appDetail: AppDetailState
-  developer: DeveloperState
   auth: AuthState
   error: ErrorState
-  submitApp: SubmitAppState
-  submitRevision: SubmitRevisionState
   adminApps: AdminAppsState
   adminApprovals: AdminApprovalsState
   adminDevManagement: AdminDevManamgenetState
   developerSetStatus: RequestState
   revisionDetail: RevisionDetailState
   revisions: RevisionsState
-  appDetailModal: AppDetailModalState
   appDelete: RequestState
-  appCategories: AppCategoriesState
-  settings: SettingsState
-  installations: AppInstallationsState
-  appUsageStats: AppUsageStatsState
   noticationMessage: NotificationMessageState
   adminStats: AdminStatsState
-  appHttpTraffic: AppHttpTrafficEventState
-  desktopIntegrationTypes: IntegrationTypeState
-  webhookEdit: WebhookEditState
-  webhooks: WebhookState
-  developerSubscriptions: DeveloperSubscriptionsState
 }
diff --git a/packages/admin-portal/src/actions/app-integration-types.ts b/packages/admin-portal/src/types/desktop-integration-types.d.ts
similarity index 53%
rename from packages/admin-portal/src/actions/app-integration-types.ts
rename to packages/admin-portal/src/types/desktop-integration-types.d.ts
index da37ec66e0..a66d5c9eb2 100644
--- a/packages/admin-portal/src/actions/app-integration-types.ts
+++ b/packages/admin-portal/src/types/desktop-integration-types.d.ts
@@ -1,6 +1,3 @@
-import { actionCreator } from '../utils/actions'
-import ActionTypes from '../constants/action-types'
-
 export interface DesktopIntegrationTypeModel {
   id?: string
   name?: string
@@ -15,7 +12,3 @@ export interface PagedResultDesktopIntegrationTypeModel_ {
   pageCount?: number
   totalCount?: number
 }
-
-export const integrationTypesReceiveData = actionCreator<PagedResultDesktopIntegrationTypeModel_ | undefined>(
-  ActionTypes.INTEGRATION_TYPES_RECEIVE_DATA,
-)
diff --git a/packages/admin-portal/src/utils/__tests__/actions.ts b/packages/admin-portal/src/utils/__tests__/actions.ts
index a8a32e7b88..f84162c88d 100644
--- a/packages/admin-portal/src/utils/__tests__/actions.ts
+++ b/packages/admin-portal/src/utils/__tests__/actions.ts
@@ -1,36 +1,28 @@
 import { actionCreator, isType } from '../actions'
 import ActionTypes from '../../constants/action-types'
-import { clientFetchAppSummary, clientFetchAppSummarySuccess } from '../../actions/client'
+import { adminApprovalsRequestData, adminApprovalsReceiveData } from '@/actions/admin-approvals'
 import { Action } from '../../types/core'
-import { ClientAppSummaryParams } from '@/reducers/client/app-summary'
 
 describe('actions utils', () => {
   describe('actionCreator', () => {
     it('should create an action of the correct type', () => {
-      const actionData: ClientAppSummaryParams = {
-        page: 1,
-      }
-      const action = { data: actionData, type: 'CLIENT_FETCH_APP_SUMMARY' }
-      expect(
-        actionCreator<ClientAppSummaryParams>(ActionTypes.CLIENT_FETCH_APP_SUMMARY)({
-          page: 1,
-        }),
-      ).toEqual(action)
+      const action = { data: 1, type: 'ADMIN_APPROVALS_REQUEST_DATA' }
+      expect(actionCreator<number>(ActionTypes.ADMIN_APPROVALS_REQUEST_DATA)(1)).toEqual(action)
     })
   })
 
   describe('isType', () => {
     it('should return true if actions are equal', () => {
-      const actionData: ClientAppSummaryParams = {
-        page: 1,
-      }
-      const action: Action<any> = { data: actionData, type: 'CLIENT_FETCH_APP_SUMMARY' }
-      expect(isType(action, clientFetchAppSummary)).toBe(true)
+      //   const actionData: ClientAppSummaryParams = {
+      //     page: 1,
+      //   }
+      const action: Action<any> = { data: 1, type: 'ADMIN_APPROVALS_REQUEST_DATA' }
+      expect(isType(action, adminApprovalsRequestData)).toBe(true)
     })
 
     it('should return false if actions are not equal', () => {
-      const anotherAction: Action<any> = { data: true, type: 'CLIENT_FETCH_APP_SUMMARY' }
-      expect(isType(anotherAction, clientFetchAppSummarySuccess)).toBe(false)
+      const anotherAction: Action<any> = { data: 1, type: 'ADMIN_APPROVALS_REQUEST_DATA' }
+      expect(isType(anotherAction, adminApprovalsReceiveData)).toBe(false)
     })
   })
 })
diff --git a/packages/admin-portal/src/utils/__tests__/app-http-traffic.ts b/packages/admin-portal/src/utils/__tests__/app-http-traffic.ts
deleted file mode 100644
index c33482d11b..0000000000
--- a/packages/admin-portal/src/utils/__tests__/app-http-traffic.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { httpTrafficPerDayStub } from '@/sagas/__stubs__/app-http-traffic-event'
-import { getAppHttpTrafficPerDayChartData, getChartOptions, getChartConfig } from '../app-http-traffic'
-
-describe('HttpTrafficPerDayChart', () => {
-  describe('getAppHttpTrafficPerDayChartData', () => {
-    const data = getAppHttpTrafficPerDayChartData(httpTrafficPerDayStub.requestsByDate || [])
-    expect(data).toEqual({
-      labels: ['2020-04-04', '2020-04-05'],
-      data: [4, 65],
-      chartDataStats: [
-        {
-          date: '2020-04-04',
-          requestCount: 4,
-        },
-        {
-          date: '2020-04-05',
-          requestCount: 65,
-        },
-      ],
-    })
-  })
-  describe('getChartOptions', () => {
-    it('should run correctly', () => {
-      const result = getAppHttpTrafficPerDayChartData(httpTrafficPerDayStub.requestsByDate || [])
-      const options = getChartOptions(result?.chartDataStats)
-      expect(options.tooltips).not.toBeNull()
-    })
-  })
-  describe('getChartConfig', () => {
-    it('should run correctly', () => {
-      const result = getAppHttpTrafficPerDayChartData(httpTrafficPerDayStub.requestsByDate || [])
-      const configs = getChartConfig(result?.labels, result?.data)
-      expect(configs).not.toBeNull()
-    })
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/boolean-to-yes-no-string.test.ts b/packages/admin-portal/src/utils/__tests__/boolean-to-yes-no-string.test.ts
deleted file mode 100644
index 0a4090c548..0000000000
--- a/packages/admin-portal/src/utils/__tests__/boolean-to-yes-no-string.test.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { convertBooleanToYesNoString } from '../boolean-to-yes-no-string'
-describe('convertBooleanToYesNoString', () => {
-  it('should return Yes when input true', () => {
-    expect(convertBooleanToYesNoString(true)).toBe('Yes')
-  })
-  it('should return No when input fasle', () => {
-    expect(convertBooleanToYesNoString(false)).toBe('No')
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/browser.ts b/packages/admin-portal/src/utils/__tests__/browser.ts
deleted file mode 100644
index 5c88ac0626..0000000000
--- a/packages/admin-portal/src/utils/__tests__/browser.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { isIE } from '../browser'
-
-describe('Browser unity', () => {
-  test('is IE', () => {
-    // @ts-ignore
-    window.navigator.__defineGetter__('userAgent', function() {
-      return 'Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko'
-    })
-
-    expect(isIE()).toBeTruthy()
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/get-desktop-integration-types.test.ts b/packages/admin-portal/src/utils/__tests__/get-desktop-integration-types.test.ts
deleted file mode 100644
index c0141c7d9e..0000000000
--- a/packages/admin-portal/src/utils/__tests__/get-desktop-integration-types.test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { getDesktopIntegrationTypes } from '../get-desktop-integration-types'
-
-describe('getDesktopIntegrationTypes', () => {
-  it('shold working correctly', () => {
-    const mockDesktopIntegrationTypes = [{ id: '1' }, { id: '2' }]
-    expect(getDesktopIntegrationTypes(['1'], mockDesktopIntegrationTypes)).toEqual([mockDesktopIntegrationTypes[0]])
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/launch-app.ts b/packages/admin-portal/src/utils/__tests__/launch-app.ts
deleted file mode 100644
index b52a6995e8..0000000000
--- a/packages/admin-portal/src/utils/__tests__/launch-app.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { handleLaunchApp } from '../launch-app'
-import { AppSummaryModel } from '@reapit/foundations-ts-definitions'
-
-jest.mock('../../core/store')
-
-describe('handleLaunchApp', () => {
-  it('should run correctly', () => {
-    const mockApp = {
-      launchUri: '',
-      id: '123',
-    } as AppSummaryModel
-    handleLaunchApp(mockApp)
-    expect(window.location.href).toEqual('')
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/number-formatter.ts b/packages/admin-portal/src/utils/__tests__/number-formatter.ts
deleted file mode 100644
index 82538cc816..0000000000
--- a/packages/admin-portal/src/utils/__tests__/number-formatter.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { formatCurrency, formatNumber } from '../number-formatter'
-describe('formatCurrency', () => {
-  it('should run correctly', () => {
-    expect(formatCurrency(14.489)).toEqual('£14.49')
-  })
-  it('should run correctly', () => {
-    expect(formatCurrency(143.025, 2, 'en-US', 'USD')).toEqual('$143.03')
-  })
-})
-describe('formatNumber', () => {
-  it('should run correctly', () => {
-    expect(formatNumber(14000)).toEqual('14,000')
-  })
-})
diff --git a/packages/admin-portal/src/utils/__tests__/route-dispatcher.ts b/packages/admin-portal/src/utils/__tests__/route-dispatcher.ts
index d0317b4f99..690c1b870a 100644
--- a/packages/admin-portal/src/utils/__tests__/route-dispatcher.ts
+++ b/packages/admin-portal/src/utils/__tests__/route-dispatcher.ts
@@ -7,8 +7,6 @@ import { adminApprovalsRequestData } from '@/actions/admin-approvals'
 jest.mock('@reapit/elements')
 jest.mock('@/utils/session')
 jest.mock('../../core/store')
-jest.mock('../../sagas/client')
-jest.mock('../../sagas/developer')
 
 describe('routeDispatcher', () => {
   it('should dispatch to adminApprovalsRequestData for the admin approvals data route', async () => {
diff --git a/packages/admin-portal/src/utils/__tests__/router-helper.test.ts b/packages/admin-portal/src/utils/__tests__/router-helper.test.ts
deleted file mode 100644
index 34a8baac28..0000000000
--- a/packages/admin-portal/src/utils/__tests__/router-helper.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getMockRouterProps } from '@/utils/mock-helper'
-import { canGoBack } from '../router-helper'
-
-describe('canGoBack', () => {
-  it('should return true', () => {
-    const { history } = getMockRouterProps({}, 3)
-    const result = canGoBack(history)
-    expect(result).toBeTruthy()
-  })
-  it('should return false', () => {
-    const { history } = getMockRouterProps({})
-    const result = canGoBack(history)
-    expect(result).toBeFalsy()
-  })
-})
diff --git a/packages/admin-portal/src/utils/app-http-traffic.ts b/packages/admin-portal/src/utils/app-http-traffic.ts
deleted file mode 100644
index 7065037e29..0000000000
--- a/packages/admin-portal/src/utils/app-http-traffic.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { RequestByDateModel } from '@/reducers/app-http-traffic-event'
-
-export interface ChartDataModel {
-  date: string
-  requestCount: number
-}
-
-export const getAppHttpTrafficPerDayChartData = (stats: RequestByDateModel[]) => {
-  let chartDataStats: ChartDataModel[] = []
-  if (stats) {
-    chartDataStats = [...stats]
-  }
-
-  const labels: string[] = []
-  const data: number[] = []
-  chartDataStats.map(item => {
-    labels.push(item.date)
-    data.push(item.requestCount)
-  })
-
-  return {
-    labels,
-    data,
-    chartDataStats,
-  }
-}
-
-export const getChartOptions = data => {
-  return {
-    legend: null,
-    width: 100,
-    height: 50,
-    maintainAspectRatio: true,
-    tooltips: {
-      mode: 'label',
-      callbacks: {
-        label: function(tooltipItem) {
-          return data.find(x => x.date === tooltipItem.label).requestCount
-        },
-      },
-    },
-  }
-}
-
-export const getChartConfig = (labels: string[], data: number[]) => {
-  return {
-    labels,
-    datasets: [
-      {
-        fill: false,
-        lineTension: 0.1,
-        backgroundColor: 'rgba(75,192,192,0.4)',
-        borderColor: 'rgba(75,192,192,1)',
-        borderCapStyle: 'butt',
-        borderDash: [],
-        borderDashOffset: 0.0,
-        borderJoinStyle: 'miter',
-        pointBorderColor: 'rgba(75,192,192,1)',
-        pointBackgroundColor: '#fff',
-        pointBorderWidth: 1,
-        pointHoverRadius: 5,
-        pointHoverBackgroundColor: 'rgba(75,192,192,1)',
-        pointHoverBorderColor: 'rgba(220,220,220,1)',
-        pointHoverBorderWidth: 2,
-        pointRadius: 1,
-        pointHitRadius: 10,
-        data,
-      },
-    ],
-  }
-}
diff --git a/packages/admin-portal/src/utils/boolean-to-yes-no-string.tsx b/packages/admin-portal/src/utils/boolean-to-yes-no-string.tsx
deleted file mode 100644
index 76dc9c9d9c..0000000000
--- a/packages/admin-portal/src/utils/boolean-to-yes-no-string.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export const convertBooleanToYesNoString: (value: boolean) => string = value => {
-  if (value) {
-    return 'Yes'
-  }
-
-  return 'No'
-}
diff --git a/packages/admin-portal/src/utils/browser.ts b/packages/admin-portal/src/utils/browser.ts
deleted file mode 100644
index 3e628fa897..0000000000
--- a/packages/admin-portal/src/utils/browser.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const isIE = () => {
-  const ua = window.navigator.userAgent //Check the userAgent property of the window.navigator object
-  const msie = ua.indexOf('MSIE ') // IE 10 or older
-  const trident = ua.indexOf('Trident/') //IE 11
-
-  return msie > 0 || trident > 0
-}
diff --git a/packages/admin-portal/src/utils/clipboard-copy.ts b/packages/admin-portal/src/utils/clipboard-copy.ts
deleted file mode 100644
index cc6396270b..0000000000
--- a/packages/admin-portal/src/utils/clipboard-copy.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-export const clipboardCopy = (text: string) => {
-  // Use the Async Clipboard API when available. Requires a secure browsing
-  // context (i.e. HTTPS)
-  if (navigator.clipboard) {
-    return navigator.clipboard.writeText(text).catch(function(err) {
-      throw err !== undefined ? err : new DOMException('The request is not allowed', 'NotAllowedError')
-    })
-  }
-
-  // ...Otherwise, use document.execCommand() fallback
-
-  // Put the text to copy into a <span>
-  let span = document.createElement('span')
-  span.textContent = text
-
-  // Preserve consecutive spaces and newlines
-  span.style.whiteSpace = 'pre'
-
-  // Add the <span> to the page
-  document.body.appendChild(span)
-
-  // Make a selection object representing the range of text selected by the user
-  const selection = window.getSelection()
-  const range = window.document.createRange()
-  let success = false
-
-  if (selection) {
-    selection.removeAllRanges()
-    range.selectNode(span)
-    selection.addRange(range)
-
-    // Copy text to the clipboard
-    try {
-      success = window.document.execCommand('copy')
-    } catch (err) {
-      console.log('error', err)
-    }
-    // Cleanup
-    selection.removeAllRanges()
-    window.document.body.removeChild(span)
-  }
-
-  return success ? Promise.resolve() : Promise.reject(new DOMException('The request is not allowed', 'NotAllowedError'))
-}
diff --git a/packages/admin-portal/src/utils/form/__tests__/errors.ts b/packages/admin-portal/src/utils/form/__tests__/errors.ts
deleted file mode 100644
index 63f5642e72..0000000000
--- a/packages/admin-portal/src/utils/form/__tests__/errors.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { getApiErrorsFromResponse, ApiFormErrorsResponse } from '../errors'
-import { CreateAppModel } from '@reapit/foundations-ts-definitions'
-
-type InputOutput = [ApiFormErrorsResponse, CreateAppModel | null]
-
-const values: InputOutput[] = [
-  [{ errors: [{ field: 'developerId', message: 'invalid' }] }, { developerId: 'invalid' }],
-  [{ errors: [] }, {}],
-  [{ errors: null }, null],
-  [{}, null],
-  [undefined, null],
-  [null, null],
-]
-
-describe('getApiErrorsFromResponse', () => {
-  it('should return to correct structure', () => {
-    values.forEach(([input, output]) => {
-      expect(getApiErrorsFromResponse(input)).toEqual(output)
-    })
-  })
-
-  it('should return null', () => {
-    expect(getApiErrorsFromResponse(null)).toEqual(null)
-  })
-
-  it('should return null', () => {
-    expect(getApiErrorsFromResponse(undefined)).toEqual(null)
-  })
-})
diff --git a/packages/admin-portal/src/utils/form/__tests__/submit-app.ts b/packages/admin-portal/src/utils/form/__tests__/submit-app.ts
deleted file mode 100644
index 2ea28fa14d..0000000000
--- a/packages/admin-portal/src/utils/form/__tests__/submit-app.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-// @ts-nocheck
-// TODO: remove developer standalone submit app code #1824
-import errorMessages from '@/constants/error-messages'
-import { validate } from '../submit-app'
-import { CustomCreateAppModel } from '@/actions/submit-app'
-
-describe('submitAppValidation', () => {
-  it('validate require all field', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: '',
-      screen3ImageUrl: '',
-      screen2ImageUrl: '',
-      screen1ImageUrl: '',
-      name: '',
-      telephone: '',
-      supportEmail: '',
-      launchUri: '',
-      iconImageUrl: '',
-      homePage: '',
-      description: '',
-      summary: '',
-      scopes: ['scope1'],
-      redirectUris: '',
-      signoutUris: '',
-      authFlow: '',
-    }
-
-    const validateRequiredKeys = [
-      'name',
-      'telephone',
-      'supportEmail',
-      'launchUri',
-      'iconImageUrl',
-      'homePage',
-      'description',
-      'screen1ImageUrl',
-      'summary',
-      'redirectUris',
-      'signoutUris',
-      'authFlow',
-    ]
-
-    const output = {} as any
-    for (let key of validateRequiredKeys) {
-      output[key] = errorMessages.FIELD_REQUIRED
-    }
-    output.description = 'Must be between 150 and 1000 characters'
-    output.summary = 'Must be between 50 and 150 characters'
-
-    expect(validate(input)).toEqual(output)
-  })
-
-  it('validate email field support email', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'invalid email',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      supportEmail: errorMessages.FIELD_WRONG_EMAIL_FORMAT,
-    })
-  })
-
-  it('validate redirect uri(s) field ', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'tester@gmail.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'http://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      redirectUris: 'Invalid redirect uri(s)',
-    })
-  })
-
-  it('validate sign out uri(s) field ', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'tester@gmail.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'app2:/invalid',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      signoutUris: 'Invalid sign out uri(s)',
-    })
-  })
-
-  it('validate home page field ', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'tester@gmail.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'test',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: [],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      homePage: 'Invalid Home Page URL',
-    })
-  })
-
-  it('validate launch uri field ', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'tester@gmail.com',
-      launchUri: 'test',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: [],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      launchUri: 'Invalid Launch URI',
-    })
-  })
-
-  it('validate telephone field', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: 'test',
-      supportEmail: 'test@test.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({
-      telephone: 'Invalid Telephone number',
-    })
-  })
-
-  it('return empty object it everything is valid', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'https://google.com,https://twitter.com,http://localhost:8080',
-      signoutUris: 'http://localhost:8080',
-      authFlow: 'authorisationCode',
-    }
-
-    expect(validate(input)).toEqual({})
-  })
-
-  it('dont validate signoutUris & redirectUris if authFlow = clientCredentials', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'http://localhost:8000',
-      iconImageUrl: 'test',
-      homePage: 'http://localhost:8000',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1'],
-      redirectUris: 'not valid',
-      signoutUris: 'not valid',
-      authFlow: 'clientCredentials',
-    }
-
-    expect(validate(input)).toEqual({
-      redirectUris: 'Invalid redirect uri(s)',
-      signoutUris: 'Invalid sign out uri(s)',
-    })
-  })
-  it('should validate scopes if authFlow = clientCredentials', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'test',
-      iconImageUrl: 'test',
-      homePage: 'test',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1', 'scope2'],
-      redirectUris: 'not valid',
-      signoutUris: 'not valid',
-      authFlow: 'clientCredentials',
-    }
-
-    expect(validate(input)).toEqual({
-      homePage: 'Invalid Home Page URL',
-      launchUri: 'Invalid Launch URI',
-      redirectUris: 'Invalid redirect uri(s)',
-      signoutUris: 'Invalid sign out uri(s)',
-    })
-  })
-  it('should run correctly with invalid scopes if authFlow = clientCredentials', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'test',
-      iconImageUrl: 'test',
-      homePage: 'test',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: [],
-      redirectUris: 'not valid',
-      signoutUris: 'not valid',
-      authFlow: 'clientCredentials',
-    }
-
-    expect(validate(input)).toEqual({
-      homePage: 'Invalid Home Page URL',
-      launchUri: 'Invalid Launch URI',
-      redirectUris: 'Invalid redirect uri(s)',
-      scopes: 'At least one Permission is required',
-      signoutUris: 'Invalid sign out uri(s)',
-    })
-  })
-
-  it('should run correctly with invalid description', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'test',
-      iconImageUrl: 'test',
-      homePage: 'test',
-      // eslint-disable-next-line
-      description: '123',
-      summary: 'Amazon.com, Inc., is an American multinational technology company based in Seattle',
-      scopes: ['scope1', 'scope2'],
-      redirectUris: 'not valid',
-      signoutUris: 'not valid',
-      authFlow: 'clientCredentials',
-    }
-
-    expect(validate(input)).toEqual({
-      description: 'Must be between 150 and 1000 characters',
-      homePage: 'Invalid Home Page URL',
-      launchUri: 'Invalid Launch URI',
-      redirectUris: 'Invalid redirect uri(s)',
-      signoutUris: 'Invalid sign out uri(s)',
-    })
-  })
-
-  it('should run correctly with invalid summary', () => {
-    const input: CustomCreateAppModel = {
-      screen4ImageUrl: 'test',
-      screen3ImageUrl: 'test',
-      screen2ImageUrl: 'test',
-      screen1ImageUrl: 'test',
-      name: 'test',
-      telephone: '(555)-555-5555',
-      supportEmail: 'test@test.com',
-      launchUri: 'test',
-      iconImageUrl: 'test',
-      homePage: 'test',
-      description:
-        // eslint-disable-next-line
-        'Amazon.com, Inc., is an American multinational technology company based in Seattle that focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is considered one of the Big Four tech companies, along with Google, Apple, and Facebook.',
-      summary: '123',
-      scopes: ['scope1', 'scope2'],
-      redirectUris: 'not valid',
-      signoutUris: 'not valid',
-      authFlow: 'clientCredentials',
-    }
-
-    expect(validate(input)).toEqual({
-      homePage: 'Invalid Home Page URL',
-      launchUri: 'Invalid Launch URI',
-      redirectUris: 'Invalid redirect uri(s)',
-      signoutUris: 'Invalid sign out uri(s)',
-      summary: 'Must be between 50 and 150 characters',
-    })
-  })
-})
diff --git a/packages/admin-portal/src/utils/form/__tests__/submit-revision.ts b/packages/admin-portal/src/utils/form/__tests__/submit-revision.ts
deleted file mode 100644
index 96c9d7e0a4..0000000000
--- a/packages/admin-portal/src/utils/form/__tests__/submit-revision.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { validate } from '../submit-revision'
-import { CreateAppRevisionModel } from '@reapit/foundations-ts-definitions'
-
-import errorMessages from '@/constants/error-messages'
-
-describe('submitRevisionValidation', () => {
-  it('validate required fields', () => {
-    const input: CreateAppRevisionModel = {
-      name: '',
-      telephone: '',
-      supportEmail: '',
-      launchUri: '',
-      iconImageUrl: '',
-      homePage: '',
-      description: '',
-      summary: '',
-      isListed: false,
-      screen1ImageUrl: '',
-      screen2ImageUrl: '',
-      screen3ImageUrl: '',
-      screen4ImageUrl: '',
-    }
-
-    const validateRequiredKeys = [
-      'name',
-      'telephone',
-      'supportEmail',
-      'launchUri',
-      'iconImageUrl',
-      'homePage',
-      'description',
-      'summary',
-      'screen1ImageUrl',
-    ]
-
-    const output = {}
-    for (let key of validateRequiredKeys) {
-      output[key] = errorMessages.FIELD_REQUIRED
-    }
-    expect(validate(input)).toEqual(output)
-  })
-
-  it('validate wrong email format and character length', () => {
-    const input: CreateAppRevisionModel = {
-      name: 'john doe',
-      telephone: '999999999',
-      supportEmail: 'invalid--reapit.com',
-      launchUri: 'httpf://reapit@com',
-      homePage: 'http://reapitcom',
-      description: 'Lorem ipsum dolor sit amet.',
-      summary: '...',
-    }
-    expect(validate(input)).toEqual({
-      supportEmail: errorMessages.FIELD_WRONG_EMAIL_FORMAT,
-      launchUri: errorMessages.FIELD_WRONG_URI_FORMAT,
-      homePage: errorMessages.FIELD_WRONG_URI_FORMAT,
-      description: errorMessages.MINIMUM_CHARACTER_LENGTH(150),
-      summary: errorMessages.MINIMUM_CHARACTER_LENGTH(50),
-    })
-  })
-
-  it('validate maximum character length', () => {
-    const gt150CharString = `Pellentesque quis scelerisque ex. Fusce pharetra sapien eu odio hendrerit bibendum. 
-      Nullam pellentesque vel tellus eu dictum. Cras eu sapien vitae elit vestibulum porta. Phasellus sagittis est 
-      eget vestibulum pellentesque. Integer ut finibus turpis. Vestibulum sodales placerat mauris, nec bibendum justo 
-      scelerisque in. Suspendisse sodales maximus arcu, nec ultricies ex commodo et.`
-    const input: CreateAppRevisionModel = {
-      name: 'john doe',
-      telephone: '999999999',
-      supportEmail: 'valid@reapit.com',
-      launchUri: 'http://reapit.com',
-      homePage: 'https://reapit.com',
-      description: gt150CharString,
-      summary: gt150CharString,
-    }
-    expect(validate(input)).toEqual({
-      summary: errorMessages.MAXIMUM_CHARACTER_LENGTH(150),
-    })
-  })
-
-  it('return empty object it everything is valid', () => {
-    const input: CreateAppRevisionModel = {
-      name: 'john doe',
-      telephone: '999999999',
-      supportEmail: 'valid@reapit.com',
-      launchUri: 'http://reapit.com',
-      homePage: 'http://reapit.com',
-      description: `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam scelerisque blandit est, et laoreet 
-        sapien congue vitae. Nulla lacus nulla, interdum quis bibendum in, consequat gravida quam.`,
-      summary: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam scelerisque blandit est.',
-      screen1ImageUrl: 'base64 string...',
-    }
-
-    expect(validate(input)).toEqual({})
-  })
-})
diff --git a/packages/admin-portal/src/utils/form/errors.ts b/packages/admin-portal/src/utils/form/errors.ts
deleted file mode 100644
index 5e6ea7a186..0000000000
--- a/packages/admin-portal/src/utils/form/errors.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-export interface ApiFormError {
-  field: string
-  message: string
-}
-
-export type ApiFormErrorsResponse =
-  | {
-      errors?: ApiFormError[] | null | undefined
-      description?: string
-    }
-  | null
-  | undefined
-
-const defaultApiFormError: ApiFormError = { field: '', message: '' }
-
-export const getApiErrorsFromResponse = (resp: ApiFormErrorsResponse) => {
-  if (!resp || !resp.errors || !Array.isArray(resp.errors)) return null
-  const errors = resp.errors.reduce(
-    (prev: { [k: string]: string | string[] } = {}, curr: ApiFormError = defaultApiFormError) => ({
-      ...prev,
-      [curr.field]: curr.message,
-    }),
-    {},
-  )
-  return errors || null
-}
diff --git a/packages/admin-portal/src/utils/form/submit-app.ts b/packages/admin-portal/src/utils/form/submit-app.ts
deleted file mode 100644
index fcf5910e32..0000000000
--- a/packages/admin-portal/src/utils/form/submit-app.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-// @ts-nocheck
-// TODO: remove developer standalone submit app code #1824
-import { validateRequire, validateEmail } from '@reapit/elements'
-import {
-  isValidUrlWithCustomScheme,
-  whiteListLocalhostAndIsValidUrl,
-  isValidHttpUrl,
-  isValidLimitToClientIds,
-  isValidTelephone,
-} from '@/utils/validate'
-import { CustomCreateAppModel } from '@/actions/submit-app'
-
-export type SubmitAppFormErrorKeys =
-  | 'name'
-  | 'telephone'
-  | 'supportEmail'
-  | 'launchUri'
-  | 'iconImageUrl'
-  | 'homePage'
-  | 'description'
-  | 'summary'
-  | 'screen1ImageUrl'
-  | 'authFlow'
-  | 'redirectUris'
-  | 'signoutUris'
-  | 'scopes'
-  | 'limitToClientIds'
-
-const MIN_DESCRIPTION_LENGTH = 150
-const MAX_DESCRIPTION_LENGTH = 1000
-const MIN_SUMMARY_LENGTH = 50
-const MAX_SUMMARY_LENGTH = 150
-
-export const validate = (values: CustomCreateAppModel) => {
-  const keysRequiredBase: SubmitAppFormErrorKeys[] = [
-    'name',
-    'telephone',
-    'supportEmail',
-    'launchUri',
-    'iconImageUrl',
-    'homePage',
-    'description',
-    'summary',
-    'screen1ImageUrl',
-    'authFlow',
-  ]
-  const keysRequiredClientCredentials: SubmitAppFormErrorKeys[] = [...keysRequiredBase, 'scopes']
-  const keysRequiredAuthorizationCode: SubmitAppFormErrorKeys[] = [...keysRequiredBase, 'redirectUris', 'signoutUris']
-  let errors = validateRequire<CustomCreateAppModel, SubmitAppFormErrorKeys>({
-    values,
-    currentErrors: {},
-    keys: values.authFlow === 'clientCredentials' ? keysRequiredClientCredentials : keysRequiredAuthorizationCode,
-  })
-
-  errors = validateEmail({
-    values,
-    currentErrors: errors,
-    keys: ['supportEmail'],
-  })
-
-  // only validating redirectUris and signoutUris when authFlow === 'authorisationCode
-
-  if (values.authFlow === 'clientCredentials') {
-    const { scopes: scopesValues } = values
-    if (Array.isArray(scopesValues) && scopesValues.length === 0) {
-      errors.scopes = 'At least one Permission is required'
-    }
-  }
-
-  if (values.redirectUris && !isValidUrlWithCustomScheme(values.redirectUris)) {
-    errors.redirectUris = 'Invalid redirect uri(s)'
-  }
-
-  if (values.signoutUris && !isValidUrlWithCustomScheme(values.signoutUris)) {
-    errors.signoutUris = 'Invalid sign out uri(s)'
-  }
-
-  if (values.limitToClientIds && !isValidLimitToClientIds(values.limitToClientIds)) {
-    errors.limitToClientIds = 'Invalid Customer ID(s). Each Customer ID should consist of 3 characters.'
-  }
-
-  if (values.homePage && !whiteListLocalhostAndIsValidUrl(values.homePage) && !isValidHttpUrl(values.homePage)) {
-    errors.homePage = 'Invalid Home Page URL'
-  }
-
-  if (values.launchUri && !whiteListLocalhostAndIsValidUrl(values.launchUri)) {
-    errors.launchUri = 'Invalid Launch URI'
-  }
-
-  if (values.telephone && !isValidTelephone(values.telephone)) {
-    errors.telephone = 'Invalid Telephone number'
-  }
-
-  const isValidDescription =
-    values.description &&
-    MIN_DESCRIPTION_LENGTH <= values.description?.length &&
-    values.description?.length <= MAX_DESCRIPTION_LENGTH
-  if (!isValidDescription) {
-    errors.description = 'Must be between 150 and 1000 characters'
-  }
-
-  const isValidSummary =
-    values?.summary && MIN_SUMMARY_LENGTH <= values?.summary?.length && values.summary?.length <= MAX_SUMMARY_LENGTH
-
-  if (!isValidSummary) {
-    errors.summary = 'Must be between 50 and 150 characters'
-  }
-
-  return errors
-}
diff --git a/packages/admin-portal/src/utils/form/submit-revision.ts b/packages/admin-portal/src/utils/form/submit-revision.ts
deleted file mode 100644
index 8760e81bb0..0000000000
--- a/packages/admin-portal/src/utils/form/submit-revision.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { CreateAppRevisionModel } from '@reapit/foundations-ts-definitions'
-import {
-  validateEmail,
-  validateMinCharacterLength,
-  validateMaxCharacterLength,
-  validateURI,
-  validateRequire,
-} from '@reapit/elements'
-
-export type SubmitRevisionFormErrorKeys = keyof CreateAppRevisionModel
-
-export const validate = (values: CreateAppRevisionModel) => {
-  let errors = validateRequire<CreateAppRevisionModel, SubmitRevisionFormErrorKeys>({
-    values,
-    currentErrors: {},
-    keys: [
-      'name',
-      'telephone',
-      'supportEmail',
-      'launchUri',
-      'iconImageUrl',
-      'homePage',
-      'description',
-      'summary',
-      'screen1ImageUrl',
-    ] as SubmitRevisionFormErrorKeys[],
-  })
-
-  errors = validateMinCharacterLength({ values, currentErrors: errors, keys: ['description'], length: 150 })
-
-  errors = validateMinCharacterLength({ values, currentErrors: errors, keys: ['summary'], length: 50 })
-
-  errors = validateMaxCharacterLength({ values, currentErrors: errors, keys: ['summary'], length: 150 })
-
-  errors = validateEmail({
-    values,
-    currentErrors: errors,
-    keys: ['supportEmail'],
-  })
-
-  errors = validateURI({
-    values,
-    currentErrors: errors,
-    keys: ['launchUri', 'homePage'],
-  })
-
-  return errors
-}
diff --git a/packages/admin-portal/src/utils/get-desktop-integration-types.ts b/packages/admin-portal/src/utils/get-desktop-integration-types.ts
deleted file mode 100644
index 2adbf06bcd..0000000000
--- a/packages/admin-portal/src/utils/get-desktop-integration-types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { DesktopIntegrationTypeModel } from '@/actions/app-integration-types'
-
-export const getDesktopIntegrationTypes = (
-  desktopIntegrationTypeIds: string[],
-  desktopIntegrationTypes: DesktopIntegrationTypeModel[],
-) =>
-  desktopIntegrationTypes.filter(desktopIntegrationType =>
-    desktopIntegrationTypeIds.includes(desktopIntegrationType.id || ''),
-  )
diff --git a/packages/admin-portal/src/utils/launch-app.ts b/packages/admin-portal/src/utils/launch-app.ts
deleted file mode 100644
index 81326821b6..0000000000
--- a/packages/admin-portal/src/utils/launch-app.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AppSummaryModel } from '@reapit/foundations-ts-definitions'
-
-export const handleLaunchApp = (app: AppSummaryModel) => {
-  import('../core/store').then(store => {
-    if (app.launchUri && app.id) {
-      if (store?.default?.state?.auth?.refreshSession?.mode === 'DESKTOP') {
-        window.location.href = `agencycloud://app?id=${app.id}&launchUri=${app.homePage}`
-      } else {
-        window.location.href = app.launchUri
-      }
-    }
-  })
-}
diff --git a/packages/admin-portal/src/utils/number-formatter.ts b/packages/admin-portal/src/utils/number-formatter.ts
deleted file mode 100644
index bbe5a839f1..0000000000
--- a/packages/admin-portal/src/utils/number-formatter.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export const formatCurrency = (
-  amount: number,
-  minimumFractionDigits = 2,
-  locales: string = 'en-GB',
-  currency = 'GBP',
-) => {
-  const numberFormat = new Intl.NumberFormat(locales, {
-    style: 'currency',
-    currency,
-    minimumFractionDigits,
-  })
-  return numberFormat.format(amount)
-}
-
-export const formatNumber = (amount: number, minimumFractionDigits = 0, locales: string = 'en-GB') => {
-  const numberFormat = new Intl.NumberFormat(locales, {
-    minimumFractionDigits,
-  })
-  return numberFormat.format(amount)
-}
diff --git a/packages/admin-portal/src/utils/router-helper.ts b/packages/admin-portal/src/utils/router-helper.ts
deleted file mode 100644
index a6c052ec93..0000000000
--- a/packages/admin-portal/src/utils/router-helper.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { History } from 'history'
-
-export function canGoBack(history: History) {
-  return history.length > 2
-}
diff --git a/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
index a36f46b574..4f3a35dbc4 100644
--- a/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/__test__/cost-explorer-table.test.tsx
@@ -31,4 +31,37 @@ describe('prepareTableData', () => {
     const { services = [] } = monthlyBillingData
     expect(prepareTableData(services)).toEqual(tableData)
   })
+
+  it('should return correct data', () => {
+    const { services = [] } = monthlyBillingData
+    const input = [
+      ...services,
+      {
+        cost: 7.975,
+        itemCount: 7,
+        amount: 638,
+        items: [{ name: 'contacts', amount: 157, cost: 1.9625, itemCount: 2 }],
+        name: 'TEST',
+      },
+    ]
+
+    const expected = [
+      {
+        amount: 638,
+        cost: 7.975,
+        itemCount: 7,
+        name: 'API Requests',
+        subRows: [{ name: 'contacts', amount: 157, cost: 1.9625, itemCount: 2, subRows: [] }],
+      },
+      {
+        cost: 7.975,
+        itemCount: null,
+        amount: 638,
+        subRows: [{ name: 'contacts', amount: 157, cost: 1.9625, itemCount: null, subRows: [] }],
+        name: 'TEST',
+      },
+    ]
+
+    expect(prepareTableData(input)).toEqual(expected)
+  })
 })
diff --git a/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
index 76f463e1da..3f07c9e0c4 100644
--- a/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
+++ b/packages/developer-portal/src/components/pages/analytics/cost-explorer/cost-explorer-component/cost-explorer-table.tsx
@@ -5,11 +5,19 @@ import { useSelector } from 'react-redux'
 import { selectMonthlyBilling, selectMonthlyBillingLoading } from '@/selector/developer'
 import { BillingBreakdownForMonthV2Model, ServiceItemBillingV2Model } from '@reapit/foundations-ts-definitions'
 
-export const prepareTableData = (data: ServiceItemBillingV2Model[]) => {
+export const prepareTableData = (data: ServiceItemBillingV2Model[], serviceName?: string) => {
   if (!data || !data.length) return []
 
-  return data.map(({ items = [], ...row }) => {
-    return { ...row, subRows: prepareTableData(items) }
+  return data.map(({ items = [], itemCount, ...row }) => {
+    const service = serviceName || row.name
+    const isApiRequests = service === 'API Requests'
+
+    const rowData = {
+      ...row,
+      itemCount: isApiRequests && itemCount ? itemCount : null,
+      subRows: prepareTableData(items, service),
+    }
+    return rowData
   })
 }
 
@@ -21,7 +29,6 @@ export const prepareTableColumns = (monthlyBilling?: BillingBreakdownForMonthV2M
       Header: 'Services',
       accessor: 'name',
       columnProps: {
-        className: 'capitalize',
         width: 200,
       },
       Footer: 'Total',
diff --git a/packages/developer-portal/src/components/pages/settings/forms/__tests__/__snapshots__/contact-information-form.test.tsx.snap b/packages/developer-portal/src/components/pages/settings/forms/__tests__/__snapshots__/contact-information-form.test.tsx.snap
index 0c019085e9..112fd1ce60 100644
--- a/packages/developer-portal/src/components/pages/settings/forms/__tests__/__snapshots__/contact-information-form.test.tsx.snap
+++ b/packages/developer-portal/src/components/pages/settings/forms/__tests__/__snapshots__/contact-information-form.test.tsx.snap
@@ -52,7 +52,7 @@ exports[`ContactInformationForm should match snapshot 1`] = `
     <Component>
       <Component
         dataTest="save-changes"
-        disabled={true}
+        disabled={false}
         loading={false}
         type="submit"
         variant="primary"
diff --git a/packages/developer-portal/src/components/pages/settings/forms/contact-information-form.tsx b/packages/developer-portal/src/components/pages/settings/forms/contact-information-form.tsx
index 5691053f9d..d7b68f39b8 100644
--- a/packages/developer-portal/src/components/pages/settings/forms/contact-information-form.tsx
+++ b/packages/developer-portal/src/components/pages/settings/forms/contact-information-form.tsx
@@ -23,10 +23,7 @@ export const ContactInformationForm: React.FC<ContactInformationFormProps> = ({
   isSubmitting,
   isValidating,
   isValid,
-  touched,
 }) => {
-  const isEnable =
-    isValid && Boolean(touched) && (touched.companyName || touched.jobTitle || touched.name || touched.telephone)
   return (
     <FormSection>
       <Form>
@@ -51,7 +48,7 @@ export const ContactInformationForm: React.FC<ContactInformationFormProps> = ({
         <LevelRight>
           <Button
             dataTest="save-changes"
-            disabled={!isEnable}
+            disabled={!isValid}
             loading={isSubmitting || isValidating}
             variant="primary"
             type="submit"
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-address-section.test.tsx.snap b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-address-section.test.tsx.snap
new file mode 100644
index 0000000000..521689d00f
--- /dev/null
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-address-section.test.tsx.snap
@@ -0,0 +1,1077 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`CompanyAddressSection should match a snapshot when no error 1`] = `
+<Fragment>
+  <Component>
+    <Component>
+      <Component
+        id="buildingName"
+        labelText="Building Name"
+        name="buildingName"
+        type="text"
+      />
+    </Component>
+    <Component>
+      <Component
+        id="buildingNumber"
+        labelText="Building Number"
+        name="buildingNumber"
+        type="text"
+      />
+    </Component>
+  </Component>
+  <Component>
+    <Component>
+      <Component
+        id="line1"
+        labelText="Address Line 1*"
+        name="line1"
+        type="text"
+      />
+    </Component>
+    <Component>
+      <Component
+        id="line2"
+        labelText="Address Line 2"
+        name="line2"
+        type="text"
+      />
+    </Component>
+  </Component>
+  <Component>
+    <Component>
+      <Component
+        id="line3"
+        labelText="Address Line 3"
+        name="line3"
+        type="text"
+      />
+    </Component>
+    <Component>
+      <Component
+        id="line4"
+        labelText="Address Line 4"
+        name="line4"
+        type="text"
+      />
+    </Component>
+  </Component>
+  <Component>
+    <Component>
+      <Component
+        id="postcode"
+        labelText="Postcode"
+        name="postcode"
+        type="text"
+      />
+    </Component>
+    <Component>
+      <Component
+        id="countryId"
+        labelText="Country"
+        name="countryId"
+        options={
+          Array [
+            Object {
+              "label": "United Kingdom",
+              "value": "GB",
+            },
+            Object {
+              "label": "Afghanistan",
+              "value": "AF",
+            },
+            Object {
+              "label": "Åland Islands",
+              "value": "AX",
+            },
+            Object {
+              "label": "Albania",
+              "value": "AL",
+            },
+            Object {
+              "label": "Algeria",
+              "value": "DZ",
+            },
+            Object {
+              "label": "American Samoa",
+              "value": "AS",
+            },
+            Object {
+              "label": "Andorra",
+              "value": "AD",
+            },
+            Object {
+              "label": "Angola",
+              "value": "AO",
+            },
+            Object {
+              "label": "Anguilla",
+              "value": "AI",
+            },
+            Object {
+              "label": "Antarctica",
+              "value": "AQ",
+            },
+            Object {
+              "label": "Antigua and Barbuda",
+              "value": "AG",
+            },
+            Object {
+              "label": "Argentina",
+              "value": "AR",
+            },
+            Object {
+              "label": "Armenia",
+              "value": "AM",
+            },
+            Object {
+              "label": "Aruba",
+              "value": "AW",
+            },
+            Object {
+              "label": "Australia",
+              "value": "AU",
+            },
+            Object {
+              "label": "Austria",
+              "value": "AT",
+            },
+            Object {
+              "label": "Azerbaijan",
+              "value": "AZ",
+            },
+            Object {
+              "label": "Bahamas",
+              "value": "BS",
+            },
+            Object {
+              "label": "Bahrain",
+              "value": "BH",
+            },
+            Object {
+              "label": "Bangladesh",
+              "value": "BD",
+            },
+            Object {
+              "label": "Barbados",
+              "value": "BB",
+            },
+            Object {
+              "label": "Belarus",
+              "value": "BY",
+            },
+            Object {
+              "label": "Belgium",
+              "value": "BE",
+            },
+            Object {
+              "label": "Belize",
+              "value": "BZ",
+            },
+            Object {
+              "label": "Benin",
+              "value": "BJ",
+            },
+            Object {
+              "label": "Bermuda",
+              "value": "BM",
+            },
+            Object {
+              "label": "Bhutan",
+              "value": "BT",
+            },
+            Object {
+              "label": "Bolivia, Plurinational State of",
+              "value": "BO",
+            },
+            Object {
+              "label": "Bonaire, Sint Eustatius and Saba",
+              "value": "BQ",
+            },
+            Object {
+              "label": "Bosnia and Herzegovina",
+              "value": "BA",
+            },
+            Object {
+              "label": "Botswana",
+              "value": "BW",
+            },
+            Object {
+              "label": "Bouvet Island",
+              "value": "BV",
+            },
+            Object {
+              "label": "Brazil",
+              "value": "BR",
+            },
+            Object {
+              "label": "British Indian Ocean Territory",
+              "value": "IO",
+            },
+            Object {
+              "label": "Brunei Darussalam",
+              "value": "BN",
+            },
+            Object {
+              "label": "Bulgaria",
+              "value": "BG",
+            },
+            Object {
+              "label": "Burkina Faso",
+              "value": "BF",
+            },
+            Object {
+              "label": "Burundi",
+              "value": "BI",
+            },
+            Object {
+              "label": "Cambodia",
+              "value": "KH",
+            },
+            Object {
+              "label": "Cameroon",
+              "value": "CM",
+            },
+            Object {
+              "label": "Canada",
+              "value": "CA",
+            },
+            Object {
+              "label": "Cape Verde",
+              "value": "CV",
+            },
+            Object {
+              "label": "Cayman Islands",
+              "value": "KY",
+            },
+            Object {
+              "label": "Central African Republic",
+              "value": "CF",
+            },
+            Object {
+              "label": "Chad",
+              "value": "TD",
+            },
+            Object {
+              "label": "Chile",
+              "value": "CL",
+            },
+            Object {
+              "label": "China",
+              "value": "CN",
+            },
+            Object {
+              "label": "Christmas Island",
+              "value": "CX",
+            },
+            Object {
+              "label": "Cocos (Keeling) Islands",
+              "value": "CC",
+            },
+            Object {
+              "label": "Colombia",
+              "value": "CO",
+            },
+            Object {
+              "label": "Comoros",
+              "value": "KM",
+            },
+            Object {
+              "label": "Congo",
+              "value": "CG",
+            },
+            Object {
+              "label": "Congo, the Democratic Republic of the",
+              "value": "CD",
+            },
+            Object {
+              "label": "Cook Islands",
+              "value": "CK",
+            },
+            Object {
+              "label": "Costa Rica",
+              "value": "CR",
+            },
+            Object {
+              "label": "Côte d'Ivoire",
+              "value": "CI",
+            },
+            Object {
+              "label": "Croatia",
+              "value": "HR",
+            },
+            Object {
+              "label": "Cuba",
+              "value": "CU",
+            },
+            Object {
+              "label": "Curaçao",
+              "value": "CW",
+            },
+            Object {
+              "label": "Cyprus",
+              "value": "CY",
+            },
+            Object {
+              "label": "Czech Republic",
+              "value": "CZ",
+            },
+            Object {
+              "label": "Denmark",
+              "value": "DK",
+            },
+            Object {
+              "label": "Djibouti",
+              "value": "DJ",
+            },
+            Object {
+              "label": "Dominica",
+              "value": "DM",
+            },
+            Object {
+              "label": "Dominican Republic",
+              "value": "DO",
+            },
+            Object {
+              "label": "Ecuador",
+              "value": "EC",
+            },
+            Object {
+              "label": "Egypt",
+              "value": "EG",
+            },
+            Object {
+              "label": "El Salvador",
+              "value": "SV",
+            },
+            Object {
+              "label": "Equatorial Guinea",
+              "value": "GQ",
+            },
+            Object {
+              "label": "Eritrea",
+              "value": "ER",
+            },
+            Object {
+              "label": "Estonia",
+              "value": "EE",
+            },
+            Object {
+              "label": "Ethiopia",
+              "value": "ET",
+            },
+            Object {
+              "label": "Falkland Islands (Malvinas)",
+              "value": "FK",
+            },
+            Object {
+              "label": "Faroe Islands",
+              "value": "FO",
+            },
+            Object {
+              "label": "Fiji",
+              "value": "FJ",
+            },
+            Object {
+              "label": "Finland",
+              "value": "FI",
+            },
+            Object {
+              "label": "France",
+              "value": "FR",
+            },
+            Object {
+              "label": "French Guiana",
+              "value": "GF",
+            },
+            Object {
+              "label": "French Polynesia",
+              "value": "PF",
+            },
+            Object {
+              "label": "French Southern Territories",
+              "value": "TF",
+            },
+            Object {
+              "label": "Gabon",
+              "value": "GA",
+            },
+            Object {
+              "label": "Gambia",
+              "value": "GM",
+            },
+            Object {
+              "label": "Georgia",
+              "value": "GE",
+            },
+            Object {
+              "label": "Germany",
+              "value": "DE",
+            },
+            Object {
+              "label": "Ghana",
+              "value": "GH",
+            },
+            Object {
+              "label": "Gibraltar",
+              "value": "GI",
+            },
+            Object {
+              "label": "Greece",
+              "value": "GR",
+            },
+            Object {
+              "label": "Greenland",
+              "value": "GL",
+            },
+            Object {
+              "label": "Grenada",
+              "value": "GD",
+            },
+            Object {
+              "label": "Guadeloupe",
+              "value": "GP",
+            },
+            Object {
+              "label": "Guam",
+              "value": "GU",
+            },
+            Object {
+              "label": "Guatemala",
+              "value": "GT",
+            },
+            Object {
+              "label": "Guernsey",
+              "value": "GG",
+            },
+            Object {
+              "label": "Guinea",
+              "value": "GN",
+            },
+            Object {
+              "label": "Guinea-Bissau",
+              "value": "GW",
+            },
+            Object {
+              "label": "Guyana",
+              "value": "GY",
+            },
+            Object {
+              "label": "Haiti",
+              "value": "HT",
+            },
+            Object {
+              "label": "Heard Island and McDonald Islands",
+              "value": "HM",
+            },
+            Object {
+              "label": "Holy See (Vatican City State)",
+              "value": "VA",
+            },
+            Object {
+              "label": "Honduras",
+              "value": "HN",
+            },
+            Object {
+              "label": "Hong Kong",
+              "value": "HK",
+            },
+            Object {
+              "label": "Hungary",
+              "value": "HU",
+            },
+            Object {
+              "label": "Iceland",
+              "value": "IS",
+            },
+            Object {
+              "label": "India",
+              "value": "IN",
+            },
+            Object {
+              "label": "Indonesia",
+              "value": "ID",
+            },
+            Object {
+              "label": "Iran, Islamic Republic of",
+              "value": "IR",
+            },
+            Object {
+              "label": "Iraq",
+              "value": "IQ",
+            },
+            Object {
+              "label": "Ireland",
+              "value": "IE",
+            },
+            Object {
+              "label": "Isle of Man",
+              "value": "IM",
+            },
+            Object {
+              "label": "Israel",
+              "value": "IL",
+            },
+            Object {
+              "label": "Italy",
+              "value": "IT",
+            },
+            Object {
+              "label": "Jamaica",
+              "value": "JM",
+            },
+            Object {
+              "label": "Japan",
+              "value": "JP",
+            },
+            Object {
+              "label": "Jersey",
+              "value": "JE",
+            },
+            Object {
+              "label": "Jordan",
+              "value": "JO",
+            },
+            Object {
+              "label": "Kazakhstan",
+              "value": "KZ",
+            },
+            Object {
+              "label": "Kenya",
+              "value": "KE",
+            },
+            Object {
+              "label": "Kiribati",
+              "value": "KI",
+            },
+            Object {
+              "label": "Korea, Democratic People's Republic of",
+              "value": "KP",
+            },
+            Object {
+              "label": "Korea, Republic of",
+              "value": "KR",
+            },
+            Object {
+              "label": "Kuwait",
+              "value": "KW",
+            },
+            Object {
+              "label": "Kyrgyzstan",
+              "value": "KG",
+            },
+            Object {
+              "label": "Lao People's Democratic Republic",
+              "value": "LA",
+            },
+            Object {
+              "label": "Latvia",
+              "value": "LV",
+            },
+            Object {
+              "label": "Lebanon",
+              "value": "LB",
+            },
+            Object {
+              "label": "Lesotho",
+              "value": "LS",
+            },
+            Object {
+              "label": "Liberia",
+              "value": "LR",
+            },
+            Object {
+              "label": "Libya",
+              "value": "LY",
+            },
+            Object {
+              "label": "Liechtenstein",
+              "value": "LI",
+            },
+            Object {
+              "label": "Lithuania",
+              "value": "LT",
+            },
+            Object {
+              "label": "Luxembourg",
+              "value": "LU",
+            },
+            Object {
+              "label": "Macao",
+              "value": "MO",
+            },
+            Object {
+              "label": "Macedonia, the former Yugoslav Republic of",
+              "value": "MK",
+            },
+            Object {
+              "label": "Madagascar",
+              "value": "MG",
+            },
+            Object {
+              "label": "Malawi",
+              "value": "MW",
+            },
+            Object {
+              "label": "Malaysia",
+              "value": "MY",
+            },
+            Object {
+              "label": "Maldives",
+              "value": "MV",
+            },
+            Object {
+              "label": "Mali",
+              "value": "ML",
+            },
+            Object {
+              "label": "Malta",
+              "value": "MT",
+            },
+            Object {
+              "label": "Marshall Islands",
+              "value": "MH",
+            },
+            Object {
+              "label": "Martinique",
+              "value": "MQ",
+            },
+            Object {
+              "label": "Mauritania",
+              "value": "MR",
+            },
+            Object {
+              "label": "Mauritius",
+              "value": "MU",
+            },
+            Object {
+              "label": "Mayotte",
+              "value": "YT",
+            },
+            Object {
+              "label": "Mexico",
+              "value": "MX",
+            },
+            Object {
+              "label": "Micronesia, Federated States of",
+              "value": "FM",
+            },
+            Object {
+              "label": "Moldova, Republic of",
+              "value": "MD",
+            },
+            Object {
+              "label": "Monaco",
+              "value": "MC",
+            },
+            Object {
+              "label": "Mongolia",
+              "value": "MN",
+            },
+            Object {
+              "label": "Montenegro",
+              "value": "ME",
+            },
+            Object {
+              "label": "Montserrat",
+              "value": "MS",
+            },
+            Object {
+              "label": "Morocco",
+              "value": "MA",
+            },
+            Object {
+              "label": "Mozambique",
+              "value": "MZ",
+            },
+            Object {
+              "label": "Myanmar",
+              "value": "MM",
+            },
+            Object {
+              "label": "Namibia",
+              "value": "NA",
+            },
+            Object {
+              "label": "Nauru",
+              "value": "NR",
+            },
+            Object {
+              "label": "Nepal",
+              "value": "NP",
+            },
+            Object {
+              "label": "Netherlands",
+              "value": "NL",
+            },
+            Object {
+              "label": "New Caledonia",
+              "value": "NC",
+            },
+            Object {
+              "label": "New Zealand",
+              "value": "NZ",
+            },
+            Object {
+              "label": "Nicaragua",
+              "value": "NI",
+            },
+            Object {
+              "label": "Niger",
+              "value": "NE",
+            },
+            Object {
+              "label": "Nigeria",
+              "value": "NG",
+            },
+            Object {
+              "label": "Niue",
+              "value": "NU",
+            },
+            Object {
+              "label": "Norfolk Island",
+              "value": "NF",
+            },
+            Object {
+              "label": "Northern Mariana Islands",
+              "value": "MP",
+            },
+            Object {
+              "label": "Norway",
+              "value": "NO",
+            },
+            Object {
+              "label": "Oman",
+              "value": "OM",
+            },
+            Object {
+              "label": "Pakistan",
+              "value": "PK",
+            },
+            Object {
+              "label": "Palau",
+              "value": "PW",
+            },
+            Object {
+              "label": "Palestinian Territory, Occupied",
+              "value": "PS",
+            },
+            Object {
+              "label": "Panama",
+              "value": "PA",
+            },
+            Object {
+              "label": "Papua New Guinea",
+              "value": "PG",
+            },
+            Object {
+              "label": "Paraguay",
+              "value": "PY",
+            },
+            Object {
+              "label": "Peru",
+              "value": "PE",
+            },
+            Object {
+              "label": "Philippines",
+              "value": "PH",
+            },
+            Object {
+              "label": "Pitcairn",
+              "value": "PN",
+            },
+            Object {
+              "label": "Poland",
+              "value": "PL",
+            },
+            Object {
+              "label": "Portugal",
+              "value": "PT",
+            },
+            Object {
+              "label": "Puerto Rico",
+              "value": "PR",
+            },
+            Object {
+              "label": "Qatar",
+              "value": "QA",
+            },
+            Object {
+              "label": "Réunion",
+              "value": "RE",
+            },
+            Object {
+              "label": "Romania",
+              "value": "RO",
+            },
+            Object {
+              "label": "Russian Federation",
+              "value": "RU",
+            },
+            Object {
+              "label": "Rwanda",
+              "value": "RW",
+            },
+            Object {
+              "label": "Saint Barthélemy",
+              "value": "BL",
+            },
+            Object {
+              "label": "Saint Helena, Ascension and Tristan da Cunha",
+              "value": "SH",
+            },
+            Object {
+              "label": "Saint Kitts and Nevis",
+              "value": "KN",
+            },
+            Object {
+              "label": "Saint Lucia",
+              "value": "LC",
+            },
+            Object {
+              "label": "Saint Martin (French part)",
+              "value": "MF",
+            },
+            Object {
+              "label": "Saint Pierre and Miquelon",
+              "value": "PM",
+            },
+            Object {
+              "label": "Saint Vincent and the Grenadines",
+              "value": "VC",
+            },
+            Object {
+              "label": "Samoa",
+              "value": "WS",
+            },
+            Object {
+              "label": "San Marino",
+              "value": "SM",
+            },
+            Object {
+              "label": "Sao Tome and Principe",
+              "value": "ST",
+            },
+            Object {
+              "label": "Saudi Arabia",
+              "value": "SA",
+            },
+            Object {
+              "label": "Senegal",
+              "value": "SN",
+            },
+            Object {
+              "label": "Serbia",
+              "value": "RS",
+            },
+            Object {
+              "label": "Seychelles",
+              "value": "SC",
+            },
+            Object {
+              "label": "Sierra Leone",
+              "value": "SL",
+            },
+            Object {
+              "label": "Singapore",
+              "value": "SG",
+            },
+            Object {
+              "label": "Sint Maarten (Dutch part)",
+              "value": "SX",
+            },
+            Object {
+              "label": "Slovakia",
+              "value": "SK",
+            },
+            Object {
+              "label": "Slovenia",
+              "value": "SI",
+            },
+            Object {
+              "label": "Solomon Islands",
+              "value": "SB",
+            },
+            Object {
+              "label": "Somalia",
+              "value": "SO",
+            },
+            Object {
+              "label": "South Africa",
+              "value": "ZA",
+            },
+            Object {
+              "label": "South Georgia and the South Sandwich Islands",
+              "value": "GS",
+            },
+            Object {
+              "label": "South Sudan",
+              "value": "SS",
+            },
+            Object {
+              "label": "Spain",
+              "value": "ES",
+            },
+            Object {
+              "label": "Sri Lanka",
+              "value": "LK",
+            },
+            Object {
+              "label": "Sudan",
+              "value": "SD",
+            },
+            Object {
+              "label": "Suriname",
+              "value": "SR",
+            },
+            Object {
+              "label": "Svalbard and Jan Mayen",
+              "value": "SJ",
+            },
+            Object {
+              "label": "Swaziland",
+              "value": "SZ",
+            },
+            Object {
+              "label": "Sweden",
+              "value": "SE",
+            },
+            Object {
+              "label": "Switzerland",
+              "value": "CH",
+            },
+            Object {
+              "label": "Syrian Arab Republic",
+              "value": "SY",
+            },
+            Object {
+              "label": "Taiwan, Province of China",
+              "value": "TW",
+            },
+            Object {
+              "label": "Tajikistan",
+              "value": "TJ",
+            },
+            Object {
+              "label": "Tanzania, United Republic of",
+              "value": "TZ",
+            },
+            Object {
+              "label": "Thailand",
+              "value": "TH",
+            },
+            Object {
+              "label": "Timor-Leste",
+              "value": "TL",
+            },
+            Object {
+              "label": "Togo",
+              "value": "TG",
+            },
+            Object {
+              "label": "Tokelau",
+              "value": "TK",
+            },
+            Object {
+              "label": "Tonga",
+              "value": "TO",
+            },
+            Object {
+              "label": "Trinidad and Tobago",
+              "value": "TT",
+            },
+            Object {
+              "label": "Tunisia",
+              "value": "TN",
+            },
+            Object {
+              "label": "Turkey",
+              "value": "TR",
+            },
+            Object {
+              "label": "Turkmenistan",
+              "value": "TM",
+            },
+            Object {
+              "label": "Turks and Caicos Islands",
+              "value": "TC",
+            },
+            Object {
+              "label": "Tuvalu",
+              "value": "TV",
+            },
+            Object {
+              "label": "Uganda",
+              "value": "UG",
+            },
+            Object {
+              "label": "Ukraine",
+              "value": "UA",
+            },
+            Object {
+              "label": "United Arab Emirates",
+              "value": "AE",
+            },
+            Object {
+              "label": "United States",
+              "value": "US",
+            },
+            Object {
+              "label": "United States Minor Outlying Islands",
+              "value": "UM",
+            },
+            Object {
+              "label": "Uruguay",
+              "value": "UY",
+            },
+            Object {
+              "label": "Uzbekistan",
+              "value": "UZ",
+            },
+            Object {
+              "label": "Vanuatu",
+              "value": "VU",
+            },
+            Object {
+              "label": "Venezuela, Bolivarian Republic of",
+              "value": "VE",
+            },
+            Object {
+              "label": "Viet Nam",
+              "value": "VN",
+            },
+            Object {
+              "label": "Virgin Islands, British",
+              "value": "VG",
+            },
+            Object {
+              "label": "Virgin Islands, U.S.",
+              "value": "VI",
+            },
+            Object {
+              "label": "Wallis and Futuna",
+              "value": "WF",
+            },
+            Object {
+              "label": "Western Sahara",
+              "value": "EH",
+            },
+            Object {
+              "label": "Yemen",
+              "value": "YE",
+            },
+            Object {
+              "label": "Zambia",
+              "value": "ZM",
+            },
+            Object {
+              "label": "Zimbabwe",
+              "value": "ZW",
+            },
+          ]
+        }
+      />
+    </Component>
+  </Component>
+</Fragment>
+`;
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-information.test.tsx.snap b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-information.test.tsx.snap
index 39c3975328..77655ce483 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-information.test.tsx.snap
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/company-information.test.tsx.snap
@@ -1,1082 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`OrganisationForm CompanyAddressSection should match a snapshot when no error 1`] = `
-<Fragment>
-  <Component>
-    <Component>
-      <Component
-        id="buildingName"
-        labelText="Building Name"
-        name="buildingName"
-        type="text"
-      />
-    </Component>
-    <Component>
-      <Component
-        id="buildingNumber"
-        labelText="Building Number"
-        name="buildingNumber"
-        type="text"
-      />
-    </Component>
-  </Component>
-  <Component>
-    <Component>
-      <Component
-        id="line1"
-        labelText="Address Line 1*"
-        name="line1"
-        type="text"
-      />
-    </Component>
-    <Component>
-      <Component
-        id="line2"
-        labelText="Address Line 2"
-        name="line2"
-        type="text"
-      />
-    </Component>
-  </Component>
-  <Component>
-    <Component>
-      <Component
-        id="line3"
-        labelText="Address Line 3"
-        name="line3"
-        type="text"
-      />
-    </Component>
-    <Component>
-      <Component
-        id="line4"
-        labelText="Address Line 4"
-        name="line4"
-        type="text"
-      />
-    </Component>
-  </Component>
-  <Component>
-    <Component>
-      <Component
-        id="postCode"
-        labelText="Postcode"
-        name="postCode"
-        type="text"
-      />
-    </Component>
-    <Component>
-      <Component
-        id="countryId"
-        labelText="Country"
-        name="countryId"
-        options={
-          Array [
-            Object {
-              "label": "United Kingdom",
-              "value": "GB",
-            },
-            Object {
-              "label": "Afghanistan",
-              "value": "AF",
-            },
-            Object {
-              "label": "Åland Islands",
-              "value": "AX",
-            },
-            Object {
-              "label": "Albania",
-              "value": "AL",
-            },
-            Object {
-              "label": "Algeria",
-              "value": "DZ",
-            },
-            Object {
-              "label": "American Samoa",
-              "value": "AS",
-            },
-            Object {
-              "label": "Andorra",
-              "value": "AD",
-            },
-            Object {
-              "label": "Angola",
-              "value": "AO",
-            },
-            Object {
-              "label": "Anguilla",
-              "value": "AI",
-            },
-            Object {
-              "label": "Antarctica",
-              "value": "AQ",
-            },
-            Object {
-              "label": "Antigua and Barbuda",
-              "value": "AG",
-            },
-            Object {
-              "label": "Argentina",
-              "value": "AR",
-            },
-            Object {
-              "label": "Armenia",
-              "value": "AM",
-            },
-            Object {
-              "label": "Aruba",
-              "value": "AW",
-            },
-            Object {
-              "label": "Australia",
-              "value": "AU",
-            },
-            Object {
-              "label": "Austria",
-              "value": "AT",
-            },
-            Object {
-              "label": "Azerbaijan",
-              "value": "AZ",
-            },
-            Object {
-              "label": "Bahamas",
-              "value": "BS",
-            },
-            Object {
-              "label": "Bahrain",
-              "value": "BH",
-            },
-            Object {
-              "label": "Bangladesh",
-              "value": "BD",
-            },
-            Object {
-              "label": "Barbados",
-              "value": "BB",
-            },
-            Object {
-              "label": "Belarus",
-              "value": "BY",
-            },
-            Object {
-              "label": "Belgium",
-              "value": "BE",
-            },
-            Object {
-              "label": "Belize",
-              "value": "BZ",
-            },
-            Object {
-              "label": "Benin",
-              "value": "BJ",
-            },
-            Object {
-              "label": "Bermuda",
-              "value": "BM",
-            },
-            Object {
-              "label": "Bhutan",
-              "value": "BT",
-            },
-            Object {
-              "label": "Bolivia, Plurinational State of",
-              "value": "BO",
-            },
-            Object {
-              "label": "Bonaire, Sint Eustatius and Saba",
-              "value": "BQ",
-            },
-            Object {
-              "label": "Bosnia and Herzegovina",
-              "value": "BA",
-            },
-            Object {
-              "label": "Botswana",
-              "value": "BW",
-            },
-            Object {
-              "label": "Bouvet Island",
-              "value": "BV",
-            },
-            Object {
-              "label": "Brazil",
-              "value": "BR",
-            },
-            Object {
-              "label": "British Indian Ocean Territory",
-              "value": "IO",
-            },
-            Object {
-              "label": "Brunei Darussalam",
-              "value": "BN",
-            },
-            Object {
-              "label": "Bulgaria",
-              "value": "BG",
-            },
-            Object {
-              "label": "Burkina Faso",
-              "value": "BF",
-            },
-            Object {
-              "label": "Burundi",
-              "value": "BI",
-            },
-            Object {
-              "label": "Cambodia",
-              "value": "KH",
-            },
-            Object {
-              "label": "Cameroon",
-              "value": "CM",
-            },
-            Object {
-              "label": "Canada",
-              "value": "CA",
-            },
-            Object {
-              "label": "Cape Verde",
-              "value": "CV",
-            },
-            Object {
-              "label": "Cayman Islands",
-              "value": "KY",
-            },
-            Object {
-              "label": "Central African Republic",
-              "value": "CF",
-            },
-            Object {
-              "label": "Chad",
-              "value": "TD",
-            },
-            Object {
-              "label": "Chile",
-              "value": "CL",
-            },
-            Object {
-              "label": "China",
-              "value": "CN",
-            },
-            Object {
-              "label": "Christmas Island",
-              "value": "CX",
-            },
-            Object {
-              "label": "Cocos (Keeling) Islands",
-              "value": "CC",
-            },
-            Object {
-              "label": "Colombia",
-              "value": "CO",
-            },
-            Object {
-              "label": "Comoros",
-              "value": "KM",
-            },
-            Object {
-              "label": "Congo",
-              "value": "CG",
-            },
-            Object {
-              "label": "Congo, the Democratic Republic of the",
-              "value": "CD",
-            },
-            Object {
-              "label": "Cook Islands",
-              "value": "CK",
-            },
-            Object {
-              "label": "Costa Rica",
-              "value": "CR",
-            },
-            Object {
-              "label": "Côte d'Ivoire",
-              "value": "CI",
-            },
-            Object {
-              "label": "Croatia",
-              "value": "HR",
-            },
-            Object {
-              "label": "Cuba",
-              "value": "CU",
-            },
-            Object {
-              "label": "Curaçao",
-              "value": "CW",
-            },
-            Object {
-              "label": "Cyprus",
-              "value": "CY",
-            },
-            Object {
-              "label": "Czech Republic",
-              "value": "CZ",
-            },
-            Object {
-              "label": "Denmark",
-              "value": "DK",
-            },
-            Object {
-              "label": "Djibouti",
-              "value": "DJ",
-            },
-            Object {
-              "label": "Dominica",
-              "value": "DM",
-            },
-            Object {
-              "label": "Dominican Republic",
-              "value": "DO",
-            },
-            Object {
-              "label": "Ecuador",
-              "value": "EC",
-            },
-            Object {
-              "label": "Egypt",
-              "value": "EG",
-            },
-            Object {
-              "label": "El Salvador",
-              "value": "SV",
-            },
-            Object {
-              "label": "Equatorial Guinea",
-              "value": "GQ",
-            },
-            Object {
-              "label": "Eritrea",
-              "value": "ER",
-            },
-            Object {
-              "label": "Estonia",
-              "value": "EE",
-            },
-            Object {
-              "label": "Ethiopia",
-              "value": "ET",
-            },
-            Object {
-              "label": "Falkland Islands (Malvinas)",
-              "value": "FK",
-            },
-            Object {
-              "label": "Faroe Islands",
-              "value": "FO",
-            },
-            Object {
-              "label": "Fiji",
-              "value": "FJ",
-            },
-            Object {
-              "label": "Finland",
-              "value": "FI",
-            },
-            Object {
-              "label": "France",
-              "value": "FR",
-            },
-            Object {
-              "label": "French Guiana",
-              "value": "GF",
-            },
-            Object {
-              "label": "French Polynesia",
-              "value": "PF",
-            },
-            Object {
-              "label": "French Southern Territories",
-              "value": "TF",
-            },
-            Object {
-              "label": "Gabon",
-              "value": "GA",
-            },
-            Object {
-              "label": "Gambia",
-              "value": "GM",
-            },
-            Object {
-              "label": "Georgia",
-              "value": "GE",
-            },
-            Object {
-              "label": "Germany",
-              "value": "DE",
-            },
-            Object {
-              "label": "Ghana",
-              "value": "GH",
-            },
-            Object {
-              "label": "Gibraltar",
-              "value": "GI",
-            },
-            Object {
-              "label": "Greece",
-              "value": "GR",
-            },
-            Object {
-              "label": "Greenland",
-              "value": "GL",
-            },
-            Object {
-              "label": "Grenada",
-              "value": "GD",
-            },
-            Object {
-              "label": "Guadeloupe",
-              "value": "GP",
-            },
-            Object {
-              "label": "Guam",
-              "value": "GU",
-            },
-            Object {
-              "label": "Guatemala",
-              "value": "GT",
-            },
-            Object {
-              "label": "Guernsey",
-              "value": "GG",
-            },
-            Object {
-              "label": "Guinea",
-              "value": "GN",
-            },
-            Object {
-              "label": "Guinea-Bissau",
-              "value": "GW",
-            },
-            Object {
-              "label": "Guyana",
-              "value": "GY",
-            },
-            Object {
-              "label": "Haiti",
-              "value": "HT",
-            },
-            Object {
-              "label": "Heard Island and McDonald Islands",
-              "value": "HM",
-            },
-            Object {
-              "label": "Holy See (Vatican City State)",
-              "value": "VA",
-            },
-            Object {
-              "label": "Honduras",
-              "value": "HN",
-            },
-            Object {
-              "label": "Hong Kong",
-              "value": "HK",
-            },
-            Object {
-              "label": "Hungary",
-              "value": "HU",
-            },
-            Object {
-              "label": "Iceland",
-              "value": "IS",
-            },
-            Object {
-              "label": "India",
-              "value": "IN",
-            },
-            Object {
-              "label": "Indonesia",
-              "value": "ID",
-            },
-            Object {
-              "label": "Iran, Islamic Republic of",
-              "value": "IR",
-            },
-            Object {
-              "label": "Iraq",
-              "value": "IQ",
-            },
-            Object {
-              "label": "Ireland",
-              "value": "IE",
-            },
-            Object {
-              "label": "Isle of Man",
-              "value": "IM",
-            },
-            Object {
-              "label": "Israel",
-              "value": "IL",
-            },
-            Object {
-              "label": "Italy",
-              "value": "IT",
-            },
-            Object {
-              "label": "Jamaica",
-              "value": "JM",
-            },
-            Object {
-              "label": "Japan",
-              "value": "JP",
-            },
-            Object {
-              "label": "Jersey",
-              "value": "JE",
-            },
-            Object {
-              "label": "Jordan",
-              "value": "JO",
-            },
-            Object {
-              "label": "Kazakhstan",
-              "value": "KZ",
-            },
-            Object {
-              "label": "Kenya",
-              "value": "KE",
-            },
-            Object {
-              "label": "Kiribati",
-              "value": "KI",
-            },
-            Object {
-              "label": "Korea, Democratic People's Republic of",
-              "value": "KP",
-            },
-            Object {
-              "label": "Korea, Republic of",
-              "value": "KR",
-            },
-            Object {
-              "label": "Kuwait",
-              "value": "KW",
-            },
-            Object {
-              "label": "Kyrgyzstan",
-              "value": "KG",
-            },
-            Object {
-              "label": "Lao People's Democratic Republic",
-              "value": "LA",
-            },
-            Object {
-              "label": "Latvia",
-              "value": "LV",
-            },
-            Object {
-              "label": "Lebanon",
-              "value": "LB",
-            },
-            Object {
-              "label": "Lesotho",
-              "value": "LS",
-            },
-            Object {
-              "label": "Liberia",
-              "value": "LR",
-            },
-            Object {
-              "label": "Libya",
-              "value": "LY",
-            },
-            Object {
-              "label": "Liechtenstein",
-              "value": "LI",
-            },
-            Object {
-              "label": "Lithuania",
-              "value": "LT",
-            },
-            Object {
-              "label": "Luxembourg",
-              "value": "LU",
-            },
-            Object {
-              "label": "Macao",
-              "value": "MO",
-            },
-            Object {
-              "label": "Macedonia, the former Yugoslav Republic of",
-              "value": "MK",
-            },
-            Object {
-              "label": "Madagascar",
-              "value": "MG",
-            },
-            Object {
-              "label": "Malawi",
-              "value": "MW",
-            },
-            Object {
-              "label": "Malaysia",
-              "value": "MY",
-            },
-            Object {
-              "label": "Maldives",
-              "value": "MV",
-            },
-            Object {
-              "label": "Mali",
-              "value": "ML",
-            },
-            Object {
-              "label": "Malta",
-              "value": "MT",
-            },
-            Object {
-              "label": "Marshall Islands",
-              "value": "MH",
-            },
-            Object {
-              "label": "Martinique",
-              "value": "MQ",
-            },
-            Object {
-              "label": "Mauritania",
-              "value": "MR",
-            },
-            Object {
-              "label": "Mauritius",
-              "value": "MU",
-            },
-            Object {
-              "label": "Mayotte",
-              "value": "YT",
-            },
-            Object {
-              "label": "Mexico",
-              "value": "MX",
-            },
-            Object {
-              "label": "Micronesia, Federated States of",
-              "value": "FM",
-            },
-            Object {
-              "label": "Moldova, Republic of",
-              "value": "MD",
-            },
-            Object {
-              "label": "Monaco",
-              "value": "MC",
-            },
-            Object {
-              "label": "Mongolia",
-              "value": "MN",
-            },
-            Object {
-              "label": "Montenegro",
-              "value": "ME",
-            },
-            Object {
-              "label": "Montserrat",
-              "value": "MS",
-            },
-            Object {
-              "label": "Morocco",
-              "value": "MA",
-            },
-            Object {
-              "label": "Mozambique",
-              "value": "MZ",
-            },
-            Object {
-              "label": "Myanmar",
-              "value": "MM",
-            },
-            Object {
-              "label": "Namibia",
-              "value": "NA",
-            },
-            Object {
-              "label": "Nauru",
-              "value": "NR",
-            },
-            Object {
-              "label": "Nepal",
-              "value": "NP",
-            },
-            Object {
-              "label": "Netherlands",
-              "value": "NL",
-            },
-            Object {
-              "label": "New Caledonia",
-              "value": "NC",
-            },
-            Object {
-              "label": "New Zealand",
-              "value": "NZ",
-            },
-            Object {
-              "label": "Nicaragua",
-              "value": "NI",
-            },
-            Object {
-              "label": "Niger",
-              "value": "NE",
-            },
-            Object {
-              "label": "Nigeria",
-              "value": "NG",
-            },
-            Object {
-              "label": "Niue",
-              "value": "NU",
-            },
-            Object {
-              "label": "Norfolk Island",
-              "value": "NF",
-            },
-            Object {
-              "label": "Northern Mariana Islands",
-              "value": "MP",
-            },
-            Object {
-              "label": "Norway",
-              "value": "NO",
-            },
-            Object {
-              "label": "Oman",
-              "value": "OM",
-            },
-            Object {
-              "label": "Pakistan",
-              "value": "PK",
-            },
-            Object {
-              "label": "Palau",
-              "value": "PW",
-            },
-            Object {
-              "label": "Palestinian Territory, Occupied",
-              "value": "PS",
-            },
-            Object {
-              "label": "Panama",
-              "value": "PA",
-            },
-            Object {
-              "label": "Papua New Guinea",
-              "value": "PG",
-            },
-            Object {
-              "label": "Paraguay",
-              "value": "PY",
-            },
-            Object {
-              "label": "Peru",
-              "value": "PE",
-            },
-            Object {
-              "label": "Philippines",
-              "value": "PH",
-            },
-            Object {
-              "label": "Pitcairn",
-              "value": "PN",
-            },
-            Object {
-              "label": "Poland",
-              "value": "PL",
-            },
-            Object {
-              "label": "Portugal",
-              "value": "PT",
-            },
-            Object {
-              "label": "Puerto Rico",
-              "value": "PR",
-            },
-            Object {
-              "label": "Qatar",
-              "value": "QA",
-            },
-            Object {
-              "label": "Réunion",
-              "value": "RE",
-            },
-            Object {
-              "label": "Romania",
-              "value": "RO",
-            },
-            Object {
-              "label": "Russian Federation",
-              "value": "RU",
-            },
-            Object {
-              "label": "Rwanda",
-              "value": "RW",
-            },
-            Object {
-              "label": "Saint Barthélemy",
-              "value": "BL",
-            },
-            Object {
-              "label": "Saint Helena, Ascension and Tristan da Cunha",
-              "value": "SH",
-            },
-            Object {
-              "label": "Saint Kitts and Nevis",
-              "value": "KN",
-            },
-            Object {
-              "label": "Saint Lucia",
-              "value": "LC",
-            },
-            Object {
-              "label": "Saint Martin (French part)",
-              "value": "MF",
-            },
-            Object {
-              "label": "Saint Pierre and Miquelon",
-              "value": "PM",
-            },
-            Object {
-              "label": "Saint Vincent and the Grenadines",
-              "value": "VC",
-            },
-            Object {
-              "label": "Samoa",
-              "value": "WS",
-            },
-            Object {
-              "label": "San Marino",
-              "value": "SM",
-            },
-            Object {
-              "label": "Sao Tome and Principe",
-              "value": "ST",
-            },
-            Object {
-              "label": "Saudi Arabia",
-              "value": "SA",
-            },
-            Object {
-              "label": "Senegal",
-              "value": "SN",
-            },
-            Object {
-              "label": "Serbia",
-              "value": "RS",
-            },
-            Object {
-              "label": "Seychelles",
-              "value": "SC",
-            },
-            Object {
-              "label": "Sierra Leone",
-              "value": "SL",
-            },
-            Object {
-              "label": "Singapore",
-              "value": "SG",
-            },
-            Object {
-              "label": "Sint Maarten (Dutch part)",
-              "value": "SX",
-            },
-            Object {
-              "label": "Slovakia",
-              "value": "SK",
-            },
-            Object {
-              "label": "Slovenia",
-              "value": "SI",
-            },
-            Object {
-              "label": "Solomon Islands",
-              "value": "SB",
-            },
-            Object {
-              "label": "Somalia",
-              "value": "SO",
-            },
-            Object {
-              "label": "South Africa",
-              "value": "ZA",
-            },
-            Object {
-              "label": "South Georgia and the South Sandwich Islands",
-              "value": "GS",
-            },
-            Object {
-              "label": "South Sudan",
-              "value": "SS",
-            },
-            Object {
-              "label": "Spain",
-              "value": "ES",
-            },
-            Object {
-              "label": "Sri Lanka",
-              "value": "LK",
-            },
-            Object {
-              "label": "Sudan",
-              "value": "SD",
-            },
-            Object {
-              "label": "Suriname",
-              "value": "SR",
-            },
-            Object {
-              "label": "Svalbard and Jan Mayen",
-              "value": "SJ",
-            },
-            Object {
-              "label": "Swaziland",
-              "value": "SZ",
-            },
-            Object {
-              "label": "Sweden",
-              "value": "SE",
-            },
-            Object {
-              "label": "Switzerland",
-              "value": "CH",
-            },
-            Object {
-              "label": "Syrian Arab Republic",
-              "value": "SY",
-            },
-            Object {
-              "label": "Taiwan, Province of China",
-              "value": "TW",
-            },
-            Object {
-              "label": "Tajikistan",
-              "value": "TJ",
-            },
-            Object {
-              "label": "Tanzania, United Republic of",
-              "value": "TZ",
-            },
-            Object {
-              "label": "Thailand",
-              "value": "TH",
-            },
-            Object {
-              "label": "Timor-Leste",
-              "value": "TL",
-            },
-            Object {
-              "label": "Togo",
-              "value": "TG",
-            },
-            Object {
-              "label": "Tokelau",
-              "value": "TK",
-            },
-            Object {
-              "label": "Tonga",
-              "value": "TO",
-            },
-            Object {
-              "label": "Trinidad and Tobago",
-              "value": "TT",
-            },
-            Object {
-              "label": "Tunisia",
-              "value": "TN",
-            },
-            Object {
-              "label": "Turkey",
-              "value": "TR",
-            },
-            Object {
-              "label": "Turkmenistan",
-              "value": "TM",
-            },
-            Object {
-              "label": "Turks and Caicos Islands",
-              "value": "TC",
-            },
-            Object {
-              "label": "Tuvalu",
-              "value": "TV",
-            },
-            Object {
-              "label": "Uganda",
-              "value": "UG",
-            },
-            Object {
-              "label": "Ukraine",
-              "value": "UA",
-            },
-            Object {
-              "label": "United Arab Emirates",
-              "value": "AE",
-            },
-            Object {
-              "label": "United States",
-              "value": "US",
-            },
-            Object {
-              "label": "United States Minor Outlying Islands",
-              "value": "UM",
-            },
-            Object {
-              "label": "Uruguay",
-              "value": "UY",
-            },
-            Object {
-              "label": "Uzbekistan",
-              "value": "UZ",
-            },
-            Object {
-              "label": "Vanuatu",
-              "value": "VU",
-            },
-            Object {
-              "label": "Venezuela, Bolivarian Republic of",
-              "value": "VE",
-            },
-            Object {
-              "label": "Viet Nam",
-              "value": "VN",
-            },
-            Object {
-              "label": "Virgin Islands, British",
-              "value": "VG",
-            },
-            Object {
-              "label": "Virgin Islands, U.S.",
-              "value": "VI",
-            },
-            Object {
-              "label": "Wallis and Futuna",
-              "value": "WF",
-            },
-            Object {
-              "label": "Western Sahara",
-              "value": "EH",
-            },
-            Object {
-              "label": "Yemen",
-              "value": "YE",
-            },
-            Object {
-              "label": "Zambia",
-              "value": "ZM",
-            },
-            Object {
-              "label": "Zimbabwe",
-              "value": "ZW",
-            },
-          ]
-        }
-      />
-    </Component>
-  </Component>
-</Fragment>
-`;
-
-exports[`OrganisationForm CompanyInformationSection should match a snapshot when no error 1`] = `
+exports[`CompanyInformationSection should match a snapshot when no error 1`] = `
 <Fragment>
   <Component>
     <Component>
@@ -1089,9 +13,9 @@ exports[`OrganisationForm CompanyInformationSection should match a snapshot when
     </Component>
     <Component>
       <Component
-        id="tel"
+        id="telephone"
         labelText="Telephone"
-        name="tel"
+        name="telephone"
         type="text"
       />
     </Component>
@@ -1107,9 +31,9 @@ exports[`OrganisationForm CompanyInformationSection should match a snapshot when
     </Component>
     <Component>
       <Component
-        id="officeEmail"
+        id="email"
         labelText="Office Email"
-        name="officeEmail"
+        name="email"
         type="text"
       />
     </Component>
@@ -1118,29 +42,29 @@ exports[`OrganisationForm CompanyInformationSection should match a snapshot when
     <Component>
       <Component
         disabled={false}
-        id="vatNumber"
+        id="taxNumber"
         labelText="VAT Number"
-        name="vatNumber"
+        name="taxNumber"
         type="text"
       />
       <Component
-        id="noVatNumber"
+        id="noTaxRegistration"
         labelText="Not VAT Registered"
-        name="noVatNumber"
+        name="noTaxRegistration"
       />
     </Component>
     <Component>
       <Component
         disabled={false}
-        id="reg"
+        id="registrationNumber"
         labelText="Company registration number"
-        name="reg"
+        name="registrationNumber"
         type="text"
       />
       <Component
-        id="noReg"
+        id="noRegistrationNumber"
         labelText="No Company registration number"
-        name="noReg"
+        name="noRegistrationNumber"
       />
     </Component>
   </Component>
@@ -1172,130 +96,3 @@ exports[`OrganisationForm CompanyInformationSection should match a snapshot when
   </Component>
 </Fragment>
 `;
-
-exports[`OrganisationForm should match a snapshot when no error 1`] = `
-<Formik
-  initialValues={
-    Object {
-      "about": "",
-      "buildingName": "",
-      "buildingNumber": "",
-      "companyName": "",
-      "countryId": "",
-      "iconImageUrl": "",
-      "line1": "",
-      "line2": "",
-      "line3": "",
-      "line4": "",
-      "nationalInsuranceNumber": "",
-      "noReg": false,
-      "noVatNumber": false,
-      "officeEmail": "",
-      "postCode": "",
-      "reg": "",
-      "tel": "",
-      "vatNumber": "",
-      "website": "",
-    }
-  }
-  onSubmit={[Function]}
-  validationSchema={
-    ObjectSchema {
-      "_blacklist": RefSet {
-        "list": Set {},
-        "refs": Map {},
-      },
-      "_conditions": Array [],
-      "_defaultDefault": [Function],
-      "_deps": Array [],
-      "_excludedEdges": Array [],
-      "_exclusive": Object {},
-      "_mutate": undefined,
-      "_nodes": Array [
-        "officeEmail",
-        "vatNumber",
-      ],
-      "_options": Object {
-        "abortEarly": true,
-        "recursive": true,
-      },
-      "_type": "object",
-      "_typeError": [Function],
-      "_whitelist": RefSet {
-        "list": Set {},
-        "refs": Map {},
-      },
-      "fields": Object {
-        "officeEmail": StringSchema {
-          "_blacklist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "_conditions": Array [],
-          "_deps": Array [],
-          "_exclusive": Object {
-            "email": false,
-          },
-          "_mutate": undefined,
-          "_options": Object {
-            "abortEarly": true,
-            "recursive": true,
-          },
-          "_type": "string",
-          "_typeError": [Function],
-          "_whitelist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "tests": Array [
-            [Function],
-          ],
-          "transforms": Array [
-            [Function],
-          ],
-          "type": "string",
-        },
-        "vatNumber": StringSchema {
-          "_blacklist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "_conditions": Array [],
-          "_deps": Array [],
-          "_exclusive": Object {
-            "required": true,
-            "trim": false,
-          },
-          "_mutate": undefined,
-          "_options": Object {
-            "abortEarly": true,
-            "recursive": true,
-          },
-          "_type": "string",
-          "_typeError": [Function],
-          "_whitelist": RefSet {
-            "list": Set {},
-            "refs": Map {},
-          },
-          "tests": Array [
-            [Function],
-            [Function],
-          ],
-          "transforms": Array [
-            [Function],
-            [Function],
-          ],
-          "type": "string",
-        },
-      },
-      "tests": Array [],
-      "transforms": Array [
-        [Function],
-      ],
-      "type": "object",
-    }
-  }
->
-  <Component />
-</Formik>
-`;
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/organisation-form.test.tsx.snap b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/organisation-form.test.tsx.snap
new file mode 100644
index 0000000000..c3a0f14b72
--- /dev/null
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/__snapshots__/organisation-form.test.tsx.snap
@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`OrganisationForm should match a snapshot when have developerInfo 1`] = `<Component />`;
+
+exports[`OrganisationForm should match a snapshot when no error 1`] = `<Component />`;
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-address-section.test.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-address-section.test.tsx
new file mode 100644
index 0000000000..5929d17de3
--- /dev/null
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-address-section.test.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+import { shallow } from 'enzyme'
+import CompanyAddressSection from '../company-address-section'
+
+describe('CompanyAddressSection', () => {
+  it('should match a snapshot when no error', () => {
+    expect(shallow(<CompanyAddressSection />)).toMatchSnapshot()
+  })
+})
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-information.test.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-information.test.tsx
index c3858d6f4b..003df7a02f 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-information.test.tsx
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/company-information.test.tsx
@@ -1,24 +1,13 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import OrganisationForm, { initialValues } from '../organisation-form'
-import CompanyAddressSection from '../company-address-section'
+import { defaultInitialValues } from '../organisation-form'
 import CompanyInformationSection, { CompanyInformationSectionProps } from '../company-information-section'
 
-describe('OrganisationForm', () => {
+describe('CompanyInformationSection', () => {
+  const mockProps: CompanyInformationSectionProps = {
+    formValues: defaultInitialValues,
+  }
   it('should match a snapshot when no error', () => {
-    expect(shallow(<OrganisationForm />)).toMatchSnapshot()
-  })
-  describe('CompanyAddressSection', () => {
-    it('should match a snapshot when no error', () => {
-      expect(shallow(<CompanyAddressSection />)).toMatchSnapshot()
-    })
-  })
-  describe('CompanyInformationSection', () => {
-    const mockProps: CompanyInformationSectionProps = {
-      formValues: initialValues,
-    }
-    it('should match a snapshot when no error', () => {
-      expect(shallow(<CompanyInformationSection {...mockProps} />)).toMatchSnapshot()
-    })
+    expect(shallow(<CompanyInformationSection {...mockProps} />)).toMatchSnapshot()
   })
 })
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/organisation-form.test.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/organisation-form.test.tsx
new file mode 100644
index 0000000000..31600f0d86
--- /dev/null
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/__tests__/organisation-form.test.tsx
@@ -0,0 +1,119 @@
+import React from 'react'
+import { DeveloperModel, UpdateDeveloperModel } from '@reapit/foundations-ts-definitions'
+import { useSelector } from 'react-redux'
+import { shallow } from 'enzyme'
+import OrganisationForm, { generateInitialValues, defaultInitialValues, handleSubmit } from '../organisation-form'
+import appState from '@/reducers/__stubs__/app-state'
+
+const developerInformation: DeveloperModel | null = appState.settings.developerInfomation
+jest.mock('react-redux', () => ({
+  ...jest.requireActual('react-redux'),
+  useDispatch: jest.fn(),
+  useSelector: jest.fn(() => developerInformation),
+}))
+
+describe('OrganisationForm', () => {
+  it('should match a snapshot when no error', () => {
+    expect(shallow(<OrganisationForm />)).toMatchSnapshot()
+  })
+  it('should match a snapshot when have developerInfo', () => {
+    ;(useSelector as jest.Mocked<any>).mockReturnValueOnce(() => null)
+    expect(shallow(<OrganisationForm />)).toMatchSnapshot()
+  })
+})
+
+describe('generateInitialValues', () => {
+  it('should return default if dont have developerInfo', () => {
+    expect(generateInitialValues({ developerInfo: null, defaultInitialValues })).toEqual(defaultInitialValues)
+  })
+  it('should return correctly if have developerInfo', () => {
+    const { companyAddress = {}, ...otherData } = developerInformation as DeveloperModel
+    const { line1, line2, line3, line4, buildingName, buildingNumber, postcode, countryId } = companyAddress
+    const {
+      about,
+      company: companyName,
+      taxNumber,
+      noTaxRegistration,
+      email,
+      registrationNumber,
+      telephone,
+      website,
+      nationalInsurance,
+    } = otherData
+    const expectedValues = {
+      about,
+      countryId,
+      companyName,
+      // TBC
+      iconImageUrl: '',
+      buildingName,
+      buildingNumber,
+      line1,
+      line2,
+      line3,
+      line4,
+      taxNumber,
+      noTaxRegistration,
+      email,
+      postcode,
+      registrationNumber,
+      noRegistrationNumber: !registrationNumber,
+      telephone,
+      website,
+      nationalInsurance,
+    }
+    expect(generateInitialValues({ developerInfo: developerInformation, defaultInitialValues })).toEqual(expectedValues)
+  })
+})
+
+describe('handleSubmit', () => {
+  it('should build data and submit correctly', () => {
+    const values = {
+      buildingName: 'tes',
+      buildingNumber: '1212',
+      line1: '',
+      line2: '',
+      line3: '',
+      line4: '',
+      postcode: '1212',
+      countryId: 'AF',
+      about: '',
+      companyName: 'REAPIT Ltd.2123znww',
+      iconImageUrl: '',
+      taxNumber: '',
+      noTaxRegistration: false,
+      email: 'cbryan@reapit.com',
+      registrationNumber: '12341',
+      noRegistrationNumber: false,
+      telephone: '08261826162',
+      website: 'https://google.com',
+      nationalInsurance: '010212',
+    }
+    const expectedValues = {
+      companyAddress: {
+        buildingName: 'tes',
+        buildingNumber: '1212',
+        line1: '',
+        line2: '',
+        line3: '',
+        line4: '',
+        postcode: '1212',
+        countryId: 'AF',
+      },
+      about: '',
+      companyName: 'REAPIT Ltd.2123znww',
+      taxNumber: '',
+      noTaxRegistration: false,
+      email: 'cbryan@reapit.com',
+      registrationNumber: '12341',
+      noRegistrationNumber: false,
+      telephone: '08261826162',
+      website: 'https://google.com',
+      nationalInsurance: '010212',
+    } as UpdateDeveloperModel
+    const updateDispatchMock = jest.fn()
+    const fn = handleSubmit(updateDispatchMock)
+    fn(values)
+    expect(updateDispatchMock).toHaveBeenCalledWith(expectedValues)
+  })
+})
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-address-section.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-address-section.tsx
index 4417068ef8..393d8dbd5f 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-address-section.tsx
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-address-section.tsx
@@ -13,7 +13,7 @@ const {
   line3Field,
   line4Field,
   countryIdField,
-  postCodeField,
+  postcodeField,
 } = formFields
 
 const CompanyAddressSection: React.FC<CompanyAddressSectionProps> = () => {
@@ -55,7 +55,7 @@ const CompanyAddressSection: React.FC<CompanyAddressSectionProps> = () => {
       </Grid>
       <Grid>
         <GridItem>
-          <Input type="text" labelText={postCodeField.label} id={postCodeField.name} name={postCodeField.name} />
+          <Input type="text" labelText={postcodeField.label} id={postcodeField.name} name={postcodeField.name} />
         </GridItem>
         <GridItem>
           <SelectBox
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-information-section.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-information-section.tsx
index ac2ec18583..7b2a925039 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-information-section.tsx
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/company-information-section.tsx
@@ -10,20 +10,20 @@ const {
   aboutField,
   companyNameField,
   iconImageUrlField,
-  vatNumberField,
-  noVatNumberField,
-  officeEmailField,
-  regField,
-  noRegField,
-  telField,
+  taxNumberField,
+  noTaxRegistrationField,
+  emailField,
+  registrationNumberField,
+  noRegistrationNumberField,
+  telephoneField,
   websiteField,
-  nationalInsuranceNumberField,
+  nationalInsuranceField,
 } = formFields
 
 const CompanyInformationSection: React.FC<CompanyInformationSectionProps> = ({ formValues }) => {
-  const { noVatNumber, noReg } = formValues
-  const isVATNumberFieldDisabled = noVatNumber
-  const isRegFieldDisabled = noReg
+  const { noTaxRegistration, noRegistrationNumber } = formValues
+  const isVATNumberFieldDisabled = noTaxRegistration
+  const isRegFieldDisabled = noRegistrationNumber
   const isNationalInsuranceNumberFieldVisible = isRegFieldDisabled
 
   return (
@@ -38,7 +38,7 @@ const CompanyInformationSection: React.FC<CompanyInformationSectionProps> = ({ f
           />
         </GridItem>
         <GridItem>
-          <Input type="text" labelText={telField.label} id={telField.name} name={telField.name} />
+          <Input type="text" labelText={telephoneField.label} id={telephoneField.name} name={telephoneField.name} />
         </GridItem>
       </Grid>
       <Grid>
@@ -46,34 +46,37 @@ const CompanyInformationSection: React.FC<CompanyInformationSectionProps> = ({ f
           <Input type="text" labelText={websiteField.label} id={websiteField.name} name={websiteField.name} />
         </GridItem>
         <GridItem>
-          <Input
-            type="text"
-            labelText={officeEmailField.label}
-            id={officeEmailField.name}
-            name={officeEmailField.name}
-          />
+          <Input type="text" labelText={emailField.label} id={emailField.name} name={emailField.name} />
         </GridItem>
       </Grid>
       <Grid>
         <GridItem>
           <Input
             type="text"
-            labelText={vatNumberField.label}
-            id={vatNumberField.name}
-            name={vatNumberField.name}
+            labelText={taxNumberField.label}
+            id={taxNumberField.name}
+            name={taxNumberField.name}
             disabled={isVATNumberFieldDisabled}
           />
-          <Checkbox name={noVatNumberField.name} id={noVatNumberField.name} labelText={noVatNumberField.label || ''} />
+          <Checkbox
+            name={noTaxRegistrationField.name}
+            id={noTaxRegistrationField.name}
+            labelText={noTaxRegistrationField.label || ''}
+          />
         </GridItem>
         <GridItem>
           <Input
             type="text"
-            labelText={regField.label}
-            id={regField.name}
-            name={regField.name}
+            labelText={registrationNumberField.label}
+            id={registrationNumberField.name}
+            name={registrationNumberField.name}
             disabled={isRegFieldDisabled}
           />
-          <Checkbox name={noRegField.name} id={noRegField.name} labelText={noRegField.label || ''} />
+          <Checkbox
+            name={noRegistrationNumberField.name}
+            id={noRegistrationNumberField.name}
+            labelText={noRegistrationNumberField.label || ''}
+          />
         </GridItem>
       </Grid>
       {isNationalInsuranceNumberFieldVisible && (
@@ -81,9 +84,9 @@ const CompanyInformationSection: React.FC<CompanyInformationSectionProps> = ({ f
           <GridItem className="is-half">
             <Input
               type="text"
-              labelText={nationalInsuranceNumberField.label}
-              id={nationalInsuranceNumberField.name}
-              name={nationalInsuranceNumberField.name}
+              labelText={nationalInsuranceField.label}
+              id={nationalInsuranceField.name}
+              name={nationalInsuranceField.name}
             />
           </GridItem>
         </Grid>
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/form-fields.ts b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/form-fields.ts
index d8c1cd276f..0b8103b308 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/form-fields.ts
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/form-fields.ts
@@ -1,15 +1,15 @@
 import { FormFieldInfo } from '@reapit/elements'
 
 export type FieldKeys =
-  | 'vatNumberField'
-  | 'noVatNumberField'
-  | 'nationalInsuranceNumberField'
-  | 'officeEmailField'
+  | 'taxNumberField'
+  | 'noTaxRegistrationField'
+  | 'nationalInsuranceField'
+  | 'emailField'
   | 'companyNameField'
-  | 'telField'
+  | 'telephoneField'
   | 'websiteField'
-  | 'regField'
-  | 'noRegField'
+  | 'registrationNumberField'
+  | 'noRegistrationNumberField'
   | 'aboutField'
   | 'iconImageUrlField'
   | 'buildingNameField'
@@ -19,14 +19,14 @@ export type FieldKeys =
   | 'line3Field'
   | 'line4Field'
   | 'countryIdField'
-  | 'postCodeField'
+  | 'postcodeField'
 export type FormFields = Partial<Record<FieldKeys, string>>
 
 export type OrganisationFormValues = {
-  vatNumber: string
-  noVatNumber: boolean
-  nationalInsuranceNumber: string
-  officeEmail: string
+  taxNumber: string
+  noTaxRegistration: boolean
+  nationalInsurance: string
+  email: string
   about: string
   companyName: string
   countryId: string
@@ -37,28 +37,28 @@ export type OrganisationFormValues = {
   line2: string
   line3: string
   line4: string
-  postCode: string
-  reg: string
-  noReg: boolean
-  tel: string
+  postcode: string
+  registrationNumber: string
+  noRegistrationNumber: boolean
+  telephone: string
   website: string
 }
 
 export const formFields: Record<FieldKeys, FormFieldInfo> = {
-  vatNumberField: {
-    name: 'vatNumber',
+  taxNumberField: {
+    name: 'taxNumber',
     label: 'VAT Number',
   },
-  noVatNumberField: {
-    name: 'noVatNumber',
+  noTaxRegistrationField: {
+    name: 'noTaxRegistration',
     label: 'Not VAT Registered',
   },
-  nationalInsuranceNumberField: {
-    name: 'nationalInsuranceNumber',
+  nationalInsuranceField: {
+    name: 'nationalInsurance',
     label: 'National Insurance Number',
   },
-  officeEmailField: {
-    name: 'officeEmail',
+  emailField: {
+    name: 'email',
     label: 'Office Email',
   },
   aboutField: {
@@ -101,20 +101,20 @@ export const formFields: Record<FieldKeys, FormFieldInfo> = {
     name: 'line4',
     label: 'Address Line 4',
   },
-  postCodeField: {
-    name: 'postCode',
+  postcodeField: {
+    name: 'postcode',
     label: 'Postcode',
   },
-  regField: {
-    name: 'reg',
+  registrationNumberField: {
+    name: 'registrationNumber',
     label: 'Company registration number',
   },
-  noRegField: {
-    name: 'noReg',
+  noRegistrationNumberField: {
+    name: 'noRegistrationNumber',
     label: 'No Company registration number',
   },
-  telField: {
-    name: 'tel',
+  telephoneField: {
+    name: 'telephone',
     label: 'Telephone',
   },
   websiteField: {
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/validation-schema.ts b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/validation-schema.ts
index 65a0c246ca..caf5574fd6 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/validation-schema.ts
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/form-schema/validation-schema.ts
@@ -1,13 +1,5 @@
 import * as Yup from 'yup'
-import { formFields } from './form-fields'
-import errorMessages from '@/constants/error-messages'
 
-const { FIELD_REQUIRED } = errorMessages
-
-const { vatNumberField, officeEmailField } = formFields
 export const companyInformationFormSchema = Yup.object().shape({
-  [vatNumberField.name]: Yup.string()
-    .trim()
-    .required(FIELD_REQUIRED),
-  [officeEmailField.name]: Yup.string().email(),
+  // Validation TBC
 })
diff --git a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/organisation-form.tsx b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/organisation-form.tsx
index 989c6fd9a8..bb5734aacb 100644
--- a/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/organisation-form.tsx
+++ b/packages/developer-portal/src/components/pages/settings/settings-organisation-tab/organisation-form/organisation-form.tsx
@@ -1,11 +1,15 @@
 import React from 'react'
-import { Button, Formik, Form, LevelRight, H3, FormSection } from '@reapit/elements'
+import { useSelector, useDispatch } from 'react-redux'
+import { Button, Formik, Form, LevelRight, H3, FormSection, Loader } from '@reapit/elements'
 import { companyInformationFormSchema } from './form-schema/validation-schema'
 import { OrganisationFormValues } from './form-schema/form-fields'
 import CompanyInformationSection from './company-information-section'
 import CompanyAddressSection from './company-address-section'
+import { DeveloperModel, UpdateDeveloperModel } from '@reapit/foundations-ts-definitions'
+import { selectSettingsPageDeveloperInformation, selectSettingsPageIsLoading } from '@/selector/settings'
+import { updateDeveloperData } from '@/actions/settings'
 
-export const initialValues: OrganisationFormValues = {
+export const defaultInitialValues: OrganisationFormValues = {
   about: '',
   countryId: '',
   companyName: '',
@@ -16,28 +20,111 @@ export const initialValues: OrganisationFormValues = {
   line2: '',
   line3: '',
   line4: '',
-  vatNumber: '',
-  noVatNumber: false,
-  officeEmail: '',
-  postCode: '',
-  reg: '',
-  noReg: false,
-  tel: '',
+  taxNumber: '',
+  noTaxRegistration: false,
+  email: '',
+  postcode: '',
+  registrationNumber: '',
+  noRegistrationNumber: false,
+  telephone: '',
   website: '',
-  nationalInsuranceNumber: '',
+  nationalInsurance: '',
+}
+
+export const generateInitialValues = ({
+  developerInfo,
+  defaultInitialValues,
+}: {
+  developerInfo: DeveloperModel | null
+  defaultInitialValues: OrganisationFormValues
+}): OrganisationFormValues => {
+  if (!developerInfo) {
+    return defaultInitialValues
+  }
+  const { companyAddress = {}, ...otherData } = developerInfo
+  const {
+    line1 = '',
+    line2 = '',
+    line3 = '',
+    line4 = '',
+    buildingName = '',
+    buildingNumber = '',
+    postcode = '',
+    countryId = '',
+  } = companyAddress
+  const {
+    about = '',
+    company: companyName = '',
+    taxNumber = '',
+    noTaxRegistration = false,
+    email = '',
+    registrationNumber = '',
+    telephone = '',
+    website = '',
+    nationalInsurance = '',
+  } = otherData
+  return {
+    about,
+    countryId,
+    companyName,
+    // TBC
+    iconImageUrl: '',
+    buildingName,
+    buildingNumber,
+    line1,
+    line2,
+    line3,
+    line4,
+    taxNumber,
+    noTaxRegistration,
+    email,
+    postcode,
+    registrationNumber,
+    noRegistrationNumber: !registrationNumber,
+    telephone,
+    website,
+    nationalInsurance,
+  }
 }
 
 export type OrganisationFormProps = {}
 
+export const handleSubmit = updateDeveloperDataDispatch => (values: OrganisationFormValues) => {
+  const { line1, line2, line3, line4, buildingName, buildingNumber, postcode, countryId, ...otherData } = values
+  const companyAddress = {
+    line1,
+    line2,
+    line3,
+    line4,
+    buildingName,
+    buildingNumber,
+    postcode,
+    countryId,
+  }
+  // TBC, exclude for now
+  delete otherData.iconImageUrl
+  const dataToSubmit: UpdateDeveloperModel = {
+    ...otherData,
+    companyAddress,
+  }
+  updateDeveloperDataDispatch(dataToSubmit)
+}
+
 const OrganisationForm: React.FC<OrganisationFormProps> = () => {
+  const dispatch = useDispatch()
+  const updateDeveloperDataDispatch = values => dispatch(updateDeveloperData(values))
+  const isLoading: boolean = useSelector(selectSettingsPageIsLoading)
+  const developerInfo: DeveloperModel | null = useSelector(selectSettingsPageDeveloperInformation)
+
+  if (isLoading) {
+    return <Loader />
+  }
+
   return (
     <Formik
-      initialValues={initialValues}
+      initialValues={generateInitialValues({ developerInfo, defaultInitialValues })}
       validationSchema={companyInformationFormSchema}
-      onSubmit={values => {
-        // TBC
-        console.log(values)
-      }}
+      onSubmit={handleSubmit(updateDeveloperDataDispatch)}
     >
       {({ values }) => {
         return (
diff --git a/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap b/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap
index 5983a9c43e..ea608008b2 100644
--- a/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap
+++ b/packages/developer-portal/src/core/__tests__/__snapshots__/router.tsx.snap
@@ -54,23 +54,6 @@ exports[`Router should match a snapshot 1`] = `
           path="/404"
           render={[Function]}
         />
-        <Component
-          path="/developer/edition-download"
-          showMenu={false}
-        >
-          <Component
-            allow="DEVELOPER"
-            component={
-              Object {
-                "$$typeof": Symbol(react.lazy),
-                "_ctor": [Function],
-                "_result": null,
-                "_status": -1,
-              }
-            }
-            path="/"
-          />
-        </Component>
         <Component
           path="/"
         >
diff --git a/packages/developer-portal/src/core/router.tsx b/packages/developer-portal/src/core/router.tsx
index ed905f270e..13ca02c8cc 100644
--- a/packages/developer-portal/src/core/router.tsx
+++ b/packages/developer-portal/src/core/router.tsx
@@ -48,10 +48,6 @@ const Router = () => {
             <Route path={Routes.REGISTER_CONFIRM} exact component={RegisterConfirm} />
             <Route path={Routes.FOUR_O_FOUR} exact render={() => <Info infoType="404" />} />
 
-            <PrivateRouteWrapper path={Routes.DEVELOPER_EDITION_DOWNLOAD} showMenu={false}>
-              <PrivateRoute allow="DEVELOPER" path="/" component={EditionDownloadPage} />
-            </PrivateRouteWrapper>
-
             <PrivateRouteWrapper path="/">
               <Switch>
                 <PrivateRoute
@@ -83,7 +79,6 @@ const Router = () => {
                 />
                 <PrivateRoute allow="DEVELOPER" path={Routes.WELCOME} exact component={WelcomePage} />
                 <PrivateRoute allow="DEVELOPER" path={Routes.HELP} exact fetcher component={HelpPage} />
-
                 <Route render={() => <Info infoType="404" />} />
               </Switch>
             </PrivateRouteWrapper>
diff --git a/packages/developer-portal/src/reducers/__stubs__/app-state.ts b/packages/developer-portal/src/reducers/__stubs__/app-state.ts
index b804a53d74..179d8cfdbd 100644
--- a/packages/developer-portal/src/reducers/__stubs__/app-state.ts
+++ b/packages/developer-portal/src/reducers/__stubs__/app-state.ts
@@ -104,7 +104,39 @@ const appState: ReduxState = {
   },
   settings: {
     loading: true,
-    developerInfomation: null,
+    developerInfomation: {
+      id: '909dcdc1-6657-4a37-a5cc-05acd79d6a47',
+      created: '2019-11-19T11:44:16',
+      modified: '2020-07-13T08:50:48',
+      externalId: '259b23bd-fc44-4493-ad57-f019bb57a315',
+      name: 'Craig Lorem Ok',
+      company: 'REAPIT Ltd.2123znww',
+      jobTitle: 'Head of Platform2z1',
+      email: 'cbryan@reapit.com',
+      telephone: '08261826162',
+      isInactive: false,
+      about: '',
+      website: 'https://google.com',
+      taxNumber: '',
+      registrationNumber: '12341',
+      billingEmail: '',
+      billingTelephone: '',
+      billingKeyContact: '',
+      reapitReference: '',
+      noTaxRegistration: false,
+      nationalInsurance: '010212',
+      status: 'incomplete',
+      companyAddress: {
+        buildingName: 'tes',
+        buildingNumber: '1212',
+        line1: '',
+        line2: '',
+        line3: '',
+        line4: '',
+        postcode: '1212',
+        countryId: 'AF',
+      },
+    },
   },
   installations: {
     formState: 'PENDING',
diff --git a/packages/developer-portal/src/sagas/__tests__/settings.ts b/packages/developer-portal/src/sagas/__tests__/settings.ts
index 8d96c9b46b..6a6677a541 100644
--- a/packages/developer-portal/src/sagas/__tests__/settings.ts
+++ b/packages/developer-portal/src/sagas/__tests__/settings.ts
@@ -1,5 +1,4 @@
 import { put, fork, all, call, takeLatest, select } from '@redux-saga/core/effects'
-import { selectMyIdentity } from '@/selector'
 import settingsSagas, {
   developerInformationFetchListen,
   developerInformationFetch,
@@ -15,6 +14,7 @@ import { ChangePasswordParams, settingShowLoading, requestDeveloperDataSuccess }
 import { cloneableGenerator } from '@redux-saga/testing-utils'
 import { selectDeveloperId, selectDeveloperEmail } from '@/selector/developer'
 import { errorThrownServer } from '@/actions/error'
+
 import errorMessages from '@/constants/error-messages'
 import messages from '@/constants/messages'
 import { developerStub } from '../__stubs__/developer'
@@ -22,6 +22,7 @@ import { removeSession, changePassword } from '@reapit/cognito-auth'
 import { authLogout } from '@/actions/auth'
 import { showNotificationMessage } from '@/actions/notification-message'
 import { fetchDeveloperById, updateDeveloperById, UpdateDeveloperByIdParams } from '@/services/developers'
+import { selectSettingsPageDeveloperInformation } from '@/selector/settings'
 
 jest.mock('@/services/developers')
 jest.mock('@reapit/elements')
@@ -67,7 +68,7 @@ describe('settings', () => {
   describe('developerInfomationChange', () => {
     const gen = cloneableGenerator(developerInfomationChange)({
       type: 'SETTING_UPDATE_DEVELOPER',
-      data: { company: '123' },
+      data: { companyName: '123' },
     })
     expect(gen.next().value).toEqual(put(settingShowLoading(true)))
     expect(gen.next().value).toEqual(select(selectDeveloperId))
@@ -75,12 +76,11 @@ describe('settings', () => {
       const clone = gen.clone()
       const id = 'id'
       const currentData = { currentData: 'value' }
-      expect(clone.next(id).value).toEqual(select(selectMyIdentity))
+      expect(clone.next(id).value).toEqual(select(selectSettingsPageDeveloperInformation))
       expect(clone.next(currentData).value).toEqual(
         call(updateDeveloperById, ({
           ...currentData,
           companyName: '123',
-          company: '123',
           id,
         } as unknown) as UpdateDeveloperByIdParams),
       )
diff --git a/packages/developer-portal/src/sagas/settings.ts b/packages/developer-portal/src/sagas/settings.ts
index b3c6ff2351..1eea612a5d 100644
--- a/packages/developer-portal/src/sagas/settings.ts
+++ b/packages/developer-portal/src/sagas/settings.ts
@@ -1,5 +1,4 @@
 import { put, fork, all, call, takeLatest, select } from '@redux-saga/core/effects'
-import { selectMyIdentity } from '@/selector'
 import { removeSession, changePassword } from '@reapit/cognito-auth'
 import { Action } from '@/types/core'
 import ActionTypes from '@/constants/action-types'
@@ -8,8 +7,9 @@ import messages from '@/constants/messages'
 import { settingShowLoading, requestDeveloperDataSuccess, ChangePasswordParams } from '@/actions/settings'
 import { errorThrownServer } from '@/actions/error'
 import { showNotificationMessage } from '@/actions/notification-message'
-import { DeveloperModel } from '@reapit/foundations-ts-definitions'
+import { UpdateDeveloperModel } from '@reapit/foundations-ts-definitions'
 import { selectDeveloperId, selectDeveloperEmail } from '@/selector/developer'
+import { selectSettingsPageDeveloperInformation } from '@/selector/settings'
 import { authLogout } from '@/actions/auth'
 import { logger } from '@reapit/utils'
 import { fetchDeveloperById, updateDeveloperById } from '@/services/developers'
@@ -40,10 +40,10 @@ export const developerInformationFetch = function*() {
 
 export type UpdateDeveloperInfoParams = {
   developerId: string
-  values: DeveloperModel
+  values: UpdateDeveloperModel
 }
 
-export const developerInfomationChange = function*({ data }: Action<DeveloperModel>) {
+export const developerInfomationChange = function*({ data }: Action<UpdateDeveloperModel>) {
   yield put(settingShowLoading(true))
   try {
     const developerId = yield select(selectDeveloperId)
@@ -52,8 +52,13 @@ export const developerInfomationChange = function*({ data }: Action<DeveloperMod
     }
 
     // merge input data with current data. Input data could may not have required attirbutes. (require)
-    const currentData = yield select(selectMyIdentity)
-    const inputApiData = { ...currentData, id: developerId, ...data, companyName: data.company || currentData.company }
+    const currentData = yield select(selectSettingsPageDeveloperInformation)
+    const inputApiData = {
+      ...currentData,
+      id: developerId,
+      ...data,
+      companyName: data.companyName || currentData.company,
+    }
 
     const response = yield call(updateDeveloperById, inputApiData)
     if (response) {
@@ -122,7 +127,7 @@ export const developerInformationFetchListen = function*() {
 }
 
 export const developerInformationChangeListen = function*() {
-  yield takeLatest<Action<DeveloperModel>>(ActionTypes.SETTING_UPDATE_DEVELOPER, developerInfomationChange)
+  yield takeLatest<Action<UpdateDeveloperModel>>(ActionTypes.SETTING_UPDATE_DEVELOPER, developerInfomationChange)
 }
 
 export const developerPasswordChangeListen = function*() {
diff --git a/packages/developer-portal/src/tests/badges/badge-branches.svg b/packages/developer-portal/src/tests/badges/badge-branches.svg
index bc9049555a..aea9a7a2c9 100644
--- a/packages/developer-portal/src/tests/badges/badge-branches.svg
+++ b/packages/developer-portal/src/tests/badges/badge-branches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">68.64%</text><text x="1425" y="140" transform="scale(.1)" textLength="430">68.64%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="164" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="47" height="20" fill="#e05d44"/><rect width="164" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:branches</text><text x="1395" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">68.7%</text><text x="1395" y="140" transform="scale(.1)" textLength="370">68.7%</text></g></svg>
diff --git a/packages/developer-portal/src/tests/badges/badge-functions.svg b/packages/developer-portal/src/tests/badges/badge-functions.svg
index c5dbd4c6b6..9eb230d7ae 100644
--- a/packages/developer-portal/src/tests/badges/badge-functions.svg
+++ b/packages/developer-portal/src/tests/badges/badge-functions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">79.36%</text><text x="1425" y="140" transform="scale(.1)" textLength="430">79.36%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="170" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="170" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="117" height="20" fill="#555"/><rect x="117" width="53" height="20" fill="#e05d44"/><rect width="170" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="595" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="595" y="140" transform="scale(.1)" textLength="1070">Coverage:functions</text><text x="1425" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">79.34%</text><text x="1425" y="140" transform="scale(.1)" textLength="430">79.34%</text></g></svg>
diff --git a/packages/developer-portal/src/tests/badges/badge-lines.svg b/packages/developer-portal/src/tests/badges/badge-lines.svg
index ddec17d912..8c369a301d 100644
--- a/packages/developer-portal/src/tests/badges/badge-lines.svg
+++ b/packages/developer-portal/src/tests/badges/badge-lines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="140" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="140" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="47" height="20" fill="#dfb317"/><rect width="140" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="1155" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">89.8%</text><text x="1155" y="140" transform="scale(.1)" textLength="370">89.8%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="146" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="146" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="93" height="20" fill="#555"/><rect x="93" width="53" height="20" fill="#dfb317"/><rect width="146" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="475" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="475" y="140" transform="scale(.1)" textLength="830">Coverage:lines</text><text x="1185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">89.66%</text><text x="1185" y="140" transform="scale(.1)" textLength="430">89.66%</text></g></svg>
diff --git a/packages/developer-portal/src/tests/badges/badge-statements.svg b/packages/developer-portal/src/tests/badges/badge-statements.svg
index 9b15b3d0ec..2ca47f26d4 100644
--- a/packages/developer-portal/src/tests/badges/badge-statements.svg
+++ b/packages/developer-portal/src/tests/badges/badge-statements.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#dfb317"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">88.79%</text><text x="1545" y="140" transform="scale(.1)" textLength="430">88.79%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="182" height="20"><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="182" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="129" height="20" fill="#555"/><rect x="129" width="53" height="20" fill="#dfb317"/><rect width="182" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="655" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="655" y="140" transform="scale(.1)" textLength="1190">Coverage:statements</text><text x="1545" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">88.64%</text><text x="1545" y="140" transform="scale(.1)" textLength="430">88.64%</text></g></svg>
diff --git a/packages/developer-portal/src/utils/route-dispatcher.ts b/packages/developer-portal/src/utils/route-dispatcher.ts
index 75913a1f03..e685148e2b 100644
--- a/packages/developer-portal/src/utils/route-dispatcher.ts
+++ b/packages/developer-portal/src/utils/route-dispatcher.ts
@@ -59,6 +59,9 @@ const routeDispatcher = async (route: RouteValue, params?: StringMap, search?: s
     case Routes.SETTINGS:
       store.dispatch(requestDeveloperData())
       break
+    case Routes.SETTINGS_ORGANISATION_TAB:
+      store.dispatch(requestDeveloperData())
+      break
     case Routes.WEBHOOKS:
       store.dispatch(developerRequestData({ page: 1, appsPerPage: GET_ALL_PAGE_SIZE } as DeveloperRequestParams))
       break
diff --git a/packages/foundations-ts-definitions/types/marketplace-api-schema.ts b/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
index 35244ad564..ad7e058f2c 100644
--- a/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
+++ b/packages/foundations-ts-definitions/types/marketplace-api-schema.ts
@@ -980,6 +980,59 @@ export interface MediaModel {
    */
   readonly links?: LinkModel[]
 }
+/**
+ * Model that represents a member of a developer organisation
+ */
+export interface MemberModel {
+  /**
+   * The id of this member
+   */
+  id?: string
+  /**
+   * The timestamp of entity creation
+   */
+  created?: string // date-time
+  /**
+   * The timestamp of entity modification
+   */
+  modified?: string // date-time
+  /**
+   * The email address of the member
+   */
+  email?: string
+  /**
+   * The full name of this member
+   */
+  name?: string
+  /**
+   * The job title for this member
+   */
+  jobTitle?: string
+  /**
+   * The status of the member (active/inactive/pending/rejected)
+   */
+  status?: string
+  /**
+   * The role of the member (active/inactive/pending/rejected)
+   */
+  role?: string
+  /**
+   * The date the member agreed to the terms
+   */
+  agreedTerms?: string // date-time
+  /**
+   * The id of the developer the member is associated to
+   */
+  developerId?: string // uuid
+  /**
+   * A flag specifying if the member has access to agency cloud
+   */
+  agencyCloudAccess?: boolean
+  /**
+   * Gets the links associated to this model
+   */
+  readonly links?: LinkModel[]
+}
 /**
  * Model to handle paged data and information
  */
diff --git a/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts b/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
index 8aa3aa2145..a2dbb4f8b8 100644
--- a/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
+++ b/packages/geo-diary-v2/src/components/pages/login/__styles__/index.ts
@@ -7,7 +7,7 @@ export const loginPageContainer = css`
   justify-content: flex-end;
   align-items: center;
   flex-direction: row;
-
+  background-color: white;
   @media screen and (max-width: 900px) {
     flex-direction: column-reverse;
   }
diff --git a/packages/geo-diary-v2/src/components/ui/appointment-time/appointment-time.tsx b/packages/geo-diary-v2/src/components/ui/appointment-time/appointment-time.tsx
index 311f1f6ed4..64b8052843 100644
--- a/packages/geo-diary-v2/src/components/ui/appointment-time/appointment-time.tsx
+++ b/packages/geo-diary-v2/src/components/ui/appointment-time/appointment-time.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
 import { ButtonGroup, Button } from '@reapit/elements'
+import { cx } from 'linaria'
 import { History } from 'history'
 import qs from 'query-string'
 import { ROUTES } from '@/core/router'
@@ -26,7 +27,7 @@ export const AppointmentTime = ({ queryParams, history }: AppointmentTimeProps)
     <Button
       type="button"
       variant="secondary"
-      className={queryParams.time === 'today' ? 'is-selected is-info' : ''}
+      className={cx(queryParams.time !== 'tomorrow' && queryParams.time !== 'weekView' && 'is-selected is-info')}
       onClick={handleChangeTravelMode({ queryParams, history, time: 'today' })}
     >
       TODAY
@@ -34,7 +35,7 @@ export const AppointmentTime = ({ queryParams, history }: AppointmentTimeProps)
     <Button
       type="button"
       variant="secondary"
-      className={queryParams.time === 'tomorrow' ? 'is-selected is-info' : ''}
+      className={cx(queryParams.time === 'tomorrow' && 'is-selected is-info')}
       onClick={handleChangeTravelMode({ queryParams, history, time: 'tomorrow' })}
     >
       TOMORROW
@@ -42,7 +43,7 @@ export const AppointmentTime = ({ queryParams, history }: AppointmentTimeProps)
     <Button
       type="button"
       variant="secondary"
-      className={queryParams.time === 'weekView' ? 'is-selected is-info' : ''}
+      className={cx(queryParams.time === 'weekView' && 'is-selected is-info')}
       onClick={handleChangeTravelMode({ queryParams, history, time: 'weekView' })}
     >
       WEEK VIEW
diff --git a/packages/geo-diary-v2/src/components/ui/list-and-map-tab/__styles__/index.ts b/packages/geo-diary-v2/src/components/ui/list-and-map-tab/__styles__/index.ts
index 83335a9deb..e5b73fb8ab 100644
--- a/packages/geo-diary-v2/src/components/ui/list-and-map-tab/__styles__/index.ts
+++ b/packages/geo-diary-v2/src/components/ui/list-and-map-tab/__styles__/index.ts
@@ -1,5 +1,5 @@
 import { css } from 'linaria'
 
 export const listAndMapTabContainer = css`
-  overflow: unset;
+  overflow: unset !important;
 `
diff --git a/packages/geo-diary-v2/src/components/ui/travel-mode/travel-mode.tsx b/packages/geo-diary-v2/src/components/ui/travel-mode/travel-mode.tsx
index 0ebc32fbe4..dd21218059 100644
--- a/packages/geo-diary-v2/src/components/ui/travel-mode/travel-mode.tsx
+++ b/packages/geo-diary-v2/src/components/ui/travel-mode/travel-mode.tsx
@@ -28,7 +28,7 @@ export const TravelMode: React.FC<TravelModeProps> = ({ queryParams, history })
       <Button
         type="button"
         variant="secondary"
-        className={cx(queryParams.travelMode === 'DRIVING' && 'is-selected is-info')}
+        className={cx(queryParams.travelMode !== 'WALKING' && 'is-selected is-info')}
         onClick={handleChangeTravelMode({ queryParams, travelMode: 'DRIVING', history })}
       >
         Car