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.

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

shontzu/91144/new branding for email and passwords page #24

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion packages/account/src/Assets/ic-brand-deriv-red.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import { Localize, localize } from '@deriv/translations';
import FormSubHeader from 'Components/form-sub-header';
import SentEmailModal from 'Components/sent-email-modal';
import DerivComLogo from 'Assets/ic-brand-deriv-red.svg';
import DerivGoLight from 'Assets/ic-brand-deriv-go-light.svg';
import DerivGoDark from 'Assets/ic-brand-deriv-go-dark.svg';

const DerivPassword = ({ email, is_dark_mode_on, is_social_signup, social_identity_provider }) => {
const DerivPassword = ({ email, is_social_signup, social_identity_provider }) => {
const [is_sent_email_modal_open, setIsSentEmailModalOpen] = React.useState(false);

const onClickSendEmail = () => {
Expand Down Expand Up @@ -53,23 +51,35 @@ const DerivPassword = ({ email, is_dark_mode_on, is_social_signup, social_identi
/>
</Text>
<div className='passwords-platform__logo-container'>
<DerivComLogo className='passwords-platform__single-icon' />
<DerivComLogo />
<Text line_height='l' size='xs' weight='bold'>
{brand_website_name}
</Text>
</div>
<div className='passwords-platform__icons'>
<Popover alignment='bottom' message={platform_name_trader}>
<Icon icon={getPlatformSettings('trader').icon} size={32} />
<Icon
icon={`${getPlatformSettings('trader').icon }-dashboard`}
size={32}
description='trader'
/>
</Popover>
<Popover alignment='bottom' message={platform_name_dbot}>
<Icon icon={getPlatformSettings('dbot').icon} size={32} />
<Icon icon={`${getPlatformSettings('dbot').icon }-dashboard`} size={32} description='dbot' />
</Popover>
<Popover alignment='bottom' message={platform_name_smarttrader}>
<Icon icon={getPlatformSettings('smarttrader').icon} size={32} />
<Icon
icon={`${getPlatformSettings('smarttrader').icon }-dashboard`}
size={32}
description='smarttrader'
/>
</Popover>
<Popover alignment='bottom' message={platform_name_go}>
{is_dark_mode_on ? <DerivGoDark /> : <DerivGoLight />}
<Icon
icon={`${getPlatformSettings('go').icon }-dashboard`}
size={32}
description='derivgo'
/>
</Popover>
</div>
</React.Fragment>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const PasswordsPlatform = ({ email, has_dxtrade_accounts, has_mt5_accounts }) =>
</Text>
<div className='passwords-platform__content'>
<Popover alignment='bottom' message='Deriv MT5'>
<Icon icon='IcRebrandingDmt5' size={32} />
<Icon icon={`${getPlatformSettings('mt5').icon }-dashboard`} size={32} />
</Popover>
<Button
className='account__passwords-footer-btn'
Expand All @@ -77,7 +77,7 @@ const PasswordsPlatform = ({ email, has_dxtrade_accounts, has_mt5_accounts }) =>
</Text>
<div className='passwords-platform__content'>
<Popover alignment='bottom' message={platform_name_dxtrade}>
<Icon icon={getPlatformSettings('dxtrade').icon} size={32} />
<Icon icon={`${getPlatformSettings('dxtrade').icon }-dashboard`} size={32} />
</Popover>
<Button
className='account__passwords-footer-btn'
Expand Down
4 changes: 0 additions & 4 deletions packages/account/src/Styles/account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -705,10 +705,6 @@ $MIN_HEIGHT_FLOATING: calc(
margin-top: 1.6rem;
}

&__single-icon {
margin-right: 0.4rem;
}

&__icons {
display: inline-grid;
grid-column-gap: 0.8rem;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/shared/brand.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"go": {
"name": "Deriv GO",
"icon": ""
"icon": "IcRebrandingDerivGo"
}
},
"platforms_appstore": {
Expand Down