diff --git a/packages/p2p/src/components/app.jsx b/packages/p2p/src/components/app.jsx index 17079db08fd0..86a82ad5c247 100644 --- a/packages/p2p/src/components/app.jsx +++ b/packages/p2p/src/components/app.jsx @@ -42,7 +42,7 @@ const App = props => { general_store.setActiveIndex(general_store.path.my_ads); } }); - general_store.setP2PConfig(); + return () => general_store.onUnmount(); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); diff --git a/packages/p2p/src/components/my-ads/reduce-order-time-banner.jsx b/packages/p2p/src/components/my-ads/reduce-order-time-banner.jsx deleted file mode 100644 index a94633cded85..000000000000 --- a/packages/p2p/src/components/my-ads/reduce-order-time-banner.jsx +++ /dev/null @@ -1,53 +0,0 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; -import { useStores } from 'Stores'; -import { HintBox, Text } from '@deriv/components'; -import { localize } from 'Components/i18next'; -import { minutesToHours } from 'Utils/date-time'; - -const ReduceOrderTimeBanner = () => { - const { general_store } = useStores(); - const { order_timeout } = general_store; - - let render_banner_text = ''; - - const { hours, minutes } = minutesToHours(order_timeout); - - if (hours === 0 && minutes === 0) { - return null; - } - - if (hours > 0) { - if (minutes > 0) { - render_banner_text = localize( - 'New orders are now active for {{hours}} hour and {{minutes}} minutes only. Complete your order before it expires!', - { hours, minutes } - ); - } else if (minutes === 0) { - render_banner_text = localize( - 'New orders are now active for {{hours}} hour only. Complete your order before it expires!', - { hours } - ); - } - } else { - render_banner_text = localize( - 'New orders are now active for {{minutes}} minutes only. Complete your order before it expires!', - { minutes } - ); - } - - return ( - - {render_banner_text} - - } - is_info - /> - ); -}; - -export default observer(ReduceOrderTimeBanner); diff --git a/packages/p2p/src/components/orders/order-table/__test__/order-table.spec.js b/packages/p2p/src/components/orders/order-table/__test__/order-table.spec.js index b8d2e4cd5dbe..6b00e30f5822 100644 --- a/packages/p2p/src/components/orders/order-table/__test__/order-table.spec.js +++ b/packages/p2p/src/components/orders/order-table/__test__/order-table.spec.js @@ -9,7 +9,6 @@ jest.mock('Stores', () => ({ active_notification_count: 0, inactive_notification_count: 0, order_table_type: false, - order_timeout: { hours: 1, minutes: 10 }, }, }), })); diff --git a/packages/p2p/src/components/orders/order-table/order-table.jsx b/packages/p2p/src/components/orders/order-table/order-table.jsx index 56be6ff942d7..41907000c542 100644 --- a/packages/p2p/src/components/orders/order-table/order-table.jsx +++ b/packages/p2p/src/components/orders/order-table/order-table.jsx @@ -7,7 +7,6 @@ import ToggleContainer from 'Components/misc/toggle-container.jsx'; import { order_list } from 'Constants/order-list'; import { useStores } from 'Stores'; import OrderTableContent from './order-table-content.jsx'; -import ReduceOrderTimeBanner from 'Components/my-ads/reduce-order-time-banner.jsx'; const OrderTable = ({ showDetails }) => { const { general_store } = useStores(); @@ -28,7 +27,6 @@ const OrderTable = ({ showDetails }) => { const is_active_tab = general_store.order_table_type === order_list.ACTIVE; return ( -
diff --git a/packages/p2p/src/stores/general-store.js b/packages/p2p/src/stores/general-store.js index 1688a504cba6..dfd8e4a045ed 100644 --- a/packages/p2p/src/stores/general-store.js +++ b/packages/p2p/src/stores/general-store.js @@ -24,7 +24,6 @@ export default class GeneralStore extends BaseStore { @observable notification_count = 0; @observable order_table_type = order_list.ACTIVE; @observable orders = []; - @observable order_timeout = 0; @observable parameters = null; @observable poi_status = null; @observable.ref props = {}; @@ -382,21 +381,6 @@ export default class GeneralStore extends BaseStore { this.order_table_type = order_table_type; } - @action.bound - setOrderTimeOut(time) { - this.order_timeout = time; - } - - @action.bound - setP2PConfig() { - requestWS({ website_status: 1 }).then(response => { - if (response && !response.error) { - const { order_payment_period } = response.website_status?.p2p_config; - this.setOrderTimeOut(order_payment_period); - } - }); - } - @action.bound setP2pOrderList(order_response) { if (order_response.error) { diff --git a/packages/p2p/src/utils/date-time.js b/packages/p2p/src/utils/date-time.js index 9fd116360f54..274b17c9121e 100644 --- a/packages/p2p/src/utils/date-time.js +++ b/packages/p2p/src/utils/date-time.js @@ -38,10 +38,3 @@ export const secondsToTimer = distance => { return `${toDoubleDigits(hours)}:${toDoubleDigits(minutes)}:${toDoubleDigits(seconds)}`; }; - -export const minutesToHours = time_in_minutes => { - // Convert the time in minutes to hours - const hours = Math.floor(time_in_minutes / 60); - const minutes = time_in_minutes % 60; - return { hours, minutes }; -};