updated links

Emurgo · Dec 13, 2024 · 4474254 · 4474254
1 parent b1505ce
commit 4474254
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 39 deletions.
diff --git a/packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.js b/packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.js
@@ -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';
 
@@ -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}
@@ -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 ? (

diff --git a/packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.scss b/packages/yoroi-extension/app/components/profile/terms-of-use/OptForAnalyticsForm.scss
@@ -12,11 +12,6 @@
     letter-spacing: 0px;
   }
 
-  .learnMore {
-    color: #4b6dde;
-    text-decoration: none;
-  }
-
   .skip {
     text-align: center;
     cursor: pointer;

diff --git a/packages/yoroi-extension/app/components/settings/categories/SupportSettings.js b/packages/yoroi-extension/app/components/settings/categories/SupportSettings.js
@@ -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';
@@ -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 = (
@@ -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'}
                 >

diff --git a/packages/yoroi-extension/app/components/topbar/SidebarRevamp.js b/packages/yoroi-extension/app/components/topbar/SidebarRevamp.js
@@ -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)}

diff --git a/packages/yoroi-extension/app/components/wallet/add/option-dialog/PickCurrencyOptionDialog.js b/packages/yoroi-extension/app/components/wallet/add/option-dialog/PickCurrencyOptionDialog.js
@@ -65,7 +65,10 @@ export default class PickCurrencyOptionDialog extends Component<Props> {
               learnMoreText={
                 <>
                   <Typography color="ds.text_gray_low">{intl.formatMessage(messages.cardanoDescription)}</Typography>
-                  <Link href="https://cardano.org" onClick={event => this.props.onExternalLinkClick(event)}>
+                  <Link
+                    href="https://cardano.org"
+                    onClick={event => this.props.onExternalLinkClick(event)}
+                  >
                     {intl.formatMessage(globalMessages.learnMore)}
                   </Link>
                 </>
@@ -83,9 +86,12 @@ export default class PickCurrencyOptionDialog extends Component<Props> {
                     <>
                       {intl.formatMessage(messages.testnetDescription)}
                       <br />
-                      <a href="https://testnets.cardano.org/" onClick={event => this.props.onExternalLinkClick(event)}>
+                      <Link
+                        href="https://testnets.cardano.org/"
+                        onClick={event => this.props.onExternalLinkClick(event)}
+                      >
                         {intl.formatMessage(globalMessages.learnMore)}
-                      </a>
+                      </Link>
                     </>
                   }
                 />
@@ -102,9 +108,12 @@ export default class PickCurrencyOptionDialog extends Component<Props> {
                     <>
                       {intl.formatMessage(messages.testnetDescription)}
                       <br />
-                      <a href="https://testnets.cardano.org/" onClick={event => this.props.onExternalLinkClick(event)}>
+                      <Link
+                        href="https://testnets.cardano.org/"
+                        onClick={event => this.props.onExternalLinkClick(event)}
+                      >
                         {intl.formatMessage(globalMessages.learnMore)}
-                      </a>
+                      </Link>
                     </>
                   }
                 />
@@ -121,9 +130,12 @@ export default class PickCurrencyOptionDialog extends Component<Props> {
                     <>
                       {intl.formatMessage(messages.testnetDescription)}
                       <br />
-                      <a href="https://testnets.cardano.org/" onClick={event => this.props.onExternalLinkClick(event)}>
+                      <Link
+                        href="https://testnets.cardano.org/"
+                        onClick={event => this.props.onExternalLinkClick(event)}
+                      >
                         {intl.formatMessage(globalMessages.learnMore)}
-                      </a>
+                      </Link>
                     </>
                   }
                 />

diff --git a/packages/yoroi-extension/app/components/widgets/options/OptionBlock.scss b/packages/yoroi-extension/app/components/widgets/options/OptionBlock.scss
@@ -53,16 +53,10 @@
             background-image: url(../../../assets/images/add-wallet/option-dialog/connect-trezor-modern.inline.svg);
           }
       }
-
-
     }
 
     // LEARN MORE TEXT BLOCK
     .learnMoreTextBlock {
-      a {
-        @include underline(var(--yoroi-palette-gray-800));
-      }
-
       overflow: hidden;
       max-height: 0;
       transition: 300ms linear;

diff --git a/packages/yoroi-extension/app/styles/overrides/Link.js b/packages/yoroi-extension/app/styles/overrides/Link.js
@@ -12,6 +12,7 @@ export const LightLink = {
   styleOverrides: {
     root: {
       color: ltDs.text_primary_medium,
+      textDecoration: 'none',
       '&:hover': {
         textDecoration: 'underline',
         color: ltDs.text_primary_max,
@@ -24,6 +25,7 @@ export const DarkLink = {
   styleOverrides: {
     root: {
       color: dtDs.text_primary_medium,
+      textDecoration: 'none',
       '&:hover': {
         textDecoration: 'underline',
         color: dtDs.text_primary_max,