diff --git a/packages/components/src/components/contract-card/contract-card-items/contract-card-body.jsx b/packages/components/src/components/contract-card/contract-card-items/contract-card-body.jsx index 040de0d14b30..e07ffecb8990 100644 --- a/packages/components/src/components/contract-card/contract-card-items/contract-card-body.jsx +++ b/packages/components/src/components/contract-card/contract-card-items/contract-card-body.jsx @@ -175,8 +175,8 @@ const AccumulatorCardBody = ({ - - + +
{ onChange={onChange} error_message_alignment={error_message_alignment || 'right'} value={contract_profit_or_loss.contract_update_take_profit} - is_checkbox_hidden={is_accumulator} is_disabled={!is_accumulator && !!is_valid_to_cancel} setCurrentFocus={setCurrentFocus} /> diff --git a/packages/components/src/components/contract-card/contract-card.jsx b/packages/components/src/components/contract-card/contract-card.jsx index 34dadd159932..840d429d5dbf 100644 --- a/packages/components/src/components/contract-card/contract-card.jsx +++ b/packages/components/src/components/contract-card/contract-card.jsx @@ -15,7 +15,6 @@ const ContractCard = ({ contract_info, getCardLabels, getContractPath, - // is_accumulator, is_multiplier, is_positions, is_unsupported, @@ -35,7 +34,6 @@ const ContractCard = ({ contract_id={contract_info.contract_id} getCardLabels={getCardLabels} getContractPath={getContractPath} - // is_accumulator={is_accumulator} is_unsupported={is_unsupported} is_multiplier={is_multiplier} is_visible={!!contract_info.is_sold} @@ -64,7 +62,6 @@ ContractCard.propTypes = { contract_info: PropTypes.object, getCardLabels: PropTypes.func, getContractPath: PropTypes.func, - // is_accumulator: PropTypes.bool, is_multiplier: PropTypes.bool, is_positions: PropTypes.bool, is_unsupported: PropTypes.bool, diff --git a/packages/components/src/components/contract-card/contract-card.scss b/packages/components/src/components/contract-card/contract-card.scss index 543895e4e2b7..574f1c092ada 100644 --- a/packages/components/src/components/contract-card/contract-card.scss +++ b/packages/components/src/components/contract-card/contract-card.scss @@ -221,24 +221,6 @@ fill: var(--brand-secondary) !important; } } - //&--accumulators { - // @include mobile { - // justify-content: flex-end; - // - // .dc-contract-type__type { - // &-label { - // width: fit-content; - // } - // &-wrapper { - // padding: 0.5em 0.8em 0.5em 0.3em; - // } - // } - // } - // .dc-contract-type__type-wrapper .category-type { - // width: unset; - // height: unset; - // } - //} } &__symbol { margin-left: 0.4rem; diff --git a/packages/core/src/public/images/common/static_images/accumulators_stats_manual_desktop.svg b/packages/core/src/public/images/common/static_images/accumulators_stats_manual_desktop.svg index 18fffd023206..c47e7153bc5e 100644 --- a/packages/core/src/public/images/common/static_images/accumulators_stats_manual_desktop.svg +++ b/packages/core/src/public/images/common/static_images/accumulators_stats_manual_desktop.svg @@ -1 +1,88 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/core/src/public/images/common/static_images/accumulators_stats_manual_mobile.svg b/packages/core/src/public/images/common/static_images/accumulators_stats_manual_mobile.svg index 8cd862001c9c..6cf7653d271a 100644 --- a/packages/core/src/public/images/common/static_images/accumulators_stats_manual_mobile.svg +++ b/packages/core/src/public/images/common/static_images/accumulators_stats_manual_mobile.svg @@ -1 +1,130 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/reports/src/Containers/open-positions.jsx b/packages/reports/src/Containers/open-positions.jsx index 85baf29a5126..1872c224b35e 100644 --- a/packages/reports/src/Containers/open-positions.jsx +++ b/packages/reports/src/Containers/open-positions.jsx @@ -94,7 +94,7 @@ const MobileRowRenderer = ({ const duration_type = getContractDurationType(contract_info.longcode); const progress_value = getTimePercentage(server_time, date_start, date_expiry) / 100; - if (isMultiplierContract(type)) { + if (isMultiplierContract(type) || isAccumulatorContract(type)) { return ( export const hasContractEntered = (contract_info: TContractInfo) => !!contract_info.entry_spot; -export const isAccumulatorContract = (contract_type: string) => /(A|DE)CCU/i.test(contract_type); +export const isAccumulatorContract = (contract_type: string) => /ACCU/i.test(contract_type); export const isMultiplierContract = (contract_type: string) => /MULT/i.test(contract_type); diff --git a/packages/trader/src/Assets/Trading/Categories/trade-categories.jsx b/packages/trader/src/Assets/Trading/Categories/trade-categories.jsx index ff21a72182ff..82b36fffc395 100644 --- a/packages/trader/src/Assets/Trading/Categories/trade-categories.jsx +++ b/packages/trader/src/Assets/Trading/Categories/trade-categories.jsx @@ -13,7 +13,7 @@ const TradeCategories = ({ category }) => {

{localize( - 'When you open a position, barriers will be created around the asset price. For each new tick, the upper and lower barriers are automatically calculated based on the asset and accumulator value that you choose. You will earn a profit if you close your position before the asset price hits either of the barriers.' + 'When you open a position, barriers will be created around the asset price. For each new tick, the upper and lower barriers are automatically calculated based on the asset and accumulator value you choose. You will earn a profit if you close your position before the asset price hits either of the barriers.' )}

diff --git a/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/accumulators-stats-manual-modal.jsx b/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/accumulators-stats-manual-modal.jsx index f1b41ddb65b4..47ebde615978 100644 --- a/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/accumulators-stats-manual-modal.jsx +++ b/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/accumulators-stats-manual-modal.jsx @@ -20,8 +20,8 @@ const AccumulatorsStatsManualModal = ({ title, icon_classname, is_manual_open, t should_header_stick_body={false} title={title} toggleModal={toggleManual} - height={is_mobile ? '605px' : '712px'} - width={is_mobile ? '328px' : '755px'} + height={is_mobile ? '605px' : '615px'} + width={is_mobile ? '328px' : '596px'} className='accumulators-stats-manual-modal' > @@ -40,7 +40,7 @@ const AccumulatorsStatsManualModal = ({ title, icon_classname, is_manual_open, t 'The numbers show the history (last 100 results from the current spot) of tick counts that stayed inside the barrier of your selected market and accumulator.' )}{' '} {localize( - 'For example, a tick count of 5 means that the price “stayed inside” for 5 ticks before breaking outside the barrier for Volatility 100 index with a 3% accumulator.' + 'For example, a tick count of 5 means that the price “stayed inside” for 5 ticks before breaking outside the barrier for Volatility 10 index with a 3% accumulator.' )} diff --git a/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/ticks-history-counter.jsx b/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/ticks-history-counter.jsx index f680140d7b86..43aa420116cd 100644 --- a/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/ticks-history-counter.jsx +++ b/packages/trader/src/Modules/Contract/Components/AccumulatorsStats/ticks-history-counter.jsx @@ -1,18 +1,41 @@ import React from 'react'; import PropTypes from 'prop-types'; +import classNames from 'classnames'; -const TicksHistoryCounter = ({ has_progress_dots, value }) => ( -

- {value} - {has_progress_dots && ( -
- {[1, 2, 3].map(dot => { - return ; - })} -
- )} -
-); +const TicksHistoryCounter = ({ has_progress_dots, value }) => { + const [is_spot_emphasizing, setIsSpotEmphasizing] = React.useState(has_progress_dots && value === 0); + + React.useLayoutEffect(() => { + let emphasizing_timeout; + if (has_progress_dots && value === 0) { + setIsSpotEmphasizing(true); + emphasizing_timeout = setTimeout(() => { + setIsSpotEmphasizing(false); + }, 700); + } + return () => { + clearTimeout(emphasizing_timeout); + }; + }, [value]); + + return ( +
+ {value} + {has_progress_dots && ( +
+ {[1, 2, 3].map(dot => { + return ; + })} +
+ )} +
+ ); +}; TicksHistoryCounter.propTypes = { has_progress_dots: PropTypes.bool, diff --git a/packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-info.jsx b/packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-info.jsx index 8bc02a99e5e9..912d05abbb73 100644 --- a/packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-info.jsx +++ b/packages/trader/src/Modules/Trading/Components/Form/ContractType/ContractTypeInfo/contract-type-info.jsx @@ -15,7 +15,11 @@ const Info = ({ handleNavigationClick, handleSelect, initial_index, item, list }
- +
diff --git a/packages/trader/src/Modules/Trading/Containers/trade-params.jsx b/packages/trader/src/Modules/Trading/Containers/trade-params.jsx index a345c4b2211c..5d75dfb8c6c4 100644 --- a/packages/trader/src/Modules/Trading/Containers/trade-params.jsx +++ b/packages/trader/src/Modules/Trading/Containers/trade-params.jsx @@ -22,8 +22,8 @@ const TradeParams = ({ form_components, is_minimized }) => { {isVisible('duration') && } {isVisible('barrier') && } {isVisible('last_digit') && } - {isVisible('amount') && } {isVisible('accumulator') && } + {isVisible('amount') && } {isVisible('take_profit') && } {isVisible('stop_loss') && } {isVisible('cancellation') && } diff --git a/packages/trader/src/Modules/Trading/Containers/trade.jsx b/packages/trader/src/Modules/Trading/Containers/trade.jsx index 728530cc80c4..fae691ed8f92 100644 --- a/packages/trader/src/Modules/Trading/Containers/trade.jsx +++ b/packages/trader/src/Modules/Trading/Containers/trade.jsx @@ -158,7 +158,7 @@ const Trade = ({ id='chart_container' className='chart-container' is_disabled={isDesktop()} - height_offset={is_accumulator ? '317px' : '259px'} + height_offset={is_accumulator ? '295px' : '259px'} >