diff --git a/LICENSE b/LICENSE index eca703eb..7b1edff2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2016 MyEtherWallet +Copyright (c) 2015-2017 MyEtherWallet LLC +Copyright (c) 2018 MyCrypto, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f0013508..defa1535 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MyEtherWallet V4+ (ALPHA - VISIT [V3](https://github.com/kvhnuke/etherwallet) for the current site)
Just looking to download? Grab our [latest release](https://github.com/MyEtherWallet/MyEtherWallet/releases) +# MyCrypto V4+ (ALPHA - VISIT [V3](https://github.com/MyCryptoHQ/mycrypto.com) for the current site)
Just looking to download? Grab our [latest release](https://github.com/MyCryptoHQ/MyCrypto/releases) [![Greenkeeper badge](https://badges.greenkeeper.io/MyCrypto/MyCrypto.svg)](https://greenkeeper.io/) @@ -122,7 +122,7 @@ npm run test:int └── webpack_config - Webpack configuration ``` -### More information is available on the [Wiki Pages](https://github.com/MyEtherWallet/MyEtherWallet/wiki) +### More information is available on the [Wiki Pages](https://github.com/MyCryptoHQ/MyCrypto/wiki) ## Thanks & Support diff --git a/common/Root.tsx b/common/Root.tsx index 38ea866f..74231413 100644 --- a/common/Root.tsx +++ b/common/Root.tsx @@ -5,7 +5,6 @@ import { withRouter, Switch, Redirect, HashRouter, Route, BrowserRouter } from ' import Contracts from 'containers/Tabs/Contracts'; import ENS from 'containers/Tabs/ENS'; import GenerateWallet from 'containers/Tabs/GenerateWallet'; -import Help from 'containers/Tabs/Help'; import SendTransaction from 'containers/Tabs/SendTransaction'; import Swap from 'containers/Tabs/Swap'; import SignAndVerifyMessage from 'containers/Tabs/SignAndVerifyMessage'; @@ -65,7 +64,6 @@ export default class Root extends Component { - diff --git a/common/api/shapeshift.ts b/common/api/shapeshift.ts index 9ca6f9bf..01100505 100644 --- a/common/api/shapeshift.ts +++ b/common/api/shapeshift.ts @@ -1,5 +1,8 @@ import { checkHttpStatus, parseJSON } from 'api/utils'; +const SHAPESHIFT_API_KEY = + '8abde0f70ca69d5851702d57b10305705d7333e93263124cc2a2649dab7ff9cf86401fc8de7677e8edcd0e7f1eed5270b1b49be8806937ef95d64839e319e6d9'; + const SHAPESHIFT_BASE_URL = 'https://shapeshift.io'; export const SHAPESHIFT_TOKEN_WHITELIST = [ @@ -28,7 +31,7 @@ export const SHAPESHIFT_WHITELIST = [...SHAPESHIFT_TOKEN_WHITELIST, 'ETH', 'ETC' class ShapeshiftService { public whitelist = SHAPESHIFT_WHITELIST; private url = SHAPESHIFT_BASE_URL; - private apiKey = '0ca1ccd50b708a3f8c02327f0caeeece06d3ddc1b0ac749a987b453ee0f4a29bdb5da2e53bc35e57fb4bb7ae1f43c93bb098c3c4716375fc1001c55d8c94c160'; + private apiKey = SHAPESHIFT_API_KEY; private postHeaders = { 'Content-Type': 'application/json' }; diff --git a/common/assets/images/favicon.png b/common/assets/images/favicon.png new file mode 100644 index 00000000..bb61b1d9 Binary files /dev/null and b/common/assets/images/favicon.png differ diff --git a/common/assets/images/fb-mewtwo.jpg b/common/assets/images/fb-mewtwo.jpg deleted file mode 100755 index 3f7a3222..00000000 Binary files a/common/assets/images/fb-mewtwo.jpg and /dev/null differ diff --git a/common/assets/images/fb-myetherwallet.png b/common/assets/images/fb-myetherwallet.png deleted file mode 100755 index 014978e9..00000000 Binary files a/common/assets/images/fb-myetherwallet.png and /dev/null differ diff --git a/common/assets/images/icons/icon128.png b/common/assets/images/icons/icon128.png deleted file mode 100755 index 5db66054..00000000 Binary files a/common/assets/images/icons/icon128.png and /dev/null differ diff --git a/common/assets/images/icons/icon16.png b/common/assets/images/icons/icon16.png deleted file mode 100755 index 2d04462b..00000000 Binary files a/common/assets/images/icons/icon16.png and /dev/null differ diff --git a/common/assets/images/icons/icon19.png b/common/assets/images/icons/icon19.png deleted file mode 100755 index ebaba1bd..00000000 Binary files a/common/assets/images/icons/icon19.png and /dev/null differ diff --git a/common/assets/images/icons/icon48.png b/common/assets/images/icons/icon48.png deleted file mode 100755 index 55b864b1..00000000 Binary files a/common/assets/images/icons/icon48.png and /dev/null differ diff --git a/common/assets/images/loading.gif b/common/assets/images/loading.gif deleted file mode 100755 index 6fd567c0..00000000 Binary files a/common/assets/images/loading.gif and /dev/null differ diff --git a/common/assets/images/logo-mycrypto.svg b/common/assets/images/logo-mycrypto.svg new file mode 100755 index 00000000..11329fc3 --- /dev/null +++ b/common/assets/images/logo-mycrypto.svg @@ -0,0 +1,33 @@ + + + + Artboard + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/assets/images/logo-myetherwallet.svg b/common/assets/images/logo-myetherwallet.svg deleted file mode 100755 index 3e3fbeef..00000000 --- a/common/assets/images/logo-myetherwallet.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - etherwallet-logo - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/assets/images/logo-myetherwalletcx.svg b/common/assets/images/logo-myetherwalletcx.svg deleted file mode 100755 index 6b641dcf..00000000 --- a/common/assets/images/logo-myetherwalletcx.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - etherwalletcx-logo - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/assets/images/mewtwo.jpg b/common/assets/images/mewtwo.jpg deleted file mode 100755 index e2f3a9e4..00000000 Binary files a/common/assets/images/mewtwo.jpg and /dev/null differ diff --git a/common/assets/images/onboarding/slide-01.svg b/common/assets/images/onboarding/slide-01.svg new file mode 100644 index 00000000..a9f0c75c --- /dev/null +++ b/common/assets/images/onboarding/slide-01.svg @@ -0,0 +1,72 @@ + + + + Artboard + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/assets/images/onboarding_icon-02.svg b/common/assets/images/onboarding/slide-02.svg similarity index 100% rename from common/assets/images/onboarding_icon-02.svg rename to common/assets/images/onboarding/slide-02.svg diff --git a/common/assets/images/onboarding_icon-03.svg b/common/assets/images/onboarding/slide-03.svg similarity index 100% rename from common/assets/images/onboarding_icon-03.svg rename to common/assets/images/onboarding/slide-03.svg diff --git a/common/assets/images/onboarding_icon-04.svg b/common/assets/images/onboarding/slide-04.svg similarity index 100% rename from common/assets/images/onboarding_icon-04.svg rename to common/assets/images/onboarding/slide-04.svg diff --git a/common/assets/images/onboarding_icon-05.svg b/common/assets/images/onboarding/slide-05.svg similarity index 100% rename from common/assets/images/onboarding_icon-05.svg rename to common/assets/images/onboarding/slide-05.svg diff --git a/common/assets/images/onboarding/slide-06.svg b/common/assets/images/onboarding/slide-06.svg new file mode 100644 index 00000000..a10c866d --- /dev/null +++ b/common/assets/images/onboarding/slide-06.svg @@ -0,0 +1,47 @@ + + + + Artboard + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/assets/images/onboarding_icon-07.svg b/common/assets/images/onboarding/slide-07.svg similarity index 100% rename from common/assets/images/onboarding_icon-07.svg rename to common/assets/images/onboarding/slide-07.svg diff --git a/common/assets/images/onboarding_icon-08.svg b/common/assets/images/onboarding/slide-08.svg similarity index 100% rename from common/assets/images/onboarding_icon-08.svg rename to common/assets/images/onboarding/slide-08.svg diff --git a/common/assets/images/onboarding_icon-09.svg b/common/assets/images/onboarding/slide-09.svg similarity index 100% rename from common/assets/images/onboarding_icon-09.svg rename to common/assets/images/onboarding/slide-09.svg diff --git a/common/assets/images/onboarding_icon-10.svg b/common/assets/images/onboarding/slide-10.svg similarity index 100% rename from common/assets/images/onboarding_icon-10.svg rename to common/assets/images/onboarding/slide-10.svg diff --git a/common/assets/images/onboarding_icon-01.svg b/common/assets/images/onboarding_icon-01.svg deleted file mode 100644 index 3a26533b..00000000 --- a/common/assets/images/onboarding_icon-01.svg +++ /dev/null @@ -1 +0,0 @@ -onboarding_icon-01 \ No newline at end of file diff --git a/common/assets/images/onboarding_icon-06.svg b/common/assets/images/onboarding_icon-06.svg deleted file mode 100644 index 781c83d5..00000000 --- a/common/assets/images/onboarding_icon-06.svg +++ /dev/null @@ -1 +0,0 @@ -onboarding_icons \ No newline at end of file diff --git a/common/assets/images/print-sidebar.png b/common/assets/images/print-sidebar.png index 4a2c0d38..169973c0 100755 Binary files a/common/assets/images/print-sidebar.png and b/common/assets/images/print-sidebar.png differ diff --git a/common/components/AlphaAgreement/index.tsx b/common/components/AlphaAgreement/index.tsx index d498655c..81999354 100644 --- a/common/components/AlphaAgreement/index.tsx +++ b/common/components/AlphaAgreement/index.tsx @@ -23,16 +23,16 @@ export default class AlphaAgreement extends React.PureComponent<{}, State> { return (
-

This is an Unstable Version of MEW

+

This is an Unstable Version of MyCrypto

- You are about to access an alpha version of MyEtherWallet that is currently in - development. In its current state, it should only be used for testing, not for important + You are about to access an alpha version of MyCrypto that is currently in development. + In its current state, it should only be used for testing, not for important transactions.

Any wallets you generate should not hold a significant value, and any transactions you - make should be for small amounts. MEW does not claim responsibility for any issues that - happen while using the alpha version. + make should be for small amounts. MyCrypto does not claim responsibility for any issues + that happen while using the alpha version.

Are you sure you would like to continue?

@@ -62,6 +62,6 @@ export default class AlphaAgreement extends React.PureComponent<{}, State> { }; private reject = () => { - window.location.assign('https://myetherwallet.com'); + window.location.assign('https://mycrypto.com'); }; } diff --git a/common/components/BalanceSidebar/PromoComponents/HardwareWallets.tsx b/common/components/BalanceSidebar/PromoComponents/HardwareWallets.tsx index 8c4f4918..45b667e8 100644 --- a/common/components/BalanceSidebar/PromoComponents/HardwareWallets.tsx +++ b/common/components/BalanceSidebar/PromoComponents/HardwareWallets.tsx @@ -1,14 +1,13 @@ import React from 'react'; -import { knowledgeBaseURL } from 'config/data'; +import { HELP_ARTICLE } from 'config'; +import { HelpLink } from 'components/ui'; import ledgerLogo from 'assets/images/logo-ledger.svg'; import trezorLogo from 'assets/images/logo-trezor.svg'; export const HardwareWallets: React.SFC = () => ( -
@@ -19,5 +18,5 @@ export const HardwareWallets: React.SFC = () => (
-
+ ); diff --git a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx index 74d4ac11..6a452908 100644 --- a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx +++ b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx @@ -1,9 +1,9 @@ import React from 'react'; import classnames from 'classnames'; -import { Token } from 'config'; +import { Token, HELP_ARTICLE } from 'config'; import { isPositiveIntegerOrZero, isValidETHAddress } from 'libs/validators'; import translate from 'translations'; -import NewTabLink from 'components/ui/NewTabLink'; +import { HelpLink } from 'components/ui'; import './AddCustomTokenForm.scss'; interface Props { @@ -86,12 +86,9 @@ export default class AddCustomTokenForm extends React.PureComponent - + {translate('Need help? Learn how to add custom tokens.')} - +
@@ -236,12 +231,7 @@ export default class Footer extends React.PureComponent {
  • - ETH: mewtopia.eth{' '} - - - {donationAddressMap.ETH} - - + ETH: {donationAddressMap.ETH}
  • {' '} diff --git a/common/components/Header/components/GasPriceDropdown.tsx b/common/components/Header/components/GasPriceDropdown.tsx index 2b6ba84d..d4b1fd94 100644 --- a/common/components/Header/components/GasPriceDropdown.tsx +++ b/common/components/Header/components/GasPriceDropdown.tsx @@ -1,7 +1,7 @@ -import { gasPriceDefaults, knowledgeBaseURL } from 'config'; +import { gasPriceDefaults, HELP_ARTICLE } from 'config'; import throttle from 'lodash/throttle'; import React, { Component } from 'react'; -import DropdownShell from 'components/ui/DropdownShell'; +import { DropdownShell, HelpLink } from 'components/ui'; import './GasPriceDropdown.scss'; import { SetGasLimitFieldAction } from 'actions/transaction'; import { gasPricetoBase } from 'libs/units'; @@ -67,13 +67,7 @@ class GasPriceDropdown extends Component { 21 GWEI.

    - - Read more - + Read more

diff --git a/common/components/Header/index.scss b/common/components/Header/index.scss index 5a2b8237..6611434f 100644 --- a/common/components/Header/index.scss +++ b/common/components/Header/index.scss @@ -98,13 +98,14 @@ $small-size: 900px; &-title { @include big-query { - flex-basis: 245px; + text-align: left; } &-logo { - max-width: 1000px; - padding: 5px 0; - min-width: 220px; + height: 64px; + width: auto; + padding: 8px; + padding-right: 0; } } diff --git a/common/components/Header/index.tsx b/common/components/Header/index.tsx index de5517e6..9ffa75c3 100644 --- a/common/components/Header/index.tsx +++ b/common/components/Header/index.tsx @@ -5,7 +5,7 @@ import { TRemoveCustomNode, TAddCustomNetwork } from 'actions/config'; -import logo from 'assets/images/logo-myetherwallet.svg'; +import logo from 'assets/images/logo-mycrypto.svg'; import { Dropdown, ColorDropdown } from 'components/ui'; import React, { PureComponent } from 'react'; import classnames from 'classnames'; @@ -118,7 +118,7 @@ export default class Header extends PureComponent { src={logo} height="64px" width="245px" - alt="MyEtherWallet" + alt="MyCrypto logo" />
diff --git a/common/components/WalletDecrypt/WalletDecrypt.tsx b/common/components/WalletDecrypt/WalletDecrypt.tsx index 5146ad47..cdef59e1 100644 --- a/common/components/WalletDecrypt/WalletDecrypt.tsx +++ b/common/components/WalletDecrypt/WalletDecrypt.tsx @@ -35,21 +35,22 @@ import { AppState } from 'reducers'; import { showNotification, TShowNotification } from 'actions/notifications'; import { getDisabledWallets } from 'selectors/wallet'; import { DisabledWallets } from './disables'; - -import LedgerIcon from 'assets/images/wallets/ledger.svg'; -import MetamaskIcon from 'assets/images/wallets/metamask.svg'; -import MistIcon from 'assets/images/wallets/mist.svg'; -import TrezorIcon from 'assets/images/wallets/trezor.svg'; -import './WalletDecrypt.scss'; import { SecureWalletName, InsecureWalletName, MiscWalletName, WalletName, isWeb3NodeAvailable, - knowledgeBaseURL + knowledgeBaseURL, + donationAddressMap } from 'config'; +import LedgerIcon from 'assets/images/wallets/ledger.svg'; +import MetamaskIcon from 'assets/images/wallets/metamask.svg'; +import MistIcon from 'assets/images/wallets/mist.svg'; +import TrezorIcon from 'assets/images/wallets/trezor.svg'; +import './WalletDecrypt.scss'; + interface OwnProps { hidden?: boolean; disabledWallets?: DisabledWallets; @@ -192,7 +193,7 @@ export class WalletDecrypt extends Component { }, [MiscWalletName.VIEW_ONLY]: { lid: 'View Address', - example: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8', + example: donationAddressMap.ETH, component: ViewOnlyDecrypt, initialParams: {}, unlock: this.props.setWallet, diff --git a/common/components/WalletDecrypt/components/InsecureWalletWarning.tsx b/common/components/WalletDecrypt/components/InsecureWalletWarning.tsx index 87d2d55f..e136813f 100644 --- a/common/components/WalletDecrypt/components/InsecureWalletWarning.tsx +++ b/common/components/WalletDecrypt/components/InsecureWalletWarning.tsx @@ -1,4 +1,6 @@ import React from 'react'; +import { HelpLink } from 'components/ui'; +import { HELP_ARTICLE } from 'config'; import './InsecureWalletWarning.scss'; interface Props { @@ -45,12 +47,11 @@ export class InsecureWalletWarning extends React.Component { }, { name: 'hasAcknowledgedDownload', - label: 'I acknowledge that I can and should download and run MyEtherWallet locally' + label: 'I acknowledge that I can and should download and run MyCrypto locally' }, { name: 'hasConfirmedSite', - label: - 'I have checked the URL and SSL certificate to make sure this is the real MyEtherWallet' + label: 'I have checked the URL and SSL certificate to make sure this is the real MyCrypto' } ]; const canContinue = checkboxes.reduce( @@ -70,32 +71,28 @@ export class InsecureWalletWarning extends React.Component {

If you must use your {walletType} online, please double-check the URL & SSL certificate. - It should say {'https://www.myetherwallet.com'} - & MYETHERWALLET LLC [US] in your URL bar. + It should say {'https://www.mycrypto.com'} + & MyCrypto, LLC [US] in your URL bar.

{checkboxes.map(this.makeCheckbox)}
diff --git a/common/components/ui/HelpLink.tsx b/common/components/ui/HelpLink.tsx new file mode 100644 index 00000000..ddf4eac8 --- /dev/null +++ b/common/components/ui/HelpLink.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import NewTabLink, { AAttributes } from './NewTabLink'; +import { HELP_ARTICLE, knowledgeBaseURL } from 'config'; + +interface Props { + article?: HELP_ARTICLE; + children?: string | React.ReactElement; +} + +const HelpLink: React.SFC = ({ article, children, ...rest }) => ( + + {children} + +); + +export default HelpLink; diff --git a/common/components/ui/NewTabLink.tsx b/common/components/ui/NewTabLink.tsx index f011aaa6..21544e99 100644 --- a/common/components/ui/NewTabLink.tsx +++ b/common/components/ui/NewTabLink.tsx @@ -1,11 +1,10 @@ import React from 'react'; -interface AAttributes { +export interface AAttributes { charset?: string; className?: string; coords?: string; download?: string; - href: string; hreflang?: string; media?: string; name?: string; @@ -31,6 +30,7 @@ interface AAttributes { } interface NewTabLinkProps extends AAttributes { + href: string; content?: React.ReactElement | string; children?: React.ReactElement | string; } diff --git a/common/components/ui/index.ts b/common/components/ui/index.ts index 580d5f38..996dba83 100644 --- a/common/components/ui/index.ts +++ b/common/components/ui/index.ts @@ -11,5 +11,6 @@ export { default as Spinner } from './Spinner'; export { default as SwapDropdown } from './SwapDropdown'; export { default as Tooltip } from './Tooltip'; export { default as TitleBar } from './TitleBar'; +export { default as HelpLink } from './HelpLink'; export * from './ConditionalInput'; export * from './Expandable'; diff --git a/common/config/data.tsx b/common/config/data.tsx index c7c1edf7..3fb093ad 100644 --- a/common/config/data.tsx +++ b/common/config/data.tsx @@ -13,12 +13,11 @@ export const N_FACTOR = 8192; export const ANNOUNCEMENT_TYPE = 'warning'; export const ANNOUNCEMENT_MESSAGE = (
- This is an Alpha build of MyEtherWallet v4. Please only use for testing, or use v3 at{' '} + This is an Alpha build of MyCrypto v4. Please only use for testing, or use v3 at{' '} {'https://myetherwallet.com'}.
- If you're interested in recieving updates about the MyEtherWallet V4 Alpha, you can subscribe - via{' '} + If you're interested in recieving updates about the MyCrypto V4 Alpha, you can subscribe via{' '} mailchimp {' '} @@ -37,9 +36,9 @@ export const ETHAddressExplorer = (address: string): string => `${etherScan}/add export const ETHTokenExplorer = (address: string): string => `${ethPlorer}/address/${address}`; export const donationAddressMap = { - BTC: '1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6', - ETH: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8', - REP: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8' + BTC: '32oirLEzZRhi33RCXDF9WHJjEb8RsrSss3', + ETH: '0x4bbeEB066eD09B7AEd07bF39EEe0460DFa261520', + REP: '0x4bbeEB066eD09B7AEd07bF39EEe0460DFa261520' }; export const gasPriceDefaults = { @@ -49,13 +48,14 @@ export const gasPriceDefaults = { export const MINIMUM_PASSWORD_LENGTH = 12; -export const knowledgeBaseURL = 'https://myetherwallet.github.io/knowledge-base'; +export const knowledgeBaseURL = 'https://support.mycrypto.com'; +export const ledgerReferralURL = 'https://www.ledgerwallet.com/r/1985?path=/products/'; +export const trezorReferralURL = 'https://trezor.io/?a=mycrypto.com'; +export const bitboxReferralURL = 'https://digitalbitbox.com/?ref=mycrypto'; +// TODO - Update url, this is MEW's export const bityReferralURL = 'https://bity.com/af/jshkb37v'; -// Note: add the real referral url once you know it +// TODO - add the real referral url once you know it export const shapeshiftReferralURL = 'https://shapeshift.io'; -export const ledgerReferralURL = 'https://www.ledgerwallet.com/r/fa4b?path=/products/'; -export const trezorReferralURL = 'https://trezor.io/?a=myetherwallet.com'; -export const bitboxReferralURL = 'https://digitalbitbox.com/?ref=mew'; export enum SecureWalletName { WEB3 = 'web3', diff --git a/common/config/helpArticles.ts b/common/config/helpArticles.ts new file mode 100644 index 00000000..0cfcfa39 --- /dev/null +++ b/common/config/helpArticles.ts @@ -0,0 +1,16 @@ +export enum HELP_ARTICLE { + HOME = '', + ENS = 'ens', + ENS_BAD_REVEAL = 'ens/ens-debugging-a-bad-instruction-reveal', + DIFFERENCE_BETWEEN_PKEY_AND_KEYSTORE = 'private-keys-passwords/difference-beween-private-key-and-keystore-file.html', + RUNNING_LOCALLY = 'offline/running-myetherwallet-locally.html', + MIGRATE_TO_METAMASK = 'migration/moving-from-private-key-to-metamask.html', + MIGRATE_TO_LEDGER = 'migration/moving-from-private-key-to-ledger-hardware-wallet.html', + ADDING_NEW_TOKENS = 'send/adding-new-token-and-sending-custom-tokens.html', + HARDWARE_WALLET_RECOMMENDATIONS = 'hardware-wallets/hardware-wallet-recommendations.html', + SENDING_TO_TREZOR = 'hardware-wallets/trezor-sending-to-trezor-device.html', + SECURING_YOUR_ETH = 'security/securing-your-ethereum.html', + PROTECT_YOUR_FUNDS = 'getting-started/protecting-yourself-and-your-funds.html', + WHAT_IS_NONCE = 'transactions/what-is-nonce.html', + WHAT_IS_GAS = 'gas/what-is-gas-ethereum' +} diff --git a/common/config/index.ts b/common/config/index.ts index d487c767..c66161be 100644 --- a/common/config/index.ts +++ b/common/config/index.ts @@ -2,3 +2,4 @@ export * from './networks'; export * from './data'; export * from './bity'; export * from './addressMessages'; +export * from './helpArticles'; diff --git a/common/config/networks.ts b/common/config/networks.ts index 01565134..ccdb8891 100644 --- a/common/config/networks.ts +++ b/common/config/networks.ts @@ -325,7 +325,7 @@ export async function setupWeb3Node(): Promise { if (!web3 || !web3.currentProvider || !web3.currentProvider.sendAsync) { throw new Error( - 'Web3 not found. Please check that MetaMask is installed, or that MyEtherWallet is open in Mist.' + 'Web3 not found. Please check that MetaMask is installed, or that MyCrypto is open in Mist.' ); } diff --git a/common/containers/OnboardModal/components/BlockchainSlide.tsx b/common/containers/OnboardModal/components/BlockchainSlide.tsx index 60e7e692..12243d65 100644 --- a/common/containers/OnboardModal/components/BlockchainSlide.tsx +++ b/common/containers/OnboardModal/components/BlockchainSlide.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconFour from 'assets/images/onboarding_icon-04.svg'; +import onboardIconFour from 'assets/images/onboarding/slide-04.svg'; const BlockchainSlide = () => { const header = translate('ONBOARD_blockchain_title'); diff --git a/common/containers/OnboardModal/components/FinalSlide.tsx b/common/containers/OnboardModal/components/FinalSlide.tsx index 7dfad4d7..f08d0c06 100644 --- a/common/containers/OnboardModal/components/FinalSlide.tsx +++ b/common/containers/OnboardModal/components/FinalSlide.tsx @@ -1,8 +1,10 @@ import React from 'react'; import translate from 'translations'; import { Link } from 'react-router-dom'; +import { HelpLink } from 'components/ui'; +import { HELP_ARTICLE } from 'config'; import OnboardSlide from './OnboardSlide'; -import onboardIconTen from 'assets/images/onboarding_icon-10.svg'; +import onboardIconTen from 'assets/images/onboarding/slide-10.svg'; const FinalSlide = ({ closeModal }) => { const header = translate('ONBOARD_final_title'); @@ -11,77 +13,42 @@ const FinalSlide = ({ closeModal }) => { const content = (
  • - + {translate('ONBOARD_final_content__2')} - +
  • - + {translate('ONBOARD_final_content__3')} - +
  • - + {translate('ONBOARD_final_content__4')} - +
  • - + {translate('ONBOARD_final_content__5')} - +
  • - + {translate('ONBOARD_final_content__6')} - +
  • - + {translate('ONBOARD_final_content__7')} - +
  • - + {translate('ONBOARD_final_content__8')} - +
  • - + {translate('ONBOARD_final_content__9')}
  • diff --git a/common/containers/OnboardModal/components/InterfaceSlide.tsx b/common/containers/OnboardModal/components/InterfaceSlide.tsx index 09023e8c..454503b1 100644 --- a/common/containers/OnboardModal/components/InterfaceSlide.tsx +++ b/common/containers/OnboardModal/components/InterfaceSlide.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconThree from 'assets/images/onboarding_icon-03.svg'; +import onboardIconThree from 'assets/images/onboarding/slide-03.svg'; const InterfaceSlide = () => { const header = translate('ONBOARD_interface_title'); diff --git a/common/containers/OnboardModal/components/NotABankSlide.tsx b/common/containers/OnboardModal/components/NotABankSlide.tsx index e096c139..43363081 100644 --- a/common/containers/OnboardModal/components/NotABankSlide.tsx +++ b/common/containers/OnboardModal/components/NotABankSlide.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconTwo from 'assets/images/onboarding_icon-02.svg'; +import onboardIconTwo from 'assets/images/onboarding/slide-02.svg'; const NotABankSlide = () => { const header = translate('ONBOARD_bank_title'); diff --git a/common/containers/OnboardModal/components/SecureSlideOne.tsx b/common/containers/OnboardModal/components/SecureSlideOne.tsx index 59edba7a..cb56d58f 100644 --- a/common/containers/OnboardModal/components/SecureSlideOne.tsx +++ b/common/containers/OnboardModal/components/SecureSlideOne.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconSeven from 'assets/images/onboarding_icon-07.svg'; +import onboardIconSeven from 'assets/images/onboarding/slide-07.svg'; const SecureSlideOne = () => { const header = translate('ONBOARD_secure_1_title'); diff --git a/common/containers/OnboardModal/components/SecureSlideThree.tsx b/common/containers/OnboardModal/components/SecureSlideThree.tsx index 168bb73e..77fc35db 100644 --- a/common/containers/OnboardModal/components/SecureSlideThree.tsx +++ b/common/containers/OnboardModal/components/SecureSlideThree.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconNine from 'assets/images/onboarding_icon-09.svg'; +import onboardIconNine from 'assets/images/onboarding/slide-09.svg'; interface Props { site?: string; diff --git a/common/containers/OnboardModal/components/SecureSlideTwo.tsx b/common/containers/OnboardModal/components/SecureSlideTwo.tsx index 065045e5..21ef3d27 100644 --- a/common/containers/OnboardModal/components/SecureSlideTwo.tsx +++ b/common/containers/OnboardModal/components/SecureSlideTwo.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconEight from 'assets/images/onboarding_icon-08.svg'; +import onboardIconEight from 'assets/images/onboarding/slide-08.svg'; const SecureSlideTwo = () => { const header = translate('ONBOARD_secure_2_title'); diff --git a/common/containers/OnboardModal/components/WelcomeSlide.tsx b/common/containers/OnboardModal/components/WelcomeSlide.tsx index 04c0f1d1..a48355ef 100644 --- a/common/containers/OnboardModal/components/WelcomeSlide.tsx +++ b/common/containers/OnboardModal/components/WelcomeSlide.tsx @@ -1,7 +1,7 @@ import React from 'react'; import OnboardSlide from './OnboardSlide'; import translate from 'translations'; -import onboardIconOne from 'assets/images/onboarding_icon-01.svg'; +import onboardIconOne from 'assets/images/onboarding/slide-01.svg'; import './WelcomeSlide.scss'; diff --git a/common/containers/OnboardModal/components/WhyMewSlide.tsx b/common/containers/OnboardModal/components/WhyMewSlide.tsx deleted file mode 100644 index 0528d2b2..00000000 --- a/common/containers/OnboardModal/components/WhyMewSlide.tsx +++ /dev/null @@ -1,21 +0,0 @@ -import React from 'react'; -import translate from 'translations'; -import OnboardSlide from './OnboardSlide'; -import onboardIconSix from 'assets/images/onboarding_icon-06.svg'; - -const WhyMewSlide = () => { - const header = translate('ONBOARD_whymew_title'); - - const content = ( -
      -
    • {translate('ONBOARD_whymew_content__1')}
    • -
    • {translate('ONBOARD_whymew_content__2')}
    • -
    • {translate('ONBOARD_whymew_content__3')}
    • -
    • {translate('ONBOARD_whymew_content__4')}
    • -
    • {translate('ONBOARD_whymew_content__5')}
    • -
    • {translate('ONBOARD_whymew_content__6')}
    • -
    - ); - return ; -}; -export default WhyMewSlide; diff --git a/common/containers/OnboardModal/components/WhyMyCryptoSlide.tsx b/common/containers/OnboardModal/components/WhyMyCryptoSlide.tsx new file mode 100644 index 00000000..221d8b56 --- /dev/null +++ b/common/containers/OnboardModal/components/WhyMyCryptoSlide.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import translate from 'translations'; +import OnboardSlide from './OnboardSlide'; +import onboardIconSix from 'assets/images/onboarding/slide-06.svg'; + +const WhyMewSlide = () => { + const header = translate('ONBOARD_whymew_title'); + + const content = ( +
      +
    • {translate('ONBOARD_whymyc_content__1')}
    • +
    • {translate('ONBOARD_whymyc_content__2')}
    • +
    • {translate('ONBOARD_whymyc_content__3')}
    • +
    • {translate('ONBOARD_whymyc_content__4')}
    • +
    • {translate('ONBOARD_whymyc_content__5')}
    • +
    • {translate('ONBOARD_whymyc_content__6')}
    • +
    + ); + return ; +}; +export default WhyMewSlide; diff --git a/common/containers/OnboardModal/components/WhySlide.tsx b/common/containers/OnboardModal/components/WhySlide.tsx index 46ace01b..70d91cb8 100644 --- a/common/containers/OnboardModal/components/WhySlide.tsx +++ b/common/containers/OnboardModal/components/WhySlide.tsx @@ -1,7 +1,7 @@ import React from 'react'; import translate from 'translations'; import OnboardSlide from './OnboardSlide'; -import onboardIconFive from 'assets/images/onboarding_icon-05.svg'; +import onboardIconFive from 'assets/images/onboarding/slide-05.svg'; const WhySlide = () => { const header = translate('ONBOARD_why_title'); diff --git a/common/containers/OnboardModal/components/index.ts b/common/containers/OnboardModal/components/index.ts index be3730b9..cf56e04e 100644 --- a/common/containers/OnboardModal/components/index.ts +++ b/common/containers/OnboardModal/components/index.ts @@ -3,7 +3,7 @@ export { default as NotABankSlide } from './NotABankSlide'; export { default as InterfaceSlide } from './InterfaceSlide'; export { default as BlockchainSlide } from './BlockchainSlide'; export { default as WhySlide } from './WhySlide'; -export { default as WhyMewSlide } from './WhyMewSlide'; +export { default as WhyMyCrypto } from './WhyMyCryptoSlide'; export { default as SecureSlideOne } from './SecureSlideOne'; export { default as SecureSlideTwo } from './SecureSlideTwo'; export { default as SecureSlideThree } from './SecureSlideThree'; diff --git a/common/containers/OnboardModal/index.tsx b/common/containers/OnboardModal/index.tsx index 1734e1af..326fb829 100644 --- a/common/containers/OnboardModal/index.tsx +++ b/common/containers/OnboardModal/index.tsx @@ -22,7 +22,7 @@ import { InterfaceSlide, BlockchainSlide, WhySlide, - WhyMewSlide, + WhyMyCrypto, SecureSlideOne, SecureSlideTwo, SecureSlideThree, @@ -151,7 +151,7 @@ class OnboardModal extends React.Component { , , , - , + , , , , diff --git a/common/containers/Tabs/Contracts/components/Interact/components/InteractForm/index.tsx b/common/containers/Tabs/Contracts/components/Interact/components/InteractForm/index.tsx index f6d00aa9..41e13ec3 100644 --- a/common/containers/Tabs/Contracts/components/Interact/components/InteractForm/index.tsx +++ b/common/containers/Tabs/Contracts/components/Interact/components/InteractForm/index.tsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import translate from 'translations'; -import { NetworkContract } from 'config'; +import { NetworkContract, donationAddressMap } from 'config'; import { getNetworkContracts } from 'selectors/config'; import { connect } from 'react-redux'; import { AppState } from 'reducers'; @@ -85,7 +85,7 @@ class InteractForm extends Component {