From b92cab4873174333e0c4297d522b442ebf0359a9 Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Thu, 20 Oct 2022 16:23:03 +0800
Subject: [PATCH 1/8] moved my-ads folder to pages folder

---
 packages/components/stories/icon/icons.js                  | 3 +--
 packages/p2p/jest.config.js                                | 1 +
 packages/p2p/src/app-content.jsx                           | 2 +-
 packages/p2p/src/components/__tests__/app-content.spec.js  | 2 +-
 .../my-ads/__tests__/ad-status.spec.js                     | 0
 .../my-ads/ad-exceeds-daily-limit-modal.jsx                | 0
 .../p2p/src/{components => pages}/my-ads/ad-status.jsx     | 0
 .../p2p/src/{components => pages}/my-ads/ad-status.scss    | 0
 packages/p2p/src/{components => pages}/my-ads/ad-type.jsx  | 0
 packages/p2p/src/{components => pages}/my-ads/ad-type.scss | 0
 .../my-ads/buy-ad-payment-methods-list.jsx                 | 0
 .../my-ads/buy-ad-payment-methods-list.scss                | 0
 .../my-ads/create-ad-add-payment-method-modal.jsx          | 2 +-
 .../{components => pages}/my-ads/create-ad-error-modal.jsx | 0
 .../my-ads/create-ad-form-payment-methods.jsx              | 2 +-
 .../src/{components => pages}/my-ads/create-ad-form.jsx    | 0
 .../src/{components => pages}/my-ads/create-ad-summary.jsx | 0
 .../p2p/src/{components => pages}/my-ads/create-ad.jsx     | 0
 .../{components => pages}/my-ads/edit-ad-cancel-modal.jsx  | 0
 .../my-ads/edit-ad-form-payment-methods.jsx                | 2 +-
 .../p2p/src/{components => pages}/my-ads/edit-ad-form.jsx  | 2 +-
 .../src/{components => pages}/my-ads/edit-ad-summary.jsx   | 0
 packages/p2p/src/{components => pages}/my-ads/edit-ad.jsx  | 0
 packages/p2p/src/pages/my-ads/index.jsx                    | 3 +++
 .../{components => pages}/my-ads/my-ads-delete-modal.jsx   | 2 +-
 .../{components => pages}/my-ads/my-ads-delete-modal.scss  | 0
 .../my-ads/my-ads-floating-rate-switch-modal.jsx           | 0
 .../{components => pages}/my-ads/my-ads-row-renderer.jsx   | 2 +-
 .../p2p/src/{components => pages}/my-ads/my-ads-table.jsx  | 2 +-
 packages/p2p/src/{components => pages}/my-ads/my-ads.jsx   | 2 +-
 packages/p2p/src/{components => pages}/my-ads/my-ads.scss  | 0
 .../src/{components => pages}/my-ads/quick-add-modal.jsx   | 2 +-
 .../src/{components => pages}/my-ads/quick-add-modal.scss  | 0
 .../my-ads/sell-ad-payment-methods-list.jsx                | 2 +-
 .../my-ads/sell-ad-payment-methods-list.scss               | 0
 .../p2p/src/{components => pages}/my-ads/toggle-ads.jsx    | 0
 packages/p2p/src/pages/test.jsx                            | 7 -------
 packages/p2p/tsconfig.json                                 | 5 +++--
 38 files changed, 20 insertions(+), 23 deletions(-)
 rename packages/p2p/src/{components => pages}/my-ads/__tests__/ad-status.spec.js (100%)
 rename packages/p2p/src/{components => pages}/my-ads/ad-exceeds-daily-limit-modal.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/ad-status.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/ad-status.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/ad-type.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/ad-type.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/buy-ad-payment-methods-list.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/buy-ad-payment-methods-list.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad-add-payment-method-modal.jsx (97%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad-error-modal.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad-form-payment-methods.jsx (96%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad-form.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad-summary.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/create-ad.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/edit-ad-cancel-modal.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/edit-ad-form-payment-methods.jsx (96%)
 rename packages/p2p/src/{components => pages}/my-ads/edit-ad-form.jsx (99%)
 rename packages/p2p/src/{components => pages}/my-ads/edit-ad-summary.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/edit-ad.jsx (100%)
 create mode 100644 packages/p2p/src/pages/my-ads/index.jsx
 rename packages/p2p/src/{components => pages}/my-ads/my-ads-delete-modal.jsx (98%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads-delete-modal.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads-floating-rate-switch-modal.jsx (100%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads-row-renderer.jsx (99%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads-table.jsx (99%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads.jsx (96%)
 rename packages/p2p/src/{components => pages}/my-ads/my-ads.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/quick-add-modal.jsx (99%)
 rename packages/p2p/src/{components => pages}/my-ads/quick-add-modal.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/sell-ad-payment-methods-list.jsx (96%)
 rename packages/p2p/src/{components => pages}/my-ads/sell-ad-payment-methods-list.scss (100%)
 rename packages/p2p/src/{components => pages}/my-ads/toggle-ads.jsx (100%)
 delete mode 100644 packages/p2p/src/pages/test.jsx

diff --git a/packages/components/stories/icon/icons.js b/packages/components/stories/icon/icons.js
index 909eeb8ed34e..5f0415e45363 100644
--- a/packages/components/stories/icon/icons.js
+++ b/packages/components/stories/icon/icons.js
@@ -147,7 +147,6 @@ export const icons =
         'IcCashierPaymentAgent',
         'IcCashierPaypalDark',
         'IcCashierPaypalLight',
-        'IcCashierPaymentAgent',
         'IcCashierPerfectMoneyDark',
         'IcCashierPerfectMoneyLight',
         'IcCashierPermatabankDark',
@@ -877,4 +876,4 @@ export const icons =
         'IcWalletZingpayDark',
         'IcWalletZingpayLight',
     ],
-};
+}
diff --git a/packages/p2p/jest.config.js b/packages/p2p/jest.config.js
index 6d193b80edd3..83fcc3225c64 100644
--- a/packages/p2p/jest.config.js
+++ b/packages/p2p/jest.config.js
@@ -9,6 +9,7 @@ module.exports = {
         '^Assets/(.*)$': '<rootDir>/src/assets/$1',
         '^Components/(.*)$': '<rootDir>/src/components/$1',
         '^Constants/(.*)$': '<rootDir>/src/constants/$1',
+        '^Pages/(.*)$': '<rootDir>/src/pages/$1',
         '^Stores/(.*)$': '<rootDir>/src/stores/$1',
         '^Stores$': '<rootDir>/src/stores/index',
         '^Translations/(.*)$': '<rootDir>/src/translations/$1',
diff --git a/packages/p2p/src/app-content.jsx b/packages/p2p/src/app-content.jsx
index 99b464ddc0f3..22ee16ddd785 100644
--- a/packages/p2p/src/app-content.jsx
+++ b/packages/p2p/src/app-content.jsx
@@ -7,7 +7,7 @@ import AdvertiserPage from 'Components/advertiser-page/advertiser-page.jsx';
 import BuySell from 'Components/buy-sell/buy-sell.jsx';
 import Dp2pBlocked from 'Components/dp2p-blocked';
 import { localize } from 'Components/i18next';
-import MyAds from 'Components/my-ads/my-ads.jsx';
+import MyAds from 'Pages/my-ads';
 import MyProfile from 'Components/my-profile';
 import NicknameForm from 'Components/nickname-form';
 import Orders from 'Components/orders/orders.jsx';
diff --git a/packages/p2p/src/components/__tests__/app-content.spec.js b/packages/p2p/src/components/__tests__/app-content.spec.js
index 07131cf03dd6..fa8ab37c3946 100644
--- a/packages/p2p/src/components/__tests__/app-content.spec.js
+++ b/packages/p2p/src/components/__tests__/app-content.spec.js
@@ -21,7 +21,7 @@ jest.mock('@deriv/components', () => ({
 jest.mock('Components/dp2p-blocked', () => jest.fn(() => 'Dp2pBlocked'));
 jest.mock('Components/nickname-form', () => jest.fn(() => 'NicknameForm'));
 jest.mock('Components/verification/verification', () => jest.fn(() => 'Verification'));
-jest.mock('Components/my-ads/my-ads', () => jest.fn(() => 'MyAds'));
+jest.mock('Pages/my-ads', () => jest.fn(() => 'MyAds'));
 jest.mock('Components/orders/orders', () => jest.fn(() => 'Orders'));
 jest.mock('Components/buy-sell/buy-sell', () => jest.fn(() => 'BuySell'));
 jest.mock('Components/my-profile', () => jest.fn(() => 'MyProfile'));
diff --git a/packages/p2p/src/components/my-ads/__tests__/ad-status.spec.js b/packages/p2p/src/pages/my-ads/__tests__/ad-status.spec.js
similarity index 100%
rename from packages/p2p/src/components/my-ads/__tests__/ad-status.spec.js
rename to packages/p2p/src/pages/my-ads/__tests__/ad-status.spec.js
diff --git a/packages/p2p/src/components/my-ads/ad-exceeds-daily-limit-modal.jsx b/packages/p2p/src/pages/my-ads/ad-exceeds-daily-limit-modal.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/ad-exceeds-daily-limit-modal.jsx
rename to packages/p2p/src/pages/my-ads/ad-exceeds-daily-limit-modal.jsx
diff --git a/packages/p2p/src/components/my-ads/ad-status.jsx b/packages/p2p/src/pages/my-ads/ad-status.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/ad-status.jsx
rename to packages/p2p/src/pages/my-ads/ad-status.jsx
diff --git a/packages/p2p/src/components/my-ads/ad-status.scss b/packages/p2p/src/pages/my-ads/ad-status.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/ad-status.scss
rename to packages/p2p/src/pages/my-ads/ad-status.scss
diff --git a/packages/p2p/src/components/my-ads/ad-type.jsx b/packages/p2p/src/pages/my-ads/ad-type.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/ad-type.jsx
rename to packages/p2p/src/pages/my-ads/ad-type.jsx
diff --git a/packages/p2p/src/components/my-ads/ad-type.scss b/packages/p2p/src/pages/my-ads/ad-type.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/ad-type.scss
rename to packages/p2p/src/pages/my-ads/ad-type.scss
diff --git a/packages/p2p/src/components/my-ads/buy-ad-payment-methods-list.jsx b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/buy-ad-payment-methods-list.jsx
rename to packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.jsx
diff --git a/packages/p2p/src/components/my-ads/buy-ad-payment-methods-list.scss b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/buy-ad-payment-methods-list.scss
rename to packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.scss
diff --git a/packages/p2p/src/components/my-ads/create-ad-add-payment-method-modal.jsx b/packages/p2p/src/pages/my-ads/create-ad-add-payment-method-modal.jsx
similarity index 97%
rename from packages/p2p/src/components/my-ads/create-ad-add-payment-method-modal.jsx
rename to packages/p2p/src/pages/my-ads/create-ad-add-payment-method-modal.jsx
index b707029f672d..5956808bf38a 100644
--- a/packages/p2p/src/components/my-ads/create-ad-add-payment-method-modal.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad-add-payment-method-modal.jsx
@@ -5,7 +5,7 @@ import { Button, Icon, MobileFullPageModal, Modal, Text } from '@deriv/component
 import { isMobile } from '@deriv/shared';
 import { useStores } from 'Stores';
 import { localize, Localize } from 'Components/i18next';
-import AddPaymentMethod from '../my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
+import AddPaymentMethod from 'Components/my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
 
 const CreateAdAddPaymentMethodModal = () => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/components/my-ads/create-ad-error-modal.jsx b/packages/p2p/src/pages/my-ads/create-ad-error-modal.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/create-ad-error-modal.jsx
rename to packages/p2p/src/pages/my-ads/create-ad-error-modal.jsx
diff --git a/packages/p2p/src/components/my-ads/create-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
similarity index 96%
rename from packages/p2p/src/components/my-ads/create-ad-form-payment-methods.jsx
rename to packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
index de7d8570db4a..23bd7faabf3f 100644
--- a/packages/p2p/src/components/my-ads/create-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
-import PaymentMethodCard from '../my-profile/payment-methods/payment-method-card';
+import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
 import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list.jsx';
 import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
diff --git a/packages/p2p/src/components/my-ads/create-ad-form.jsx b/packages/p2p/src/pages/my-ads/create-ad-form.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/create-ad-form.jsx
rename to packages/p2p/src/pages/my-ads/create-ad-form.jsx
diff --git a/packages/p2p/src/components/my-ads/create-ad-summary.jsx b/packages/p2p/src/pages/my-ads/create-ad-summary.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/create-ad-summary.jsx
rename to packages/p2p/src/pages/my-ads/create-ad-summary.jsx
diff --git a/packages/p2p/src/components/my-ads/create-ad.jsx b/packages/p2p/src/pages/my-ads/create-ad.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/create-ad.jsx
rename to packages/p2p/src/pages/my-ads/create-ad.jsx
diff --git a/packages/p2p/src/components/my-ads/edit-ad-cancel-modal.jsx b/packages/p2p/src/pages/my-ads/edit-ad-cancel-modal.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/edit-ad-cancel-modal.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad-cancel-modal.jsx
diff --git a/packages/p2p/src/components/my-ads/edit-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
similarity index 96%
rename from packages/p2p/src/components/my-ads/edit-ad-form-payment-methods.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
index f11eb9e75326..7fb651ea40d5 100644
--- a/packages/p2p/src/components/my-ads/edit-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
-import PaymentMethodCard from '../my-profile/payment-methods/payment-method-card';
+import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
 import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list.jsx';
 import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
diff --git a/packages/p2p/src/components/my-ads/edit-ad-form.jsx b/packages/p2p/src/pages/my-ads/edit-ad-form.jsx
similarity index 99%
rename from packages/p2p/src/components/my-ads/edit-ad-form.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad-form.jsx
index fbc81bb8b732..3cd0e048de5d 100644
--- a/packages/p2p/src/components/my-ads/edit-ad-form.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad-form.jsx
@@ -12,7 +12,7 @@ import { buy_sell } from 'Constants/buy-sell';
 import { useStores } from 'Stores';
 import { ad_type } from 'Constants/floating-rate';
 import FloatingRate from 'Components/floating-rate';
-import EditAdCancelModal from 'Components/my-ads/edit-ad-cancel-modal.jsx';
+import EditAdCancelModal from './edit-ad-cancel-modal.jsx';
 import { generateErrorDialogTitle, generateErrorDialogBody } from 'Utils/adverts';
 import EditAdFormPaymentMethods from './edit-ad-form-payment-methods.jsx';
 import CreateAdAddPaymentMethodModal from './create-ad-add-payment-method-modal.jsx';
diff --git a/packages/p2p/src/components/my-ads/edit-ad-summary.jsx b/packages/p2p/src/pages/my-ads/edit-ad-summary.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/edit-ad-summary.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad-summary.jsx
diff --git a/packages/p2p/src/components/my-ads/edit-ad.jsx b/packages/p2p/src/pages/my-ads/edit-ad.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/edit-ad.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad.jsx
diff --git a/packages/p2p/src/pages/my-ads/index.jsx b/packages/p2p/src/pages/my-ads/index.jsx
new file mode 100644
index 000000000000..87a7b238a4db
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/index.jsx
@@ -0,0 +1,3 @@
+import MyAds from './my-ads';
+
+export default MyAds;
diff --git a/packages/p2p/src/components/my-ads/my-ads-delete-modal.jsx b/packages/p2p/src/pages/my-ads/my-ads-delete-modal.jsx
similarity index 98%
rename from packages/p2p/src/components/my-ads/my-ads-delete-modal.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-delete-modal.jsx
index 1886133604cd..ef08b7911e43 100644
--- a/packages/p2p/src/components/my-ads/my-ads-delete-modal.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-delete-modal.jsx
@@ -6,7 +6,7 @@ import { observer } from 'mobx-react-lite';
 import { Localize } from 'Components/i18next';
 import { requestWS } from 'Utils/websocket';
 import { useStores } from 'Stores';
-import 'Components/my-ads/my-ads-delete-modal.scss';
+import './my-ads-delete-modal.scss';
 
 const MyAdsDeleteModal = () => {
     const { my_ads_store } = useStores();
diff --git a/packages/p2p/src/components/my-ads/my-ads-delete-modal.scss b/packages/p2p/src/pages/my-ads/my-ads-delete-modal.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/my-ads-delete-modal.scss
rename to packages/p2p/src/pages/my-ads/my-ads-delete-modal.scss
diff --git a/packages/p2p/src/components/my-ads/my-ads-floating-rate-switch-modal.jsx b/packages/p2p/src/pages/my-ads/my-ads-floating-rate-switch-modal.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/my-ads-floating-rate-switch-modal.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-floating-rate-switch-modal.jsx
diff --git a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
similarity index 99%
rename from packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
index 71d81340edcb..fadc2687ac7c 100644
--- a/packages/p2p/src/components/my-ads/my-ads-row-renderer.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
@@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite';
 import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
-import AdStatus from 'Components/my-ads/ad-status.jsx';
+import AdStatus from './ad-status.jsx';
 import { useStores } from 'Stores';
 import { generateEffectiveRate } from 'Utils/format-value';
 import AdType from './ad-type.jsx';
diff --git a/packages/p2p/src/components/my-ads/my-ads-table.jsx b/packages/p2p/src/pages/my-ads/my-ads-table.jsx
similarity index 99%
rename from packages/p2p/src/components/my-ads/my-ads-table.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-table.jsx
index 5502e2012c05..1ed7edf6dee6 100644
--- a/packages/p2p/src/components/my-ads/my-ads-table.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-table.jsx
@@ -5,7 +5,7 @@ import { isDesktop, isMobile } from '@deriv/shared';
 import { observer } from 'mobx-react-lite';
 import { localize, Localize } from 'Components/i18next';
 import Empty from 'Components/empty/empty.jsx';
-import ToggleAds from 'Components/my-ads/toggle-ads.jsx';
+import ToggleAds from './toggle-ads.jsx';
 import { TableError } from 'Components/table/table-error.jsx';
 import { ad_type } from 'Constants/floating-rate';
 import { useStores } from 'Stores';
diff --git a/packages/p2p/src/components/my-ads/my-ads.jsx b/packages/p2p/src/pages/my-ads/my-ads.jsx
similarity index 96%
rename from packages/p2p/src/components/my-ads/my-ads.jsx
rename to packages/p2p/src/pages/my-ads/my-ads.jsx
index 1aba44af449f..d3f56a7a323d 100644
--- a/packages/p2p/src/components/my-ads/my-ads.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads.jsx
@@ -8,7 +8,7 @@ import { TableError } from 'Components/table/table-error.jsx';
 import CreateAd from './create-ad.jsx';
 import EditAd from './edit-ad.jsx';
 import MyAdsTable from './my-ads-table.jsx';
-import Verification from '../verification/verification.jsx';
+import Verification from 'Components/verification/verification.jsx';
 import './my-ads.scss';
 
 const MyAdsState = ({ message }) => (
diff --git a/packages/p2p/src/components/my-ads/my-ads.scss b/packages/p2p/src/pages/my-ads/my-ads.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/my-ads.scss
rename to packages/p2p/src/pages/my-ads/my-ads.scss
diff --git a/packages/p2p/src/components/my-ads/quick-add-modal.jsx b/packages/p2p/src/pages/my-ads/quick-add-modal.jsx
similarity index 99%
rename from packages/p2p/src/components/my-ads/quick-add-modal.jsx
rename to packages/p2p/src/pages/my-ads/quick-add-modal.jsx
index d3589b06b5ea..6e01fc4f4c41 100644
--- a/packages/p2p/src/components/my-ads/quick-add-modal.jsx
+++ b/packages/p2p/src/pages/my-ads/quick-add-modal.jsx
@@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite';
 import { localize, Localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { useStores } from 'Stores';
-import AddPaymentMethod from '../my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
+import AddPaymentMethod from 'Components/my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
 import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
 import './quick-add-modal.scss';
 
diff --git a/packages/p2p/src/components/my-ads/quick-add-modal.scss b/packages/p2p/src/pages/my-ads/quick-add-modal.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/quick-add-modal.scss
rename to packages/p2p/src/pages/my-ads/quick-add-modal.scss
diff --git a/packages/p2p/src/components/my-ads/sell-ad-payment-methods-list.jsx b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.jsx
similarity index 96%
rename from packages/p2p/src/components/my-ads/sell-ad-payment-methods-list.jsx
rename to packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.jsx
index c0586b4749bb..57ab37219bf5 100644
--- a/packages/p2p/src/components/my-ads/sell-ad-payment-methods-list.jsx
+++ b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.jsx
@@ -6,7 +6,7 @@ import { observer } from 'mobx-react-lite';
 import { localize } from 'Components/i18next';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import PaymentMethodCard from '../my-profile/payment-methods/payment-method-card';
+import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import './sell-ad-payment-methods-list.scss';
 
 const SellAdPaymentMethodsList = ({
diff --git a/packages/p2p/src/components/my-ads/sell-ad-payment-methods-list.scss b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.scss
similarity index 100%
rename from packages/p2p/src/components/my-ads/sell-ad-payment-methods-list.scss
rename to packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.scss
diff --git a/packages/p2p/src/components/my-ads/toggle-ads.jsx b/packages/p2p/src/pages/my-ads/toggle-ads.jsx
similarity index 100%
rename from packages/p2p/src/components/my-ads/toggle-ads.jsx
rename to packages/p2p/src/pages/my-ads/toggle-ads.jsx
diff --git a/packages/p2p/src/pages/test.jsx b/packages/p2p/src/pages/test.jsx
deleted file mode 100644
index 7d143587f67b..000000000000
--- a/packages/p2p/src/pages/test.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react';
-
-const test = () => {
-    return <div>test</div>;
-};
-
-export default test;
diff --git a/packages/p2p/tsconfig.json b/packages/p2p/tsconfig.json
index 0d202e2b791c..301a6ab9088f 100644
--- a/packages/p2p/tsconfig.json
+++ b/packages/p2p/tsconfig.json
@@ -6,12 +6,13 @@
             "Assets/*": ["src/assets/*"],
             "Components/*": ["src/components/*"],
             "Constants/*": ["src/constants/*"],
+            "Pages/*": ["src/pages/*"],
             "Stores/*": ["src/stores/*"],
             "Translations/*": ["src/translations/*"],
             "Utils/*": ["src/utils/*"],
-            "@deriv/*":["../*/src"]
+            "@deriv/*": ["../*/src"]
         },
-        "outDir": "./lib",
+        "outDir": "./lib"
     },
     "include": ["src"]
 }

From 026ae9dfdb07a7879a02da0a27a93f069d797cdd Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Thu, 20 Oct 2022 16:27:13 +0800
Subject: [PATCH 2/8] reverted icons commit

---
 packages/components/stories/icon/icons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/components/stories/icon/icons.js b/packages/components/stories/icon/icons.js
index 5f0415e45363..29d8b9c8a3b2 100644
--- a/packages/components/stories/icon/icons.js
+++ b/packages/components/stories/icon/icons.js
@@ -147,6 +147,7 @@ export const icons =
         'IcCashierPaymentAgent',
         'IcCashierPaypalDark',
         'IcCashierPaypalLight',
+        'IcCashierPaymentAgent',
         'IcCashierPerfectMoneyDark',
         'IcCashierPerfectMoneyLight',
         'IcCashierPermatabankDark',

From 7ce88073df8ec2a0f362d51a006c7dee31b8d3d4 Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Thu, 20 Oct 2022 16:28:20 +0800
Subject: [PATCH 3/8] added ; in icons

---
 packages/components/stories/icon/icons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/stories/icon/icons.js b/packages/components/stories/icon/icons.js
index 29d8b9c8a3b2..909eeb8ed34e 100644
--- a/packages/components/stories/icon/icons.js
+++ b/packages/components/stories/icon/icons.js
@@ -877,4 +877,4 @@ export const icons =
         'IcWalletZingpayDark',
         'IcWalletZingpayLight',
     ],
-}
+};

From e724013ffa886766ecab73a56a2e013f0b2cedee Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Fri, 21 Oct 2022 10:52:18 +0800
Subject: [PATCH 4/8] moved ad-status, ad-type and buy-ad-payment-method-list
 components into their own folders

---
 .../pages/my-ads/{ => ad-status}/__tests__/ad-status.spec.js  | 0
 packages/p2p/src/pages/my-ads/{ => ad-status}/ad-status.jsx   | 0
 packages/p2p/src/pages/my-ads/{ => ad-status}/ad-status.scss  | 0
 packages/p2p/src/pages/my-ads/{ => ad-type}/ad-type.jsx       | 0
 packages/p2p/src/pages/my-ads/{ => ad-type}/ad-type.scss      | 0
 .../buy-ad-payment-methods-list.jsx                           | 0
 .../buy-ad-payment-methods-list.scss                          | 0
 .../p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx   | 2 +-
 .../p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx     | 2 +-
 packages/p2p/src/pages/my-ads/{index.jsx => index.js}         | 0
 packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx         | 4 ++--
 11 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/p2p/src/pages/my-ads/{ => ad-status}/__tests__/ad-status.spec.js (100%)
 rename packages/p2p/src/pages/my-ads/{ => ad-status}/ad-status.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => ad-status}/ad-status.scss (100%)
 rename packages/p2p/src/pages/my-ads/{ => ad-type}/ad-type.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => ad-type}/ad-type.scss (100%)
 rename packages/p2p/src/pages/my-ads/{ => buy-ad-payment-methods-list}/buy-ad-payment-methods-list.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => buy-ad-payment-methods-list}/buy-ad-payment-methods-list.scss (100%)
 rename packages/p2p/src/pages/my-ads/{index.jsx => index.js} (100%)

diff --git a/packages/p2p/src/pages/my-ads/__tests__/ad-status.spec.js b/packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js
similarity index 100%
rename from packages/p2p/src/pages/my-ads/__tests__/ad-status.spec.js
rename to packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js
diff --git a/packages/p2p/src/pages/my-ads/ad-status.jsx b/packages/p2p/src/pages/my-ads/ad-status/ad-status.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/ad-status.jsx
rename to packages/p2p/src/pages/my-ads/ad-status/ad-status.jsx
diff --git a/packages/p2p/src/pages/my-ads/ad-status.scss b/packages/p2p/src/pages/my-ads/ad-status/ad-status.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/ad-status.scss
rename to packages/p2p/src/pages/my-ads/ad-status/ad-status.scss
diff --git a/packages/p2p/src/pages/my-ads/ad-type.jsx b/packages/p2p/src/pages/my-ads/ad-type/ad-type.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/ad-type.jsx
rename to packages/p2p/src/pages/my-ads/ad-type/ad-type.jsx
diff --git a/packages/p2p/src/pages/my-ads/ad-type.scss b/packages/p2p/src/pages/my-ads/ad-type/ad-type.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/ad-type.scss
rename to packages/p2p/src/pages/my-ads/ad-type/ad-type.scss
diff --git a/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.jsx b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.jsx
rename to packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx
diff --git a/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.scss b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/buy-ad-payment-methods-list.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list.scss
rename to packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/buy-ad-payment-methods-list.scss
diff --git a/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
index 23bd7faabf3f..7628f638506b 100644
--- a/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
 import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
 
 const CreateAdFormPaymentMethods = ({ is_sell_advert, onSelectPaymentMethods }) => {
diff --git a/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
index 7fb651ea40d5..6b09fece23b9 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
 import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
 
 const EditAdFormPaymentMethods = ({ is_sell_advert, selected_methods, setSelectedMethods, touched }) => {
diff --git a/packages/p2p/src/pages/my-ads/index.jsx b/packages/p2p/src/pages/my-ads/index.js
similarity index 100%
rename from packages/p2p/src/pages/my-ads/index.jsx
rename to packages/p2p/src/pages/my-ads/index.js
diff --git a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
index fadc2687ac7c..83c52266b7a3 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
@@ -7,10 +7,10 @@ import { observer } from 'mobx-react-lite';
 import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
-import AdStatus from './ad-status.jsx';
+import AdStatus from './ad-status/ad-status.jsx';
 import { useStores } from 'Stores';
 import { generateEffectiveRate } from 'Utils/format-value';
-import AdType from './ad-type.jsx';
+import AdType from './ad-type/ad-type.jsx';
 
 const MyAdsRowRenderer = observer(({ row: advert, setAdvert }) => {
     const { floating_rate_store, general_store, my_ads_store, my_profile_store } = useStores();

From 9409f6765c6fe160b185455c78fe9abddf779e0b Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Fri, 21 Oct 2022 11:53:31 +0800
Subject: [PATCH 5/8] moved modals back to my-ads in components, created
 folders for create-ad, edit-ad

---
 .../my-ads/ad-exceeds-daily-limit-modal.jsx               | 0
 .../my-ads/create-ad-add-payment-method-modal.jsx         | 0
 .../my-ads/create-ad-error-modal.jsx                      | 0
 .../{pages => components}/my-ads/edit-ad-cancel-modal.jsx | 0
 .../{pages => components}/my-ads/my-ads-delete-modal.jsx  | 0
 .../{pages => components}/my-ads/my-ads-delete-modal.scss | 0
 .../my-ads/my-ads-floating-rate-switch-modal.jsx          | 0
 .../src/{pages => components}/my-ads/quick-add-modal.jsx  | 2 +-
 .../src/{pages => components}/my-ads/quick-add-modal.scss | 0
 .../create-ad-form-payment-methods.jsx                    | 4 ++--
 .../{ => create-ad/create-ad-form}/create-ad-form.jsx     | 8 ++++----
 .../create-ad-summary}/create-ad-summary.jsx              | 0
 .../p2p/src/pages/my-ads/{ => create-ad}/create-ad.jsx    | 2 +-
 .../edit-ad-form-payment-methods.jsx                      | 4 ++--
 .../p2p/src/pages/my-ads/{ => edit-ad}/edit-ad-form.jsx   | 6 +++---
 .../src/pages/my-ads/{ => edit-ad}/edit-ad-summary.jsx    | 0
 packages/p2p/src/pages/my-ads/{ => edit-ad}/edit-ad.jsx   | 0
 packages/p2p/src/pages/my-ads/my-ads-table.jsx            | 8 ++++----
 packages/p2p/src/pages/my-ads/my-ads.jsx                  | 4 ++--
 19 files changed, 19 insertions(+), 19 deletions(-)
 rename packages/p2p/src/{pages => components}/my-ads/ad-exceeds-daily-limit-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/create-ad-add-payment-method-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/create-ad-error-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/edit-ad-cancel-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/my-ads-delete-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/my-ads-delete-modal.scss (100%)
 rename packages/p2p/src/{pages => components}/my-ads/my-ads-floating-rate-switch-modal.jsx (100%)
 rename packages/p2p/src/{pages => components}/my-ads/quick-add-modal.jsx (99%)
 rename packages/p2p/src/{pages => components}/my-ads/quick-add-modal.scss (100%)
 rename packages/p2p/src/pages/my-ads/{ => create-ad/create-ad-form-payment-methods}/create-ad-form-payment-methods.jsx (93%)
 rename packages/p2p/src/pages/my-ads/{ => create-ad/create-ad-form}/create-ad-form.jsx (98%)
 rename packages/p2p/src/pages/my-ads/{ => create-ad/create-ad-summary}/create-ad-summary.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => create-ad}/create-ad.jsx (92%)
 rename packages/p2p/src/pages/my-ads/{ => edit-ad/edit-ad-form-payment-methods}/edit-ad-form-payment-methods.jsx (92%)
 rename packages/p2p/src/pages/my-ads/{ => edit-ad}/edit-ad-form.jsx (99%)
 rename packages/p2p/src/pages/my-ads/{ => edit-ad}/edit-ad-summary.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => edit-ad}/edit-ad.jsx (100%)

diff --git a/packages/p2p/src/pages/my-ads/ad-exceeds-daily-limit-modal.jsx b/packages/p2p/src/components/my-ads/ad-exceeds-daily-limit-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/ad-exceeds-daily-limit-modal.jsx
rename to packages/p2p/src/components/my-ads/ad-exceeds-daily-limit-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/create-ad-add-payment-method-modal.jsx b/packages/p2p/src/components/my-ads/create-ad-add-payment-method-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/create-ad-add-payment-method-modal.jsx
rename to packages/p2p/src/components/my-ads/create-ad-add-payment-method-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/create-ad-error-modal.jsx b/packages/p2p/src/components/my-ads/create-ad-error-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/create-ad-error-modal.jsx
rename to packages/p2p/src/components/my-ads/create-ad-error-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/edit-ad-cancel-modal.jsx b/packages/p2p/src/components/my-ads/edit-ad-cancel-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/edit-ad-cancel-modal.jsx
rename to packages/p2p/src/components/my-ads/edit-ad-cancel-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/my-ads-delete-modal.jsx b/packages/p2p/src/components/my-ads/my-ads-delete-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/my-ads-delete-modal.jsx
rename to packages/p2p/src/components/my-ads/my-ads-delete-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/my-ads-delete-modal.scss b/packages/p2p/src/components/my-ads/my-ads-delete-modal.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/my-ads-delete-modal.scss
rename to packages/p2p/src/components/my-ads/my-ads-delete-modal.scss
diff --git a/packages/p2p/src/pages/my-ads/my-ads-floating-rate-switch-modal.jsx b/packages/p2p/src/components/my-ads/my-ads-floating-rate-switch-modal.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/my-ads-floating-rate-switch-modal.jsx
rename to packages/p2p/src/components/my-ads/my-ads-floating-rate-switch-modal.jsx
diff --git a/packages/p2p/src/pages/my-ads/quick-add-modal.jsx b/packages/p2p/src/components/my-ads/quick-add-modal.jsx
similarity index 99%
rename from packages/p2p/src/pages/my-ads/quick-add-modal.jsx
rename to packages/p2p/src/components/my-ads/quick-add-modal.jsx
index 6e01fc4f4c41..cfcbfdb3ca66 100644
--- a/packages/p2p/src/pages/my-ads/quick-add-modal.jsx
+++ b/packages/p2p/src/components/my-ads/quick-add-modal.jsx
@@ -8,7 +8,7 @@ import { localize, Localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { useStores } from 'Stores';
 import AddPaymentMethod from 'Components/my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
-import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
+import SellAdPaymentMethodsList from 'Pages/my-ads/sell-ad-payment-methods-list.jsx';
 import './quick-add-modal.scss';
 
 const QuickAddModal = ({ advert }) => {
diff --git a/packages/p2p/src/pages/my-ads/quick-add-modal.scss b/packages/p2p/src/components/my-ads/quick-add-modal.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/quick-add-modal.scss
rename to packages/p2p/src/components/my-ads/quick-add-modal.scss
diff --git a/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
similarity index 93%
rename from packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
rename to packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
index 7628f638506b..500c0214ce59 100644
--- a/packages/p2p/src/pages/my-ads/create-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
-import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
+import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list.jsx';
 
 const CreateAdFormPaymentMethods = ({ is_sell_advert, onSelectPaymentMethods }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/create-ad-form.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
similarity index 98%
rename from packages/p2p/src/pages/my-ads/create-ad-form.jsx
rename to packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
index c8acd8eb4ece..adbbc91f7ff2 100644
--- a/packages/p2p/src/pages/my-ads/create-ad-form.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
@@ -20,10 +20,10 @@ import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
 import { useStores } from 'Stores';
-import CreateAdSummary from './create-ad-summary.jsx';
-import CreateAdErrorModal from './create-ad-error-modal.jsx';
-import CreateAdFormPaymentMethods from './create-ad-form-payment-methods.jsx';
-import CreateAdAddPaymentMethodModal from './create-ad-add-payment-method-modal.jsx';
+import CreateAdSummary from '../create-ad-summary/create-ad-summary.jsx';
+import CreateAdErrorModal from 'Components/my-ads/create-ad-error-modal.jsx';
+import CreateAdFormPaymentMethods from '../create-ad-form-payment-methods/create-ad-form-payment-methods.jsx';
+import CreateAdAddPaymentMethodModal from 'Components/my-ads/create-ad-add-payment-method-modal.jsx';
 
 const CreateAdFormWrapper = ({ children }) => {
     if (isMobile()) {
diff --git a/packages/p2p/src/pages/my-ads/create-ad-summary.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/create-ad-summary.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/create-ad-summary.jsx
rename to packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/create-ad-summary.jsx
diff --git a/packages/p2p/src/pages/my-ads/create-ad.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
similarity index 92%
rename from packages/p2p/src/pages/my-ads/create-ad.jsx
rename to packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
index 498aa2f3e877..bbe7b265dbb6 100644
--- a/packages/p2p/src/pages/my-ads/create-ad.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react-lite';
 import { localize } from 'Components/i18next';
 import PageReturn from 'Components/page-return/page-return.jsx';
 import { useStores } from 'Stores';
-import CreateAdForm from './create-ad-form.jsx';
+import CreateAdForm from './create-ad-form/create-ad-form.jsx';
 
 const CreateAd = () => {
     const { my_ads_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
similarity index 92%
rename from packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
index 6b09fece23b9..0035b0e4981f 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
-import SellAdPaymentMethodsList from './sell-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
+import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list.jsx';
 
 const EditAdFormPaymentMethods = ({ is_sell_advert, selected_methods, setSelectedMethods, touched }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/edit-ad-form.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx
similarity index 99%
rename from packages/p2p/src/pages/my-ads/edit-ad-form.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx
index 3cd0e048de5d..136bd2d30aa4 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad-form.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx
@@ -12,10 +12,10 @@ import { buy_sell } from 'Constants/buy-sell';
 import { useStores } from 'Stores';
 import { ad_type } from 'Constants/floating-rate';
 import FloatingRate from 'Components/floating-rate';
-import EditAdCancelModal from './edit-ad-cancel-modal.jsx';
+import EditAdCancelModal from 'Components/my-ads/edit-ad-cancel-modal.jsx';
 import { generateErrorDialogTitle, generateErrorDialogBody } from 'Utils/adverts';
-import EditAdFormPaymentMethods from './edit-ad-form-payment-methods.jsx';
-import CreateAdAddPaymentMethodModal from './create-ad-add-payment-method-modal.jsx';
+import EditAdFormPaymentMethods from './edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx';
+import CreateAdAddPaymentMethodModal from 'Components/my-ads/create-ad-add-payment-method-modal.jsx';
 import EditAdSummary from './edit-ad-summary.jsx';
 
 const EditAdFormWrapper = ({ children }) => {
diff --git a/packages/p2p/src/pages/my-ads/edit-ad-summary.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/edit-ad-summary.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary.jsx
diff --git a/packages/p2p/src/pages/my-ads/edit-ad.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/edit-ad.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx
diff --git a/packages/p2p/src/pages/my-ads/my-ads-table.jsx b/packages/p2p/src/pages/my-ads/my-ads-table.jsx
index 1ed7edf6dee6..4abdc1244e57 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-table.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-table.jsx
@@ -10,11 +10,11 @@ import { TableError } from 'Components/table/table-error.jsx';
 import { ad_type } from 'Constants/floating-rate';
 import { useStores } from 'Stores';
 import { generateErrorDialogTitle } from 'Utils/adverts';
-import MyAdsDeleteModal from './my-ads-delete-modal.jsx';
-import MyAdsFloatingRateSwitchModal from './my-ads-floating-rate-switch-modal.jsx';
+import MyAdsDeleteModal from 'Components/my-ads/my-ads-delete-modal.jsx';
+import MyAdsFloatingRateSwitchModal from 'Components/my-ads/my-ads-floating-rate-switch-modal.jsx';
 import MyAdsRowRenderer from './my-ads-row-renderer.jsx';
-import QuickAddModal from './quick-add-modal.jsx';
-import AdExceedsDailyLimitModal from './ad-exceeds-daily-limit-modal.jsx';
+import QuickAddModal from 'Components/my-ads/quick-add-modal.jsx';
+import AdExceedsDailyLimitModal from 'Components/my-ads/ad-exceeds-daily-limit-modal.jsx';
 
 const getHeaders = offered_currency => [
     { text: localize('Ad ID') },
diff --git a/packages/p2p/src/pages/my-ads/my-ads.jsx b/packages/p2p/src/pages/my-ads/my-ads.jsx
index d3f56a7a323d..6352bbed2cf3 100644
--- a/packages/p2p/src/pages/my-ads/my-ads.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads.jsx
@@ -5,8 +5,8 @@ import { observer } from 'mobx-react-lite';
 import { localize } from 'Components/i18next';
 import { useStores } from 'Stores';
 import { TableError } from 'Components/table/table-error.jsx';
-import CreateAd from './create-ad.jsx';
-import EditAd from './edit-ad.jsx';
+import CreateAd from './create-ad/create-ad.jsx';
+import EditAd from './edit-ad/edit-ad.jsx';
 import MyAdsTable from './my-ads-table.jsx';
 import Verification from 'Components/verification/verification.jsx';
 import './my-ads.scss';

From b6e7d2abedd3430eeb37b86756db1e62b7a4dd5c Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Fri, 21 Oct 2022 12:22:35 +0800
Subject: [PATCH 6/8] added individual index.js files for folders and
 subcomponents, moved edit-ad files into their own folder

---
 .../src/pages/my-ads/ad-status/__tests__/ad-status.spec.js    | 2 +-
 packages/p2p/src/pages/my-ads/ad-status/index.js              | 3 +++
 packages/p2p/src/pages/my-ads/ad-type/index.js                | 3 +++
 .../p2p/src/pages/my-ads/buy-ad-payment-methods-list/index.js | 3 +++
 .../my-ads/create-ad/create-ad-form-payment-methods/index.js  | 3 +++
 .../pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx  | 4 ++--
 .../p2p/src/pages/my-ads/create-ad/create-ad-form/index.js    | 3 +++
 .../p2p/src/pages/my-ads/create-ad/create-ad-summary/index.js | 3 +++
 packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx         | 2 +-
 packages/p2p/src/pages/my-ads/create-ad/index.js              | 3 +++
 .../my-ads/edit-ad/edit-ad-form-payment-methods/index.js      | 3 +++
 .../pages/my-ads/edit-ad/{ => edit-ad-form}/edit-ad-form.jsx  | 4 ++--
 packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/index.js   | 3 +++
 .../my-ads/edit-ad/{ => edit-ad-summary}/edit-ad-summary.jsx  | 0
 .../p2p/src/pages/my-ads/edit-ad/edit-ad-summary/index.js     | 3 +++
 packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx             | 2 +-
 packages/p2p/src/pages/my-ads/edit-ad/index.js                | 3 +++
 packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx         | 4 ++--
 packages/p2p/src/pages/my-ads/my-ads.jsx                      | 4 ++--
 19 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 packages/p2p/src/pages/my-ads/ad-status/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/ad-type/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/create-ad/create-ad-form/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/create-ad/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/index.js
 rename packages/p2p/src/pages/my-ads/edit-ad/{ => edit-ad-form}/edit-ad-form.jsx (99%)
 create mode 100644 packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/index.js
 rename packages/p2p/src/pages/my-ads/edit-ad/{ => edit-ad-summary}/edit-ad-summary.jsx (100%)
 create mode 100644 packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/edit-ad/index.js

diff --git a/packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js b/packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js
index 165039c18aa1..1fc34195ce86 100644
--- a/packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js
+++ b/packages/p2p/src/pages/my-ads/ad-status/__tests__/ad-status.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { screen, render } from '@testing-library/react';
-import AdStatus from '../ad-status.jsx';
+import AdStatus from '../ad-status';
 
 describe('<AdStatus />', () => {
     it('Component should show proper status if is_active prop is true', () => {
diff --git a/packages/p2p/src/pages/my-ads/ad-status/index.js b/packages/p2p/src/pages/my-ads/ad-status/index.js
new file mode 100644
index 000000000000..f50315c55d21
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/ad-status/index.js
@@ -0,0 +1,3 @@
+import AdStatus from './ad-status';
+
+export default AdStatus;
diff --git a/packages/p2p/src/pages/my-ads/ad-type/index.js b/packages/p2p/src/pages/my-ads/ad-type/index.js
new file mode 100644
index 000000000000..7895cc3e7a3e
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/ad-type/index.js
@@ -0,0 +1,3 @@
+import AdType from './ad-type';
+
+export default AdType;
diff --git a/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/index.js b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/index.js
new file mode 100644
index 000000000000..bdde5f5a3fbf
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/buy-ad-payment-methods-list/index.js
@@ -0,0 +1,3 @@
+import BuyAdPaymentMethodsList from './buy-ad-payment-methods-list';
+
+export default BuyAdPaymentMethodsList;
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/index.js b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/index.js
new file mode 100644
index 000000000000..77c75ce6ce68
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/index.js
@@ -0,0 +1,3 @@
+import CreateAdFormPaymentMethods from './create-ad-form-payment-methods';
+
+export default CreateAdFormPaymentMethods;
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
index adbbc91f7ff2..c9c482e15b6d 100644
--- a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/create-ad-form.jsx
@@ -20,9 +20,9 @@ import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
 import { useStores } from 'Stores';
-import CreateAdSummary from '../create-ad-summary/create-ad-summary.jsx';
+import CreateAdSummary from '../create-ad-summary';
 import CreateAdErrorModal from 'Components/my-ads/create-ad-error-modal.jsx';
-import CreateAdFormPaymentMethods from '../create-ad-form-payment-methods/create-ad-form-payment-methods.jsx';
+import CreateAdFormPaymentMethods from '../create-ad-form-payment-methods';
 import CreateAdAddPaymentMethodModal from 'Components/my-ads/create-ad-add-payment-method-modal.jsx';
 
 const CreateAdFormWrapper = ({ children }) => {
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/index.js b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/index.js
new file mode 100644
index 000000000000..5fa89d0da547
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form/index.js
@@ -0,0 +1,3 @@
+import CreateAdForm from './create-ad-form.jsx';
+
+export default CreateAdForm;
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/index.js b/packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/index.js
new file mode 100644
index 000000000000..eaf80e50bb5e
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-summary/index.js
@@ -0,0 +1,3 @@
+import CreateAdSummary from './create-ad-summary';
+
+export default CreateAdSummary;
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
index bbe7b265dbb6..0b90cc2043cf 100644
--- a/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad.jsx
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react-lite';
 import { localize } from 'Components/i18next';
 import PageReturn from 'Components/page-return/page-return.jsx';
 import { useStores } from 'Stores';
-import CreateAdForm from './create-ad-form/create-ad-form.jsx';
+import CreateAdForm from './create-ad-form';
 
 const CreateAd = () => {
     const { my_ads_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/create-ad/index.js b/packages/p2p/src/pages/my-ads/create-ad/index.js
new file mode 100644
index 000000000000..1837eeea4780
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/create-ad/index.js
@@ -0,0 +1,3 @@
+import CreateAd from './create-ad.jsx';
+
+export default CreateAd;
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/index.js b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/index.js
new file mode 100644
index 000000000000..37dcef5203b6
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/index.js
@@ -0,0 +1,3 @@
+import EditAdFormPaymentMethods from './edit-ad-form-payment-methods';
+
+export default EditAdFormPaymentMethods;
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/edit-ad-form.jsx
similarity index 99%
rename from packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/edit-ad-form.jsx
index 136bd2d30aa4..5193d3358b68 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/edit-ad-form.jsx
@@ -14,9 +14,9 @@ import { ad_type } from 'Constants/floating-rate';
 import FloatingRate from 'Components/floating-rate';
 import EditAdCancelModal from 'Components/my-ads/edit-ad-cancel-modal.jsx';
 import { generateErrorDialogTitle, generateErrorDialogBody } from 'Utils/adverts';
-import EditAdFormPaymentMethods from './edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx';
+import EditAdFormPaymentMethods from '../edit-ad-form-payment-methods';
 import CreateAdAddPaymentMethodModal from 'Components/my-ads/create-ad-add-payment-method-modal.jsx';
-import EditAdSummary from './edit-ad-summary.jsx';
+import EditAdSummary from '../edit-ad-summary';
 
 const EditAdFormWrapper = ({ children }) => {
     if (isMobile()) {
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/index.js b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/index.js
new file mode 100644
index 000000000000..16ef7b13aafe
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form/index.js
@@ -0,0 +1,3 @@
+import EditAdForm from './edit-ad-form';
+
+export default EditAdForm;
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/edit-ad-summary.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary.jsx
rename to packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/edit-ad-summary.jsx
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/index.js b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/index.js
new file mode 100644
index 000000000000..fa59e3e4d34a
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-summary/index.js
@@ -0,0 +1,3 @@
+import EditAdSummary from './edit-ad-summary';
+
+export default EditAdSummary;
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx
index 8402fcb65e67..12ab1d871907 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Loading } from '@deriv/components';
 import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
-import EditAdForm from './edit-ad-form.jsx';
+import EditAdForm from './edit-ad-form';
 
 const EditAd = () => {
     const { my_ads_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/index.js b/packages/p2p/src/pages/my-ads/edit-ad/index.js
new file mode 100644
index 000000000000..07165d7425ac
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/edit-ad/index.js
@@ -0,0 +1,3 @@
+import EditAd from './edit-ad.jsx';
+
+export default EditAd;
diff --git a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
index 83c52266b7a3..7b119fed7fbb 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
@@ -7,10 +7,10 @@ import { observer } from 'mobx-react-lite';
 import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
-import AdStatus from './ad-status/ad-status.jsx';
+import AdStatus from './ad-status';
 import { useStores } from 'Stores';
 import { generateEffectiveRate } from 'Utils/format-value';
-import AdType from './ad-type/ad-type.jsx';
+import AdType from './ad-type';
 
 const MyAdsRowRenderer = observer(({ row: advert, setAdvert }) => {
     const { floating_rate_store, general_store, my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/my-ads.jsx b/packages/p2p/src/pages/my-ads/my-ads.jsx
index 6352bbed2cf3..48cb83d9c20c 100644
--- a/packages/p2p/src/pages/my-ads/my-ads.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads.jsx
@@ -5,8 +5,8 @@ import { observer } from 'mobx-react-lite';
 import { localize } from 'Components/i18next';
 import { useStores } from 'Stores';
 import { TableError } from 'Components/table/table-error.jsx';
-import CreateAd from './create-ad/create-ad.jsx';
-import EditAd from './edit-ad/edit-ad.jsx';
+import CreateAd from './create-ad';
+import EditAd from './edit-ad';
 import MyAdsTable from './my-ads-table.jsx';
 import Verification from 'Components/verification/verification.jsx';
 import './my-ads.scss';

From 564d6cc48a2f394d1b4a4e1fc935fc05c25dcca1 Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Fri, 21 Oct 2022 16:29:26 +0800
Subject: [PATCH 7/8] added rest of the files to their respective folders

---
 packages/p2p/src/components/my-ads/quick-add-modal.jsx        | 2 +-
 .../create-ad-form-payment-methods.jsx                        | 4 ++--
 .../edit-ad-form-payment-methods.jsx                          | 4 ++--
 packages/p2p/src/pages/my-ads/my-ads-table/index.js           | 3 +++
 .../pages/my-ads/my-ads-table/my-ads-row-renderer/index.js    | 3 +++
 .../my-ads-row-renderer}/my-ads-row-renderer.jsx              | 4 ++--
 .../p2p/src/pages/my-ads/{ => my-ads-table}/my-ads-table.jsx  | 4 ++--
 packages/p2p/src/pages/my-ads/my-ads.jsx                      | 2 +-
 .../src/pages/my-ads/sell-ad-payment-methods-list/index.js    | 3 +++
 .../sell-ad-payment-methods-list.jsx                          | 0
 .../sell-ad-payment-methods-list.scss                         | 0
 packages/p2p/src/pages/my-ads/toggle-ads/index.js             | 3 +++
 packages/p2p/src/pages/my-ads/{ => toggle-ads}/toggle-ads.jsx | 2 +-
 13 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 packages/p2p/src/pages/my-ads/my-ads-table/index.js
 create mode 100644 packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/index.js
 rename packages/p2p/src/pages/my-ads/{ => my-ads-table/my-ads-row-renderer}/my-ads-row-renderer.jsx (99%)
 rename packages/p2p/src/pages/my-ads/{ => my-ads-table}/my-ads-table.jsx (98%)
 create mode 100644 packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/index.js
 rename packages/p2p/src/pages/my-ads/{ => sell-ad-payment-methods-list}/sell-ad-payment-methods-list.jsx (100%)
 rename packages/p2p/src/pages/my-ads/{ => sell-ad-payment-methods-list}/sell-ad-payment-methods-list.scss (100%)
 create mode 100644 packages/p2p/src/pages/my-ads/toggle-ads/index.js
 rename packages/p2p/src/pages/my-ads/{ => toggle-ads}/toggle-ads.jsx (98%)

diff --git a/packages/p2p/src/components/my-ads/quick-add-modal.jsx b/packages/p2p/src/components/my-ads/quick-add-modal.jsx
index cfcbfdb3ca66..cf491e95e57e 100644
--- a/packages/p2p/src/components/my-ads/quick-add-modal.jsx
+++ b/packages/p2p/src/components/my-ads/quick-add-modal.jsx
@@ -8,7 +8,7 @@ import { localize, Localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { useStores } from 'Stores';
 import AddPaymentMethod from 'Components/my-profile/payment-methods/add-payment-method/add-payment-method.jsx';
-import SellAdPaymentMethodsList from 'Pages/my-ads/sell-ad-payment-methods-list.jsx';
+import SellAdPaymentMethodsList from 'Pages/my-ads/sell-ad-payment-methods-list';
 import './quick-add-modal.scss';
 
 const QuickAddModal = ({ advert }) => {
diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
index 500c0214ce59..b08ac248d3a8 100644
--- a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
-import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list';
+import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list';
 
 const CreateAdFormPaymentMethods = ({ is_sell_advert, onSelectPaymentMethods }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
index 0035b0e4981f..1d35964bb501 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list/buy-ad-payment-methods-list.jsx';
-import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list.jsx';
+import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list';
+import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list';
 
 const EditAdFormPaymentMethods = ({ is_sell_advert, selected_methods, setSelectedMethods, touched }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/my-ads-table/index.js b/packages/p2p/src/pages/my-ads/my-ads-table/index.js
new file mode 100644
index 000000000000..1509575c9ed7
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/my-ads-table/index.js
@@ -0,0 +1,3 @@
+import MyAdsTable from './my-ads-table';
+
+export default MyAdsTable;
diff --git a/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/index.js b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/index.js
new file mode 100644
index 000000000000..a305c7b7ab6c
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/index.js
@@ -0,0 +1,3 @@
+import MyAdsRowRenderer from './my-ads-row-renderer';
+
+export default MyAdsRowRenderer;
diff --git a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
similarity index 99%
rename from packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
index 7b119fed7fbb..c4896159338c 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-row-renderer.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
@@ -7,10 +7,10 @@ import { observer } from 'mobx-react-lite';
 import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
-import AdStatus from './ad-status';
+import AdStatus from '../../ad-status';
 import { useStores } from 'Stores';
 import { generateEffectiveRate } from 'Utils/format-value';
-import AdType from './ad-type';
+import AdType from '../../ad-type';
 
 const MyAdsRowRenderer = observer(({ row: advert, setAdvert }) => {
     const { floating_rate_store, general_store, my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/my-ads-table.jsx b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-table.jsx
similarity index 98%
rename from packages/p2p/src/pages/my-ads/my-ads-table.jsx
rename to packages/p2p/src/pages/my-ads/my-ads-table/my-ads-table.jsx
index 4abdc1244e57..6412aafdc0f6 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-table.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-table.jsx
@@ -5,14 +5,14 @@ import { isDesktop, isMobile } from '@deriv/shared';
 import { observer } from 'mobx-react-lite';
 import { localize, Localize } from 'Components/i18next';
 import Empty from 'Components/empty/empty.jsx';
-import ToggleAds from './toggle-ads.jsx';
+import ToggleAds from '../toggle-ads';
 import { TableError } from 'Components/table/table-error.jsx';
 import { ad_type } from 'Constants/floating-rate';
 import { useStores } from 'Stores';
 import { generateErrorDialogTitle } from 'Utils/adverts';
 import MyAdsDeleteModal from 'Components/my-ads/my-ads-delete-modal.jsx';
 import MyAdsFloatingRateSwitchModal from 'Components/my-ads/my-ads-floating-rate-switch-modal.jsx';
-import MyAdsRowRenderer from './my-ads-row-renderer.jsx';
+import MyAdsRowRenderer from './my-ads-row-renderer';
 import QuickAddModal from 'Components/my-ads/quick-add-modal.jsx';
 import AdExceedsDailyLimitModal from 'Components/my-ads/ad-exceeds-daily-limit-modal.jsx';
 
diff --git a/packages/p2p/src/pages/my-ads/my-ads.jsx b/packages/p2p/src/pages/my-ads/my-ads.jsx
index 48cb83d9c20c..ca25d48358e7 100644
--- a/packages/p2p/src/pages/my-ads/my-ads.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads.jsx
@@ -7,7 +7,7 @@ import { useStores } from 'Stores';
 import { TableError } from 'Components/table/table-error.jsx';
 import CreateAd from './create-ad';
 import EditAd from './edit-ad';
-import MyAdsTable from './my-ads-table.jsx';
+import MyAdsTable from './my-ads-table';
 import Verification from 'Components/verification/verification.jsx';
 import './my-ads.scss';
 
diff --git a/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/index.js b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/index.js
new file mode 100644
index 000000000000..89569f936dcc
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/index.js
@@ -0,0 +1,3 @@
+import SellAdPaymentMethodsList from './sell-ad-payment-methods-list';
+
+export default SellAdPaymentMethodsList;
diff --git a/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.jsx b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/sell-ad-payment-methods-list.jsx
similarity index 100%
rename from packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.jsx
rename to packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/sell-ad-payment-methods-list.jsx
diff --git a/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.scss b/packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/sell-ad-payment-methods-list.scss
similarity index 100%
rename from packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list.scss
rename to packages/p2p/src/pages/my-ads/sell-ad-payment-methods-list/sell-ad-payment-methods-list.scss
diff --git a/packages/p2p/src/pages/my-ads/toggle-ads/index.js b/packages/p2p/src/pages/my-ads/toggle-ads/index.js
new file mode 100644
index 000000000000..19202523e77f
--- /dev/null
+++ b/packages/p2p/src/pages/my-ads/toggle-ads/index.js
@@ -0,0 +1,3 @@
+import ToggleAds from './toggle-ads';
+
+export default ToggleAds;
diff --git a/packages/p2p/src/pages/my-ads/toggle-ads.jsx b/packages/p2p/src/pages/my-ads/toggle-ads/toggle-ads.jsx
similarity index 98%
rename from packages/p2p/src/pages/my-ads/toggle-ads.jsx
rename to packages/p2p/src/pages/my-ads/toggle-ads/toggle-ads.jsx
index 93f44af2c04f..e24dac2fbe44 100644
--- a/packages/p2p/src/pages/my-ads/toggle-ads.jsx
+++ b/packages/p2p/src/pages/my-ads/toggle-ads/toggle-ads.jsx
@@ -7,7 +7,7 @@ import { observer } from 'mobx-react-lite';
 import { requestWS } from 'Utils/websocket';
 import { localize } from 'Components/i18next';
 import { useStores } from 'Stores';
-import './my-ads.scss';
+import '../my-ads.scss';
 
 const ToggleAds = observer(() => {
     const { general_store, my_ads_store } = useStores();

From fc821d491ed5dab1e9af10b3fa289ce93812b8ac Mon Sep 17 00:00:00 2001
From: ameerul hady <ameerul@deriv.com>
Date: Tue, 1 Nov 2022 12:06:42 +0800
Subject: [PATCH 8/8] changed path string for imports with ../../

---
 .../create-ad-form-payment-methods.jsx                        | 4 ++--
 .../edit-ad-form-payment-methods.jsx                          | 4 ++--
 .../my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
index b08ac248d3a8..eb01aa8f73fa 100644
--- a/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/create-ad/create-ad-form-payment-methods/create-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list';
-import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list';
+import BuyAdPaymentMethodsList from 'Pages/my-ads/buy-ad-payment-methods-list';
+import SellAdPaymentMethodsList from 'Pages/my-ads/sell-ad-payment-methods-list';
 
 const CreateAdFormPaymentMethods = ({ is_sell_advert, onSelectPaymentMethods }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
index 1d35964bb501..557d47e9acd9 100644
--- a/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
+++ b/packages/p2p/src/pages/my-ads/edit-ad/edit-ad-form-payment-methods/edit-ad-form-payment-methods.jsx
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react-lite';
 import { useStores } from 'Stores';
 import PaymentMethodCard from 'Components/my-profile/payment-methods/payment-method-card';
 import { localize } from 'Components/i18next';
-import BuyAdPaymentMethodsList from '../../buy-ad-payment-methods-list';
-import SellAdPaymentMethodsList from '../../sell-ad-payment-methods-list';
+import BuyAdPaymentMethodsList from 'Pages/my-ads/buy-ad-payment-methods-list';
+import SellAdPaymentMethodsList from 'Pages/my-ads/sell-ad-payment-methods-list';
 
 const EditAdFormPaymentMethods = ({ is_sell_advert, selected_methods, setSelectedMethods, touched }) => {
     const { my_ads_store, my_profile_store } = useStores();
diff --git a/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
index c4896159338c..b1ed601b9147 100644
--- a/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
+++ b/packages/p2p/src/pages/my-ads/my-ads-table/my-ads-row-renderer/my-ads-row-renderer.jsx
@@ -7,10 +7,10 @@ import { observer } from 'mobx-react-lite';
 import { Localize, localize } from 'Components/i18next';
 import { buy_sell } from 'Constants/buy-sell';
 import { ad_type } from 'Constants/floating-rate';
-import AdStatus from '../../ad-status';
+import AdStatus from 'Pages/my-ads/ad-status';
 import { useStores } from 'Stores';
 import { generateEffectiveRate } from 'Utils/format-value';
-import AdType from '../../ad-type';
+import AdType from 'Pages/my-ads/ad-type';
 
 const MyAdsRowRenderer = observer(({ row: advert, setAdvert }) => {
     const { floating_rate_store, general_store, my_ads_store, my_profile_store } = useStores();