Fix a bunch of non-new tab links and mistranslated text (#1506)

common/components/Footer/index.tsx

@@ -169,7 +169,7 @@ export default class Footer extends React.PureComponent<Props, State> {
             </NewTabLink>
 
             <div className="Footer-about-links">
-              <a href="https://mycrypto.com">MyCrypto.com</a>
+              <NewTabLink href="https://mycrypto.com">MyCrypto.com</NewTabLink>
               <NewTabLink href={knowledgeBaseURL}>{translateRaw('FOOTER_SUPPORT')}</NewTabLink>
               <NewTabLink href="https://about.mycrypto.com">
                 {translateRaw('FOOTER_TEAM')}

common/components/Header/components/CustomNodeModal.tsx

@@ -98,7 +98,7 @@ class CustomNodeModal extends React.Component<Props, State> {
     const options = [...staticNetwrks, ...customNetwrks, CUSTOM];
     return (
       <Modal
-        title={translateRaw('NODE_Title')}
+        title={translateRaw('NODE_TITLE')}
         isOpen={isOpen}
         buttons={buttons}
         handleClose={handleClose}
@@ -125,7 +125,7 @@ class CustomNodeModal extends React.Component<Props, State> {
               />
             </label>
             <label className="col-sm-3 input-group">
-              <div className="input-group-header">Network</div>
+              <div className="input-group-header">{translate('CUSTOM_NETWORK')}</div>
               <Dropdown
                 value={network}
                 options={options}

common/components/Translate.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import Markdown from 'react-markdown';
+import NewTabLink from 'components/ui/NewTabLink';
 
 interface Props {
   source: string;
@@ -11,7 +12,10 @@ const TranslateMarkdown = ({ source }: Props) => {
       escapeHtml={true}
       unwrapDisallowed={true}
       allowedTypes={['link', 'emphasis', 'strong', 'code', 'root', 'inlineCode']}
-      renderers={{ root: React.Fragment }}
+      renderers={{
+        root: React.Fragment,
+        link: NewTabLink
+      }}
       source={source}
     />
   );

common/components/WalletDecrypt/components/DeterministicWalletsModal.tsx

@@ -24,7 +24,6 @@ const WALLETS_PER_PAGE = 5;
 interface Props {
   // Passed props
   isOpen?: boolean;
-  walletType?: string;
   dPath: string;
   dPaths: DPath[];
   publicKey?: string;
@@ -87,16 +86,7 @@ class DeterministicWalletsModalClass extends React.PureComponent<Props, State> {
   }
 
   public render() {
-    const {
-      wallets,
-      desiredToken,
-      network,
-      tokens,
-      dPath,
-      dPaths,
-      onCancel,
-      walletType
-    } = this.props;
+    const { wallets, desiredToken, network, tokens, dPath, dPaths, onCancel } = this.props;
     const { selectedAddress, customPath, page } = this.state;
 
     const buttons: IButton[] = [
@@ -115,7 +105,7 @@ class DeterministicWalletsModalClass extends React.PureComponent<Props, State> {
 
     return (
       <Modal
-        title={translateRaw(`DECRYPT_PROMPT_UNLOCK_${walletType}`)}
+        title={translateRaw('DECRYPT_PROMPT_SELECT_ADDRESS')}
         isOpen={this.props.isOpen}
         buttons={buttons}
         handleClose={onCancel}
@@ -274,7 +264,7 @@ class DeterministicWalletsModalClass extends React.PureComponent<Props, State> {
 
   private renderDPathOption(option: Option) {
     if (option.value === customDPath.value) {
-      return translate('ADD_Radio_5_PathCustom');
+      return translate('X_CUSTOM');
     }
 
     return (

common/components/WalletDecrypt/components/LedgerNano.tsx

@@ -66,7 +66,7 @@ class LedgerNanoSDecryptClass extends PureComponent<Props, State> {
         <div className="LedgerDecrypt">
           <div className="alert alert-danger">
             Unlocking a Ledger hardware wallet is only possible on pages served over HTTPS. You can
-            unlock your wallet at <a href="https://mycrypto.com">MyCrypto.com</a>
+            unlock your wallet at <NewTabLink href="https://mycrypto.com">MyCrypto.com</NewTabLink>
           </div>
         </div>
       );
@@ -116,7 +116,6 @@ class LedgerNanoSDecryptClass extends PureComponent<Props, State> {
           onCancel={this.handleCancel}
           onConfirmAddress={this.handleUnlock}
           onPathChange={this.handlePathChange}
-          walletType={'LEDGER'}
         />
       </div>
     );

common/components/WalletDecrypt/components/Mnemonic.tsx

@@ -91,7 +91,6 @@ class MnemonicDecryptClass extends PureComponent<Props, State> {
           onCancel={this.handleCancel}
           onConfirmAddress={this.handleUnlock}
           onPathChange={this.handlePathChange}
-          walletType={'MNEMONIC'}
         />
       </div>
     );

common/components/WalletDecrypt/components/Trezor.tsx

@@ -93,7 +93,6 @@ class TrezorDecryptClass extends PureComponent<Props, State> {
           onCancel={this.handleCancel}
           onConfirmAddress={this.handleUnlock}
           onPathChange={this.handlePathChange}
-          walletType={'TREZOR'}
         />
       </div>
     );

common/translations/lang/en.json

@@ -43,6 +43,7 @@
     "X_PRIVKEYDESC": "This is the unencrypted text version of your private key, meaning no password is necessary. If someone were to find your unencrypted private key, they could access your wallet without a password. For this reason, encrypted versions are typically recommended. ",
     "X_SAVE": "Save ",
     "X_TRY_AGAIN": "Try again",
+    "X_CUSTOM": "Custom ",
     "CX_WARNING_1": "Make sure you have **external backups** of any wallets you store here. Many things could happen that would cause you to lose the data in this Chrome Extension, including uninstalling and reinstalling the extension. This extension is a way to easily access your wallets, **not** a way to back them up. ",
     "SIDEBAR_ACCOUNTADDR": "Account Address ",
     "SIDEBAR_ACCOUNTBAL": "Account Balance ",
@@ -384,8 +385,7 @@
     "MODAL_BACK": "Back",
     "WALLET_UNLOCKING": "Unlocking...",
     "HELP_ARTICLE_1": "How to use MyCrypto with your Nano S",
-    "DECRYPT_PROMPT_UNLOCK_LEDGER": "Unlock your Ledger",
-    "DECRYPT_PROMPT_UNLOCK_TREZOR": "Unlock your TREZOR",
+    "DECRYPT_PROMPT_SELECT_ADDRESS": "Select an Address",
     "DECRYPT_DROPDOWN_LABEL": "Addresses",
     "ACTION_1": "Confirm",
     "ACTION_2": "Cancel",
@@ -479,6 +479,7 @@
     "TOOLTIP_INSECURE_WALLET_TYPE": "This wallet type is insecure",
     "TOOLTIP_SECURE_WALLET_TYPE": "This wallet type is secure",
     "CUSTOM_NODE_CONFLICT": "You already have a node called $conflictedNode that matches this one, saving will overwrite it",
+    "CUSTOM_NETWORK": "Network",
     "CUSTOM_NODE_NAME": "Node Name",
     "CUSTOM_NETWORK_NAME": "Network Name",
     "CUSTOM_NETWORK_CURRENCY": "Currency",