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

henry/93321/fix: unable to view chart for digit contracts in mobile for non tick … #8356

Merged
merged 9 commits into from
May 10, 2023
Merged

henry/93321/fix: unable to view chart for digit contracts in mobile for non tick … #8356

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d53372e
fix: unable to view chart for digit contracts in mobile for non tick …
henry-deriv Apr 26, 2023
305fc0e
Merge branch 'master' of github.com:binary-com/deriv-app into henry/9…
henry-deriv Apr 27, 2023
3d9d1e8
fix: include accumualtors in the change
henry-deriv Apr 27, 2023
1600ee8
fix: add brackets for readability
henry-deriv Apr 27, 2023
831c6f0
fix: bug
henry-deriv Apr 27, 2023
eb628ae
Merge branch 'master' of github.com:binary-com/deriv-app into henry/9…
henry-deriv Apr 28, 2023
502a969
refactor: naming
henry-deriv Apr 28, 2023
43539cd
Merge branch 'master' of github.com:binary-com/deriv-app into henry/9…
henry-deriv May 2, 2023
35c68b0
Merge branch 'master' into henry/93321/charts-empty-for-1min-and-abov…
sandeep-deriv May 10, 2023
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
14 changes: 3 additions & 11 deletions packages/trader/src/Modules/SmartChart/Components/toolbar-widgets.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ import PropTypes from 'prop-types';
import React from 'react';
import { isDesktop, isMobile } from '@deriv/shared';
import { ChartMode, DrawTools, Share, StudyLegend, Views, ToolbarWidget } from 'Modules/SmartChart';
import { connect } from 'Stores/connect';

const ToolbarWidgets = ({ is_accumulator, position, updateChartType, updateGranularity }) => (
const ToolbarWidgets = ({ position, updateChartType, updateGranularity }) => (
<ToolbarWidget position={position || isMobile() ? 'bottom' : null}>
{!is_accumulator && (
<ChartMode portalNodeId='modal_root' onChartType={updateChartType} onGranularity={updateGranularity} />
)}
<ChartMode portalNodeId='modal_root' onChartType={updateChartType} onGranularity={updateGranularity} />
{isDesktop() && <StudyLegend portalNodeId='modal_root' searchInputClassName='data-hj-whitelist' />}
{isDesktop() && <Views portalNodeId='modal_root' searchInputClassName='data-hj-whitelist' />}
{isDesktop() && <DrawTools portalNodeId='modal_root' />}
Expand All @@ -20,11 +17,6 @@ ToolbarWidgets.propTypes = {
position: PropTypes.string,
updateChartType: PropTypes.func,
updateGranularity: PropTypes.func,
is_accumulator: PropTypes.func,
};

export default React.memo(
connect(({ modules }) => ({
is_accumulator: modules.trade.is_accumulator,
}))(ToolbarWidgets)
);
export default React.memo(ToolbarWidgets);
14 changes: 4 additions & 10 deletions packages/trader/src/Modules/Trading/Containers/trade.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import classNames from 'classnames';
import { DesktopWrapper, Div100vhContainer, MobileWrapper, SwipeableWrapper } from '@deriv/components';
import { isDesktop, isMobile } from '@deriv/shared';
import ChartLoader from 'App/Components/Elements/chart-loader.jsx';
import { isDigitTradeType } from 'Modules/Trading/Helpers/digits';
import { connect } from 'Stores/connect';
import PositionsDrawer from 'App/Components/Elements/PositionsDrawer';
import MarketIsClosedOverlay from 'App/Components/Elements/market-is-closed-overlay.jsx';
Expand All @@ -31,7 +30,6 @@ const BottomWidgetsMobile = ({ tick, digits, setTick, setDigits }) => {
};

const Trade = ({
contract_type,
form_components,
getFirstOpenMarket,
should_show_active_symbols_loading,
Expand Down Expand Up @@ -182,13 +180,7 @@ const Trade = ({
</div>
</DesktopWrapper>
<MobileWrapper>
<ChartLoader
is_visible={
is_chart_loading ||
should_show_active_symbols_loading ||
(isDigitTradeType(contract_type) && !digits[0])
}
/>
<ChartLoader is_visible={is_chart_loading || should_show_active_symbols_loading} />
<SwipeableWrapper
onChange={onChangeSwipeableIndex}
is_disabled={
Expand Down Expand Up @@ -392,13 +384,14 @@ const Chart = props => {
id='trade'
isMobile={isMobile()}
maxTick={isMobile() ? max_ticks : undefined}
granularity={granularity}
granularity={show_digits_stats || is_accumulator ? 0 : granularity}
requestAPI={wsSendRequest}
requestForget={wsForget}
requestForgetStream={wsForgetStream}
requestSubscribe={wsSubscribe}
settings={settings}
should_show_eu_content={should_show_eu_content}
showTicksOnly={show_digits_stats || is_accumulator}
stateChangeListener={chartStateChange}
symbol={symbol}
topWidgets={is_trade_enabled ? topWidgets : null}
Expand Down Expand Up @@ -481,6 +474,7 @@ const ChartTrade = connect(({ client, modules, ui, common, contract_trade, portf
is_digit_contract: contract_trade.last_contract.is_digit_contract,
is_ended: contract_trade.last_contract.is_ended,
},
is_accumulator: modules.trade.is_accumulator,
is_trade_enabled: modules.trade.is_trade_enabled,
main_barrier: modules.trade.main_barrier_flattened,
extra_barriers: modules.trade.barriers_flattened,
Expand Down