-
- {['risefall', 'callputequal'].includes(formName) && start_dates && (
-
-
-
-
- {date_start !== 'now' && (
-
-
-
- )}
+
+
+ {contractForms.includes(formName) && (
+ <>
+ {formName === 'highlowticks' && (
+
+
+
+ )}
+ {formName === 'reset' && reset_message && (
+
+
)}
+
+
- {formName !== 'highlowticks' && (
- <>
+ {['risefall', 'callputequal'].includes(formName) && start_dates && (
- {expiryType === 'duration' && (
- <>
-
- {
- updateFormField(
- 'duration_amount',
- e.target.value,
- 'input'
- );
- }}
- />
-
-
-
-
-
- )}
- {expiryType === 'endtime' && (
- <>
- {endtime_data && (
-
- {endtime_data.show_datepicker ? (
- {
- onExpiryDateChange(value);
- }}
- />
- ) : (
-
- )}
-
- )}
-
+ {date_start !== 'now' && (
+
+
+
)}
+ )}
- {expiryType === 'endtime' && expiry_time && (
+ {formName !== 'highlowticks' && (
+ <>
-
+ {expiryType === 'duration' && (
+ <>
+
+ {
+ updateFormField(
+ 'duration_amount',
+ e.target.value,
+ 'input'
+ );
+ }}
+ />
+
+
+
+
+
+ )}
+ {expiryType === 'endtime' && (
+ <>
+ {endtime_data && (
+
+ {endtime_data.show_datepicker ? (
+ {
+ onExpiryDateChange(value);
+ }}
+ />
+ ) : (
+
+ )}
+
+ )}
+
+ )}
- )}
-
- )}
-
+ {expiryType === 'endtime' && expiry_time && (
+
+ )}
+
+ )}
- {['matchdiff', 'overunder'].includes(formName) && (
-
- )}
+
- {['highlowticks'].includes(formName) && (
-
-
-
+ {['matchdiff', 'overunder'].includes(formName) && (
+
-
- )}
+ )}
- {!['lookbackhigh', 'lookbacklow', 'lookbackhighlow'].includes(
- formName
- ) && (
-
-
-
+ {['highlowticks'].includes(formName) && (
+
+ )}
- {currency_list ? (
- <>
+ {!['lookbackhigh', 'lookbacklow', 'lookbackhighlow'].includes(
+ formName
+ ) && (
+
+
+
+
+
+ {currency_list ? (
+ <>
+
+ handleAmountChange(e, 'amount')}
+ />
+
+
+
+
+
+ ) : (
- handleAmountChange(e, 'amount')}
+ value={amount}
+ addonLabel={currency}
+ addOnPosition='right'
/>
-
-
-
-
- ) : (
-
- handleAmountChange(e, 'amount')}
- value={amount}
- addonLabel={currency}
- addOnPosition='right'
- />
-
- )}
-
- )}
+ )}
+
+ )}
- {['lookbackhigh', 'lookbacklow', 'lookbackhighlow'].includes(
- formName
- ) && (
-
- {currency_list ? (
- <>
+ {['lookbackhigh', 'lookbacklow', 'lookbackhighlow'].includes(
+ formName
+ ) && (
+
+ {currency_list ? (
+ <>
+
+ handleAmountChange(e, 'multiplier')}
+ />
+
+
+
+
+
+ ) : (
- handleAmountChange(e, 'multiplier')}
/>
-
-
-
-
- ) : (
-
- handleAmountChange(e, 'multiplier')}
- />
-
- )}
-
- )}
-
- {show_allow_equals && (
-
- {
- updateFormField('callputequal', e, 'change');
- }}
- size='md'
- checked={+is_equal === 1}
- infoIconMessage={localize(
- 'Win payout if exit spot is also equal to entry spot.'
)}
- />
-
- )}
-
-
- )}
-
+
+ )}
+
+ {show_allow_equals && (
+
+ {
+ updateFormField('callputequal', e, 'change');
+ }}
+ size='md'
+ checked={+is_equal === 1}
+ infoIconMessage={localize(
+ 'Win payout if exit spot is also equal to entry spot.'
+ )}
+ />
+
+ )}
+
+
+ )}
+
);
};
diff --git a/src/javascript/app/pages/form/numbers-dropdown.jsx b/src/javascript/app/pages/form/numbers-dropdown.jsx
index b23cb7c9a5a..90a2f352f2f 100644
--- a/src/javascript/app/pages/form/numbers-dropdown.jsx
+++ b/src/javascript/app/pages/form/numbers-dropdown.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { BreakpointProvider, CustomDropdown, DropdownItem, useDropdown } from '@deriv-com/quill-ui';
+import { CustomDropdown, DropdownItem, useDropdown } from '@deriv-com/quill-ui';
const Content = ({ value, start, end, elementId, onUpdate }) => {
const { close } = useDropdown();
@@ -22,15 +22,13 @@ const Content = ({ value, start, end, elementId, onUpdate }) => {
};
export const NumbersDropdown = ({ value, label, start, end, elementId, onUpdate }) => (
-
-
-
-
-
+
+
+
);
diff --git a/src/javascript/app/pages/form/time-selection.jsx b/src/javascript/app/pages/form/time-selection.jsx
index fb7479f02f5..8d6e623ac59 100644
--- a/src/javascript/app/pages/form/time-selection.jsx
+++ b/src/javascript/app/pages/form/time-selection.jsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
-import { BreakpointProvider, CustomDropdown, DropdownItem, useDropdown } from '@deriv-com/quill-ui';
+import { CustomDropdown, DropdownItem, useDropdown } from '@deriv-com/quill-ui';
import moment from 'moment/moment';
import { useTimeChange } from '../../hooks/events';
import tradeManager from '../../common/trade_manager.js';
@@ -82,14 +82,12 @@ export const TimePickerDropdown = ({
};
return (
-
- handleOpen(elementId)}>
-
-
-
+
handleOpen(elementId)}>
+
+
);
};
diff --git a/src/javascript/app/pages/trade/duration.js b/src/javascript/app/pages/trade/duration.js
index fc0d3a82449..481901a30b5 100644
--- a/src/javascript/app/pages/trade/duration.js
+++ b/src/javascript/app/pages/trade/duration.js
@@ -145,18 +145,18 @@ const Durations = (() => {
}
});
+ const list = Object.keys(duration_list).sort((a, b) => (
+ commonTrading.durationOrder(a) > commonTrading.durationOrder(b) ? 1 : -1
+ ));
+
const duration_options = [];
- Object.values(duration_list).forEach(option => {
- duration_options.push({ text: option.text, value: option.value });
+ Object.values(list).forEach(option => {
+ duration_options.push({ text: duration_list[option].text, value: option });
});
tradeManager.set({
duration_options,
});
- const list = Object.keys(duration_list).sort((a, b) => (
- commonTrading.durationOrder(a) > commonTrading.durationOrder(b) ? 1 : -1
- ));
-
smallest_duration = {
amount: duration_list[list[0]].dataset.minimum,
unit : list[0],