- {this.renderRow({
- logo: (
-
- ),
- title: this.context.t('directDepositEther'),
- text: this.context.t('directDepositEtherExplainer'),
- buttonLabel: this.context.t('viewAccount'),
- onButtonClick: () => this.goToAccountDetailsModal(),
- })}
- {this.renderRow({
- logo:
,
- title: this.context.t('testFaucet'),
- text: this.faucetRowText(networkName),
- buttonLabel: this.context.t('getEther'),
- onButtonClick: () => toFaucet(network),
- hide: !isTestNetwork,
- })}
{this.renderRow({
logo: (
),
- title: this.context.t('buyCoinSwitch'),
- text: this.context.t('buyCoinSwitchExplainer'),
- buttonLabel: this.context.t('continueToCoinSwitch'),
- onButtonClick: () => {
- this.context.metricsEvent({
- eventOpts: {
- category: 'Accounts',
- action: 'Deposit Ether',
- name: 'Click buy Ether via CoinSwitch',
- },
- })
- toCoinSwitch(address)
- },
- hide: isTestNetwork,
+ title: this.context.t('directDepositEther'),
+ text: this.context.t('directDepositEtherExplainer'),
+ buttonLabel: this.context.t('viewAccount'),
+ onButtonClick: () => this.goToAccountDetailsModal(),
+ })}
+ {this.renderRow({
+ logo:
,
+ title: this.context.t('testFaucet'),
+ text: this.faucetRowText(networkName),
+ buttonLabel: this.context.t('getEther'),
+ onButtonClick: () => toFaucet(network),
+ hide: !isTestNetwork,
})}
diff --git a/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js b/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
index aac9cd8ae..abee66e48 100644
--- a/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
+++ b/ui/app/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
@@ -19,9 +19,6 @@ function mapDispatchToProps(dispatch) {
toWyre: (address) => {
dispatch(buyEth({ service: 'wyre', address }))
},
- toCoinSwitch: (address) => {
- dispatch(buyEth({ service: 'coinswitch', address }))
- },
hideModal: () => {
dispatch(hideModal())
},
diff --git a/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js b/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js
index df326978d..6fbdb54c3 100644
--- a/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js
+++ b/ui/app/components/app/modals/metametrics-opt-in-modal/metametrics-opt-in-modal.component.js
@@ -24,7 +24,7 @@ export default class MetaMetricsOptInModal extends Component {
-
+
Help Us Improve MetaMask
diff --git a/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js b/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
index e74c1c94e..54556f630 100644
--- a/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
+++ b/ui/app/components/app/modals/qr-scanner/qr-scanner.component.js
@@ -210,7 +210,7 @@ export default class QrScanner extends Component {
return (
<>
-
+
{title ?
{title}
: null}
{msg}
diff --git a/ui/app/components/app/modals/transaction-confirmed/transaction-confirmed.component.js b/ui/app/components/app/modals/transaction-confirmed/transaction-confirmed.component.js
index e34c4dc4d..aded7cb65 100644
--- a/ui/app/components/app/modals/transaction-confirmed/transaction-confirmed.component.js
+++ b/ui/app/components/app/modals/transaction-confirmed/transaction-confirmed.component.js
@@ -28,7 +28,7 @@ export default class TransactionConfirmed extends PureComponent {
return (
-
+
{`${t('confirmed')}!`}
diff --git a/ui/app/components/app/network.js b/ui/app/components/app/network.js
index 387dbb536..194e65c65 100644
--- a/ui/app/components/app/network.js
+++ b/ui/app/components/app/network.js
@@ -173,7 +173,7 @@ export default class Network extends Component {
) : (
diff --git a/ui/app/components/app/token-cell/token-cell.js b/ui/app/components/app/token-cell/token-cell.js
index 9a7673588..9c3a4bcff 100644
--- a/ui/app/components/app/token-cell/token-cell.js
+++ b/ui/app/components/app/token-cell/token-cell.js
@@ -10,7 +10,7 @@ import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount'
export default function TokenCell({
address,
decimals,
- outdatedBalance,
+ balanceError,
symbol,
string,
image,
@@ -21,13 +21,14 @@ export default function TokenCell({
const formattedFiat = useTokenFiatAmount(address, string, symbol)
- const warning = outdatedBalance ? (
+ const warning = balanceError ? (
{t('troubleTokenBalances')}
event.stopPropagation()}
style={{ color: '#F7861C' }}
>
{t('here')}
@@ -38,7 +39,7 @@ export default function TokenCell({
return (
{tokensWithBalances.map((tokenData, index) => {
tokenData.image = assetImages[tokenData.address]
- return (
-
- {imagePath &&
}
+ {imagePath &&
}
)
diff --git a/ui/app/components/ui/editable-label/editable-label.js b/ui/app/components/ui/editable-label/editable-label.js
index e082082b1..12ce68a7b 100644
--- a/ui/app/components/ui/editable-label/editable-label.js
+++ b/ui/app/components/ui/editable-label/editable-label.js
@@ -45,13 +45,15 @@ class EditableLabel extends Component {
className={classnames('large-input', 'editable-label__input', {
'editable-label__input--error': value === '',
})}
+ autoFocus
/>,
-
- this.handleSubmit()}
- />
-
,
+
this.handleSubmit()}
+ >
+ ,
]
}
@@ -60,12 +62,13 @@ class EditableLabel extends Component {
{this.state.value}
,
-
- this.setState({ isEditing: true })}
- />
-
,
+
this.setState({ isEditing: true })}
+ >
+ ,
]
}
diff --git a/ui/app/components/ui/editable-label/index.scss b/ui/app/components/ui/editable-label/index.scss
index fdb430c7d..23c5df4a2 100644
--- a/ui/app/components/ui/editable-label/index.scss
+++ b/ui/app/components/ui/editable-label/index.scss
@@ -23,10 +23,11 @@
}
}
- &__icon-wrapper {
+ &__icon-button {
position: absolute;
margin-left: 10px;
left: 100%;
+ background: unset;
}
&__icon {
diff --git a/ui/app/components/ui/error-message/error-message.component.js b/ui/app/components/ui/error-message/error-message.component.js
index e4d39ee4f..fdb8b651f 100644
--- a/ui/app/components/ui/error-message/error-message.component.js
+++ b/ui/app/components/ui/error-message/error-message.component.js
@@ -7,7 +7,7 @@ const ErrorMessage = (props, context) => {
return (
-
+
{`ALERT: ${error}`}
)
diff --git a/ui/app/components/ui/icon-with-fallback/icon-with-fallback.component.js b/ui/app/components/ui/icon-with-fallback/icon-with-fallback.component.js
index 5b114d382..27e16d28e 100644
--- a/ui/app/components/ui/icon-with-fallback/icon-with-fallback.component.js
+++ b/ui/app/components/ui/icon-with-fallback/icon-with-fallback.component.js
@@ -30,6 +30,7 @@ export default class IconWithFallback extends PureComponent {
src={icon}
style={style}
className={className}
+ alt=""
/>
) : (
{
return (
<>
)
diff --git a/ui/app/components/ui/metafox-logo/metafox-logo.component.js b/ui/app/components/ui/metafox-logo/metafox-logo.component.js
index 6a9838543..faae1eb8e 100644
--- a/ui/app/components/ui/metafox-logo/metafox-logo.component.js
+++ b/ui/app/components/ui/metafox-logo/metafox-logo.component.js
@@ -24,12 +24,13 @@ export default class MetaFoxLogo extends PureComponent {
})}
>
-
+
{this.context.t('addAcquiredTokens')}
diff --git a/ui/app/pages/add-token/token-search/token-search.component.js b/ui/app/pages/add-token/token-search/token-search.component.js
index 904fdcefb..8ef9d20af 100644
--- a/ui/app/pages/add-token/token-search/token-search.component.js
+++ b/ui/app/pages/add-token/token-search/token-search.component.js
@@ -53,7 +53,7 @@ export default class TokenSearch extends Component {
renderAdornment() {
return (
-
)
}
diff --git a/ui/app/pages/asset/asset.scss b/ui/app/pages/asset/asset.scss
index e265e4943..f80cd66a4 100644
--- a/ui/app/pages/asset/asset.scss
+++ b/ui/app/pages/asset/asset.scss
@@ -42,5 +42,7 @@
&__icon {
@include Paragraph;
+
+ font-weight: 900;
}
}
diff --git a/ui/app/pages/asset/components/token-asset.js b/ui/app/pages/asset/components/token-asset.js
index 81198ee5d..00296a59e 100644
--- a/ui/app/pages/asset/components/token-asset.js
+++ b/ui/app/pages/asset/components/token-asset.js
@@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { useDispatch, useSelector } from 'react-redux'
import { useHistory } from 'react-router-dom'
-import { createAccountLink } from '@metamask/etherscan-link'
+import { createTokenTrackerLink } from '@metamask/etherscan-link'
import TransactionList from '../../../components/app/transaction-list'
import { TokenOverview } from '../../../components/app/wallet-overview'
@@ -19,9 +19,9 @@ import TokenOptions from './token-options'
export default function TokenAsset({ token }) {
const dispatch = useDispatch()
const network = useSelector(getCurrentNetworkId)
- const selectedAccountName = useSelector(
- (state) => getSelectedIdentity(state).name,
- )
+ const selectedIdentity = useSelector(getSelectedIdentity)
+ const selectedAccountName = selectedIdentity.name
+ const selectedAddress = selectedIdentity.address
const history = useHistory()
return (
@@ -36,7 +36,11 @@ export default function TokenAsset({ token }) {
dispatch(showModal({ name: 'HIDE_TOKEN_CONFIRMATION', token }))
}
onViewEtherscan={() => {
- const url = createAccountLink(token.address, network)
+ const url = createTokenTrackerLink(
+ token.address,
+ network,
+ selectedAddress,
+ )
global.platform.openTab({ url })
}}
tokenSymbol={token.symbol}
diff --git a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
index 8243a10bb..2ef4e0ea3 100644
--- a/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
+++ b/ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.component.js
@@ -9,6 +9,7 @@ import { ENVIRONMENT_TYPE_NOTIFICATION } from '../../../../app/scripts/lib/enums
export default class ConfirmAddSuggestedToken extends Component {
static contextTypes = {
t: PropTypes.func,
+ trackEvent: PropTypes.func,
}
static propTypes = {
@@ -139,6 +140,19 @@ export default class ConfirmAddSuggestedToken extends Component {
onClick={() => {
addToken(pendingToken)
.then(() => removeSuggestedTokens())
+ .then(() => {
+ this.context.trackEvent({
+ event: 'Token Added',
+ category: 'Wallet',
+ sensitiveProperties: {
+ token_symbol: pendingToken.symbol,
+ token_contract_address: pendingToken.address,
+ token_decimal_precision: pendingToken.decimals,
+ unlisted: pendingToken.unlisted,
+ source: 'dapp',
+ },
+ })
+ })
.then(() => history.push(mostRecentOverviewPage))
}}
>
diff --git a/ui/app/pages/confirm-add-token/confirm-add-token.component.js b/ui/app/pages/confirm-add-token/confirm-add-token.component.js
index 3a0b0b3d0..4334f377a 100644
--- a/ui/app/pages/confirm-add-token/confirm-add-token.component.js
+++ b/ui/app/pages/confirm-add-token/confirm-add-token.component.js
@@ -8,6 +8,7 @@ import TokenBalance from '../../components/ui/token-balance'
export default class ConfirmAddToken extends Component {
static contextTypes = {
t: PropTypes.func,
+ trackEvent: PropTypes.func,
}
static propTypes = {
@@ -103,10 +104,22 @@ export default class ConfirmAddToken extends Component {
className="page-container__footer-button"
onClick={() => {
addTokens(pendingTokens).then(() => {
+ const pendingTokenValues = Object.values(pendingTokens)
+ pendingTokenValues.forEach((pendingToken) => {
+ this.context.trackEvent({
+ event: 'Token Added',
+ category: 'Wallet',
+ sensitiveProperties: {
+ token_symbol: pendingToken.symbol,
+ token_contract_address: pendingToken.address,
+ token_decimal_precision: pendingToken.decimals,
+ unlisted: pendingToken.unlisted,
+ source: pendingToken.isCustom ? 'custom' : 'list',
+ },
+ })
+ })
clearPendingTokens()
- const firstTokenAddress = Object.values(
- pendingTokens,
- )?.[0].address?.toLowerCase()
+ const firstTokenAddress = pendingTokenValues?.[0].address?.toLowerCase()
if (firstTokenAddress) {
history.push(`${ASSET_ROUTE}/${firstTokenAddress}`)
} else {
diff --git a/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 6cea504e0..5486776b7 100644
--- a/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/app/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -236,7 +236,7 @@ export default class ConfirmApproveContent extends Component {
{this.renderApproveContentCard({
- symbol:
,
+ symbol:
,
title: 'Permission',
content: this.renderPermissionContent(),
showEdit: true,
diff --git a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
index 9f036cb80..a9f68d388 100644
--- a/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
+++ b/ui/app/pages/confirm-decrypt-message/confirm-decrypt-message.component.js
@@ -195,6 +195,7 @@ export default class ConfirmDecryptMessage extends Component {
) : (
@@ -240,7 +241,7 @@ export default class ConfirmDecryptMessage extends Component {
})
}}
>
-
{t('decryptMetamask')}
diff --git a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index b4ecc5c10..08a3cbf95 100644
--- a/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/app/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -170,6 +170,7 @@ export default class ConfirmEncryptionPublicKey extends Component {
diff --git a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
index e60ec0ec2..e8bb69152 100644
--- a/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
+++ b/ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
@@ -86,7 +86,7 @@ export default function ConfirmTokenTransactionBase({
primaryTotalTextOverride={
{`${tokensText} + `}
-
+
{ethTransactionTotal}
}
diff --git a/ui/app/pages/create-account/connect-hardware/index.js b/ui/app/pages/create-account/connect-hardware/index.js
index 8e80d3775..a17806207 100644
--- a/ui/app/pages/create-account/connect-hardware/index.js
+++ b/ui/app/pages/create-account/connect-hardware/index.js
@@ -129,7 +129,7 @@ class ConnectHardwareForm extends Component {
}
})
.catch((e) => {
- const errorMessage = e.message
+ const errorMessage = typeof e === 'string' ? e : e.message
if (errorMessage === 'Window blocked') {
this.setState({ browserSupported: false, error: null })
} else if (errorMessage.includes(U2F_ERROR)) {
@@ -210,6 +210,7 @@ class ConnectHardwareForm extends Component {
// eslint-disable-next-line react/jsx-key
-
+
{t('protectYourKeys')}
{t('protectYourKeysMessage1')}
diff --git a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index 65ea159e1..b859457e8 100644
--- a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -32,7 +32,7 @@ export default class MetaMetricsOptIn extends Component {
-
+
{t('metametricsHelpImproveMetaMask')}
diff --git a/ui/app/pages/first-time-flow/select-action/select-action.component.js b/ui/app/pages/first-time-flow/select-action/select-action.component.js
index 2d4a21589..993c0b16e 100644
--- a/ui/app/pages/first-time-flow/select-action/select-action.component.js
+++ b/ui/app/pages/first-time-flow/select-action/select-action.component.js
@@ -50,7 +50,7 @@ export default class SelectAction extends PureComponent {
-
+
{t('noAlreadyHaveSeed')}
@@ -70,7 +70,7 @@ export default class SelectAction extends PureComponent {
-
+
{t('letsGoSetUp')}
diff --git a/ui/app/pages/send/send.component.js b/ui/app/pages/send/send.component.js
index b5865c4ba..727c213af 100644
--- a/ui/app/pages/send/send.component.js
+++ b/ui/app/pages/send/send.component.js
@@ -154,6 +154,7 @@ export default class SendTransactionScreen extends Component {
if (sendTokenAddress && prevTokenAddress !== sendTokenAddress) {
this.updateSendToken()
+ this.validate(sendTokenAddress)
updateGas = true
}
diff --git a/ui/app/pages/send/tests/send-component.test.js b/ui/app/pages/send/tests/send-component.test.js
index 42a3dc504..4c5cd04e3 100644
--- a/ui/app/pages/send/tests/send-component.test.js
+++ b/ui/app/pages/send/tests/send-component.test.js
@@ -138,7 +138,7 @@ describe('Send Component', function () {
balance: '',
},
})
- assert(utilsMethodStubs.doesAmountErrorRequireUpdate.calledOnce)
+ assert(utilsMethodStubs.doesAmountErrorRequireUpdate.calledTwice)
assert.deepEqual(
utilsMethodStubs.doesAmountErrorRequireUpdate.getCall(0).args[0],
{
diff --git a/ui/app/pages/settings/contact-list-tab/contact-list-tab.component.js b/ui/app/pages/settings/contact-list-tab/contact-list-tab.component.js
index 81e5baf26..068dc3daf 100644
--- a/ui/app/pages/settings/contact-list-tab/contact-list-tab.component.js
+++ b/ui/app/pages/settings/contact-list-tab/contact-list-tab.component.js
@@ -49,6 +49,7 @@ export default class ContactListTab extends Component {
renderAddButton() {
const { history } = this.props
+
return (
)
diff --git a/ui/app/pages/settings/contact-list-tab/index.scss b/ui/app/pages/settings/contact-list-tab/index.scss
index f15b9c485..aef7c208c 100644
--- a/ui/app/pages/settings/contact-list-tab/index.scss
+++ b/ui/app/pages/settings/contact-list-tab/index.scss
@@ -221,7 +221,7 @@
.address-book-add-button {
&__button {
position: absolute;
- top: 10px;
+ top: 80px;
right: 16px;
height: 56px;
width: 56px;
@@ -235,6 +235,10 @@
margin-right: 5px;
cursor: pointer;
box-shadow: 0 2px 16px rgba(0, 0, 0, 0.25);
+
+ @media screen and (max-width: 576px) {
+ top: 10px;
+ }
}
}
diff --git a/ui/app/pages/settings/info-tab/info-tab.component.js b/ui/app/pages/settings/info-tab/info-tab.component.js
index 966c26799..0e8118910 100644
--- a/ui/app/pages/settings/info-tab/info-tab.component.js
+++ b/ui/app/pages/settings/info-tab/info-tab.component.js
@@ -96,7 +96,11 @@ export default class InfoTab extends PureComponent {
-
+
diff --git a/ui/app/pages/swaps/build-quote/build-quote.js b/ui/app/pages/swaps/build-quote/build-quote.js
index a1bcea61f..3aabcf82e 100644
--- a/ui/app/pages/swaps/build-quote/build-quote.js
+++ b/ui/app/pages/swaps/build-quote/build-quote.js
@@ -13,6 +13,7 @@ import DropdownInputPair from '../dropdown-input-pair'
import DropdownSearchList from '../dropdown-search-list'
import SlippageButtons from '../slippage-buttons'
import { getTokens } from '../../../ducks/metamask/metamask'
+import InfoTooltip from '../../../components/ui/info-tooltip'
import {
fetchQuotesAndSetQuoteState,
@@ -366,6 +367,27 @@ export default function BuildQuote({
defaultToAll
/>
+ {selectedToToken?.address &&
+ selectedToToken?.address !== ETH_SWAPS_TOKEN_OBJECT.address && (
+
+ )}
{
diff --git a/ui/app/pages/swaps/build-quote/index.scss b/ui/app/pages/swaps/build-quote/index.scss
index eace3058c..acc1f7352 100644
--- a/ui/app/pages/swaps/build-quote/index.scss
+++ b/ui/app/pages/swaps/build-quote/index.scss
@@ -116,6 +116,27 @@
}
}
+ &__token-message {
+ @include H7;
+
+ width: 100%;
+ color: $Grey-500;
+ margin-top: 4px;
+ display: flex;
+ align-items: center;
+ }
+
+ &__token-etherscan-link {
+ color: $Blue-500;
+ cursor: pointer;
+ margin-right: 4px;
+ }
+
+ &__token-tooltip-container {
+ // Needed to override the style property added by the react-tippy library
+ display: flex !important;
+ }
+
/* Prevents the swaps "Swap to" field from overflowing */
.dropdown-input-pair__to .dropdown-search-list {
width: 100%;
diff --git a/ui/app/pages/swaps/index.js b/ui/app/pages/swaps/index.js
index 02aff4a32..f41aef9d6 100644
--- a/ui/app/pages/swaps/index.js
+++ b/ui/app/pages/swaps/index.js
@@ -299,7 +299,7 @@ export default function Swap() {
ethBalance={ethBalance}
setMaxSlippage={setMaxSlippage}
selectedAccountAddress={selectedAccountAddress}
- maxSlippage={Number(maxSlippage)}
+ maxSlippage={maxSlippage}
/>
)
}}
diff --git a/ui/app/pages/swaps/intro-popup/intro-popup.js b/ui/app/pages/swaps/intro-popup/intro-popup.js
index a01375b1b..5d525b7ee 100644
--- a/ui/app/pages/swaps/intro-popup/intro-popup.js
+++ b/ui/app/pages/swaps/intro-popup/intro-popup.js
@@ -64,7 +64,7 @@ export default function IntroPopup({ onClose }) {
{t('swapIntroLiquiditySourcesLabel')}
-
+
{t('swapIntroLearnMoreHeader')}
diff --git a/ui/app/pages/swaps/loading-swaps-quotes/aggregator-logo.js b/ui/app/pages/swaps/loading-swaps-quotes/aggregator-logo.js
index f121f6f03..6b147c1c6 100644
--- a/ui/app/pages/swaps/loading-swaps-quotes/aggregator-logo.js
+++ b/ui/app/pages/swaps/loading-swaps-quotes/aggregator-logo.js
@@ -19,7 +19,7 @@ export default function AggregatorLogo({ icon, color }) {
boxShadow: `0px 4px 20px ${hexToRGB(color, 0.25)}`,
}}
>
-
+
)
diff --git a/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js b/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
index bf750f36f..d73e3a9b9 100644
--- a/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
+++ b/ui/app/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
@@ -7,7 +7,7 @@ import { usePrevious } from '../../../../hooks/usePrevious'
const renderAdornment = () => (
-
)
diff --git a/ui/app/pages/swaps/select-quote-popover/quote-details/quote-details.js b/ui/app/pages/swaps/select-quote-popover/quote-details/quote-details.js
index 2fa822eab..96692f3a8 100644
--- a/ui/app/pages/swaps/select-quote-popover/quote-details/quote-details.js
+++ b/ui/app/pages/swaps/select-quote-popover/quote-details/quote-details.js
@@ -82,6 +82,7 @@ const QuoteDetails = ({
{t('swapMetaMaskFee')}
diff --git a/ui/app/pages/swaps/select-quote-popover/select-quote-popover-constants.js b/ui/app/pages/swaps/select-quote-popover/select-quote-popover-constants.js
index 516a7ae84..8d25a5b93 100644
--- a/ui/app/pages/swaps/select-quote-popover/select-quote-popover-constants.js
+++ b/ui/app/pages/swaps/select-quote-popover/select-quote-popover-constants.js
@@ -10,7 +10,7 @@ export const QUOTE_DATA_ROWS_PROPTYPES_SHAPE = PropTypes.shape({
networkFees: PropTypes.string.isRequired,
quoteSource: PropTypes.string.isRequired,
rawNetworkFees: PropTypes.string.isRequired,
- slippage: PropTypes.string.isRequired,
+ slippage: PropTypes.number.isRequired,
sourceTokenDecimals: PropTypes.number.isRequired,
sourceTokenSymbol: PropTypes.string.isRequired,
sourceTokenValue: PropTypes.string.isRequired,
diff --git a/ui/app/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/app/pages/swaps/slippage-buttons/slippage-buttons.js
index 20f706366..fe5daaa63 100644
--- a/ui/app/pages/swaps/slippage-buttons/slippage-buttons.js
+++ b/ui/app/pages/swaps/slippage-buttons/slippage-buttons.js
@@ -116,7 +116,7 @@ export default function SlippageButtons({ onSelect }) {
{
setCustomValue(event.target.value)
- onSelect(event.target.value)
+ onSelect(Number(event.target.value))
}}
type="number"
step="0.1"
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 15daa555c..f9d9de22d 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -23,6 +23,7 @@ import {
} from '../selectors'
import { switchedToUnconnectedAccount } from '../ducks/alerts/unconnected-account'
import { getUnconnectedAccountAlertEnabledness } from '../ducks/metamask/metamask'
+import { LISTED_CONTRACT_ADDRESSES } from '../../../shared/constants/tokens'
import * as actionConstants from './actionConstants'
let background = null
@@ -2210,9 +2211,21 @@ export function setPendingTokens(pendingTokens) {
const { address, symbol, decimals } = customToken
const tokens =
address && symbol && decimals
- ? { ...selectedTokens, [address]: { ...customToken, isCustom: true } }
+ ? {
+ ...selectedTokens,
+ [address]: {
+ ...customToken,
+ isCustom: true,
+ },
+ }
: selectedTokens
+ Object.keys(tokens).forEach((tokenAddress) => {
+ tokens[tokenAddress].unlisted = !LISTED_CONTRACT_ADDRESSES.includes(
+ tokenAddress.toLowerCase(),
+ )
+ })
+
return {
type: actionConstants.SET_PENDING_TOKENS,
payload: tokens,
diff --git a/yarn.lock b/yarn.lock
index 8527d8ee9..1348d21e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1833,16 +1833,16 @@
web3 "^0.20.7"
web3-provider-engine "^16.0.1"
-"@metamask/controllers@^4.0.2":
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-4.0.2.tgz#ec7efa2bea7f323bb3dc458b8a29d1a284f2849e"
- integrity sha512-SoEgVgRlguazOJF/pHCE+DFk+9Wb0z/cSsfyFrUSLUiQ0hZOx+fuuxf5bbNvnUNdXgMqai8WP11f9IBXPBad3w==
+"@metamask/controllers@^4.2.0":
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-4.2.0.tgz#ee304fa26aa1d291e21e7969dffee0977b149cbf"
+ integrity sha512-NPpBFP6x2YPEdJhjP5jC9E/WHJ+FJNWH7wf8he5/dfeY0J9hlXgkRv6vrvYI3wo6YvcgPy3IF1EOA0rR4jNbeg==
dependencies:
await-semaphore "^0.1.3"
eth-contract-metadata "^1.11.0"
eth-ens-namehash "^2.0.8"
eth-json-rpc-infura "^5.1.0"
- eth-keyring-controller "^5.6.1"
+ eth-keyring-controller "^6.1.0"
eth-method-registry "1.1.0"
eth-phishing-detect "^1.1.13"
eth-query "^2.1.2"
@@ -1879,9 +1879,9 @@
hdkey "0.8.0"
"@metamask/eth-token-tracker@^3.0.1":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@metamask/eth-token-tracker/-/eth-token-tracker-3.0.1.tgz#36b89f39c2af2ac41aa600dcedd2341704d94484"
- integrity sha512-vlSKnI27zMCbaDOAHG5apYXoZgO833GUOP6/gkkzuKNEE7QZZCMti/9U6DYfrE8QvgbWyt/RjZkF3cTXXjBhCA==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/@metamask/eth-token-tracker/-/eth-token-tracker-3.1.0.tgz#1396c5d88401f3cd598b0c86d3a42951c8e78d73"
+ integrity sha512-SopDFnIu7lI8aloD9HGPEpqlcjZNzZ5BeXZqrNRSdSO+CGpuwmFoeyrCrgEmrlkKQvP8dQi6R6aYK/itFPhPrg==
dependencies:
deep-equal "^1.1.0"
eth-block-tracker "^4.4.2"
@@ -1891,10 +1891,10 @@
human-standard-token-abi "^1.0.2"
safe-event-emitter "^1.0.1"
-"@metamask/etherscan-link@^1.2.0":
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/@metamask/etherscan-link/-/etherscan-link-1.2.0.tgz#677aa49774bd41a1f0fe783a9c04e13075ad73d2"
- integrity sha512-zSrOowUdEmr2u3HrlrO/dn1Wc6REXvs0bV1m9/JJmzLw1fXpJQ6qn2sPeu/KtZF0Im9iPt4a01nGjFuhzot54w==
+"@metamask/etherscan-link@^1.3.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@metamask/etherscan-link/-/etherscan-link-1.3.0.tgz#ce5b9e0083f51386f8f462110b4094cf6243022c"
+ integrity sha512-2BLaSJLqOIq5CasneVqortc7sPMjgXDTdPv4dSjseF+RUtv/HPTSXZPhV2dFkGd/n+eCQoevPRVOFsVvuRnFeA==
"@metamask/forwarder@^1.1.0":
version "1.1.0"
- 
+ 
- 
}
text={t('createAccount')}
@@ -377,6 +378,7 @@ export default class AccountMenu extends Component {
}
text={t('importAccount')}
@@ -401,6 +403,7 @@ export default class AccountMenu extends Component {
}
text={t('connectHardwareWallet')}
@@ -411,7 +414,7 @@ export default class AccountMenu extends Component {
toggleAccountMenu()
history.push(ABOUT_US_ROUTE)
}}
- icon={
}
+ icon={
+ 
+ 
+ 
+ 
- ),
- title: this.context.t('directDepositEther'),
- text: this.context.t('directDepositEtherExplainer'),
- buttonLabel: this.context.t('viewAccount'),
- onButtonClick: () => this.goToAccountDetailsModal(),
- })}
- {this.renderRow({
- logo: ,
- title: this.context.t('testFaucet'),
- text: this.faucetRowText(networkName),
- buttonLabel: this.context.t('getEther'),
- onButtonClick: () => toFaucet(network),
- hide: !isTestNetwork,
- })}
{this.renderRow({
logo: (
),
- title: this.context.t('buyCoinSwitch'),
- text: this.context.t('buyCoinSwitchExplainer'),
- buttonLabel: this.context.t('continueToCoinSwitch'),
- onButtonClick: () => {
- this.context.metricsEvent({
- eventOpts: {
- category: 'Accounts',
- action: 'Deposit Ether',
- name: 'Click buy Ether via CoinSwitch',
- },
- })
- toCoinSwitch(address)
- },
- hide: isTestNetwork,
+ title: this.context.t('directDepositEther'),
+ text: this.context.t('directDepositEtherExplainer'),
+ buttonLabel: this.context.t('viewAccount'),
+ onButtonClick: () => this.goToAccountDetailsModal(),
+ })}
+ {this.renderRow({
+ logo: ,
+ title: this.context.t('testFaucet'),
+ text: this.faucetRowText(networkName),
+ buttonLabel: this.context.t('getEther'),
+ onButtonClick: () => toFaucet(network),
+ hide: !isTestNetwork,
})}
+ 
+ 
+ 
) : (
diff --git a/ui/app/components/app/token-cell/token-cell.js b/ui/app/components/app/token-cell/token-cell.js
index 9a7673588..9c3a4bcff 100644
--- a/ui/app/components/app/token-cell/token-cell.js
+++ b/ui/app/components/app/token-cell/token-cell.js
@@ -10,7 +10,7 @@ import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount'
export default function TokenCell({
address,
decimals,
- outdatedBalance,
+ balanceError,
symbol,
string,
image,
@@ -21,13 +21,14 @@ export default function TokenCell({
const formattedFiat = useTokenFiatAmount(address, string, symbol)
- const warning = outdatedBalance ? (
+ const warning = balanceError ? (
{t('troubleTokenBalances')}
event.stopPropagation()}
style={{ color: '#F7861C' }}
>
{t('here')}
@@ -38,7 +39,7 @@ export default function TokenCell({
return (
+ 
+ showEthLogo && 
+ 
+ 
+ 
+ 
+ 
,
+ symbol: 
+ 
)
diff --git a/ui/app/pages/first-time-flow/create-password/unique-image/unique-image.component.js b/ui/app/pages/first-time-flow/create-password/unique-image/unique-image.component.js
index a6579e60e..ad30c2066 100644
--- a/ui/app/pages/first-time-flow/create-password/unique-image/unique-image.component.js
+++ b/ui/app/pages/first-time-flow/create-password/unique-image/unique-image.component.js
@@ -19,7 +19,7 @@ export default class UniqueImageScreen extends PureComponent {
return (
+ 
+ 
+ 
+ 
+ 
{t('swapMetaMaskFee')}