Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"dependencies": {
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/preset-typescript": "^7.24.7",
"@deriv-com/analytics": "1.31.3",
"@deriv-com/smartcharts-champion": "^1.2.4",
"@deriv-com/analytics": "1.31.9",
"@deriv-com/smartcharts-champion": "^1.3.1",
"@types/react-transition-group": "^4.4.4",
"babel-jest": "^29.7.0",
"dotenv": "^8.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-v2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"uuid": "^9.0.1"
},
"devDependencies": {
"@deriv-com/analytics": "1.31.3",
"@deriv-com/analytics": "1.31.9",
"@deriv/api-types": "1.0.172",
"@testing-library/react": "^13.4.0",
"@testing-library/react-hooks": "^7.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": "20.x"
},
"dependencies": {
"@deriv-com/analytics": "1.31.6",
"@deriv-com/analytics": "1.31.9",
"@deriv-com/ui": "1.36.4",
"@deriv-com/utils": "^0.0.42",
"@deriv/deriv-api": "^1.0.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"dependencies": {
"@babel/polyfill": "^7.12.1 ",
"@datadog/browser-rum": "^5.11.0",
"@deriv-com/analytics": "1.31.3",
"@deriv-com/analytics": "1.31.9",
"@deriv-com/quill-tokens": "2.0.4",
"@deriv-com/quill-ui": "1.24.4",
"@deriv-com/translations": "1.3.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/reports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"dependencies": {
"@babel/polyfill": "^7.12.1 ",
"@deriv-com/analytics": "1.31.3",
"@deriv-com/analytics": "1.31.9",
"@deriv-com/ui": "1.36.4",
"@deriv/api": "^1.0.0",
"@deriv/components": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"typescript": "^5.0.0"
},
"dependencies": {
"@deriv-com/analytics": "1.31.3",
"@deriv-com/analytics": "1.31.9",
"@deriv/quill-icons": "2.2.1",
"@deriv-com/translations": "1.3.9",
"@deriv-com/utils": "^0.0.42",
Expand Down
4 changes: 2 additions & 2 deletions packages/trader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@
"webpack-node-externals": "^2.5.2"
},
"dependencies": {
"@deriv-com/analytics": "1.31.3",
"@deriv-com/analytics": "1.31.9",
"@deriv-com/quill-tokens": "2.0.4",
"@deriv-com/quill-ui": "1.24.4",
"@deriv-com/smartcharts-champion": "^1.2.4",
"@deriv-com/smartcharts-champion": "^1.3.1",
"@deriv-com/translations": "1.3.9",
"@deriv-com/ui": "1.36.4",
"@deriv-com/utils": "^0.0.42",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ describe('getChartAnalyticsData', () => {
symbol: 'Volatility 75 (1s) Index',
symbol_category: 'derived-synthetics-continuous_indices',
time_interval_name: '1 minute',
drawing_tool_name: 'horizontal_line',
pxthickness: '2',
color_name: 'red',
cta_name: 'price',
};
const market_type_name = mocked_data.symbol;
const tab_market_name = mocked_data.symbol_category;
Expand Down Expand Up @@ -115,21 +119,15 @@ describe('getChartAnalyticsData', () => {
});
expect(getChartAnalyticsData(STATE_TYPES.INDICATOR_INFO_TOGGLE)).toEqual({});
});
it('should return correct object with data and event_type for STATE_TYPES.INDICATORS_MODAL_TOGGLE', () => {
it('should return correct object with data and event_type for STATE_TYPES.INDICATORS_MODAL_OPEN', () => {
expect(
getChartAnalyticsData(STATE_TYPES.INDICATORS_MODAL_TOGGLE, {
getChartAnalyticsData(STATE_TYPES.INDICATORS_MODAL_OPEN, {
is_open: mocked_data.is_open,
})
).toEqual({
data: { action: ACTION.OPEN },
event_type: indicators_event_type,
});
expect(
getChartAnalyticsData(STATE_TYPES.INDICATORS_MODAL_TOGGLE, {
is_open: false,
})
).toEqual({});
expect(getChartAnalyticsData(STATE_TYPES.INDICATORS_MODAL_TOGGLE)).toEqual({});
});
it('should return correct object with data and event_type for STATE_TYPES.INDICATOR_ADDED', () => {
expect(
Expand Down Expand Up @@ -232,6 +230,7 @@ describe('getChartAnalyticsData', () => {
data: {
action: ACTION.ADD_TO_FAVORITES,
market_type_name,
tab_market_name: '',
},
event_type: market_event_type,
});
Expand All @@ -244,9 +243,173 @@ describe('getChartAnalyticsData', () => {
data: {
action: ACTION.DELETE_FROM_FAVORITES,
market_type_name,
tab_market_name: '',
},
event_type: market_event_type,
});
expect(getChartAnalyticsData(STATE_TYPES.FAVORITE_MARKETS_TOGGLE)).toEqual({});
});

it('should return correct object with data and event_type for STATE_TYPES.CHART_MODE_MODAL_OPEN', () => {
expect(getChartAnalyticsData(STATE_TYPES.CHART_MODE_MODAL_OPEN)).toEqual({
data: { action: ACTION.OPEN },
event_type: chart_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.CHART_SWITCH_TOGGLE', () => {
expect(
getChartAnalyticsData(STATE_TYPES.CHART_SWITCH_TOGGLE, {
chart_type_name: mocked_data.chart_type_name,
})
).toEqual({
data: {
action: ACTION.CHART_SMOOTHING_TOGGLE,
chart_type_name: mocked_data.chart_type_name,
},
event_type: chart_event_type,
});
expect(getChartAnalyticsData(STATE_TYPES.CHART_SWITCH_TOGGLE)).toEqual({});
});

it('should return correct object with data and event_type for STATE_TYPES.MARKET_MENU_MODAL_TOGGLE', () => {
expect(
getChartAnalyticsData(STATE_TYPES.MARKET_MENU_MODAL_TOGGLE, {
is_open: true,
})
).toEqual({
data: { action: ACTION.OPEN },
event_type: market_event_type,
});
expect(
getChartAnalyticsData(STATE_TYPES.MARKET_MENU_MODAL_TOGGLE, {
is_open: false,
})
).toEqual({
data: { action: ACTION.CLOSE },
event_type: market_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.INDICATOR_EDITED', () => {
expect(
getChartAnalyticsData(STATE_TYPES.INDICATOR_EDITED, {
indicator_type_name: mocked_data.indicator_type_name,
indicators_category_name: mocked_data.indicators_category_name,
})
).toEqual({
data: {
action: ACTION.EDIT_ACTIVE,
indicator_type_name: mocked_data.indicator_type_name,
indicators_category_name: mocked_data.indicators_category_name,
},
event_type: indicators_event_type,
});
expect(getChartAnalyticsData(STATE_TYPES.INDICATOR_EDITED)).toEqual({});
});
});

describe('getChartAnalyticsData for crosshair events', () => {
const mocked_data = {
cta_name: 'price',
};
const crosshair_event_type = 'ce_crosshair_v2';

it('should return correct object with data and event_type for STATE_TYPES.CROSSHAIR_CLICK', () => {
expect(
getChartAnalyticsData(STATE_TYPES.CROSSHAIR_CLICK, {
cta_name: mocked_data.cta_name,
})
).toEqual({
data: {
action: ACTION.CROSSHAIR_CLICK,
cta_name: mocked_data.cta_name,
},
event_type: crosshair_event_type,
});
});
});

describe('getChartAnalyticsData for drawing tools events', () => {
const mocked_data = {
drawing_tool_name: 'horizontal_line',
pxthickness: '2',
color_name: 'red',
};
const drawing_tools_event_type = 'ce_drawing_tools_form_v2';

it('should return correct object with data and event_type for STATE_TYPES.DRAWING_TOOLS_MODAL_OPEN', () => {
expect(getChartAnalyticsData(STATE_TYPES.DRAWING_TOOLS_MODAL_OPEN)).toEqual({
data: { action: ACTION.OPEN },
event_type: drawing_tools_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.DRAWING_TOOLS_ADD', () => {
expect(
getChartAnalyticsData(STATE_TYPES.DRAWING_TOOLS_ADD, {
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
color_name: mocked_data.color_name,
})
).toEqual({
data: {
action: ACTION.ADD_DRAWING_TOOL,
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
color_name: mocked_data.color_name,
},
event_type: drawing_tools_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.DRAWING_TOOLS_DELETE', () => {
expect(
getChartAnalyticsData(STATE_TYPES.DRAWING_TOOLS_DELETE, {
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
color_name: mocked_data.color_name,
})
).toEqual({
data: {
action: ACTION.DELETE_DRAWING_TOOL,
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
color_name: mocked_data.color_name,
},
event_type: drawing_tools_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.DRAWING_TOOLS_EDIT_PX', () => {
expect(
getChartAnalyticsData(STATE_TYPES.DRAWING_TOOLS_EDIT_PX, {
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
})
).toEqual({
data: {
action: ACTION.EDIT_DRAWING_TOOL_PX,
drawing_tool_name: mocked_data.drawing_tool_name,
pxthickness: mocked_data.pxthickness,
},
event_type: drawing_tools_event_type,
});
});

it('should return correct object with data and event_type for STATE_TYPES.DRAWING_TOOLS_EDIT_COLOR', () => {
expect(
getChartAnalyticsData(STATE_TYPES.DRAWING_TOOLS_EDIT_COLOR, {
drawing_tool_name: mocked_data.drawing_tool_name,
color_name: mocked_data.color_name,
})
).toEqual({
data: {
action: ACTION.EDIT_DRAWING_TOOL_COLOR,
drawing_tool_name: mocked_data.drawing_tool_name,
color_name: mocked_data.color_name,
},
event_type: drawing_tools_event_type,
});
});
});
Loading
Loading