Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zaki/update_endtime_logic #113

Merged
merged 2 commits into from
May 28, 2019
Merged

zaki/update_endtime_logic #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d217437
updated end time logic to draw line and exit spot marker in same resp…
zaki-hanafiah May 28, 2019
618bf4e
Merge branch 'dev' of github.com:binary-com/deriv-app into update_end…
zaki-hanafiah May 28, 2019
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
20 changes: 14 additions & 6 deletions src/javascript/app/Stores/Modules/Contract/Helpers/__tests__/logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ describe('logic', () => {
tick_count: 5,
exit_tick_time: 9999999,
sell_time: 1000000,
is_sold: 1,
is_expired: 1,
date_expiry: 8888888,
};
expect(Logic.getEndTime(contract_info)).to.eql(9999999);
Expand All @@ -276,7 +276,7 @@ describe('logic', () => {
const contract_info = {
exit_tick_time: 9999999,
sell_time: 8888888,
is_sold: 1,
is_expired: 1,
date_expiry: 7777777,
};
expect(Logic.getEndTime(contract_info)).to.eql(7777777);
Expand All @@ -285,7 +285,7 @@ describe('logic', () => {
const contract_info = {
exit_tick_time: 9999999,
sell_time: 7777777,
is_sold: 1,
is_expired: 1,
date_expiry: 8888888,
};
expect(Logic.getEndTime(contract_info)).to.eql(9999999);
Expand All @@ -294,7 +294,6 @@ describe('logic', () => {
const contract_info = {
date_expiry: 8888888,
exit_tick_time: 8888887,
is_sold: 1,
sell_time: 8888889,
status: 'sold',
};
Expand All @@ -304,7 +303,6 @@ describe('logic', () => {
const contract_info = {
date_expiry: 8888889,
exit_tick_time: 8888887,
is_sold: 1,
sell_time: 8888888,
status: 'sold',
};
Expand All @@ -314,7 +312,17 @@ describe('logic', () => {
const contract_info = {
exit_tick_time: 9999999,
sell_time: 1000000,
is_sold: 0,
is_expired: 0,
date_expiry: 888888,
};
expect(Logic.getEndTime(contract_info)).to.eql(undefined);
});
it('Should return exit_tick_time if contract is_path_dependent', () => {
const contract_info = {
exit_tick_time: 9999999,
sell_time: 1000000,
is_expired: 0,
is_path_dependent: '1',
date_expiry: 888888,
};
expect(Logic.getEndTime(contract_info)).to.eql(undefined);
Expand Down
13 changes: 10 additions & 3 deletions src/javascript/app/Stores/Modules/Contract/Helpers/logic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,16 @@ export const isValidToSell = (contract_info) => (
);

export const getEndTime = (contract_info) => {
const { exit_tick_time, date_expiry, sell_time, tick_count : is_tick_contract, is_sold } = contract_info;
const {
exit_tick_time,
date_expiry,
is_expired,
is_path_dependent,
sell_time,
tick_count: is_tick_contract,
} = contract_info;

if (!is_sold) return undefined;
if (!is_expired && !isUserSold(contract_info)) return undefined;

if (isUserSold(contract_info)) {
return (sell_time > date_expiry) ?
Expand All @@ -98,5 +105,5 @@ export const getEndTime = (contract_info) => {
return date_expiry;
}

return exit_tick_time;
return (date_expiry > exit_tick_time && !(+is_path_dependent)) ? date_expiry : exit_tick_time;
};