Skip to content

Commit

Permalink
evgeniy /87215/87226/ info description / glitch while switching accou…
Browse files Browse the repository at this point in the history
…nt (binary-com#70)

* fix: description

* fix: disable trade params while switching account

---------

Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
  • Loading branch information
yauheni-deriv and “yauheni-kryzhyk-deriv” committed Feb 1, 2023
1 parent 33d770d commit 423670f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const AccumulatorTradeDescription = () => {
'We’ve limited the maximum payout for every contract, and it differs for every asset. Your contract will be closed automatically when the maximum payout is reached.'
),
},
{ type: 'heading', text: localize('Maximum duration') },
{ type: 'heading', text: localize('Maximum ticks') },
{
type: 'paragraph',
text: localize(
Expand Down
7 changes: 6 additions & 1 deletion packages/trader/src/Modules/Trading/Containers/trade.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const Trade = ({
is_chart_loading,
is_dark_theme,
is_eu,
is_logging_in,
is_market_closed,
is_market_unavailable_visible,
is_trade_enabled,
Expand Down Expand Up @@ -224,7 +225,10 @@ const Trade = ({
<FormLayout
is_market_closed={is_market_closed}
is_trade_enabled={
is_trade_enabled && form_components.length > 0 && network_status.class === 'online'
is_trade_enabled &&
form_components.length > 0 &&
network_status.class === 'online' &&
!is_logging_in
}
/>
</div>
Expand All @@ -236,6 +240,7 @@ export default connect(({ client, common, modules, ui }) => ({
getFirstOpenMarket: modules.trade.getFirstOpenMarket,
is_accumulator: modules.trade.is_accumulator,
is_eu: client.is_eu,
is_logging_in: client.is_logging_in,
is_synthetics_available: modules.trade.is_synthetics_available,
is_synthetics_trading_market_available: modules.trade.is_synthetics_trading_market_available,
network_status: common.network_status,
Expand Down

0 comments on commit 423670f

Please sign in to comment.