fix: improve report (#17710)

deriv-com · Dec 20, 2024 · 34dc34f · 34dc34f
1 parent 7777912
commit 34dc34f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/packages/bot-web-ui/src/stores/run-panel-store.ts b/packages/bot-web-ui/src/stores/run-panel-store.ts
@@ -13,6 +13,7 @@ import GTM from 'Utils/gtm';
 import { helpers } from 'Utils/store-helpers';
 import { TDbot } from 'Types';
 import RootStore from './root-store';
+import { getSelectedTradeType } from '@deriv/bot-skeleton/src/scratch/utils';
 
 export type TContractState = {
     buy?: Buy;
@@ -143,7 +144,11 @@ export default class RunPanelStore {
         if (show_bot_stop_message)
             botNotification(notification_message.bot_stop, {
                 label: localize('Reports'),
-                onClick: () => (window.location.href = routes.reports),
+                onClick: () => {
+                    const contract_type = getSelectedTradeType();
+                    sessionStorage.setItem('contract_type_bots', contract_type);
+                    window.location.href = routes.reports;
+                },
             });
     };
 

diff --git a/packages/reports/src/Containers/open-positions.tsx b/packages/reports/src/Containers/open-positions.tsx
@@ -189,11 +189,32 @@ const OpenPositions = observer(({ component_icon, ...props }: TOpenPositions) =>
     const [has_multiplier_contract, setHasMultiplierContract] = React.useState(false);
     const { isDesktop } = useDevice();
     const previous_active_positions = usePrevious(active_positions);
-    const contract_types = [
-        { text: localize('Options'), value: 'options', is_default: !is_multiplier && !is_accumulator },
-        { text: localize('Multipliers'), value: 'multipliers', is_default: is_multiplier },
-        { text: localize('Accumulators'), value: 'accumulators', is_default: is_accumulator },
-    ];
+
+    const generateContractTypes = () => {
+        const contract_type_bot = sessionStorage.getItem('contract_type_bots');
+
+        if (!contract_type_bot) {
+            return [
+                { text: localize('Options'), value: 'options', is_default: !is_multiplier && !is_accumulator },
+                { text: localize('Multipliers'), value: 'multipliers', is_default: is_multiplier },
+                { text: localize('Accumulators'), value: 'accumulators', is_default: is_accumulator },
+            ];
+        }
+
+        const is_multiplier_bot = contract_type_bot === 'trade_definition_multiplier';
+        const is_accumulator_bot = contract_type_bot === 'trade_definition_accumulator';
+
+        const contract_types = [
+            { text: localize('Options'), value: 'options', is_default: !is_multiplier_bot && !is_accumulator_bot },
+            { text: localize('Multipliers'), value: 'multipliers', is_default: is_multiplier_bot },
+            { text: localize('Accumulators'), value: 'accumulators', is_default: is_accumulator_bot },
+        ];
+        sessionStorage.removeItem('contract_type_bots');
+        return contract_types;
+    };
+
+    const contract_types = generateContractTypes();
+
     const [contract_type_value, setContractTypeValue] = React.useState(
         contract_types.find(type => type.is_default)?.value || 'options'
     );