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

Purchase section improvements #685

Merged
merged 18 commits into from
Jul 19, 2024
Merged

Purchase section improvements #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7cb0316
chore: initial trade results dev
prince-deriv Jul 11, 2024
77fdde1
chore: results and error messages
prince-deriv Jul 12, 2024
a7b6036
chore: popup load
prince-deriv Jul 17, 2024
9fc9266
chore: contract end
prince-deriv Jul 17, 2024
717f678
chore: add login error
prince-deriv Jul 17, 2024
08d922e
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 17, 2024
9c4aab0
chore: hide popup
prince-deriv Jul 17, 2024
8fb0b38
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 17, 2024
e9626be
chore: ui fixes
prince-deriv Jul 18, 2024
101e7be
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 18, 2024
f63aa37
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 18, 2024
13857ab
chore: fix sell and audit clash
prince-deriv Jul 18, 2024
31e9885
chore: language fixes
prince-deriv Jul 18, 2024
05491a7
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 18, 2024
5da5aa8
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 18, 2024
898d9a9
chore: audit and qa test fixes
prince-deriv Jul 19, 2024
80539aa
chore: fixed all around issues
prince-deriv Jul 19, 2024
f30a07e
Merge branch 'redesign' into purchase-section-improvements
prince-deriv Jul 19, 2024
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
29 changes: 29 additions & 0 deletions src/javascript/app/common/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import React from 'react';
import { Tooltip } from '@deriv-com/quill-ui';
import parse from 'html-react-parser';
import { getLocalTime } from '../base/clock';

const parseData = (rawData) => !rawData ? '' : parse(rawData);

const triggerClick = (query) => document.querySelector(query)?.click();

const TimeTooltipWrapper = (element, time) => {
const localTime = getLocalTime(`${time}` || '');
return (
<Tooltip
as='div'
tooltipContent={localTime}
tooltipPosition='left'
variant='base'
>
{element}
</Tooltip>
);
};

export {
parseData,
triggerClick,
TimeTooltipWrapper,
};

99 changes: 53 additions & 46 deletions src/javascript/app/pages/bottom/explanation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React, { useEffect, useState } from 'react';
import parse from 'html-react-parser';
import { Text } from '@deriv-com/quill-ui';
import { contractExplanationData } from './data/explanation.js';
import { useContractChange, useMarketChange } from '../../hooks/events';
import Defaults, { PARAM_NAMES } from '../trade/defaults';
import Language from '../../../_common/language';
import Url from '../../../_common/url';
import { localize } from '../../../_common/localize.js';

export const Explanation = () => {
export const Explanation = ({ explanationOnly = false }) => {
const language = Language.get();

const [formName,setFormName] = useState('');
Expand Down Expand Up @@ -93,57 +94,61 @@ export const Explanation = () => {
return (
<div className='tab-explanation'>
{/* ========== Winning ========== */}
<div id='explanation_winning'>
<div id={`winning_${formName}`}>
<h3>{localize('Winning the contract')}</h3>
{contractExplanationData.winning[formName].content.map(
(data, idx) => (
<p key={idx}>{parse(data)}</p>
)
)}
</div>
</div>

{/* ========== Image ========== */}
{images[formName] && (
<div id='explanation_image'>
<div className='gr-row'>
<div className='gr-2 hide-mobile' />
<div
className='gr-4 gr-12-m padding-right'
style={{ margin: 'auto' }}
>
<img
id='explanation_image_1'
className='responsive'
src={`${image_path}${images[formName].image1}?${process.env.BUILD_HASH}`}
/>
{!explanationOnly && (
<>
<div id='explanation_winning'>
<div id={`winning_${formName}`}>
<h3>{localize('Winning the contract')}</h3>
{contractExplanationData.winning[formName].content.map(
(data, idx) => (
<p key={idx}>{parse(data)}</p>
)
)}
</div>
<div className='gr-4 gr-12-m padding-left'>
<img
id='explanation_image_2'
className='responsive'
src={`${image_path}${images[formName].image2}?${process.env.BUILD_HASH}`}
/>
</div>
<div className='gr-2 hide-mobile' />
</div>
</div>

{/* ========== Image ========== */}
{images[formName] && (
<div id='explanation_image'>
<div className='gr-row'>
<div className='gr-2 hide-mobile' />
<div
className='gr-4 gr-12-m padding-right'
style={{ margin: 'auto' }}
>
<img
id='explanation_image_1'
className='responsive'
src={`${image_path}${images[formName].image1}?${process.env.BUILD_HASH}`}
/>
</div>
<div className='gr-4 gr-12-m padding-left'>
<img
id='explanation_image_2'
className='responsive'
src={`${image_path}${images[formName].image2}?${process.env.BUILD_HASH}`}
/>
</div>
<div className='gr-2 hide-mobile' />
</div>
</div>
)}
</>
)}

{/* ========== Explain ========== */}
<div id='explanation_explain' className='gr-child'>
<div id={`explain_${formName}`}>
<h3>{contractExplanationData.explain[formName].title}</h3>
<Text size='lg' bold>{contractExplanationData.explain[formName].title}</Text>
{contractExplanationData.explain[formName].content.map(
(data, idx) => (
<p key={idx}>{parse(data)}</p>
<Text size='md' key={idx}>{parse(data)}</Text>
)
)}
{contractExplanationData.explain[formName].title_secondary && (
<h3 className='secondary-title'>
<Text size='lg' bold>
{contractExplanationData.explain[formName].title_secondary}
</h3>
</Text>
)}
{contractExplanationData.explain[formName].content_secondary &&
contractExplanationData.explain[formName].content_secondary.map(
Expand All @@ -153,13 +158,15 @@ export const Explanation = () => {
</div>

{/* ========== Note ========== */}
{contractExplanationData.note[formName] && (
<p className='hint'>
<strong>{localize('Note')}: </strong>
{contractExplanationData.note[formName].content.map((data, idx) => (
<span key={idx}>{parse(data)}</span>
))}
</p>
{!explanationOnly && (
contractExplanationData.note[formName] && (
<p className='hint'>
<strong>{localize('Note')}: </strong>
{contractExplanationData.note[formName].content.map((data, idx) => (
<span key={idx}>{parse(data)}</span>
))}
</p>
)
)}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/javascript/app/pages/trade/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Symbols = require('./symbols');
const Tick = require('./tick');
const marketsElement = require('./markets.jsx');
const GuideElement = require('./guide.jsx');
const PurchaseElement = require('./purchase.jsx');
const PurchaseElement = require('./purchase/purchase.jsx');
const MarketSelectorElement = require('./markets/market-selector.jsx');
const TabsElement = require('../bottom/tabs.jsx');
const formatMoney = require('../../common/currency').formatMoney;
Expand Down
Loading
Loading