Skip to content

Commit

Permalink
Merge pull request #127 from Dhruv-deriv/DesignFixes/DHRUV
Browse files Browse the repository at this point in the history
Design Fixes for Deafulting/dhruv
  • Loading branch information
amina-deriv committed Sep 24, 2024
2 parents b6fe295 + e299ece commit a51623c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 2 additions & 0 deletions packages/appstore/src/components/cfds-listing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const CFDsListing = observer(() => {
is_populating_mt5_account_list,
real_account_creation_unlock_date,
ctrader_total_balance,
updateMT5AccountDetails,
} = client;
const { setAppstorePlatform } = common;
const { openDerivRealAccountNeededModal, setShouldShowCooldownModal } = ui;
Expand Down Expand Up @@ -179,6 +180,7 @@ const CFDsListing = observer(() => {
setPerformanceValue('switch_from_demo_to_real_time');
setPerformanceValue('switch_from_real_to_demo_time');
}
updateMT5AccountDetails();
}, [is_landing_company_loaded, is_populating_mt5_account_list]);

return (
Expand Down
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
8 changes: 4 additions & 4 deletions packages/shared/src/styles/themes.scss
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: #{$alpha-color-red-2};
--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-colored-background: #{$color-white};
--status-alert-background: #{$color-yellow-3};
// Dashboard
Expand Down Expand Up @@ -325,10 +323,12 @@
--status-success: #{$color-green-3};
--status-transfer: #{$color-orange};
--status-info: #{$color-blue};
--status-warning-dark: #{$color-yellow-1};
--status-danger-transparent: #{$alpha-color-red-1};
--status-success-transparent: #{$alpha-color-green-3};
--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
1 change: 1 addition & 0 deletions packages/stores/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,7 @@ type TTradersHubStore = {
setIsSetupRealAccountOrGoToDemoModalVisible: (value: boolean) => void;
selected_jurisdiction_kyc_status: Record<string, string>;
setSelectedJurisdictionKYCStatus: (value: Record<string, string>) => void;
getDefaultJurisdiction: () => string;
};

type TContractReplay = {
Expand Down

0 comments on commit a51623c

Please sign in to comment.