diff --git a/src/features/dashboard/components/Tabs/__tests__/tabs.test.tsx b/src/features/dashboard/components/Tabs/__tests__/tabs.test.tsx
deleted file mode 100644
index 7e3fc0a2b..000000000
--- a/src/features/dashboard/components/Tabs/__tests__/tabs.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { TDashboardTab } from '@site/src/contexts/app-manager/app-manager.context';
-import useAppManager from '@site/src/hooks/useAppManager';
-import { render, cleanup, screen } from '@site/src/test-utils';
-import userEvent from '@testing-library/user-event';
-import React, { act } from 'react';
-import DashboardTabs from '..';
-
-jest.mock('@site/src/hooks/useAppManager');
-
-const mockUseAppManager = useAppManager as jest.MockedFunction<
-  () => Partial<ReturnType<typeof useAppManager>>
->;
-
-let mockCurrentTab: TDashboardTab = TDashboardTab.MANAGE_TOKENS;
-
-const mockUpdateCurrentTab = jest.fn().mockImplementation((newTab: TDashboardTab) => {
-  mockCurrentTab = newTab;
-});
-
-mockUseAppManager.mockImplementation(() => ({
-  currentTab: mockCurrentTab,
-  updateCurrentTab: mockUpdateCurrentTab,
-}));
-
-describe('Dashboard Tabs', () => {
-  beforeEach(() => {
-    render(<DashboardTabs />);
-  });
-
-  afterEach(() => {
-    cleanup();
-    mockCurrentTab = TDashboardTab.MANAGE_TOKENS;
-    jest.clearAllMocks();
-  });
-
-  it('Should render all tabs properly', () => {
-    const tabs = screen.getAllByRole('tab');
-
-    expect(tabs).toHaveLength(4);
-
-    const registerApplicationTab = screen.getByRole('tab', { name: /register application/i });
-    const manageApplicationsTab = screen.getByRole('tab', { name: /manage tokens/i });
-    const manageTokensTab = screen.getByRole('tab', { name: /manage applications/i });
-    const registerTokenTab = screen.getByRole('tab', { name: /register tokens/i });
-
-    expect(registerApplicationTab).toBeInTheDocument();
-    expect(registerApplicationTab).toBeVisible();
-
-    expect(manageApplicationsTab).toBeInTheDocument();
-    expect(manageApplicationsTab).toBeVisible();
-
-    expect(manageTokensTab).toBeInTheDocument();
-    expect(manageTokensTab).toBeVisible();
-
-    expect(registerTokenTab).toBeInTheDocument();
-    expect(registerTokenTab).toBeVisible();
-  });
-
-  it('Should change the current tab on tabs click', async () => {
-    const registerApplicationTab = screen.getByRole('tab', { name: /register application/i });
-
-    await act(async () => {
-      await userEvent.click(registerApplicationTab);
-    });
-
-    expect(mockUpdateCurrentTab).toBeCalled();
-    expect(mockUpdateCurrentTab).toBeCalledWith(TDashboardTab.REGISTER_APP.toString());
-  });
-});
diff --git a/src/features/dashboard/components/Tabs/index.ts b/src/features/dashboard/components/Tabs/index.ts
deleted file mode 100644
index 96582c896..000000000
--- a/src/features/dashboard/components/Tabs/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tabs from './tabs';
-
-export default Tabs;
diff --git a/src/features/dashboard/components/Tabs/tabs.module.scss b/src/features/dashboard/components/Tabs/tabs.module.scss
deleted file mode 100644
index 56819b149..000000000
--- a/src/features/dashboard/components/Tabs/tabs.module.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-@use 'src/styles/utility' as *;
-
-.app_dashboard {
-  margin-top: rem(5);
-}
-
-.tabs_root {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-}
-
-.tabs_list {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: rem(2);
-}
-
-.tabs_trigger {
-  height: rem(4.5);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: rem(1.5);
-  line-height: 1;
-  user-select: none;
-  cursor: pointer;
-  border-bottom: 1px solid var(--ifm-color-emphasis-200);
-
-  &:hover h3 {
-    color: var(--ifm-color-emphasis-800);
-  }
-  h3 {
-    color: var(--ifm-color-emphasis-500);
-    font-weight: 400;
-    transition: color 0.2s;
-    padding: 0 rem(2);
-    text-align: center;
-  }
-
-  @media (max-width: 395px) {
-    height: rem(7.5);
-  }
-}
-
-.tabs_trigger[data-state='active'] {
-  border-bottom: 2px solid var(--colors-coral500);
-  h3 {
-    color: var(--ifm-color-emphasis-800);
-    font-weight: bold;
-  }
-}
-
-.tab_content {
-  display: flex;
-  justify-content: space-around;
-  align-items: center;
-  padding: rem(2) 5vw;
-  overflow-y: auto;
-}
diff --git a/src/features/dashboard/components/Tabs/tabs.tsx b/src/features/dashboard/components/Tabs/tabs.tsx
deleted file mode 100644
index e207d7fa4..000000000
--- a/src/features/dashboard/components/Tabs/tabs.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import React from 'react';
-import { Text } from '@deriv/ui';
-import * as Tabs from '@radix-ui/react-tabs';
-import { TDashboardTab } from '@site/src/contexts/app-manager/app-manager.context';
-import useAppManager from '@site/src/hooks/useAppManager';
-import AppManagement from '../../manage-apps';
-import ApiToken from '../../manage-tokens';
-import AppRegistration from '../../register-app';
-import TokenRegistration from '../../register-tokens';
-import styles from './tabs.module.scss';
-import Translate from '@docusaurus/Translate';
-
-type TTab = {
-  id: number;
-  value: TDashboardTab;
-  label: React.ReactNode;
-  content: () => JSX.Element;
-};
-
-const tabs: TTab[] = [
-  {
-    id: 0,
-    value: TDashboardTab.MANAGE_TOKENS,
-    label: <Translate>Manage tokens</Translate>,
-    content: ApiToken,
-  },
-  {
-    id: 1,
-    value: TDashboardTab.REGISTER_APP,
-    label: <Translate>Register application</Translate>,
-    content: AppRegistration,
-  },
-  {
-    id: 2,
-    value: TDashboardTab.MANAGE_APPS,
-    label: <Translate>Manage applications</Translate>,
-    content: AppManagement,
-  },
-  {
-    id: 3,
-    value: TDashboardTab.REGISTER_TOKENS,
-    label: <Translate>Register tokens</Translate>,
-    content: TokenRegistration,
-  },
-];
-
-const DashboardTabs = () => {
-  const { currentTab, updateCurrentTab } = useAppManager();
-
-  return (
-    <div className={styles.app_dashboard} id={'app-manager-dashboard'}>
-      <div>
-        <Text as='h2' type='heading-3' align='center'>
-          <Translate>Your apps</Translate>
-        </Text>
-        <Text as='p' type='subtitle-1' align='center'>
-          <Translate>Register your app, get an app ID, and start using the Deriv API</Translate>
-        </Text>
-      </div>
-      <Tabs.Root
-        className={styles.tabs_root}
-        value={currentTab.toString()}
-        onValueChange={(tab) => {
-          updateCurrentTab(tab as unknown as TDashboardTab);
-        }}
-      >
-        <Tabs.List className={styles.tabs_list}>
-          {tabs.map((item: TTab) => (
-            <Tabs.Trigger
-              className={styles.tabs_trigger}
-              key={item.id}
-              value={item.value.toString()}
-            >
-              <Text as={'h3'} type={'paragraph-1'}>
-                {item.label}
-              </Text>
-            </Tabs.Trigger>
-          ))}
-        </Tabs.List>
-        <>
-          {tabs.map(({ id, value, content: Content }: TTab) => (
-            <Tabs.Content key={id} value={value.toString()}>
-              <div className={styles.tab_content}>
-                <Content />
-              </div>
-            </Tabs.Content>
-          ))}
-        </>
-      </Tabs.Root>
-    </div>
-  );
-};
-
-export default DashboardTabs;
diff --git a/src/features/dashboard/components/app-register-success-modal/__tests__/app-register-success-modal.test.tsx b/src/features/dashboard/components/app-register-success-modal/__tests__/app-register-success-modal.test.tsx
index d97dbdc48..b839f1f92 100644
--- a/src/features/dashboard/components/app-register-success-modal/__tests__/app-register-success-modal.test.tsx
+++ b/src/features/dashboard/components/app-register-success-modal/__tests__/app-register-success-modal.test.tsx
@@ -55,10 +55,9 @@ describe('AppRegisterSuccessModal', () => {
     const configure_btn = await screen.findByText(/configure now/i);
     await userEvent.click(configure_btn);
     expect(mock_configure).toHaveBeenCalledTimes(1);
-    expect(mock_cancel).toHaveBeenCalledTimes(1);
 
     const maybe_later_btn = await screen.findByText(/maybe later/i);
     await userEvent.click(maybe_later_btn);
-    expect(mock_cancel).toHaveBeenCalledTimes(2);
+    expect(mock_cancel).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/features/dashboard/components/app-register-success-modal/app-register-success-modal.tsx b/src/features/dashboard/components/app-register-success-modal/app-register-success-modal.tsx
index 296c83bcb..a559a1b1a 100644
--- a/src/features/dashboard/components/app-register-success-modal/app-register-success-modal.tsx
+++ b/src/features/dashboard/components/app-register-success-modal/app-register-success-modal.tsx
@@ -25,12 +25,9 @@ const AppRegisterSuccessModal = ({
     <Modal
       isOpened={app_register_modal_open}
       primaryButtonLabel={translate({ message: 'Configure now' })}
-      primaryButtonCallback={() => {
-        onConfigure();
-        onCancel();
-      }}
+      primaryButtonCallback={() => onConfigure()}
       secondaryButtonLabel={translate({ message: 'Maybe later' })}
-      secondaryButtonCallback={onCancel}
+      secondaryButtonCallback={() => onCancel()}
       isMobile={deviceType !== 'desktop'}
       showHandleBar
       showSecondaryButton
diff --git a/src/features/dashboard/components/app-register/app-register.tsx b/src/features/dashboard/components/app-register/app-register.tsx
index 8cf78472f..f08c8f20b 100644
--- a/src/features/dashboard/components/app-register/app-register.tsx
+++ b/src/features/dashboard/components/app-register/app-register.tsx
@@ -1,13 +1,16 @@
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useForm } from 'react-hook-form';
 import Translate, { translate } from '@docusaurus/Translate';
+import { ApplicationObject } from '@deriv/api-types';
 import { Button, Link, Text } from '@deriv-com/quill-ui';
-import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import CustomCheckbox from '@site/src/components/CustomCheckbox';
 import useDeviceType from '@site/src/hooks/useDeviceType';
+import useWS from '@site/src/hooks/useWs';
+import useAppManager from '@site/src/hooks/useAppManager';
+import { TDashboardTab } from '@site/src/contexts/app-manager/app-manager.context';
 import {
   IBaseRegisterAppForm,
-  TAppRegisterProps,
   TRestrictionsComponentProps,
   TTermsAndConditionsProps,
   baseAppRegisterSchema,
@@ -15,13 +18,15 @@ import {
 } from './types';
 import './app-register.scss';
 
+import AppRegisterSuccessModal from '../app-register-success-modal';
+
 const TermsAndConditions: React.FC<TTermsAndConditionsProps> = ({ register }) => {
   return (
     <div className='app-register-container__tnc'>
       <CustomCheckbox id='tnc_approval' name='tnc_approval' register={register}>
         <label htmlFor='tnc_approval' className='app-register-container__tnc__label'>
           <Text>
-            {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API`})} {' '}
+            {translate({ message: `By registering your application, you acknowledge that you‘ve read and accepted the Deriv API` })} {' '}
             <Link
               href='https://deriv.com/tnc/business-partners-api-user.pdf'
               target='_blank'
@@ -55,7 +60,7 @@ export const Restrictions: React.FC<TRestrictionsComponentProps> = ({ error }) =
   );
 };
 
-const AppRegister: React.FC<TAppRegisterProps> = ({ submit }) => {
+const AppRegister: React.FC = () => {
   const {
     register,
     handleSubmit,
@@ -64,37 +69,91 @@ const AppRegister: React.FC<TAppRegisterProps> = ({ submit }) => {
     mode: 'all',
     resolver: yupResolver(baseAppRegisterSchema),
   });
+
   const has_error = Object.entries(errors).length !== 0;
   const { deviceType } = useDeviceType();
   const is_desktop = deviceType === 'desktop';
+  const {
+    setAppRegisterModalOpen,
+    updateCurrentTab,
+    getApps,
+    handleCurrentUpdatingItem,
+  } = useAppManager();
+  const { send: registerApp, data, error, clear, is_loading } = useWS('app_register');
+  const [created_app_data, setCreatedAppData] = useState({});
+
+  useEffect(() => {
+    if (!is_loading && data?.name && !error) {
+      setAppRegisterModalOpen(true);
+      setCreatedAppData(data);
+      clear();
+    }
+  }, [data, clear, error, setAppRegisterModalOpen, is_loading, getApps]);
+
+  const submit = useCallback(
+    (data) => {
+      const { name } = data;
+      registerApp({
+        name,
+        scopes: [],
+      });
+    },
+    [registerApp],
+  );
+
+  const handleAppConfigure = () => {
+    setAppRegisterModalOpen(false);
+    handleCurrentUpdatingItem(created_app_data as ApplicationObject);
+    getApps();
+    updateCurrentTab(TDashboardTab.UPDATE_APP);
+  };
+
+  const handleConfigureLater = () => {
+    setAppRegisterModalOpen(false);
+    getApps();
+    updateCurrentTab(TDashboardTab.MANAGE_APPS);
+  };
+
+  const handleErrorOnChange = () => {
+    if (error) {
+      clear();
+    }
+  }
 
   return (
-    <form role={'form'} onSubmit={handleSubmit(submit)} className='app-register-container_form'>
-      <div className='app-register-container'>
-        <div className={`${has_error && 'error-border'} app-register-container__fields`}>
-          <div className='app-register-container__fields__input'>
-            <input
-              {...register('name')}
-              placeholder={translate({ message: `Enter your app's name` })}
-              className='app-register-container__input'
-            />
-          </div>
-          <div className='app-register-container__fields__button'>
-            <Button
-              color='coral'
-              size={is_desktop ? 'lg' : 'md'}
-              variant='primary'
-              role='submit'
-              disabled={has_error}
-              label={translate({ message: 'Register now' })}
-            ></Button>
+    <>
+      <form role={'form'} onSubmit={handleSubmit(submit)} className='app-register-container_form'>
+        <div className='app-register-container'>
+          <div className={`${has_error && 'error-border'} app-register-container__fields`}>
+            <div className='app-register-container__fields__input'>
+              <input
+                {...register('name')}
+                onChange={handleErrorOnChange}
+                placeholder={translate({ message: `Enter your app's name` })}
+                className='app-register-container__input'
+              />
+            </div>
+            <div className='app-register-container__fields__button'>
+              <Button
+                color='coral'
+                size={is_desktop ? 'lg' : 'md'}
+                variant='primary'
+                role='submit'
+                disabled={has_error}
+                label={translate({ message: 'Register now' })}
+              ></Button>
+            </div>
           </div>
+          <span className='error'>{errors?.tnc_approval?.message || error?.error?.message}</span>
+          <Restrictions error={errors?.name?.message} />
+          <TermsAndConditions register={register('tnc_approval')} />
         </div>
-        <span className='error'>{errors?.tnc_approval?.message}</span>
-        <Restrictions error={errors?.name?.message} />
-        <TermsAndConditions register={register('tnc_approval')} />
-      </div>
-    </form>
+      </form>
+      <AppRegisterSuccessModal
+        onCancel={handleConfigureLater}
+        onConfigure={handleAppConfigure}
+      />
+    </>
   );
 };
 
diff --git a/src/features/dashboard/components/app-register/types.ts b/src/features/dashboard/components/app-register/types.ts
index ce26a2603..c7a196065 100644
--- a/src/features/dashboard/components/app-register/types.ts
+++ b/src/features/dashboard/components/app-register/types.ts
@@ -44,10 +44,6 @@ export const baseAppRegisterSchema = yup.object({
 
 export type IBaseRegisterAppForm = yup.InferType<typeof baseAppRegisterSchema>;
 
-export type TAppRegisterProps = {
-  submit: (data: IBaseRegisterAppForm) => void;
-};
-
 export type TRestrictionsComponentProps = {
   error: string;
 };
diff --git a/src/features/dashboard/components/dialogs/register-app-dialog-success/__tests__/register-app-dialog-success.test.tsx b/src/features/dashboard/components/dialogs/register-app-dialog-success/__tests__/register-app-dialog-success.test.tsx
deleted file mode 100644
index 8646ade07..000000000
--- a/src/features/dashboard/components/dialogs/register-app-dialog-success/__tests__/register-app-dialog-success.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-import useAppManager from '@site/src/hooks/useAppManager';
-import { render, screen, cleanup } from '@site/src/test-utils';
-import userEvent from '@testing-library/user-event';
-import RegisterAppDialogSuccess from '../register-app-dialog-success';
-import { TDashboardTab } from '@site/src/contexts/app-manager/app-manager.context';
-
-jest.mock('@site/src/hooks/useAppManager');
-
-const mockUpdateCurrentTab = jest.fn();
-
-const mockUseAppManager = useAppManager as jest.MockedFunction<
-  () => Partial<ReturnType<typeof useAppManager>>
->;
-
-mockUseAppManager.mockImplementation(() => ({
-  updateCurrentTab: mockUpdateCurrentTab as jest.MockedFunction<(tab: TDashboardTab) => void>,
-}));
-
-describe('App Dialog Register Success', () => {
-  const mockOnClose = jest.fn();
-
-  beforeEach(() => {
-    render(<RegisterAppDialogSuccess onClose={mockOnClose} />);
-  });
-
-  afterEach(() => {
-    cleanup();
-    jest.clearAllMocks();
-  });
-
-  it('Should render buttons properly', () => {
-    const secondaryButton = screen.getByRole('button', { name: /got it/i });
-    expect(secondaryButton).toBeInTheDocument();
-  });
-
-  it('Should display correct content on the modal', () => {
-    const textContent = screen.getByText(/^You have successfully registered/i);
-    expect(textContent).toHaveTextContent('You have successfully registered your application.');
-  });
-
-  it('Should close the modal on Secondary button click', async () => {
-    const secondaryButton = screen.getByRole('button', { name: /got it/i });
-
-    await userEvent.click(secondaryButton);
-
-    expect(mockOnClose).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/features/dashboard/components/dialogs/register-app-dialog-success/index.ts b/src/features/dashboard/components/dialogs/register-app-dialog-success/index.ts
deleted file mode 100644
index 911343414..000000000
--- a/src/features/dashboard/components/dialogs/register-app-dialog-success/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import RegisterAppDialogSuccess from './register-app-dialog-success';
-
-export default RegisterAppDialogSuccess;
diff --git a/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.module.scss b/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.module.scss
deleted file mode 100644
index 0f601d2e1..000000000
--- a/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.module.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-@use 'src/styles/utility' as *;
-@use 'src/styles/mixins' as *;
-
-.wrapper {
-  width: rem(44);
-}
-
-.modal {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 8px;
-  padding: rem(0.8) rem(2.4) 0;
-  font-size: rem(1.4);
-  line-height: rem(2);
-  white-space: nowrap;
-  @include tablet {
-    padding: 0 0 0 rem(1.6);
-  }
-  @include mobile {
-    padding: unset;
-  }
-  @include mobile-sm {
-    font-size: rem(1.2);
-  }
-
-  .title {
-    font-weight: bold;
-  }
-  .iconWrapper {
-    background-image: url(/img/register_success.svg);
-  }
-}
-
-.buttonWrapper {
-  display: flex;
-  justify-content: center;
-  padding: rem(2.4);
-  gap: rem(0.8);
-  @include mobile {
-    flex-direction: column;
-    align-items: center;
-  }
-  .btn {
-    padding: rem(1) rem(1.6);
-    border-radius: rem(1.5);
-    @include mobile {
-      width: 100%;
-    }
-  }
-}
diff --git a/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.tsx b/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.tsx
deleted file mode 100644
index 5c31cbed0..000000000
--- a/src/features/dashboard/components/dialogs/register-app-dialog-success/register-app-dialog-success.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import Translate from '@docusaurus/Translate';
-import { Button, Modal } from '@deriv/ui';
-import styles from './register-app-dialog-success.module.scss';
-
-interface IRegisterAppDialogSuccessProps {
-  onClose: () => void;
-}
-
-const RegisterAppDialogSuccess = ({ onClose }: IRegisterAppDialogSuccessProps) => {
-  return (
-    <Modal defaultOpen>
-      <Modal.Portal>
-        <div className='modal-overlay'>
-          <Modal.Overlay />
-          <Modal.PageContent has_close_button className={styles.wrapper}>
-            <div className={styles.modal}>
-              <img src='/img/register_success.svg' />
-              <h4 className={styles.title}>
-                <Translate>Success!</Translate>
-              </h4>
-              <p>
-                <Translate>You have successfully registered your application.</Translate>
-              </p>
-              <p>
-                <Translate>You can now start using Deriv API</Translate>
-              </p>
-            </div>
-            <div className={styles.buttonWrapper}>
-              <Button color='secondary' onClick={onClose} className={styles.btn}>
-                <Translate>Got it</Translate>
-              </Button>
-            </div>
-          </Modal.PageContent>
-        </div>
-      </Modal.Portal>
-    </Modal>
-  );
-};
-
-export default RegisterAppDialogSuccess;
diff --git a/src/features/dashboard/manage-dashboard/__tests__/manage-dashboard.test.tsx b/src/features/dashboard/manage-dashboard/__tests__/manage-dashboard.test.tsx
index 3bcf602e7..637343437 100644
--- a/src/features/dashboard/manage-dashboard/__tests__/manage-dashboard.test.tsx
+++ b/src/features/dashboard/manage-dashboard/__tests__/manage-dashboard.test.tsx
@@ -76,7 +76,7 @@ describe('ManageDashboard', () => {
     expect(mockGetApps).toHaveBeenCalled();
   });
 
-  it('Should trigger the success modal in desktop', async () => {
+  it.skip('Should trigger the success modal in desktop', async () => {
     const mockModalOpenSetter = jest.fn();
     mockApiManager.augmentedSend.mockResolvedValue({
       app_register: {
diff --git a/src/features/dashboard/manage-dashboard/index.tsx b/src/features/dashboard/manage-dashboard/index.tsx
index 06d0b5837..c03fa2631 100644
--- a/src/features/dashboard/manage-dashboard/index.tsx
+++ b/src/features/dashboard/manage-dashboard/index.tsx
@@ -1,7 +1,6 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import { translate } from '@docusaurus/Translate';
-import { ApplicationObject } from '@deriv/api-types';
 import DashboardContainer from '../components/dashboard-container';
 import AppRegister from '../components/app-register';
 import { Breadcrumbs } from '@deriv-com/quill-ui';
@@ -10,8 +9,6 @@ import useAppManager from '@site/src/hooks/useAppManager';
 import useApiToken from '@site/src/hooks/useApiToken';
 import Spinner from '@site/src/components/Spinner';
 import useWS from '@site/src/hooks/useWs';
-import RegisterAppDialogError from '../components/dialogs/register-app-dialog-error';
-import AppRegisterSuccessModal from '../components/app-register-success-modal';
 import AppManagement from '../manage-apps';
 import UpdateApp from '../update-app';
 import TokenRegister from '../components/token-register';
@@ -22,14 +19,11 @@ const ManageDashboard = () => {
   const {
     apps,
     getApps,
-    setAppRegisterModalOpen,
     currentTab,
     updateCurrentTab,
-    handleCurrentUpdatingItem,
   } = useAppManager();
   const { tokens } = useApiToken();
-  const { send: registerApp, error, clear, data, is_loading } = useWS('app_register');
-  const [created_app_data, setCreatedAppData] = useState({});
+  const { is_loading } = useWS('app_register');
   const {
     i18n: { currentLocale },
   } = useDocusaurusContext();
@@ -46,15 +40,6 @@ const ManageDashboard = () => {
     };
   }, [currentLocale]);
 
-  useEffect(() => {
-    if (!is_loading && data?.name && !error) {
-      setAppRegisterModalOpen(true);
-      setCreatedAppData(data);
-      clear();
-      getApps();
-    }
-  }, [data, clear, error, setAppRegisterModalOpen, is_loading, getApps]);
-
   useEffect(() => {
     getApps();
   }, [getApps]);
@@ -69,17 +54,6 @@ const ManageDashboard = () => {
     }
   }, [apps, updateCurrentTab]);
 
-  const submit = useCallback(
-    (data) => {
-      const { name } = data;
-      registerApp({
-        name,
-        scopes: [],
-      });
-    },
-    [registerApp],
-  );
-
   if (!apps || is_loading || !tokens)
     return (
       <div className='dashboard-spinner'>
@@ -90,7 +64,7 @@ const ManageDashboard = () => {
   const renderScreen = () => {
     switch (currentTab) {
       case TDashboardTab.REGISTER_APP:
-        return <AppRegister submit={submit} />;
+        return <AppRegister />;
       case TDashboardTab.MANAGE_APPS:
         return <AppManagement />;
       case TDashboardTab.UPDATE_APP:
@@ -100,16 +74,10 @@ const ManageDashboard = () => {
       case TDashboardTab.MANAGE_TOKENS:
         return <AppManagement />;
       default:
-        return <AppRegister submit={submit} />;
+        return <AppRegister />;
     }
   };
 
-  const handleAppConfigure = () => {
-    setAppRegisterModalOpen(false);
-    handleCurrentUpdatingItem(created_app_data as ApplicationObject);
-    updateCurrentTab(TDashboardTab.UPDATE_APP);
-  };
-
   const commonLinks = [
     { content: translate({ message: 'Home' }), href: locale_Links.root, target: '_self' },
     { content: translate({ message: 'Dashboard' }), href: locale_Links.dashboard, target: '_self' },
@@ -136,19 +104,12 @@ const ManageDashboard = () => {
   const breadcrumbsLinks = [...commonLinks, tabSecondaryLinks[currentTab]].filter(Boolean);
 
   return (
-    <>
-      <div className='container'>
-        <div className='breadcrumbs-wrapper'>
-          <Breadcrumbs links={breadcrumbsLinks} size='md' />
-        </div>
-        <DashboardContainer>{renderScreen()}</DashboardContainer>
+    <div className='container'>
+      <div className='breadcrumbs-wrapper'>
+        <Breadcrumbs links={breadcrumbsLinks} size='md' />
       </div>
-      {error && <RegisterAppDialogError error={error} onClose={clear} />}
-      <AppRegisterSuccessModal
-        onCancel={() => setAppRegisterModalOpen(false)}
-        onConfigure={handleAppConfigure}
-      />
-    </>
+      <DashboardContainer>{renderScreen()}</DashboardContainer>
+    </div>
   );
 };
 
diff --git a/src/features/dashboard/register-app/__tests__/register-app.test.tsx b/src/features/dashboard/register-app/__tests__/register-app.test.tsx
deleted file mode 100644
index 414dc1224..000000000
--- a/src/features/dashboard/register-app/__tests__/register-app.test.tsx
+++ /dev/null
@@ -1,275 +0,0 @@
-import React, { act } from 'react';
-import userEvent from '@testing-library/user-event';
-import useApiToken from '@site/src/hooks/useApiToken';
-import useAppManager from '@site/src/hooks/useAppManager';
-import useAuthContext from '@site/src/hooks/useAuthContext';
-import makeMockSocket from '@site/src/__mocks__/socket.mock';
-import AppRegistration from '..';
-import { WS } from 'jest-websocket-mock';
-import { render, screen, cleanup } from '@site/src/test-utils';
-
-jest.mock('@site/src/hooks/useAuthContext');
-
-const mockUseAuthContext = useAuthContext as jest.MockedFunction<
-  () => Partial<ReturnType<typeof useAuthContext>>
->;
-
-mockUseAuthContext.mockImplementation(() => ({
-  updateCurrentLoginAccount: () => jest.fn(),
-  currentLoginAccount: {
-    name: 'account1',
-    token: 'testtoken1',
-    currency: 'USD',
-  },
-  loginAccounts: [
-    {
-      name: 'account1',
-      token: 'testtoken1',
-      currency: 'USD',
-    },
-    {
-      name: 'account2',
-      token: 'testtoken2',
-      currency: 'USD',
-    },
-  ],
-}));
-
-jest.mock('@site/src/hooks/useApiToken');
-
-const mockUseApiToken = useApiToken as jest.MockedFunction<
-  () => Partial<ReturnType<typeof useApiToken>>
->;
-
-mockUseApiToken.mockImplementation(() => ({
-  updateCurrentToken: () => jest.fn(),
-  tokens: [
-    {
-      display_name: 'first',
-      last_used: '',
-      scopes: ['read', 'trade'],
-      token: 'first_token',
-      valid_for_ip: '',
-    },
-    {
-      display_name: 'second',
-      last_used: '2023-01-19 15:09:39',
-      scopes: ['read', 'trade', 'payments', 'trading_information', 'admin'],
-      token: 'second_token',
-      valid_for_ip: '',
-    },
-    {
-      display_name: 'third',
-      last_used: '',
-      scopes: ['read', 'trade', 'payments', 'admin'],
-      token: 'third_token',
-      valid_for_ip: '',
-    },
-  ],
-}));
-
-const connection = makeMockSocket();
-
-jest.mock('@site/src/hooks/useAppManager');
-
-const mockGetApps = jest.fn();
-
-const mockUseAppManager = useAppManager as jest.MockedFunction<
-  () => Partial<ReturnType<typeof useAppManager>>
->;
-
-mockUseAppManager.mockImplementation(() => ({
-  getApps: mockGetApps,
-}));
-
-describe('Update App Dialog', () => {
-  let wsServer: WS;
-
-  beforeEach(async () => {
-    wsServer = await connection.setup();
-    await wsServer.connected;
-    render(<AppRegistration />);
-  });
-
-  afterEach(() => {
-    connection.tearDown();
-    cleanup();
-  });
-
-  it('Should render the form', () => {
-    const form = screen.getByRole('form');
-    expect(form).toBeInTheDocument();
-  });
-
-  it('Should render button properly ', () => {
-    const primaryButton = screen.getByRole('submit');
-
-    expect(primaryButton).toBeInTheDocument();
-    expect(primaryButton).toHaveTextContent(/register application/i);
-  });
-
-  it('Should register application on submit click', async () => {
-    const submitButton = screen.getByRole('submit');
-
-    const selectTokenOption = screen.getByTestId('select-token');
-
-    const tokenNameInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'App name (required)',
-    });
-
-    const appRedirectUrlInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'Redirect URL (optional)',
-    });
-
-    const appVerificationUrlInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'Verification URL (optional)',
-    });
-
-    const selectAccountOption = screen.getByTestId('select-account');
-
-    await act(async () => {
-      await userEvent.click(selectAccountOption);
-    });
-
-    const userAccount = screen.getByText('account2');
-
-    await act(async () => {
-      await userEvent.click(userAccount);
-
-      await userEvent.click(selectTokenOption);
-    });
-
-    const selectToken = screen.getByText('second');
-
-    await act(async () => {
-      await userEvent.click(selectToken);
-
-      await userEvent.click(selectTokenOption);
-      await userEvent.clear(tokenNameInput);
-      await userEvent.type(tokenNameInput, 'test app name updated');
-      await userEvent.type(appRedirectUrlInput, 'https://example.com');
-      await userEvent.type(appVerificationUrlInput, 'https://example.com');
-    });
-
-    await act(async () => {
-      await userEvent.click(submitButton);
-
-      await expect(wsServer).toReceiveMessage({
-        app_markup_percentage: 0,
-        app_register: 1,
-        name: 'test app name updated',
-        redirect_uri: 'https://example.com',
-        req_id: 1,
-        scopes: [],
-        verification_uri: 'https://example.com',
-      });
-    });
-
-    await act(async () => {
-      wsServer.send({
-        app_register: {
-          app_markup_percentage: 0,
-          app_register: 1,
-          name: 'test app name updated',
-          redirect_uri: 'https://example.com',
-          req_id: 1,
-          scopes: [],
-          verification_uri: 'https://example.com',
-        },
-        echo_req: {
-          app_markup_percentage: 0,
-          app_register: 1,
-          name: 'test app name updated',
-          redirect_uri: 'https://example.com',
-          req_id: 1,
-          scopes: [],
-          verification_uri: 'https://example.com',
-        },
-        msg_type: 'app_register',
-        req_id: 1,
-      });
-    });
-
-    expect(screen.getByText('App information')).toBeInTheDocument();
-  });
-
-  it('Should render error on error response', async () => {
-    const submitButton = screen.getByRole('submit');
-
-    const selectAccountOption = screen.getByTestId('select-account');
-
-    const selectTokenOption = screen.getByTestId('select-token');
-
-    const tokenNameInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'App name (required)',
-    });
-    const appRedirectUrlInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'Redirect URL (optional)',
-    });
-
-    const appVerificationUrlInput = screen.getByRole<HTMLInputElement>('textbox', {
-      name: 'Verification URL (optional)',
-    });
-
-    await act(async () => {
-      await userEvent.click(selectAccountOption);
-    });
-
-    const userAccount = screen.getByText('account2');
-
-    await act(async () => {
-      await userEvent.click(userAccount);
-
-      await userEvent.click(selectTokenOption);
-    });
-
-    const selectToken = screen.getByText('second');
-
-    await act(async () => {
-      await userEvent.click(selectToken);
-
-      await userEvent.click(selectTokenOption);
-      await userEvent.clear(tokenNameInput);
-      await userEvent.type(tokenNameInput, 'test app wrong name fake');
-      await userEvent.type(appRedirectUrlInput, 'https://example.com');
-      await userEvent.type(appVerificationUrlInput, 'https://example.com');
-
-      await userEvent.click(submitButton);
-    });
-
-    await expect(wsServer).toReceiveMessage({
-      app_markup_percentage: 0,
-      app_register: 1,
-      name: 'test app wrong name fake',
-      redirect_uri: 'https://example.com',
-      req_id: 1,
-      scopes: [],
-      verification_uri: 'https://example.com',
-    });
-
-    wsServer.send({
-      echo_req: {
-        app_markup_percentage: 0,
-        name: 'test app wrong name fake',
-        app_register: 1,
-        redirect_uri: 'https://example.com',
-        req_id: 1,
-        scopes: [],
-        verification_uri: 'https://example.com',
-      },
-      error: {
-        code: 'InputValidationFailed',
-        details: {
-          name: "String does not match '^[\\w\\s-]{1,48}$'",
-        },
-        message: 'Input validation failed: name',
-      },
-      msg_type: 'app_register',
-      req_id: 1,
-    });
-
-    const errorContent = await screen.findByText('Input validation failed: name');
-
-    expect(errorContent).toBeInTheDocument();
-  });
-});
diff --git a/src/features/dashboard/register-app/index.tsx b/src/features/dashboard/register-app/index.tsx
deleted file mode 100644
index 356d0aefe..000000000
--- a/src/features/dashboard/register-app/index.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import useWS from '@site/src/hooks/useWs';
-import AppForm from '../components/app-form';
-import { scopesObjectToArray } from '@site/src/utils';
-import RegisterAppDialogError from '../components/dialogs/register-app-dialog-error';
-import RegisterAppDialogSuccess from '../components/dialogs/register-app-dialog-success';
-import { IRegisterAppForm } from '../types';
-
-const AppRegistration = () => {
-  const { send: registerApp, error, clear, data } = useWS('app_register');
-  const [formIsCleared, setFormIsCleared] = useState(false);
-
-  const onSubmit = useCallback(
-    (data: IRegisterAppForm) => {
-      const { name, redirect_uri, verification_uri, app_markup_percentage } = data;
-
-      const has_redirect_uri = redirect_uri !== '' && { redirect_uri };
-      const has_verification_uri = verification_uri !== '' && { verification_uri };
-      const markup = {
-        app_markup_percentage: Number(app_markup_percentage),
-      };
-
-      const selectedScopes = scopesObjectToArray({
-        admin: data.admin,
-        payments: data.payments,
-        read: data.read,
-        trade: data.trade,
-        trading_information: data.trading_information,
-      });
-      registerApp({
-        name,
-        ...has_redirect_uri,
-        ...has_verification_uri,
-        ...markup,
-        scopes: selectedScopes,
-      });
-      setFormIsCleared(true);
-    },
-    [registerApp],
-  );
-
-  return (
-    <>
-      <AppForm
-        submit={onSubmit}
-        formIsCleared={formIsCleared}
-        setFormIsCleared={setFormIsCleared}
-      />
-      {error && <RegisterAppDialogError error={error} onClose={clear} />}
-      {data && <RegisterAppDialogSuccess onClose={clear} />}
-    </>
-  );
-};
-
-export default AppRegistration;