diff --git a/packages/appstore/src/components/modals/verification-docs-list-modal/ListItem.tsx b/packages/appstore/src/components/modals/verification-docs-list-modal/ListItem.tsx index b8c2494b2290..f6cbed51b807 100644 --- a/packages/appstore/src/components/modals/verification-docs-list-modal/ListItem.tsx +++ b/packages/appstore/src/components/modals/verification-docs-list-modal/ListItem.tsx @@ -68,7 +68,7 @@ const ListItem = observer(({ id, text, status, route }: TListItemProps) => { {status === AUTH_STATUS_CODES.NONE || (id === 'tax' && status === 0) ? ( - + ) : (
{ fill='var(--text-disabled-1)' /> ) : ( - + )}
)} diff --git a/packages/appstore/src/components/modals/verification-docs-list-modal/verification-docs-list-modal.scss b/packages/appstore/src/components/modals/verification-docs-list-modal/verification-docs-list-modal.scss index e0fb8e7897f2..994816c69f59 100644 --- a/packages/appstore/src/components/modals/verification-docs-list-modal/verification-docs-list-modal.scss +++ b/packages/appstore/src/components/modals/verification-docs-list-modal/verification-docs-list-modal.scss @@ -8,6 +8,7 @@ &-list { width: 100%; &-item { + cursor: pointer; display: flex; min-height: 5.6rem; align-items: center; diff --git a/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.scss b/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.scss index 71ab94a2fbf7..29e37fb1f2e0 100644 --- a/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.scss +++ b/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.scss @@ -83,8 +83,8 @@ margin-bottom: 0.8rem; } &-description { + margin: 1.6rem 0; max-width: 30rem; - margin: 1.6rem auto; } } diff --git a/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.tsx b/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.tsx index 4b67a4c91930..87c628afcece 100644 --- a/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.tsx +++ b/packages/cfd/src/Containers/mt5-create-password/mt5-create-password.tsx @@ -81,6 +81,7 @@ const MT5CreatePassword = ({ size='xs' align='left' className='mt5-password-modal__create-password-description' + fill='var(--text-prominent)' > { 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(), { @@ -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(), { diff --git a/packages/hooks/src/useIsSelectedMT5AccountCreated.ts b/packages/hooks/src/useIsSelectedMT5AccountCreated.ts index bb4f415c0c71..2902ddc41bc0 100644 --- a/packages/hooks/src/useIsSelectedMT5AccountCreated.ts +++ b/packages/hooks/src/useIsSelectedMT5AccountCreated.ts @@ -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, diff --git a/packages/shared/src/styles/themes.scss b/packages/shared/src/styles/themes.scss index 14bf6c249e5a..2fd0813e773f 100644 --- a/packages/shared/src/styles/themes.scss +++ b/packages/shared/src/styles/themes.scss @@ -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 @@ -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};