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

Design Fixes done in Verification modal #126

Closed
wants to merge 5 commits into from
Closed

Design Fixes done in Verification modal #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd8b115
fix: fixed the color of badges in dark mode
Dhruv-deriv Sep 23, 2024
6775a18
fix: removed code
Dhruv-deriv Sep 24, 2024
b506071
Merge branch 'dhruv/amina_mt5_defaulting_jurisdiction' of github.com:…
Dhruv-deriv Sep 24, 2024
cf396ff
fix: merge
Dhruv-deriv Sep 24, 2024
1c81cce
fix: deisgn cleanup
Dhruv-deriv Sep 24, 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
7 changes: 5 additions & 2 deletions packages/appstore/src/components/modals/verification-docs-list-modal/ListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const ListItem = observer(({ id, text, status, route }: TListItemProps) => {
<Localize i18n_default_text={text} />
</Text>
{status === AUTH_STATUS_CODES.NONE || (id === 'tax' && status === 0) ? (
<LabelPairedChevronRightMdRegularIcon />
<LabelPairedChevronRightMdRegularIcon fill='var(--text-prominent)' />
) : (
<div className='verification-docs-list-modal__card'>
<StatusBadge
Expand All @@ -84,7 +84,10 @@ const ListItem = observer(({ id, text, status, route }: TListItemProps) => {
fill='var(--text-disabled-1)'
/>
) : (
<LabelPairedChevronRightMdRegularIcon />
<LabelPairedChevronRightMdRegularIcon
className='verification-docs-list-modal__card--icon'
fill='var(--text-prominent)'
/>
)}
</div>
)}
Expand Down
1 change: 1 addition & 0 deletions ...tore/src/components/modals/verification-docs-list-modal/verification-docs-list-modal.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
&-list {
width: 100%;
&-item {
cursor: pointer;
display: flex;
min-height: 5.6rem;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion packages/cfd/src/Containers/mt5-create-password/mt5-create-password.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
margin-bottom: 0.8rem;
}
&-description {
margin: 1.6rem 0;
max-width: 30rem;
margin: 1.6rem auto;
}
}

Expand Down
1 change: 1 addition & 0 deletions packages/cfd/src/Containers/mt5-create-password/mt5-create-password.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const MT5CreatePassword = ({
size='xs'
align='left'
className='mt5-password-modal__create-password-description'
fill='var(--text-prominent)'
>
<Localize
i18n_default_text='Create a password for your {{platform}} account:'
Expand Down
4 changes: 2 additions & 2 deletions packages/cfd/src/sass/cfd.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
}

.dc-form-submit-button {
box-shadow: 0px 2px 0px 0px var(--border-divider) inset;
box-shadow: 0px 2px 0px 0px #f2f3f4 inset;
width: 100%;
padding-inline: 1.6rem;
padding-block-start: 1.6rem;
Expand Down Expand Up @@ -498,7 +498,7 @@
}
.dc-modal-header {
&--cfd-password-modal {
box-shadow: 0px -2px 0px 0px var(--border-divider) inset;
box-shadow: 0px -2px 0px 0px #f2f3f4 inset;
}
}
}
4 changes: 2 additions & 2 deletions packages/hooks/src/__tests__/useMFAccountStatus.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('useMFAccountStatus', () => {
mock_store.client.is_eu = true;
mockUseHasMaltaInvestAccount.mockReturnValue(true);
mockUseGetMFAccountStatus.mockReturnValue({
kyc_status: { poi_status: 'verified', poa_status: 'verified', valid_tin: 1 },
kyc_status: { poi_status: 'verified', poa_status: 'verified' },
mf_account_status: ACCOUNT_BADGE_STATUS.NEEDS_VERIFICATION,
});
const { result } = renderHook(() => useMFAccountStatus(), {
Expand All @@ -34,7 +34,7 @@ describe('useMFAccountStatus', () => {
it('should return null if conditions are not met', () => {
mockUseHasMaltaInvestAccount.mockReturnValue(false);
mockUseGetMFAccountStatus.mockReturnValue({
kyc_status: { poi_status: 'verified', poa_status: 'verified', valid_tin: 1 },
kyc_status: { poi_status: 'verified', poa_status: 'verified' },
mf_account_status: ACCOUNT_BADGE_STATUS.NEEDS_VERIFICATION,
});
const { result } = renderHook(() => useMFAccountStatus(), {
Expand Down
1 change: 1 addition & 0 deletions packages/hooks/src/useIsSelectedMT5AccountCreated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const useIsSelectedMT5AccountCreated = () => {
const existing_account_status = existing_account?.status ? getStatusBadge(existing_account?.status) : null;

const available_account_to_create = !is_selected_MT5_account_created ? selected_account[0] : null;

return {
is_selected_MT5_account_created,
existing_account,
Expand Down
20 changes: 10 additions & 10 deletions packages/shared/src/styles/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,15 @@
--status-default: #{$color-grey-3};
--status-adjustment: #{$color-grey-1};
--status-danger: #{$color-red-1};
--status-danger-transparent: #{$color-status-error};
--status-success: #{$color-green-1};
--status-success-transparent: #{$alpha-color-green-3};
--status-warning: #{$color-yellow};
--status-warning-dark: #{$color-yellow-1};
--status-danger-transparent: #{$alpha-color-red-1};
--status-danger-transparent: #{$alpha-color-red-1};
--status-info-transparent: #{$alpha-color-blue-1};
--status-warning-transparent: #{$alpha-color-yellow-1};
--status-transfer: #{$color-orange};
--status-info: #{$color-blue};
--status-info-transparent: #{$alpha-color-blue-1};
--status-info-transparent: #{$color-status-information};
--status-transfer: #{$color-orange};
--status-colored-background: #{$color-white};
--status-alert-background: #{$color-yellow-3};
// Dashboard
Expand Down Expand Up @@ -319,16 +317,18 @@
// Status
--status-default: #{$color-grey-3};
--status-adjustment: #{$color-grey-1};
--status-danger: #{$color-red-2};
--status-danger: #{$color-red-1};
--status-danger-transparent: #{$color-status-error};
--status-success: #{$color-green-1};
--status-success-transparent: #{$alpha-color-green-3};
--status-warning: #{$color-yellow};
--status-warning-dark: #{$color-yellow-1};
--status-warning-transparent: #{$alpha-color-yellow-1};
--status-success: #{$color-green-3};
--status-transfer: #{$color-orange};
--status-info: #{$color-blue};
--status-info-transparent: #{$color-status-information};
--status-transfer: #{$color-orange};
--status-colored-background: #{$color-white};
--status-alert-background: #{$color-yellow-3};
--status-warning-dark: #{$color-yellow-1};
--status-danger-transparent: #{$alpha-color-red-1};
--status-info-transparent: #{$alpha-color-blue-1};
// Transparentize
--transparent-success: #{$alpha-color-green-2};
Expand Down
Loading