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

Shontzu/fixing issues in the cards that was fixed and closed but reverted when merging #69

Merged
merged 35 commits into from
Aug 3, 2023
Merged

Shontzu/fixing issues in the cards that was fixed and closed but reverted when merging #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7bb0f9e
Merge branch 'binary-com:master' into feature-revamp-compare-account
shontzu-deriv Jul 24, 2023
46fe67b
chore: added s to spread(s)
shontzu-deriv Jul 24, 2023
4924cc5
chore: fixed capitalization
shontzu-deriv Jul 24, 2023
894badf
chore: line split
shontzu-deriv Jul 24, 2023
930c4e7
fix: failing test case
shontzu-deriv Jul 24, 2023
06732d0
fix: updated markets offerings for MT5 Financial Labuan
shontzu-deriv Jul 24, 2023
fd0b426
fix: Other CFDs --> Other CFDs Platform
shontzu-deriv Jul 24, 2023
c58046f
Merge pull request #55 from shontzu-deriv/shontzu/CFDS-733/Missing-s-…
hirad-deriv Jul 25, 2023
1f39cb3
Merge pull request #56 from shontzu-deriv/shontzu/CFDS-734/Indices-an…
hirad-deriv Jul 25, 2023
240a950
Merge pull request #57 from shontzu-deriv/shontzu/CFDS-735/The-Regula…
hirad-deriv Jul 25, 2023
0e7c2f6
Merge branch 'feature-revamp-compare-account' into shontzu/CFDS-736/T…
shontzu-deriv Jul 25, 2023
71398b1
Merge pull request #58 from shontzu-deriv/shontzu/CFDS-736/The-market…
hirad-deriv Jul 25, 2023
215710d
fix: removed standard/micro from DerivX Forex label
shontzu-deriv Jul 25, 2023
8b8a0fc
refactor: optimised code
shontzu-deriv Jul 25, 2023
7de6b9d
fix: icon size inconsistencyn mobile VP
shontzu-deriv Jul 25, 2023
ebc6ff2
refactor: css refactoring to reflect figma as much as possible
shontzu-deriv Jul 25, 2023
a38157d
refactor: minor css fixes
shontzu-deriv Jul 25, 2023
0e9cbed
fix: fixed
shontzu-deriv Jul 26, 2023
778fcad
Merge pull request #59 from shontzu-deriv/shontzu/CFDS-752/Deriv-X-Ot…
hirad-deriv Jul 26, 2023
3cee2e1
Merge pull request #60 from shontzu-deriv/shontzu/CFDS-762/Mobile_And…
hirad-deriv Jul 26, 2023
5795001
Merge pull request #61 from shontzu-deriv/shontzu/CFDS-785/Regulator-…
hirad-deriv Jul 26, 2023
1e24cc3
Merge pull request #62 from shontzu-deriv/shontzu/CFDS-786/Markets-of…
hirad-deriv Jul 26, 2023
3ef50b5
fix: refactored line break to not break translation
shontzu-deriv Jul 26, 2023
39a2442
style: added bottom padding for mobile
shontzu-deriv Jul 26, 2023
3dc928d
Merge pull request #64 from shontzu-deriv/shontzu/CFDS-763/Compare-CF…
hirad-deriv Jul 26, 2023
01706e9
Merge pull request #63 from shontzu-deriv/shontzu/CFDS-735/The-Regula…
hirad-deriv Jul 26, 2023
68acdd7
fix: merge conflict
shontzu-deriv Jul 27, 2023
8919b58
Merge branch 'feature-revamp-compare-account' of github.com:hirad-rew…
shontzu-deriv Jul 27, 2023
9d92c20
Merge branch 'feature-revamp-compare-account' of github.com:hirad-rew…
shontzu-deriv Jul 27, 2023
3729d96
chore: CFDS-733, 734, 735, 785, 786
shontzu-deriv Jul 31, 2023
2a88603
chore: revert package-lock.json changes
shontzu-deriv Aug 2, 2023
31b656c
chore: revert package-lock.json changes
shontzu-deriv Aug 2, 2023
3f00f07
chore: revert package-lock.json changes
shontzu-deriv Aug 2, 2023
44f2eda
fix: revert untinteded changes
shontzu-deriv Aug 2, 2023
796331e
Update date-picker-input.tsx
shontzu-deriv Aug 2, 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
6 changes: 3 additions & 3 deletions ...count/src/Sections/Verification/ProofOfOwnership/__test__/proof-of-ownership-form.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ describe('proof-of-ownership-form.jsx', () => {
citizen='id'
/>
);
const cardItems = screen.getAllByRole('card-item');
expect(cardItems.length).toEqual(1);
const cardItems = screen.getByRole('card-item');
expect(cardItems).toBeInTheDocument();
});
it('should render multiple card items inside the form', () => {
render(
Expand All @@ -30,7 +30,7 @@ describe('proof-of-ownership-form.jsx', () => {
/>
);
const cardItems = screen.getAllByRole('card-item');
expect(cardItems.length).toEqual(Object.keys(grouped_payment_method_data).length);
expect(cardItems).toHaveLength(Object.keys(grouped_payment_method_data).length);
});
it('should format identifier', async () => {
render(
Expand Down
21 changes: 11 additions & 10 deletions ...d/src/Containers/cfd-compare-accounts/__tests__/cfd-compare-accounts-description.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('<CFDCompareAccountsDescription />', () => {

it('should render content for gaming market type with market type svg', () => {
render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Deriv (SVG) LLC')).toBeInTheDocument();
expect(screen.getByText('St. Vincent & Grenadines')).toBeInTheDocument();
Expand All @@ -41,7 +41,7 @@ describe('<CFDCompareAccountsDescription />', () => {
mocked_props.trading_platforms.shortcode = 'vanuatu';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Deriv (V) Ltd')).toBeInTheDocument();
expect(screen.getByText('Vanuatu')).toBeInTheDocument();
Expand All @@ -51,7 +51,7 @@ describe('<CFDCompareAccountsDescription />', () => {
mocked_props.trading_platforms.market_type = 'all';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Deriv (SVG) LLC')).toBeInTheDocument();
expect(screen.getByText('St. Vincent & Grenadines')).toBeInTheDocument();
Expand All @@ -64,7 +64,7 @@ describe('<CFDCompareAccountsDescription />', () => {
mocked_props.trading_platforms.shortcode = 'svg';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Deriv (SVG) LLC')).toBeInTheDocument();
expect(screen.getByText('St. Vincent & Grenadines')).toBeInTheDocument();
Expand All @@ -77,7 +77,7 @@ describe('<CFDCompareAccountsDescription />', () => {
mocked_props.trading_platforms.shortcode = 'vanuatu';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Deriv (V) Ltd')).toBeInTheDocument();
expect(screen.getByText('Vanuatu')).toBeInTheDocument();
Expand All @@ -90,20 +90,21 @@ describe('<CFDCompareAccountsDescription />', () => {
mocked_props.trading_platforms.shortcode = 'labuan';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:100')).toBeInTheDocument();
expect(screen.getByText('Deriv (FX) Ltd')).toBeInTheDocument();
expect(screen.getByText('Labuan')).toBeInTheDocument();
expect(screen.getByText('Labuan Financial Services Authority')).toBeInTheDocument();
expect(screen.getByText('(licence no. MB/18/0024) Regulator/External Dispute Resolution')).toBeInTheDocument();
expect(screen.getByText('(licence no. MB/18/0024)')).toBeInTheDocument();
expect(screen.getByText('Regulator/External Dispute Resolution')).toBeInTheDocument();
});

it('should render content for financial market type with maltainvest shortcode ', () => {
mocked_props.trading_platforms.market_type = 'financial';
mocked_props.trading_platforms.shortcode = 'maltainvest';

render(<CFDCompareAccountsDescription {...mocked_props} />);
assertContent('Maximum Leverage', '0.5 pips', 'Spread from', 'Counterparty company', 'Jurisdiction');
assertContent('Maximum leverage', '0.5 pips', 'Spreads from', 'Counterparty company', 'Jurisdiction');
expect(screen.getByText('1:30')).toBeInTheDocument();
expect(screen.getByText('Deriv Investments (Europe) Limited')).toBeInTheDocument();
expect(screen.getByText('Malta')).toBeInTheDocument();
Expand All @@ -120,8 +121,8 @@ describe('<CFDCompareAccountsDescription />', () => {

render(<CFDCompareAccountsDescription {...mocked_props} />);
expect(screen.getByText('1:1000')).toBeInTheDocument();
expect(screen.getByText('Maximum Leverage')).toBeInTheDocument();
expect(screen.getByText('Maximum leverage')).toBeInTheDocument();
expect(screen.getByText('0.5 pips')).toBeInTheDocument();
expect(screen.getByText('Spread from')).toBeInTheDocument();
expect(screen.getByText('Spreads from')).toBeInTheDocument();
});
});
11 changes: 8 additions & 3 deletions packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts-description.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,30 @@ const CFDCompareAccountsDescription = ({ trading_platforms, is_demo }: TCompareA
{!is_demo && (
<React.Fragment>
<div className='compare-cfd-account-text-container__separator'>
<Text as='h1' weight='bold' size='xxs' align='center'>
<Text as='h1' weight='bold' size='xs' align='center'>
{juridisction_data.counterparty_company}
</Text>
<Text as='p' size='xxxs' align='center'>
{juridisction_data.counterparty_company_description}
</Text>
</div>
<div className='compare-cfd-account-text-container__separator'>
<Text as='h1' weight='bold' size='xxs' align='center'>
<Text as='h1' weight='bold' size='xs' align='center'>
{juridisction_data.jurisdiction}
</Text>
<Text as='p' size='xxxs' align='center'>
{juridisction_data.jurisdiction_description}
</Text>
</div>
<div className='compare-cfd-account-text-container__separator'>
<Text as='h1' weight='bold' size='xxs' align='center'>
<Text as='h1' weight='bold' size='xs' align='center'>
{juridisction_data.regulator}
</Text>
{juridisction_data.regulator_license && (
<Text as='p' size='xxxs' align='center'>
{juridisction_data.regulator_license}
</Text>
)}
<Text as='p' size='xxxs' align='center'>
{juridisction_data.regulator_description}
</Text>
Expand Down
7 changes: 3 additions & 4 deletions packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
.compare-cfd-account {
max-width: 123.2rem;
margin: auto;
padding: 5rem 0;
&-container {
margin: 1.5rem;
@include mobile {
Expand Down Expand Up @@ -54,7 +53,7 @@
box-shadow: 0 2px 8px 0 var(--shadow-menu);
}
@include mobile {
width: 17rem;
width: 18rem;
}
&__eu-clients {
position: relative;
Expand All @@ -78,10 +77,10 @@
&-outline {
display: flex;
flex-direction: column;
padding: 2rem 2.4rem 0;
padding: 4rem 2.4rem 0;
border-radius: 2.4rem;
@include mobile {
padding-top: 4.5rem;
padding: 7rem 1.5rem 0;
}
}
&-text-container {
Expand Down
9 changes: 1 addition & 8 deletions packages/cfd/src/Containers/cfd-compare-accounts/instruments-icon-with-label.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@ const InstrumentsIconWithLabel = ({ icon, text, highlighted, className, is_aster
className={className}
>
<TradingInstrumentsIcon icon={icon} size={24} className='trading-instruments__icon' />
<Text
as='p'
weight='bolder'
line_height='xs'
size='xxs'
align='center'
className='trading-instruments__text'
>
<Text as='p' weight='bolder' line_height='xs' size='xxs' align='left' className='trading-instruments__text'>
{text}
</Text>
{is_asterisk && (
Expand Down
Loading