From 479b4db9aa4e86932927e142f253178c26701206 Mon Sep 17 00:00:00 2001 From: aizad-deriv Date: Thu, 16 Feb 2023 18:33:15 +0800 Subject: [PATCH] fix: migrate route folder to tsx --- .../reports/src/Components/Routes/index.js | 7 ---- .../reports/src/Containers/open-positions.tsx | 42 +++++-------------- 2 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 packages/reports/src/Components/Routes/index.js diff --git a/packages/reports/src/Components/Routes/index.js b/packages/reports/src/Components/Routes/index.js deleted file mode 100644 index ecff56bd3670..000000000000 --- a/packages/reports/src/Components/Routes/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import BinaryLink from './binary-link'; -import RouteWithSubRoutes from './route-with-sub-routes'; -import BinaryRoutes from './binary-routes'; - -export * from './helpers'; -export { BinaryLink, RouteWithSubRoutes }; -export default BinaryRoutes; diff --git a/packages/reports/src/Containers/open-positions.tsx b/packages/reports/src/Containers/open-positions.tsx index 6955ee73038b..1f37ee79883e 100644 --- a/packages/reports/src/Containers/open-positions.tsx +++ b/packages/reports/src/Containers/open-positions.tsx @@ -4,13 +4,12 @@ import { DesktopWrapper, MobileWrapper, ProgressBar, + Tabs, DataList, DataTable, ContractCard, usePrevious, PositionsDrawerCard, - Dropdown, - SelectNative, } from '@deriv/components'; import { urlFor, @@ -273,7 +272,10 @@ export const OpenPositionsTable = ({ currency && (
- + - + item?.id} > @@ -423,18 +427,7 @@ const OpenPositions = ({ const [active_index, setActiveIndex] = React.useState(is_multiplier ? 1 : 0); // Tabs should be visible only when there is at least one active multiplier contract const [has_multiplier_contract, setMultiplierContract] = React.useState(false); - const [contract_type_value, setContractTypeValue] = React.useState(is_multiplier ? 'Multipliers' : 'Options'); const previous_active_positions = usePrevious(active_positions); - const contract_types = [ - { - text: localize('Options'), - value: 'Options', - }, - { - text: localize('Multipliers'), - value: 'Multipliers', - }, - ]; React.useEffect(() => { /* @@ -465,9 +458,7 @@ const OpenPositions = ({ if (error) return

{error}

; - const is_multiplier_selected = contract_type_value === 'Multipliers'; - const is_options_selected = contract_type_value === 'Options'; - + const is_multiplier_selected = has_multiplier_contract && active_index === 1; const active_positions_filtered = active_positions?.filter(p => { if (p.contract_info) { return is_multiplier_selected @@ -516,10 +507,6 @@ const OpenPositions = ({ totals: active_positions_filtered_totals, }; - const handleChange = e => { - setContractTypeValue(e.target.value); - }; - return ( @@ -563,20 +550,11 @@ const OpenPositions = ({ ) : ( - ) : ( - )} );