Skip to content

Commit

Permalink
Merge pull request #3782 from Emurgo/sorin/YOEXT-1600/dark-theme-uat
Browse files Browse the repository at this point in the history 
Sorin/yoext 1600/dark theme uat
  • Loading branch information
@vsubhuman
vsubhuman authored Dec 17, 2024
2 parents ab5b0fd + e1c40c5 commit 2c75e85
Show file tree
Hide file tree
Showing 47 changed files with 610 additions and 365 deletions.
4 changes: 4 additions & 0 deletions ...ges/yoroi-extension/app/assets/images/assets-page/token-default-logo.inline.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions packages/yoroi-extension/app/assets/images/transaction/no-transactions.inline.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 16 additions & 35 deletions packages/yoroi-extension/app/assets/images/uri/invalid-uri.inline.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion packages/yoroi-extension/app/components/common/NumericInputRP.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,9 @@ class AmountInputRevamp extends Component<AmountInputProps> {
fontSize: '24px',
lineHeight: '32px',
marginTop: '-16px',
color: 'ds.text_gray_medium',
},
'& input::placeholder': { color: 'grayscale.600' },
'& input::placeholder': { color: 'ds.text_gray_medium' },
}}
>
<NumericInputRP {...this.props} />
Expand Down
9 changes: 3 additions & 6 deletions packages/yoroi-extension/app/components/common/TextField.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import React from 'react';
import type { ElementRef, Node } from 'react';
import { IconButton, InputAdornment, TextField as TextFieldBase, useTheme, styled } from '@mui/material';
import { ReactComponent as ErrorIcon } from '../../assets/images/forms/error.inline.svg';
import { ReactComponent as DoneIcon } from '../../assets/images/forms/done.inline.svg';
import { ReactComponent as EyeIcon } from '../../assets/images/forms/password-eye-close.inline.svg';
import { ReactComponent as CloseEyeIcon } from '../../assets/images/forms/password-eye.inline.svg';
Expand Down Expand Up @@ -121,7 +120,7 @@ function TextField({
</InputAdornment>
) : type === 'password' ? (
<InputAdornment position="end" sx={{ minWidth: '52px', display: 'flex', justifyContent: 'flex-end' }}>
{Boolean(error) === true && !isRevampTheme ? <ErrorIcon /> : done === true && !isRevampTheme ? <DoneIcon /> : null}
{done === true && !isRevampTheme ? <DoneIcon /> : null}
<SIconButton
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
Expand All @@ -137,16 +136,14 @@ function TextField({
</InputAdornment>
) : QRHandler ? (
<InputAdornment position="end" sx={{ minWidth: '52px', display: 'flex', justifyContent: 'flex-end' }}>
{Boolean(error) === true && !isRevampTheme ? <ErrorIcon /> : done === true && !isRevampTheme ? <DoneIcon /> : null}
{done === true && !isRevampTheme ? <DoneIcon /> : null}
<SIconButton aria-label="QR Code Scanner" onClick={QRHandler} edge="end">
<QRLogo />
</SIconButton>
</InputAdornment>
) : (
<InputAdornment position="end">
{Boolean(error) === true && !isRevampTheme ? (
<ErrorIcon id="input-error-icon" />
) : (done === true && !isRevampTheme) || greenCheck ? (
{(done === true && !isRevampTheme) || greenCheck ? (
<DoneIcon id="input-done-icon" />
) : null}
</InputAdornment>
Expand Down
12 changes: 5 additions & 7 deletions packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import FormControlLabel from '@mui/material/FormControlLabel';
import { ReactComponent as AnalyticsIllustration } from '../../../assets/images/analytics-illustration.inline.svg';
import { ReactComponent as YesIcon } from '../../../assets/images/yes.inline.svg';
import { ReactComponent as NoIcon } from '../../../assets/images/no.inline.svg';
import { Box, Typography } from '@mui/material';
import { Box, Link, Typography } from '@mui/material';
import { RevampSwitch } from '../../widgets/Switch';
import environment from '../../../environment';

Expand Down Expand Up @@ -180,14 +180,13 @@ export default class OptForAnalyticsForm extends Component<Props, State> {
marginTop: '15px',
}}
>
<a
<Link
target="_blank"
rel="noreferrer"
href={environment.externalPrivacyPolicyURL()}
className={styles.learnMore}
>
{intl.formatMessage(messages.privacyNotice)}
</a>
</Link>
</Box>
</Box>
) : null}
Expand All @@ -201,14 +200,13 @@ export default class OptForAnalyticsForm extends Component<Props, State> {
justifyContent: isStartupScreen ? 'center' : 'flex-start',
}}
>
<a
<Link
target="_blank"
rel="noreferrer"
href="https://emurgohelpdesk.zendesk.com/hc/en-us/articles/7594394140303-What-s-user-insights-"
className={styles.learnMore}
>
{intl.formatMessage(messages.learnMore)}
</a>
</Link>
</Box>

{isSettingsScreen ? (
Expand Down
5 changes: 0 additions & 5 deletions packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
letter-spacing: 0px;
}

.learnMore {
color: #4b6dde;
text-decoration: none;
}

.skip {
text-align: center;
cursor: pointer;
Expand Down
16 changes: 5 additions & 11 deletions packages/yoroi-extension/app/components/settings/categories/SupportSettings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Component } from 'react';
import type { Node, ComponentType } from 'react';
import { observer } from 'mobx-react';
import { defineMessages, intlShape, FormattedMessage } from 'react-intl';
import { Box, Button, Typography } from '@mui/material';
import { Box, Button, Link, Typography } from '@mui/material';
import globalMessages from '../../../i18n/global-messages';
import type { $npm$ReactIntl$IntlFormat } from 'react-intl';
import { withLayout } from '../../../styles/context/layout';
Expand Down Expand Up @@ -66,23 +66,23 @@ class SupportSettings extends Component<Props & InjectedProps> {
const { intl } = this.context;

const faqLink = (
<a
<Link
href={intl.formatMessage(globalMessages.faqLinkUrl)}
onClick={event => onExternalLinkClick(event)}
id="settings:support-faq-link"
>
{intl.formatMessage(messages.faqLink)}
</a>
</Link>
);

const supportRequestLink = (
<a
<Link
href="https://emurgohelpdesk.zendesk.com/hc/en-us/requests/new?ticket_form_id=360013330335"
onClick={event => onExternalLinkClick(event)}
id="settings:support-requestSupport-link"
>
{intl.formatMessage(messages.supportRequestLink)}
</a>
</Link>
);

const downloadLogsLink = (
Expand Down Expand Up @@ -135,12 +135,6 @@ class SupportSettings extends Component<Props & InjectedProps> {
</Typography>
<Typography
component="div"
sx={{
'& a': {
color: 'ds.primary_500',
textDecoration: isRevampLayout ? 'none' : 'underline',
},
}}
color="ds.text_gray_medium"
variant={isRevampLayout ? 'body1' : 'body2'}
>
Expand Down
10 changes: 7 additions & 3 deletions packages/yoroi-extension/app/components/topbar/SidebarRevamp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,13 @@ export default class SidebarRevamp extends Component<Props> {
target="_blank"
rel="noreferrer"
sx={{
color: 'grayscale.50',
bgcolor: 'primary.700',
'&:hover': { bgcolor: 'primary.800' },
color: 'ds.bg_color_contrast_high',
bgcolor: 'ds.el_primary_max',
'&:hover': {
bgcolor: 'ds.primary_800',
color: 'ds.bg_color_contrast_min',
textDecoration: 'none',
},
}}
>
{intl.formatMessage(globalMessages.sidebarFaq)}
Expand Down
Loading

0 comments on commit 2c75e85

Please sign in to comment.