{
})}
ref={traders_hub_ref}
>
- {has_any_real_account && is_real &&
}
+ {has_any_real_account &&
}
{should_show_banner && !has_any_real_account && !is_eu && is_landing_company_loaded && (
}>
diff --git a/packages/appstore/webpack.config.js b/packages/appstore/webpack.config.js
index cfc55a8997e1..aeb44ebe458a 100644
--- a/packages/appstore/webpack.config.js
+++ b/packages/appstore/webpack.config.js
@@ -42,6 +42,10 @@ const svg_loaders = [
// const default_plugins = [new CleanWebpackPlugin(), new ForkTsCheckerWebpackPlugin()];
const default_plugins = [
// new BundleAnalyzerPlugin(),
+ new Dotenv(),
+ new DefinePlugin({
+ 'process.env.TRUSTPILOT_API_KEY': JSON.stringify(process.env.TRUSTPILOT_API_KEY),
+ }),
new IgnorePlugin({ resourceRegExp: /^\.\/locale$/, contextRegExp: /moment$/ }),
new CircularDependencyPlugin({ exclude: /node_modules/, failOnError: true }),
];
@@ -87,12 +91,6 @@ module.exports = function (env) {
},
extensions: ['.ts', '.tsx', '.js'],
},
- plugins: [
- new Dotenv(),
- new DefinePlugin({
- 'process.env.TRUSTPILOT_API_KEY': JSON.stringify(process.env.TRUSTPILOT_API_KEY),
- }),
- ],
module: {
rules: [
{
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
index 79f146aa934f..788baa58eb04 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
@@ -83,8 +83,7 @@ Blockly.Blocks.lists_getSublist = {
}
this.initSvg();
- //commented this line breaks the backward compatibility
- //this.render(false);
+ this.renderEfficiently();
},
customContextMenu(menu) {
modifyContextMenu(menu);
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
index 267a3c155690..6b5941005529 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
@@ -69,7 +69,7 @@ Blockly.Blocks.lists_split = {
}
this.initSvg();
- //this.render(false);
+ this.renderEfficiently();
},
customContextMenu(menu) {
modifyContextMenu(menu);
diff --git a/packages/bot-skeleton/src/scratch/blocks/Math/math_number_property.js b/packages/bot-skeleton/src/scratch/blocks/Math/math_number_property.js
index 34b898aeddeb..0ffd8a5bd9a0 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Math/math_number_property.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Math/math_number_property.js
@@ -65,18 +65,15 @@ Blockly.Blocks.math_number_property = {
return container;
},
updateShape(hasDivisorInput) {
- const inputExists = this.getInput('DIVISOR');
-
if (hasDivisorInput) {
- if (!inputExists) {
+ const inputExists = this.getInput('DIVISOR');
+ if (inputExists) {
+ this.removeInput('DIVISOR');
+ } else {
this.appendValueInput('DIVISOR').setCheck('Number');
this.initSvg();
- //commented this line breaks the backward compatibility
- //this.render(false);
+ this.renderEfficiently();
}
- } else {
- //commented this line breaks the backward compatibiliy
- //this.removeInput('DIVISOR');
}
},
customContextMenu(menu) {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Text/text_charAt.js b/packages/bot-skeleton/src/scratch/blocks/Text/text_charAt.js
index be23d3ef997e..0c2dd78fac7f 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Text/text_charAt.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Text/text_charAt.js
@@ -76,8 +76,7 @@ Blockly.Blocks.text_charAt = {
this.isAt = isAt;
this.initSvg();
- //commented this line breaks the backward compatibility
- //this.render(false);
+ this.renderEfficiently();
},
getRequiredValueInputs() {
return {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Text/text_getSubstring.js b/packages/bot-skeleton/src/scratch/blocks/Text/text_getSubstring.js
index 88524074ba31..11556acec4ef 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Text/text_getSubstring.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Text/text_getSubstring.js
@@ -131,8 +131,7 @@ Blockly.Blocks.text_getSubstring = {
}
this.initSvg();
- //commented this line breaks the backward compatibility
- //this.render(false);
+ this.renderEfficiently();
},
getRequiredValueInputs() {
const hasInput = input_name => this.getInput(input_name)?.type === Blockly.INPUT_VALUE;
diff --git a/packages/bot-skeleton/src/scratch/blocks/Text/text_prompt_ext.js b/packages/bot-skeleton/src/scratch/blocks/Text/text_prompt_ext.js
index b5627e34e0d1..76565d8aef07 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Text/text_prompt_ext.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Text/text_prompt_ext.js
@@ -12,8 +12,7 @@ Blockly.Blocks.text_prompt_ext = {
this.setOutput(true, 'Number');
}
this.initSvg();
- //commented this line breaks the backward compatibility
- //this.render(false);
+ this.renderEfficiently();
return undefined;
});
},
diff --git a/packages/bot-skeleton/src/scratch/hooks/gesture.js b/packages/bot-skeleton/src/scratch/hooks/gesture.js
index 487e45bde6c9..aa3a74e86f65 100644
--- a/packages/bot-skeleton/src/scratch/hooks/gesture.js
+++ b/packages/bot-skeleton/src/scratch/hooks/gesture.js
@@ -24,6 +24,7 @@ Blockly.Gesture.prototype.updateIsDraggingFromFlyout = function () {
}
// The start block is no longer relevant, because this is a drag.
+ this.startBlock.workspace.clearGesture();
this.startBlock = null;
this.targetBlock = this.flyout.createBlock(this.mostRecentEvent, this.targetBlock);
this.targetBlock.select();
diff --git a/packages/bot-web-ui/package.json b/packages/bot-web-ui/package.json
index cf001c18b81a..c59394543f95 100644
--- a/packages/bot-web-ui/package.json
+++ b/packages/bot-web-ui/package.json
@@ -77,7 +77,7 @@
"@deriv/bot-skeleton": "^1.0.0",
"@deriv/components": "^1.0.0",
"@deriv/hooks": "^1.0.0",
- "@deriv/deriv-charts": "^2.2.0",
+ "@deriv/deriv-charts": "^2.3.0",
"@deriv/shared": "^1.0.0",
"@deriv/stores": "^1.0.0",
"@deriv/translations": "^1.0.0",
diff --git a/packages/bot-web-ui/src/analytics/__tests__/utils.spec.ts b/packages/bot-web-ui/src/analytics/__tests__/utils.spec.ts
index 069ddb5f1935..e1eb8fcab98c 100644
--- a/packages/bot-web-ui/src/analytics/__tests__/utils.spec.ts
+++ b/packages/bot-web-ui/src/analytics/__tests__/utils.spec.ts
@@ -1,14 +1,26 @@
-import { DBOT_TABS } from 'Constants/bot-contents';
-import { TFormStrategy } from '../constants';
+import { Analytics } from '@deriv-com/analytics';
+import { ACTION, TFormStrategy } from '../constants';
+import { rudderStackSendSwitchLoadStrategyTabEvent } from '../rudderstack-bot-builder';
+import {
+ rudderStackSendGoogleDriveConnectEvent,
+ rudderStackSendGoogleDriveDisconnectEvent,
+ rudderStackSendUploadStrategyCompletedEvent,
+} from '../rudderstack-common-events';
import {
- getTradeParameterData,
getRsDropdownTextFromLocalStorage,
- getSubpageName,
+ getStrategyType,
+ getTradeParameterData,
rudderstack_text_error,
} from '../utils';
jest.mock('@deriv/bot-skeleton/src/scratch/dbot', () => jest.fn());
+jest.mock('@deriv-com/analytics', () => ({
+ Analytics: {
+ trackEvent: jest.fn(),
+ },
+}));
+
describe('utils', () => {
const form_strategy = {
form_values: {
@@ -19,13 +31,6 @@ describe('utils', () => {
},
} as TFormStrategy;
- const subpage_name = {
- [`${DBOT_TABS.DASHBOARD}`]: 'dashboard',
- [`${DBOT_TABS.BOT_BUILDER}`]: 'bot_builder',
- [`${DBOT_TABS.CHART}`]: 'charts',
- [`${DBOT_TABS.TUTORIAL}`]: 'tutorials',
- };
-
it('getRsDropdownTextFromLocalStorage() should return empty object when parced json of "qs-analytics" localStorage equals undefined or null', () => {
const result = getRsDropdownTextFromLocalStorage();
expect(result).toEqual({});
@@ -83,45 +88,111 @@ describe('utils', () => {
});
});
- it('getSubpageName() should "undefined" if was not pass anything', () => {
- const result = getSubpageName();
+ it('should return "new" if the XML has is_dbot="true"', () => {
+ const xml = `
+
+
+ `;
- expect(result).toEqual('undefined');
+ const result = getStrategyType(xml);
+ expect(result).toBe('new');
});
- it('getSubpageName() should return "dashboard" active_tab equals 0', () => {
- // eslint-disable-next-line no-proto
- jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(`${DBOT_TABS.DASHBOARD}`);
+ it('should return "old" if the XML has is_dbot="false"', () => {
+ const xml = `
+
+
+ `;
- const result = getSubpageName();
+ const result = getStrategyType(xml);
+ expect(result).toBe('old');
+ });
- expect(result).toEqual(subpage_name[`${DBOT_TABS.DASHBOARD}`]);
+ it('should return "old" if the XML does not contain the is_dbot attribute', () => {
+ const xml = `
+
+
+ `;
+ const result = getStrategyType(xml);
+ expect(result).toBe('old');
});
- it('getSubpageName() should return "bot_builder" active_tab equals 1', () => {
- // eslint-disable-next-line no-proto
- jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(`${DBOT_TABS.BOT_BUILDER}`);
+ it('should return "old" for invalid XML', () => {
+ const xml = `
+
+
+ `;
+
+ const result = getStrategyType(xml);
+ expect(result).toBe('old');
+ });
+
+ it('should return "old" if an unexpected error occurs during parsing', () => {
+ global.DOMParser = jest.fn().mockImplementation(() => {
+ return {
+ parseFromString: () => {
+ throw new Error('Parsing error');
+ },
+ };
+ });
- const result = getSubpageName();
+ const xml = '
';
+ const result = getStrategyType(xml);
- expect(result).toEqual(subpage_name[`${DBOT_TABS.BOT_BUILDER}`]);
+ expect(result).toBe('old');
});
- it('getSubpageName() should return "charts" active_tab equals 2', () => {
- // eslint-disable-next-line no-proto
- jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(`${DBOT_TABS.CHART}`);
+ it('should call Analytics.trackEvent with the correct parameters', () => {
+ const load_strategy = { load_strategy_tab: 'local' };
- const result = getSubpageName();
+ rudderStackSendSwitchLoadStrategyTabEvent(load_strategy);
- expect(result).toEqual(subpage_name[`${DBOT_TABS.CHART}`]);
+ expect(Analytics.trackEvent).toHaveBeenCalledWith('ce_bot_form', {
+ action: ACTION.SWITCH_LOAD_STRATEGY_TAB,
+ form_name: 'ce_bot_form',
+ load_strategy_tab: load_strategy.load_strategy_tab,
+ subform_name: 'load_strategy',
+ subpage_name: 'bot_builder',
+ });
});
- it('getSubpageName() should return "tutorials" active_tab equals 3', () => {
- // eslint-disable-next-line no-proto
- jest.spyOn(localStorage.__proto__, 'getItem').mockReturnValue(`${DBOT_TABS.TUTORIAL}`);
+ it('should call Analytics.trackEvent with correct parameters for upload strategy completed event', () => {
+ const upload_parameters = {
+ upload_provider: 'my_computer',
+ upload_id: '12345',
+ upload_type: 'new',
+ };
+
+ rudderStackSendUploadStrategyCompletedEvent(upload_parameters);
+
+ expect(Analytics.trackEvent).toHaveBeenCalledWith('ce_bot_form', {
+ action: ACTION.UPLOAD_STRATEGY_COMPLETED,
+ form_name: 'ce_bot_form',
+ subform_name: 'load_strategy',
+ subpage_name: 'bot_builder',
+ upload_provider: upload_parameters.upload_provider,
+ upload_id: upload_parameters.upload_id,
+ upload_type: upload_parameters.upload_type,
+ });
+ });
- const result = getSubpageName();
+ it('should call Analytics.trackEvent with correct parameters for Google Drive connect event', () => {
+ rudderStackSendGoogleDriveConnectEvent();
- expect(result).toEqual(subpage_name[`${DBOT_TABS.TUTORIAL}`]);
+ expect(Analytics.trackEvent).toHaveBeenCalledWith('ce_bot_form', {
+ action: ACTION.GOOGLE_DRIVE_CONNECT,
+ form_name: 'ce_bot_form',
+ subpage_name: 'bot_builder',
+ });
+ });
+
+ it('should call Analytics.trackEvent with correct parameters for Google Drive disconnect event', () => {
+ rudderStackSendGoogleDriveDisconnectEvent();
+
+ expect(Analytics.trackEvent).toHaveBeenCalledWith('ce_bot_form', {
+ action: ACTION.GOOGLE_DRIVE_DISCONNECT,
+ form_name: 'ce_bot_form',
+ subpage_name: 'bot_builder',
+ });
});
});
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-bot-builder.ts b/packages/bot-web-ui/src/analytics/rudderstack-bot-builder.ts
index 91b6038f8f01..b2dbe7705d82 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-bot-builder.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-bot-builder.ts
@@ -1,6 +1,5 @@
import { Analytics, TEvents } from '@deriv-com/analytics';
import { ACTION, form_name } from './constants';
-import { getSubpageName } from './utils';
export const rudderStackSendSwitchLoadStrategyTabEvent = ({ load_strategy_tab }: TEvents['ce_bot_form']) => {
Analytics.trackEvent('ce_bot_form', {
@@ -8,6 +7,6 @@ export const rudderStackSendSwitchLoadStrategyTabEvent = ({ load_strategy_tab }:
form_name,
load_strategy_tab,
subform_name: 'load_strategy',
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
});
};
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts b/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
index fd5ec1692383..7a58c1d82b45 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-common-events.ts
@@ -1,14 +1,20 @@
import { Analytics, TEvents } from '@deriv-com/analytics';
import { ACTION, form_name, TFormStrategy } from './constants';
-import { getRsStrategyType, getSubpageName } from './utils';
+import { getRsStrategyType } from './utils';
-export const rudderStackSendOpenEvent = ({ subform_source, subform_name }: TEvents['ce_bot_form']) => {
+export const rudderStackSendOpenEvent = ({
+ subpage_name,
+ subform_source,
+ subform_name,
+ load_strategy_tab,
+}: TEvents['ce_bot_form']) => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.OPEN,
form_name,
- subpage_name: getSubpageName(),
+ subpage_name,
subform_name,
subform_source,
+ load_strategy_tab,
});
};
@@ -16,22 +22,23 @@ export const rudderStackSendCloseEvent = ({
subform_name,
quick_strategy_tab,
selected_strategy,
+ load_strategy_tab,
}: TEvents['ce_bot_form'] & TFormStrategy) => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.CLOSE,
form_name,
- subpage_name: getSubpageName(),
subform_name,
quick_strategy_tab,
strategy_name: getRsStrategyType(selected_strategy),
+ load_strategy_tab,
});
};
-export const rudderStackSendRunBotEvent = () => {
+export const rudderStackSendRunBotEvent = ({ subpage_name }: TEvents['ce_bot_form']) => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.RUN_BOT,
form_name,
- subpage_name: getSubpageName(),
+ subpage_name,
});
};
@@ -40,7 +47,7 @@ export const rudderStackSendUploadStrategyStartEvent = ({ upload_provider, uploa
action: ACTION.UPLOAD_STRATEGY_START,
form_name,
subform_name: 'load_strategy',
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
upload_provider,
upload_id,
});
@@ -55,7 +62,7 @@ export const rudderStackSendUploadStrategyCompletedEvent = ({
action: ACTION.UPLOAD_STRATEGY_COMPLETED,
form_name,
subform_name: 'load_strategy',
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
upload_provider,
upload_id,
upload_type,
@@ -73,7 +80,7 @@ export const rudderStackSendUploadStrategyFailedEvent = ({
action: ACTION.UPLOAD_STRATEGY_FAILED,
form_name,
subform_name: 'load_strategy',
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
upload_provider,
upload_id,
upload_type,
@@ -86,7 +93,7 @@ export const rudderStackSendGoogleDriveConnectEvent = () => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.GOOGLE_DRIVE_CONNECT,
form_name,
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
});
};
@@ -94,6 +101,6 @@ export const rudderStackSendGoogleDriveDisconnectEvent = () => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.GOOGLE_DRIVE_DISCONNECT,
form_name,
- subpage_name: getSubpageName(),
+ subpage_name: 'bot_builder',
});
};
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
index d760faa6c473..840df02185de 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-dashboard.ts
@@ -1,11 +1,11 @@
import { Analytics, TEvents } from '@deriv-com/analytics';
import { ACTION, form_name } from './constants';
-export const rudderStackSendDashboardClickEvent = ({ dashboard_click_name }: TEvents['ce_bot_form']) => {
+export const rudderStackSendDashboardClickEvent = ({ dashboard_click_name, subpage_name }: TEvents['ce_bot_form']) => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.DASHBOARD_CLICK,
form_name,
- subpage_name: 'dashboard',
+ subpage_name,
dashboard_click_name,
});
};
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-quick-strategy.ts b/packages/bot-web-ui/src/analytics/rudderstack-quick-strategy.ts
index ad37c56840ee..d3202f5252b1 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-quick-strategy.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-quick-strategy.ts
@@ -1,6 +1,6 @@
import { Analytics, TEvents } from '@deriv-com/analytics';
import { ACTION, form_name, type TFormStrategy } from './constants';
-import { getRsStrategyType, getSubpageName, getTradeParameterData } from './utils';
+import { getRsStrategyType, getTradeParameterData } from './utils';
export const rudderStackSendQsRunStrategyEvent = ({
form_values,
diff --git a/packages/bot-web-ui/src/analytics/rudderstack-tutorials.ts b/packages/bot-web-ui/src/analytics/rudderstack-tutorials.ts
index 22ef7e730642..38f0857b0e8f 100644
--- a/packages/bot-web-ui/src/analytics/rudderstack-tutorials.ts
+++ b/packages/bot-web-ui/src/analytics/rudderstack-tutorials.ts
@@ -1,12 +1,12 @@
import { Analytics, TEvents } from '@deriv-com/analytics';
import { ACTION, form_name, TSelectedStrategy } from './constants';
-import { getRsStrategyType, getSubpageName } from './utils';
+import { getRsStrategyType } from './utils';
export const rudderStackSendSelectQsStrategyGuideEvent = ({ selected_strategy }: TSelectedStrategy) => {
Analytics.trackEvent('ce_bot_form', {
action: ACTION.SELECT_QUICK_STRATEGY_GUIDE,
form_name,
- subpage_name: getSubpageName(),
+ subpage_name: 'tutorials',
strategy_name: getRsStrategyType(selected_strategy),
});
};
@@ -15,7 +15,7 @@ export const rudderStackSendTutorialSearchEvent = ({ search_term }: TEvents['ce_
Analytics.trackEvent('ce_bot_form', {
action: 'search',
form_name: 'ce_bot_form',
- subpage_name: getSubpageName(),
+ subpage_name: 'tutorials',
search_term,
});
};
diff --git a/packages/bot-web-ui/src/analytics/utils.ts b/packages/bot-web-ui/src/analytics/utils.ts
index bc8cd82df6c0..e0f3f7f62a04 100644
--- a/packages/bot-web-ui/src/analytics/utils.ts
+++ b/packages/bot-web-ui/src/analytics/utils.ts
@@ -19,20 +19,6 @@ export const getRsStrategyType = (selected_strategy: string) => STRATEGIES[selec
export const getQsActiveTabString = (tab: string) => (tab === 'TRADE_PARAMETERS' ? 'trade parameters' : 'learn more');
-export const getSubpageName = () => {
- const active_tab = localStorage.getItem('active_tab');
- if (active_tab === '0') {
- return 'dashboard';
- } else if (active_tab === '1') {
- return 'bot_builder';
- } else if (active_tab === '2') {
- return 'charts';
- } else if (active_tab === '3') {
- return 'tutorials';
- }
- return 'undefined';
-};
-
enum LOAD_MODAL_TABS_VALUE {
recent = 'recent',
local = 'local',
diff --git a/packages/bot-web-ui/src/app/__tests__/app-content.spec.tsx b/packages/bot-web-ui/src/app/__tests__/app-content.spec.tsx
index de755b1d9e52..4cbb48f656e4 100644
--- a/packages/bot-web-ui/src/app/__tests__/app-content.spec.tsx
+++ b/packages/bot-web-ui/src/app/__tests__/app-content.spec.tsx
@@ -83,10 +83,10 @@ describe('AppContent', () => {
});
beforeAll(() => {
- mock_DBot_store = mockDBotStore(mock_store, mock_ws);
+ mock_DBot_store = mockDBotStore(mock_store, mock_ws as any);
wrapper = ({ children }: { children: JSX.Element }) => (
-
+
{children}
@@ -137,7 +137,7 @@ describe('AppContent', () => {
});
it('should unsubscribe message handler on component unmount', async () => {
- mock_store.client.is_logged_in = false;
+ mock_store.client.is_logged_in = true;
mock_DBot_store?.transactions?.recovered_transactions.push(11);
if (mock_DBot_store)
diff --git a/packages/bot-web-ui/src/app/app-content.jsx b/packages/bot-web-ui/src/app/app-content.jsx
index 62aa01b485dc..dca3d7799550 100644
--- a/packages/bot-web-ui/src/app/app-content.jsx
+++ b/packages/bot-web-ui/src/app/app-content.jsx
@@ -34,43 +34,50 @@ const AppContent = observer(() => {
const init_api_interval = React.useRef(null);
const msg_listener = React.useRef(null);
- const handleMessage = ({ data }) => {
- if (data?.msg_type === 'proposal_open_contract' && !data?.error) {
- const { proposal_open_contract } = data;
- if (
- proposal_open_contract?.status !== 'open' &&
- !recovered_transactions?.includes(proposal_open_contract?.contract_id)
- ) {
- recoverPendingContracts(proposal_open_contract);
+ const handleMessage = React.useCallback(
+ ({ data }) => {
+ if (data?.msg_type === 'proposal_open_contract' && !data?.error) {
+ const { proposal_open_contract } = data;
+ if (
+ proposal_open_contract?.status !== 'open' &&
+ !recovered_transactions?.includes(proposal_open_contract?.contract_id)
+ ) {
+ recoverPendingContracts(proposal_open_contract);
+ }
}
- }
- };
+ },
+ [recovered_transactions, recoverPendingContracts]
+ );
- function checkIfApiInitialized() {
+ const checkIfApiInitialized = React.useCallback(() => {
init_api_interval.current = setInterval(() => {
if (api_base?.api) {
clearInterval(init_api_interval.current);
+
// Listen for proposal open contract messages to check
// if there is any active contract from bot still running
if (api_base?.api && !is_subscribed_to_msg_listener.current) {
is_subscribed_to_msg_listener.current = true;
- msg_listener.current = api_base.api?.onMessage()?.subscribe(handleMessage);
+ msg_listener.current = api_base.api.onMessage()?.subscribe(handleMessage);
}
}
}, 500);
- }
+ }, [handleMessage]);
React.useEffect(() => {
- // Check until api is initialized and then subscribe to the proposal open conrtact
- checkIfApiInitialized();
+ // Check until api is initialized and then subscribe to the api messages
+ // Also we should only subscribe to the messages once user is logged in
+ // And is not already subscribed to the messages
+ if (!is_subscribed_to_msg_listener.current && client.is_logged_in) {
+ checkIfApiInitialized();
+ }
return () => {
if (is_subscribed_to_msg_listener.current && msg_listener.current) {
is_subscribed_to_msg_listener.current = false;
msg_listener.current.unsubscribe();
}
};
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
+ }, [checkIfApiInitialized, client.is_logged_in, client.loginid]);
React.useEffect(() => {
showDigitalOptionsMaltainvestError(client, common);
diff --git a/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-loading.spec.tsx b/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-loading.spec.tsx
index 32e8c9180af1..f1dbbcc0c7ad 100644
--- a/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-loading.spec.tsx
+++ b/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-loading.spec.tsx
@@ -4,13 +4,10 @@ import { render, screen } from '@testing-library/react';
import { mock_ws } from 'Utils/mock';
import { DBotStoreProvider, mockDBotStore } from 'Stores/useDBotStore';
import ContractCardLoader from '../contract-card-loading';
+import { contract_stages } from 'Constants/contract-stage';
+import { message_running_bot } from '../contract-card-running-bot';
-jest.mock('@deriv/bot-skeleton/src/scratch/blockly', () => jest.fn());
-jest.mock('@deriv/bot-skeleton/src/scratch/dbot', () => ({
- saveRecentWorkspace: jest.fn(),
- unHighlightAllBlocks: jest.fn(),
-}));
-jest.mock('@deriv/bot-skeleton/src/scratch/hooks/block_svg', () => jest.fn());
+jest.mock('@deriv/bot-skeleton/src/scratch/dbot', () => ({}));
describe('ContractCardLoader', () => {
let wrapper: ({ children }: { children: JSX.Element }) => JSX.Element;
@@ -53,4 +50,12 @@ describe('ContractCardLoader', () => {
const stopElement = svgElement.querySelector('animate'); // accessing the node directly to test the animation duration
expect(stopElement).toHaveAttribute('dur', '5s');
});
+
+ it('should render ContractCardLoader with the Text component when contract stage is running bot', () => {
+ render(
, {
+ wrapper,
+ });
+ const text = screen.getByText(message_running_bot);
+ expect(text).toBeInTheDocument();
+ });
});
diff --git a/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-running-bot.spec.tsx b/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-running-bot.spec.tsx
new file mode 100644
index 000000000000..d5f24c14aeaa
--- /dev/null
+++ b/packages/bot-web-ui/src/components/contract-card-loading/__tests__/contract-card-running-bot.spec.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { mockStore, StoreProvider } from '@deriv/stores';
+import { render, screen } from '@testing-library/react';
+import { mock_ws } from 'Utils/mock';
+import { DBotStoreProvider, mockDBotStore } from 'Stores/useDBotStore';
+import ContractCardRunningBot, { message_running_bot } from '../contract-card-running-bot';
+
+jest.mock('@deriv/bot-skeleton/src/scratch/dbot', () => ({}));
+
+describe('ContractCardRunningBot', () => {
+ let wrapper: ({ children }: { children: JSX.Element }) => JSX.Element;
+ beforeAll(() => {
+ const mock_store = mockStore({});
+ const mock_DBot_store = mockDBotStore(mock_store, mock_ws);
+
+ wrapper = ({ children }: { children: JSX.Element }) => (
+
+
+ {children}
+
+
+ );
+ });
+
+ it('renders ContractCardRunningBot with the Icon component with correct props', () => {
+ const { container } = render(
);
+ // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access
+ const svg = container.getElementsByTagName('svg')[0];
+ expect(svg).toBeInTheDocument();
+ expect(svg).toHaveAttribute('id', 'rotate-icon');
+ expect(svg).toHaveClass('dc-icon--black');
+ expect(svg).toHaveAttribute('height', '16');
+ expect(svg).toHaveAttribute('width', '16');
+ });
+
+ it('renders ContractCardRunningBot with the Text component with the correct text and styles', () => {
+ render(
);
+ const text = screen.getByText(message_running_bot);
+ expect(text).toBeInTheDocument();
+ expect(text).toHaveClass('dc-contract-card-message');
+ });
+});
diff --git a/packages/bot-web-ui/src/components/contract-card-loading/contract-card-loading.tsx b/packages/bot-web-ui/src/components/contract-card-loading/contract-card-loading.tsx
index fe9d03e014e6..cded20044fcb 100644
--- a/packages/bot-web-ui/src/components/contract-card-loading/contract-card-loading.tsx
+++ b/packages/bot-web-ui/src/components/contract-card-loading/contract-card-loading.tsx
@@ -1,35 +1,44 @@
import React from 'react';
import ContentLoader from 'react-content-loader';
+import { contract_stages } from 'Constants/contract-stage';
+import ContractCardRunningBot from './contract-card-running-bot';
type TContractCardLoader = {
speed?: number;
+ contract_stage?: number;
};
-const ContractCardLoader = ({ speed = 3 }: TContractCardLoader) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+const ContractCardLoader = ({ speed = 3, contract_stage }: TContractCardLoader) => (
+ <>
+ {contract_stage === contract_stages.RUNNING ? (
+
+ ) : (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
);
export default ContractCardLoader;
diff --git a/packages/bot-web-ui/src/components/contract-card-loading/contract-card-running-bot.tsx b/packages/bot-web-ui/src/components/contract-card-loading/contract-card-running-bot.tsx
new file mode 100644
index 000000000000..aa8d303f02ed
--- /dev/null
+++ b/packages/bot-web-ui/src/components/contract-card-loading/contract-card-running-bot.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { localize } from '@deriv/translations';
+import { Icon, Text } from '@deriv/components';
+
+export const message_running_bot = localize('Your bot is running and waiting for a signal to buy a contract.');
+
+const ContractCardRunningBot = () => (
+ <>
+
+
+ {message_running_bot}
+
+
+);
+
+export default ContractCardRunningBot;
diff --git a/packages/bot-web-ui/src/components/load-modal/load-modal.tsx b/packages/bot-web-ui/src/components/load-modal/load-modal.tsx
index 5bfbfcfd86e3..0db59d90467b 100644
--- a/packages/bot-web-ui/src/components/load-modal/load-modal.tsx
+++ b/packages/bot-web-ui/src/components/load-modal/load-modal.tsx
@@ -4,7 +4,9 @@ import { observer, useStore } from '@deriv/stores';
import { localize } from '@deriv/translations';
import { tabs_title } from 'Constants/load-modal';
import { useDBotStore } from 'Stores/useDBotStore';
+import { rudderStackSendSwitchLoadStrategyTabEvent } from '../../analytics/rudderstack-bot-builder';
import { rudderStackSendCloseEvent } from '../../analytics/rudderstack-common-events';
+import { LOAD_MODAL_TABS } from '../../analytics/utils';
import GoogleDrive from '../../pages/dashboard/load-bot-preview/google-drive';
import Local from './local';
import LocalFooter from './local-footer';
@@ -28,6 +30,13 @@ const LoadModal = observer(() => {
const { is_desktop } = ui;
const header_text = localize('Load strategy');
+ const handleTabItemClick = (active_index: number) => {
+ setActiveTabIndex(active_index);
+ rudderStackSendSwitchLoadStrategyTabEvent({
+ load_strategy_tab: LOAD_MODAL_TABS[active_index + (!is_desktop ? 1 : 0)],
+ });
+ };
+
if (!is_desktop) {
return (
{
onClickClose={() => {
setPreviewOnPopup(false);
toggleLoadModal();
- rudderStackSendCloseEvent({ subform_source: 'bot_builder', subform_name: 'load_strategy' });
+ rudderStackSendCloseEvent({
+ subform_name: 'load_strategy',
+ load_strategy_tab: LOAD_MODAL_TABS[active_index + 1],
+ });
}}
height_offset='80px'
page_overlay
>
-
+
@@ -66,13 +78,16 @@ const LoadModal = observer(() => {
is_open={is_load_modal_open}
toggleModal={() => {
toggleLoadModal();
- rudderStackSendCloseEvent({ subform_source: 'bot_builder', subform_name: 'load_strategy' });
+ rudderStackSendCloseEvent({
+ subform_name: 'load_strategy',
+ load_strategy_tab: LOAD_MODAL_TABS[active_index + (!is_desktop ? 1 : 0)],
+ });
}}
onEntered={onEntered}
elements_to_ignore={[document.querySelector('.injectionDiv')]}
>
-
+
diff --git a/packages/bot-web-ui/src/components/summary/__tests__/summary-card.spec.tsx b/packages/bot-web-ui/src/components/summary/__tests__/summary-card.spec.tsx
index b56549c414d4..5b797ac24c2c 100644
--- a/packages/bot-web-ui/src/components/summary/__tests__/summary-card.spec.tsx
+++ b/packages/bot-web-ui/src/components/summary/__tests__/summary-card.spec.tsx
@@ -18,6 +18,12 @@ jest.mock('Components/contract-card-loading', () => jest.fn(() => 'ContractCardL
const mock_contract_info: ProposalOpenContract = { account_id: 95381528 };
+const mock_props = {
+ is_contract_loading: false,
+ is_bot_running: false,
+ contract_info: mock_contract_info,
+};
+
describe('SummaryCard', () => {
let wrapper: ({ children }: { children: JSX.Element }) => JSX.Element, mock_DBot_store: RootStore | undefined;
const mock_store = mockStore({});
@@ -34,7 +40,7 @@ describe('SummaryCard', () => {
});
it('should render SummaryCard component', () => {
- render(, { wrapper });
+ render(, { wrapper });
const summary_card = screen.getByTestId('dt_mock_summary_card');
@@ -42,7 +48,7 @@ describe('SummaryCard', () => {
});
it('the SummaryCard should be rendered with the inactive style when the contract is inactive, the contract is not loading, and the contract_info is null or absent', () => {
- render(, { wrapper });
+ render(, { wrapper });
const summary_card = screen.getByTestId('dt_mock_summary_card');
@@ -55,7 +61,9 @@ describe('SummaryCard', () => {
mock_DBot_store?.run_panel.setContractStage(1);
mock_DBot_store?.summary_card.onBotContractEvent({ is_sold: 1 });
- render(, { wrapper });
+ render(, {
+ wrapper,
+ });
const summary_card = screen.getByTestId('dt_mock_summary_card');
const contract_card_loader = screen.getByText('ContractCardLoader');
@@ -66,7 +74,7 @@ describe('SummaryCard', () => {
});
it('the SummaryCard should render the inner component ContractCard when the contract is not loading and the contract info exists', () => {
- render(, { wrapper });
+ render(, { wrapper });
const summary_card = screen.getByTestId('dt_mock_summary_card');
const contract_card = screen.getByText('ContractCard');
@@ -74,4 +82,16 @@ describe('SummaryCard', () => {
expect(summary_card).toBeInTheDocument();
expect(contract_card).toBeInTheDocument();
});
+
+ it('the SummaryCard should render the inner component ContractCardLoader when the bot has been running for more than 5 seconds', () => {
+ render(, {
+ wrapper,
+ });
+
+ const summary_card = screen.getByTestId('dt_mock_summary_card');
+ const contract_card_loader = screen.getByText('ContractCardLoader');
+
+ expect(summary_card).toBeInTheDocument();
+ expect(contract_card_loader).toBeInTheDocument();
+ });
});
diff --git a/packages/bot-web-ui/src/components/summary/summary-card.scss b/packages/bot-web-ui/src/components/summary/summary-card.scss
index d31c4a64bde4..17405adec1b6 100644
--- a/packages/bot-web-ui/src/components/summary/summary-card.scss
+++ b/packages/bot-web-ui/src/components/summary/summary-card.scss
@@ -16,14 +16,12 @@
text-align: center;
line-height: 2rem;
padding: 0 3rem;
+
& .dc-text {
text-align: center;
}
}
- &--is-loading {
- background-color: inherit;
- border: 1px solid var(--general-main-1);
- }
+
&--completed {
border: 1px solid var(--general-main-1);
@@ -31,25 +29,54 @@
border: 1px solid var(--border-disabled);
}
}
+
+ &--delayed-loading {
+ align-items: center;
+ }
+
.dc-contract-card {
padding: 1.6rem 1.6rem 0.8rem;
+
+ &-message {
+ margin: 0 3rem;
+ }
}
+
.dc-contract-card__grid-underlying-trade {
grid-template-columns: 1.5fr 1fr;
}
+
.dc-contract-card-items-wrapper {
grid-template-columns: 1.5fr 1fr;
margin-top: 0.8rem;
}
+
&--mobile {
.dc-contract-card {
padding: 1.5rem 3.4rem;
}
+
.dc-contract-card__grid-underlying-trade--mobile {
grid-template-columns: 1fr 1.25fr;
}
+
.dc-contract-card-items-wrapper {
grid-template-columns: 1fr 1fr;
}
}
+
+ @keyframes rotate {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+ }
+
+ #rotate-icon {
+ margin: 0 0 2rem;
+ animation: rotate 2s linear infinite;
+ }
}
diff --git a/packages/bot-web-ui/src/components/summary/summary-card.tsx b/packages/bot-web-ui/src/components/summary/summary-card.tsx
index 3657c90647c8..5ced9809d5a9 100644
--- a/packages/bot-web-ui/src/components/summary/summary-card.tsx
+++ b/packages/bot-web-ui/src/components/summary/summary-card.tsx
@@ -9,16 +9,22 @@ import { getContractTypeDisplay } from 'Constants/contract';
import { useDBotStore } from 'Stores/useDBotStore';
import { TSummaryCardProps } from './summary-card.types';
-const SummaryCard = observer(({ contract_info, is_contract_loading }: TSummaryCardProps) => {
+const SummaryCard = observer(({ contract_info, is_contract_loading, is_bot_running }: TSummaryCardProps) => {
const { summary_card, run_panel } = useDBotStore();
const { ui, common } = useStore();
- const { is_contract_completed, is_contract_inactive, is_multiplier, is_accumulator } = summary_card;
- const { onClickSell, is_sell_requested } = run_panel;
+ const { is_contract_completed, is_contract_inactive, is_multiplier, is_accumulator, setIsBotRunning } =
+ summary_card;
+ const { onClickSell, is_sell_requested, contract_stage } = run_panel;
const { addToast, current_focus, removeToast, setCurrentFocus } = ui;
const { server_time } = common;
const { is_desktop } = ui;
+ React.useEffect(() => {
+ const cleanup = setIsBotRunning();
+ return cleanup;
+ }, [is_contract_loading]);
+
const card_header = (
- {is_contract_loading && }
- {!is_contract_loading && contract_info && (
+ {is_contract_loading && !is_bot_running && }
+ {is_bot_running && }
+ {!is_contract_loading && contract_info && !is_bot_running && (
)}
- {!is_contract_loading && !contract_info && (
+ {!is_contract_loading && !contract_info && !is_bot_running && (
{localize('When you’re ready to trade, hit ')}
{localize('Run')}
diff --git a/packages/bot-web-ui/src/components/summary/summary-card.types.ts b/packages/bot-web-ui/src/components/summary/summary-card.types.ts
index 8ccdfb1a83cc..7f4738d30a3a 100644
--- a/packages/bot-web-ui/src/components/summary/summary-card.types.ts
+++ b/packages/bot-web-ui/src/components/summary/summary-card.types.ts
@@ -19,4 +19,5 @@ export type TContractInfo = Omit<
export interface TSummaryCardProps {
contract_info?: ProposalOpenContract | null;
is_contract_loading: boolean;
+ is_bot_running: boolean;
}
diff --git a/packages/bot-web-ui/src/components/summary/summary.scss b/packages/bot-web-ui/src/components/summary/summary.scss
index d46c0cd5b94b..100ccd5657e2 100644
--- a/packages/bot-web-ui/src/components/summary/summary.scss
+++ b/packages/bot-web-ui/src/components/summary/summary.scss
@@ -2,8 +2,10 @@
display: flex;
align-items: center;
flex-direction: column;
- background-color: var(--general-section-2);
+ justify-content: center;
+ background: linear-gradient(180deg, #f2f3f4 0%, rgba(242, 243, 244, 0) 80%);
width: 100%;
+
@include desktop-screen {
height: inherit;
}
@@ -12,6 +14,10 @@
width: 100%;
}
+ &--delayed-loading {
+ justify-content: center;
+ }
+
&__tiles {
display: flex;
flex-wrap: wrap;
@@ -37,12 +43,14 @@
margin-bottom: 4px;
@include typeface(--small-center-bold-black, none);
}
+
&-content {
height: 18px;
margin-bottom: 4px;
@include typeface(--small-center-normal-black, none);
}
}
+
&__amount {
@include typeface(--small-center-normal-black, none);
@@ -50,6 +58,7 @@
font-weight: bold;
color: var(--text-profit-success);
}
+
&--negative {
font-weight: bold;
color: var(--text-loss-danger);
diff --git a/packages/bot-web-ui/src/components/summary/summary.tsx b/packages/bot-web-ui/src/components/summary/summary.tsx
index ed60f6464cd7..87bb66aba6f5 100644
--- a/packages/bot-web-ui/src/components/summary/summary.tsx
+++ b/packages/bot-web-ui/src/components/summary/summary.tsx
@@ -12,7 +12,7 @@ type TSummary = {
const Summary = observer(({ is_drawer_open }: TSummary) => {
const { ui } = useStore();
const { dashboard, summary_card } = useDBotStore();
- const { is_contract_loading, contract_info } = summary_card;
+ const { is_contract_loading, contract_info, is_bot_running } = summary_card;
const { active_tour } = dashboard;
const { is_desktop } = ui;
return (
@@ -26,12 +26,16 @@ const Summary = observer(({ is_drawer_open }: TSummary) => {
>
-
+
)}
botAction('DELETE', bot_id)}
+ className={classNames('ssb-list__menu__item', {
+ 'ssb-list__menu__item--disabled': disable_delete,
+ })}
+ onClick={() => {
+ if (!disable_delete) {
+ botAction('DELETE', bot_id);
+ }
+ }}
tabIndex={0}
onKeyDown={(e: React.KeyboardEvent) => {
- if (e.key === 'Enter') {
+ if (e.key === 'Enter' && !disable_delete) {
botAction('DELETE', bot_id);
}
}}
diff --git a/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.scss b/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.scss
index f239c0c257e0..27fdb37a6e82 100644
--- a/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.scss
+++ b/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.scss
@@ -93,9 +93,18 @@
margin-right: 8px;
}
- &:hover {
+ &:not(&--disabled):hover {
+ cursor: pointer;
background-color: var(--state-hover);
}
+ &--disabled {
+ background-color: var(--state-hover);
+ opacity: 0.5;
+ cursor: not-allowed;
+ &:hover {
+ background-color: var(--state-hover);
+ }
+ }
}
}
}
diff --git a/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.tsx b/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.tsx
index b96904102107..99feb58f60bf 100644
--- a/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.tsx
+++ b/packages/bot-web-ui/src/pages/server-side-bot/bot-list/bot-list.tsx
@@ -81,8 +81,7 @@ const BotList: React.FC
= observer(({ setFormVisibility }) => {
stopBot(bot_id);
break;
case 'OPEN':
- // eslint-disable-next-line no-console
- console.log('OPEN');
+ setActiveBotId(bot_id);
closeMenu();
break;
case 'DELETE':
@@ -111,6 +110,7 @@ const BotList: React.FC = observer(({ setFormVisibility }) => {
useOnClickOutside(menu_ref, closeMenu, event => menu_open.visible && !menu_ref?.current.contains(event.target));
const has_list = !!bot_list?.length;
+ const should_disable_delete = menu_open.bot_id === active_bot.bot_id && active_bot.status === 'running';
return (
<>
@@ -123,6 +123,7 @@ const BotList: React.FC = observer(({ setFormVisibility }) => {
bot_id={menu_open.bot_id}
botAction={botAction}
is_mobile={is_mobile}
+ disable_delete={should_disable_delete}
/>
diff --git a/packages/bot-web-ui/src/stores/load-modal-store.ts b/packages/bot-web-ui/src/stores/load-modal-store.ts
index 0317e77c7c7e..a4c308e599b4 100644
--- a/packages/bot-web-ui/src/stores/load-modal-store.ts
+++ b/packages/bot-web-ui/src/stores/load-modal-store.ts
@@ -7,13 +7,12 @@ import { TStores } from '@deriv/stores/types';
import { localize } from '@deriv/translations';
import { clearInjectionDiv, tabs_title } from 'Constants/load-modal';
import { TStrategy } from 'Types';
-import { rudderStackSendSwitchLoadStrategyTabEvent } from '../analytics/rudderstack-bot-builder';
import {
rudderStackSendUploadStrategyCompletedEvent,
rudderStackSendUploadStrategyFailedEvent,
rudderStackSendUploadStrategyStartEvent,
} from '../analytics/rudderstack-common-events';
-import { getStrategyType, LOAD_MODAL_TABS } from '../analytics/utils';
+import { getStrategyType } from '../analytics/utils';
import RootStore from './root-store';
interface ILoadModalStore {
@@ -50,7 +49,7 @@ interface ILoadModalStore {
onToggleDeleteDialog: (is_delete_modal_open: boolean) => void;
onZoomInOutClick: (is_zoom_in: string) => void;
previewRecentStrategy: (workspace_id: string) => void;
- setActiveTabIndex: (index: number, is_default: boolean) => void;
+ setActiveTabIndex: (index: number) => void;
setLoadedLocalFile: (loaded_local_file: File | null) => void;
setDashboardStrategies: (strategies: Array
) => void;
setRecentStrategies: (recent_strategies: TStrategy[]) => void;
@@ -456,15 +455,8 @@ export default class LoadModalStore implements ILoadModalStore {
this.refreshStrategiesTheme();
};
- setActiveTabIndex = (index: number, is_default: boolean): void => {
+ setActiveTabIndex = (index: number): void => {
this.active_index = index;
- if (!is_default) {
- const { ui } = this.core;
- const { is_mobile } = ui;
- rudderStackSendSwitchLoadStrategyTabEvent({
- load_strategy_tab: LOAD_MODAL_TABS[index + (is_mobile ? 1 : 0)],
- });
- }
};
setLoadedLocalFile = (loaded_local_file: File | null): void => {
diff --git a/packages/bot-web-ui/src/stores/summary-card-store.ts b/packages/bot-web-ui/src/stores/summary-card-store.ts
index f35a1ea6b447..4f4a4ff4a196 100644
--- a/packages/bot-web-ui/src/stores/summary-card-store.ts
+++ b/packages/bot-web-ui/src/stores/summary-card-store.ts
@@ -47,6 +47,7 @@ export default class SummaryCardStore {
contract_id?: string | null = null;
profit?: number = 0;
indicative?: number = 0;
+ is_bot_running?: boolean = false;
constructor(root_store: RootStore, core: TStores) {
makeObservable(this, {
@@ -59,6 +60,7 @@ export default class SummaryCardStore {
contract_update_stop_loss: observable,
has_contract_update_take_profit: observable,
has_contract_update_stop_loss: observable,
+ is_bot_running: observable,
contract_update_config: observable,
contract_id: observable,
profit: observable,
@@ -74,6 +76,7 @@ export default class SummaryCardStore {
onChange: action.bound,
populateContractUpdateConfig: action.bound,
setContractUpdateConfig: action.bound,
+ setIsBotRunning: action.bound,
updateLimitOrder: action.bound,
setValidationErrorMessages: action,
validateProperty: action,
@@ -212,6 +215,26 @@ export default class SummaryCardStore {
}
}
+ /**
+ * Sets the bot's running state based on whether the contract is still loading
+ */
+ setIsBotRunning() {
+ if (!this.is_contract_loading) {
+ this.is_bot_running = false;
+ return;
+ }
+
+ const onTimeout = () => {
+ if (this.is_contract_loading) {
+ this.is_bot_running = true;
+ this.root_store.run_panel.setContractStage(contract_stages.RUNNING);
+ }
+ };
+
+ const timeout = setTimeout(onTimeout, 5000);
+ return () => clearTimeout(timeout);
+ }
+
updateLimitOrder() {
const limit_order = this.getLimitOrder();
diff --git a/packages/cashier-v2/package.json b/packages/cashier-v2/package.json
index c98247c437ab..423077d4ad24 100644
--- a/packages/cashier-v2/package.json
+++ b/packages/cashier-v2/package.json
@@ -14,7 +14,7 @@
"start": "rimraf dist && npm run test && npm run serve"
},
"dependencies": {
- "@deriv-com/ui": "1.29.9",
+ "@deriv-com/ui": "1.29.10",
"@deriv-com/utils": "^0.0.25",
"@deriv/api-v2": "^1.0.0",
"@deriv/integration": "^1.0.0",
diff --git a/packages/cashier/package.json b/packages/cashier/package.json
index 12402ee5f6fa..1f053f99647f 100644
--- a/packages/cashier/package.json
+++ b/packages/cashier/package.json
@@ -37,6 +37,7 @@
"url": "https://github.com/binary-com/deriv-app/issues"
},
"dependencies": {
+ "@deriv-com/analytics": "1.11.0",
"@deriv/api": "^1.0.0",
"@deriv/api-types": "1.0.172",
"@deriv/components": "^1.0.0",
diff --git a/packages/cashier/src/components/cashier-container/real/real.scss b/packages/cashier/src/components/cashier-container/real/real.scss
index 156134338ee5..cf7dfd990046 100644
--- a/packages/cashier/src/components/cashier-container/real/real.scss
+++ b/packages/cashier/src/components/cashier-container/real/real.scss
@@ -3,4 +3,20 @@
width: 100%;
height: 80vh;
}
+
+ &__iframe {
+ @include mobile {
+ position: absolute;
+ height: calc(100% - 3.2rem);
+ inset-inline-end: 0;
+ padding: 0 1.6rem;
+
+ + .page-container__sidebar--right {
+ position: relative;
+ top: calc(100% + 1.6rem);
+ padding-bottom: 1.6rem;
+ flex: none;
+ }
+ }
+ }
}
diff --git a/packages/cashier/src/components/cashier-container/real/real.tsx b/packages/cashier/src/components/cashier-container/real/real.tsx
index 7957b165eaa8..e1e91acb67f2 100644
--- a/packages/cashier/src/components/cashier-container/real/real.tsx
+++ b/packages/cashier/src/components/cashier-container/real/real.tsx
@@ -29,7 +29,7 @@ const Real = observer(() => {
{should_show_loader && }
{iframe_url && (