diff --git a/packages/core/src/Stores/contract-trade-store.js b/packages/core/src/Stores/contract-trade-store.js index 8827b6fff42e..87a99e0bd630 100644 --- a/packages/core/src/Stores/contract-trade-store.js +++ b/packages/core/src/Stores/contract-trade-store.js @@ -136,7 +136,7 @@ export default class ContractTradeStore extends BaseStore { }; get should_highlight_current_spot() { - return ( + return !!( this.current_symbol_spot && this.accumulators_high_barrier && this.accumulators_low_barrier && diff --git a/packages/trader/src/Modules/Trading/Containers/purchase.jsx b/packages/trader/src/Modules/Trading/Containers/purchase.jsx index c6d25928224e..ee6ca24988d3 100644 --- a/packages/trader/src/Modules/Trading/Containers/purchase.jsx +++ b/packages/trader/src/Modules/Trading/Containers/purchase.jsx @@ -48,7 +48,7 @@ const Purchase = ({ const info = proposal_info[type] || {}; const is_disabled = !is_trade_enabled || !info.id || !is_purchase_enabled; const is_proposal_error = - is_multiplier || (is_accumulator && !is_mobile) ? info.has_error && info.has_error_details : info.has_error; + is_multiplier || (is_accumulator && !is_mobile) ? info.has_error && !!info.message : info.has_error; const purchase_fieldset = (