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

Shaheer/feature/90115/update jurisdiction #74

Merged
merged 7 commits into from
May 25, 2023
Merged

Shaheer/feature/90115/update jurisdiction #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2946ebd
Merge pull request #27 from amina-deriv/amina/feature/90115/update_ju…
shaheer-deriv May 15, 2023
2585e53
Merge pull request #28 from amina-deriv/amina/feature/90115/update_ju…
shaheer-deriv May 22, 2023
7da2544
Merge pull request #30 from amina-deriv/amina/feature/90115/update_ju…
shaheer-deriv May 24, 2023
de97112
fix: :bug: fixes labuan assets value
shaheer-deriv May 24, 2023
4e38fd6
style: :lipstick: fixes hover effect for added cards
shaheer-deriv May 24, 2023
202d61b
fix: :bug: adds disabled prop for flipped card
shaheer-deriv May 24, 2023
601cecf
test: :test_tube: adds missing prop to jurisdiction testcase
shaheer-deriv May 24, 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
3 changes: 1 addition & 2 deletions packages/appstore/src/components/cfds-listing/cfds-listing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
cursor: pointer;
transition: all 0.1s ease-in;

&:not(.selected-card):hover {
&:not(.selected-card):not(.cfd-card-disabled):not(.cfd-card-disabled-flat):hover {
box-shadow: 0 2px 8px 0 var(--shadow-menu);
}

Expand Down Expand Up @@ -289,7 +289,6 @@
align-items: center;
}
&-disabled {
pointer-events: none;
&-flat {
border: solid 1px var(--border-normal);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cfd/src/Constants/jurisdiction-contents/jurisdiction-labuan-contents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const getJurisdictionLabuanContents = (): TJurisdictionCardItems => ({
description: localize('Forex and Cryptocurrencies'),
title_indicators: {
type: 'displayText',
display_text: localize('90+'),
display_text: localize('80+'),
display_text_skin_color: 'red-dark',
},
},
Expand Down
2 changes: 2 additions & 0 deletions packages/cfd/src/Containers/jurisdiction-modal/__test__/jurisdiction-card-back.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import JurisdictionCardBack from '../jurisdiction-card-back';
describe('<JurisdictionCardBack />', () => {
type TMockProps = {
card_classname: string;
disabled: boolean;
toggleCardFlip: jest.Mock;
is_card_selected: boolean;
verification_docs: (
Expand All @@ -18,6 +19,7 @@ describe('<JurisdictionCardBack />', () => {

const mock_props: TMockProps = {
card_classname: 'test_classname',
disabled: false,
is_card_selected: false,
toggleCardFlip: jest.fn(),
verification_docs: [],
Expand Down
2 changes: 2 additions & 0 deletions packages/cfd/src/Containers/jurisdiction-modal/jurisdiction-card-back.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { TJurisdictionCardBackProps } from 'Containers/props.types';

const JurisdictionCardBack = ({
card_classname,
disabled,
is_card_selected,
toggleCardFlip,
verification_docs,
Expand All @@ -14,6 +15,7 @@ const JurisdictionCardBack = ({
data-testid='dt_jurisdiction_card_back_container'
className={classNames(card_classname, 'cfd-card-back', {
[`${card_classname}--selected selected-card`]: is_card_selected,
'cfd-card-disabled-flat': disabled,
})}
>
<div
Expand Down
1 change: 1 addition & 0 deletions packages/cfd/src/Containers/jurisdiction-modal/jurisdiction-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const JurisdictionCard = ({
/>
<JurisdictionCardBack
card_classname={card_classname}
disabled={disabled}
is_card_selected={is_card_selected}
toggleCardFlip={toggleCardFlip}
verification_docs={verification_docs}
Expand Down
1 change: 1 addition & 0 deletions packages/cfd/src/Containers/props.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ export type TJurisdictionCardProps = {

export type TJurisdictionCardBackProps = {
card_classname: string;
disabled: boolean;
is_card_selected: boolean;
toggleCardFlip: React.MouseEventHandler<HTMLSpanElement>;
verification_docs: TJurisdictionCardItemVerification | undefined;
Expand Down
3 changes: 1 addition & 2 deletions packages/cfd/src/sass/cfd-dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@
cursor: pointer;
transition: all 0.1s ease-in;

&:not(.selected-card):hover {
&:not(.selected-card):not(.cfd-card-disabled):not(.cfd-card-disabled-flat):hover {
box-shadow: 0 2px 8px 0 var(--shadow-menu);
}

Expand Down Expand Up @@ -779,7 +779,6 @@
align-items: center;
}
&-disabled {
pointer-events: none;
&-flat {
border: solid 1px var(--border-normal);
}
Expand Down