Manage merge conflicts

README.md

@@ -11,7 +11,7 @@
 * Yarn >= 1.7.0\*\*
 * Python 2.7.X\*\*\*
 
-<sub>\*Higher versions should work fun, but may cause inconsistencies. It's suggested you run 8.9.4 using `nvm`.</sub>
+<sub>\*Higher versions should work fine, but may cause inconsistencies. It's suggested you run 8.9.4 using `nvm`.</sub>
 <br/>
 <sub>**npm is NOT supported for package management. MyCrypto uses yarn.lock to ensure sub-dependency versions are pinned, so yarn is required to install node_modules</sub>
 <br/>

common/components/TXMetaDataPanel/components/AdvancedGas.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { EAC_SCHEDULING_CONFIG } from 'libs/scheduling';
-import { translateRaw } from 'translations';
+import translate, { translateRaw } from 'translations';
 import { AppState } from 'features/reducers';
 import { TToggleAutoGasLimit, toggleAutoGasLimit, getAutoGasLimitEnabled } from 'features/config';
 import { scheduleSelectors } from 'features/schedule';
@@ -69,7 +69,7 @@ class AdvancedGas extends React.Component<Props, State> {
               defaultChecked={autoGasLimitEnabled}
               onChange={this.handleToggleAutoGasLimit}
             />
-            <span>Automatically Calculate Gas Limit</span>
+            <span>{translate('TRANS_AUTO_GAS_TOGGLE')}</span>
           </label>
         </div>
 

common/components/WalletDecrypt/WalletDecrypt.tsx

@@ -250,7 +250,8 @@ const WalletDecrypt = withRouter<Props>(
             <i className="fa fa-arrow-left" /> {translate('CHANGE_WALLET')}
           </button>
           <h2 className="WalletDecrypt-decrypt-title">
-            {!selectedWallet.isReadOnly && 'Unlock your'} {translate(selectedWallet.lid)}
+            {!selectedWallet.isReadOnly && translate('UNLOCK_WALLET')}{' '}
+            {translate(selectedWallet.lid)}
           </h2>
           <section className="WalletDecrypt-decrypt-form">
             <Errorable

common/components/WalletDecrypt/components/Trezor.tsx

@@ -65,7 +65,7 @@ class TrezorDecryptClass extends PureComponent<Props, State> {
           {isLoading ? (
             <div className="TrezorDecrypt-message">
               <Spinner light={true} />
-              Unlocking...
+              {translate('WALLET_UNLOCKING')}
             </div>
           ) : (
             translate('ADD_TREZOR_SCAN')
@@ -73,14 +73,14 @@ class TrezorDecryptClass extends PureComponent<Props, State> {
         </button>
 
         <NewTabLink className="TrezorDecrypt-buy btn btn-sm btn-default" href={trezorReferralURL}>
-          {translate('Don’t have a TREZOR? Order one now!')}
+          {translate('ORDER_TREZOR')}
         </NewTabLink>
 
         <div className={`TrezorDecrypt-error alert alert-danger ${showErr}`}>{error || '-'}</div>
 
         <div className="TrezorDecrypt-help">
           <NewTabLink href="https://support.mycrypto.com/accessing-your-wallet/how-to-use-your-trezor-with-mycrypto.html">
-            How to use TREZOR with MyCrypto
+            {translate('HOWTO_TREZOR')}
           </NewTabLink>
         </div>
 

common/config/data.tsx

@@ -3,7 +3,7 @@ import { getValues } from '../utils/helpers';
 import packageJson from '../../package.json';
 import { GasPriceSetting } from 'types/network';
 import { makeExplorer } from 'utils/helpers';
-import NewTabLink from 'components/ui/NewTabLink';
+import translate from 'translations';
 
 export const languages = require('./languages.json');
 export const discordURL = 'https://discord.gg/VSaTXEA';
@@ -25,10 +25,7 @@ export const APP_ALPHA_EXPIRATION = 1532476800000;
 // Message must be a JSX element if you want to use HTML.
 export const ANNOUNCEMENT_TYPE = '';
 export const ANNOUNCEMENT_MESSAGE = (
-  <React.Fragment>
+  <React.Fragment>{translate('ANNOUNCEMENT_MESSAGE')}</React.Fragment>
-    Welcome to the new MyCrypto. We hope you like it! If it's urgent and you need the old site, you
-    can still use <NewTabLink href="https://legacy.mycrypto.com">MyCrypto Legacy</NewTabLink>
-  </React.Fragment>
 );
 
 const etherScan = 'https://etherscan.io';

common/translations/lang/en.json

@@ -78,7 +78,10 @@
     "X_HARDWARE_WALLET": "Hardware Wallet",
     "X_HARDWARE_WALLET_2": "hardware wallet ",
     "ADD_TREZOR_SCAN": "Connect to TREZOR ",
+    "ORDER_TREZOR": "Don’t have a TREZOR? Order one now!",
+    "HOWTO_TREZOR": "How to use TREZOR with MyCrypto",
     "X_KEEPKEY": "KeepKey",
+    "UNLOCK_WALLET": "Unlock your",
     "X_PARITYSIGNER": "Parity Signer ",
     "ADD_PARITY_DESC": "Connect & sign via your Parity Signer mobile app ",
     "ADD_PARITY_1": "Transaction canceled ",
@@ -181,6 +184,7 @@
     "TRANS_SIMPLE": "Simple",
     "TRANS_DATA": "Data ",
     "TRANS_GAS": "Gas Limit ",
+    "TRANS_AUTO_GAS_TOGGLE": "Automatically Calculate Gas Limit",
     "TRANS_SENDINFO": "A standard transaction using 21000 gas will cost 0.000441 ETH. We use a slightly-above-minimum gas price of 0.000000021 ETH to ensure it gets mined quickly. We do not take a transaction fee. ",
     "OFFLINE_TITLE": "Generate & Send Offline Transaction ",
     "OFFLINE_DESC": "Generating offline transactions can be done in three steps. You will complete steps 1 and 3 on an online computer, and step 2 on an offline/airgapped computer. This ensures your private keys do not touch an internet-connected device. ",
@@ -659,6 +663,7 @@
     "USING_PAYMENT_ID": "Using the required Payment ID of:",
     "PAYMENT_ID_WARNING": "Don't forget to send your XMR with the payment ID [[?]](https://getmonero.org/resources/moneropedia/paymentid.html) above, or you WILL lose your funds.",
     "WHAT_IS_PAYMENT_ID": "what's a payment ID?",
+    "ANNOUNCEMENT_MESSAGE": "Welcome to the new MyCrypto. We hope you like it! If it's urgent and you need the old site, you can still use [MyCrypto Legacy](https://legacy.mycrypto.com)",
     "U2F_NOT_SUPPORTED": "The U2F standard that hardware wallets use does not seem to be supported by your browser. Please try again using Google Chrome."
   }
 }