@@ -239,7 +230,7 @@ export default class Home extends PureComponent {
- { homeOverview }
+
-
+ history.push(`${ASSET_ROUTE}/${asset}`)}
+ />
-
+
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index bdb957f96..43a20bd20 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux'
import { withRouter } from 'react-router-dom'
import {
unconfirmedTransactionsCountSelector,
- getSelectedToken,
getCurrentEthBalance,
getFirstPermissionRequest,
getTotalUnapprovedCount,
@@ -60,7 +59,6 @@ const mapStateToProps = (state) => {
threeBoxSynced,
showRestorePrompt,
selectedAddress,
- selectedToken: getSelectedToken(state),
threeBoxLastUpdated,
firstPermissionsRequestId,
totalUnapprovedCount,
diff --git a/ui/app/pages/home/index.scss b/ui/app/pages/home/index.scss
index bd4f85775..251d45f1e 100644
--- a/ui/app/pages/home/index.scss
+++ b/ui/app/pages/home/index.scss
@@ -18,7 +18,6 @@
justify-content: flex-start;
align-items: center;
flex: 0 0 auto;
- padding-top: 16px;
}
// TODO: fix style import order so this isn't required to override specificity of `tab` class
diff --git a/ui/app/pages/index.scss b/ui/app/pages/index.scss
index 5cefd8db3..9bd1a928f 100644
--- a/ui/app/pages/index.scss
+++ b/ui/app/pages/index.scss
@@ -23,3 +23,5 @@
@import 'confirm-approve/index';
@import 'permissions-connect/index';
+
+@import 'asset/asset';
diff --git a/ui/app/pages/keychains/reveal-seed.js b/ui/app/pages/keychains/reveal-seed.js
index 238a5937e..8f9e0aec4 100644
--- a/ui/app/pages/keychains/reveal-seed.js
+++ b/ui/app/pages/keychains/reveal-seed.js
@@ -3,8 +3,8 @@ import { connect } from 'react-redux'
import PropTypes from 'prop-types'
import classnames from 'classnames'
import { requestRevealSeedWords } from '../../store/actions'
-import { DEFAULT_ROUTE } from '../../helpers/constants/routes'
import ExportTextContainer from '../../components/ui/export-text-container'
+import { getMostRecentOverviewPage } from '../../ducks/history/history'
import Button from '../../components/ui/button'
@@ -107,7 +107,7 @@ class RevealSeedPage extends Component {
type="default"
large
className="page-container__footer-button"
- onClick={() => this.props.history.push(DEFAULT_ROUTE)}
+ onClick={() => this.props.history.push(this.props.mostRecentOverviewPage)}
>
{this.context.t('cancel')}
@@ -132,7 +132,7 @@ class RevealSeedPage extends Component {
type="default"
large
className="page-container__footer-button"
- onClick={() => this.props.history.push(DEFAULT_ROUTE)}
+ onClick={() => this.props.history.push(this.props.mostRecentOverviewPage)}
>
{this.context.t('close')}
@@ -166,16 +166,23 @@ class RevealSeedPage extends Component {
RevealSeedPage.propTypes = {
requestRevealSeedWords: PropTypes.func,
history: PropTypes.object,
+ mostRecentOverviewPage: PropTypes.string.isRequired,
}
RevealSeedPage.contextTypes = {
t: PropTypes.func,
}
+const mapStateToProps = (state) => {
+ return {
+ mostRecentOverviewPage: getMostRecentOverviewPage(state),
+ }
+}
+
const mapDispatchToProps = (dispatch) => {
return {
requestRevealSeedWords: (password) => dispatch(requestRevealSeedWords(password)),
}
}
-export default connect(null, mapDispatchToProps)(RevealSeedPage)
+export default connect(mapStateToProps, mapDispatchToProps)(RevealSeedPage)
diff --git a/ui/app/pages/mobile-sync/mobile-sync.component.js b/ui/app/pages/mobile-sync/mobile-sync.component.js
index 7b79e0f8c..4afbf93ed 100644
--- a/ui/app/pages/mobile-sync/mobile-sync.component.js
+++ b/ui/app/pages/mobile-sync/mobile-sync.component.js
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types'
import classnames from 'classnames'
import PubNub from 'pubnub'
import qrCode from 'qrcode-generator'
-import { DEFAULT_ROUTE } from '../../helpers/constants/routes'
import Button from '../../components/ui/button'
import LoadingScreen from '../../components/ui/loading-screen'
@@ -24,6 +23,7 @@ export default class MobileSyncPage extends Component {
selectedAddress: PropTypes.string.isRequired,
displayWarning: PropTypes.func.isRequired,
fetchInfoToSync: PropTypes.func.isRequired,
+ mostRecentOverviewPage: PropTypes.string.isRequired,
requestRevealSeedWords: PropTypes.func.isRequired,
}
@@ -78,8 +78,8 @@ export default class MobileSyncPage extends Component {
}
goBack () {
- const { history } = this.props
- history.push(DEFAULT_ROUTE)
+ const { history, mostRecentOverviewPage } = this.props
+ history.push(mostRecentOverviewPage)
}
clearTimeouts () {
diff --git a/ui/app/pages/mobile-sync/mobile-sync.container.js b/ui/app/pages/mobile-sync/mobile-sync.container.js
index 1699c3a04..da83ba013 100644
--- a/ui/app/pages/mobile-sync/mobile-sync.container.js
+++ b/ui/app/pages/mobile-sync/mobile-sync.container.js
@@ -1,6 +1,7 @@
import { connect } from 'react-redux'
import { displayWarning, requestRevealSeedWords, fetchInfoToSync } from '../../store/actions'
import MobileSyncPage from './mobile-sync.component'
+import { getMostRecentOverviewPage } from '../../ducks/history/history'
const mapDispatchToProps = (dispatch) => {
return {
@@ -18,6 +19,7 @@ const mapStateToProps = (state) => {
} = state
return {
+ mostRecentOverviewpage: getMostRecentOverviewPage(state),
selectedAddress,
}
}
diff --git a/ui/app/pages/routes/routes.component.js b/ui/app/pages/routes/routes.component.js
index e7dd63df1..54a055f8d 100644
--- a/ui/app/pages/routes/routes.component.js
+++ b/ui/app/pages/routes/routes.component.js
@@ -30,9 +30,11 @@ import Alert from '../../components/ui/alert'
import AppHeader from '../../components/app/app-header'
import UnlockPage from '../unlock-page'
import Alerts from '../../components/app/alerts'
+import Asset from '../asset'
import {
ADD_TOKEN_ROUTE,
+ ASSET_ROUTE,
CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
CONFIRM_ADD_TOKEN_ROUTE,
CONFIRM_TRANSACTION_ROUTE,
@@ -78,6 +80,7 @@ export default class Routes extends Component {
providerId: PropTypes.string,
hasPermissionsRequests: PropTypes.bool,
autoLockTimeLimit: PropTypes.number,
+ pageChanged: PropTypes.func.isRequired,
}
static contextTypes = {
@@ -86,7 +89,7 @@ export default class Routes extends Component {
}
UNSAFE_componentWillMount () {
- const { currentCurrency, setCurrentCurrencyToUSD } = this.props
+ const { currentCurrency, pageChanged, setCurrentCurrencyToUSD } = this.props
if (!currentCurrency) {
setCurrentCurrencyToUSD()
@@ -94,6 +97,7 @@ export default class Routes extends Component {
this.props.history.listen((locationObj, action) => {
if (action === 'PUSH') {
+ pageChanged(locationObj.pathname)
const url = `&url=${encodeURIComponent('http://www.metamask.io/metametrics' + locationObj.pathname)}`
this.context.metricsEvent({}, {
currentPath: '',
@@ -126,6 +130,7 @@ export default class Routes extends Component {
+
)
diff --git a/ui/app/pages/routes/routes.container.js b/ui/app/pages/routes/routes.container.js
index e243cae54..d4a638250 100644
--- a/ui/app/pages/routes/routes.container.js
+++ b/ui/app/pages/routes/routes.container.js
@@ -15,6 +15,7 @@ import {
setLastActiveTime,
setMouseUserState,
} from '../../store/actions'
+import { pageChanged } from '../../ducks/history/history'
function mapStateToProps (state) {
const { appState } = state
@@ -54,6 +55,7 @@ function mapDispatchToProps (dispatch) {
setCurrentCurrencyToUSD: () => dispatch(setCurrentCurrency('usd')),
setMouseUserState: (isMouseUser) => dispatch(setMouseUserState(isMouseUser)),
setLastActiveTime: () => dispatch(setLastActiveTime()),
+ pageChanged: (path) => dispatch(pageChanged(path)),
}
}
diff --git a/ui/app/pages/send/send-content/send-asset-row/send-asset-row.container.js b/ui/app/pages/send/send-content/send-asset-row/send-asset-row.container.js
index ecc057775..3fdb4803c 100644
--- a/ui/app/pages/send/send-content/send-asset-row/send-asset-row.container.js
+++ b/ui/app/pages/send/send-content/send-asset-row/send-asset-row.container.js
@@ -1,7 +1,7 @@
import { connect } from 'react-redux'
import SendAssetRow from './send-asset-row.component'
import { getMetaMaskAccounts, getSendTokenAddress } from '../../../../selectors'
-import { updateSend } from '../../../../store/actions'
+import { updateSendToken } from '../../../../store/actions'
function mapStateToProps (state) {
return {
@@ -14,7 +14,7 @@ function mapStateToProps (state) {
function mapDispatchToProps (dispatch) {
return {
- setSendToken: (token) => dispatch(updateSend({ token })),
+ setSendToken: (token) => dispatch(updateSendToken(token)),
}
}
diff --git a/ui/app/pages/send/send-footer/send-footer.component.js b/ui/app/pages/send/send-footer/send-footer.component.js
index ce0675f2d..1bf61a3e4 100644
--- a/ui/app/pages/send/send-footer/send-footer.component.js
+++ b/ui/app/pages/send/send-footer/send-footer.component.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import PageContainerFooter from '../../../components/ui/page-container/page-container-footer'
-import { CONFIRM_TRANSACTION_ROUTE, DEFAULT_ROUTE } from '../../../helpers/constants/routes'
+import { CONFIRM_TRANSACTION_ROUTE } from '../../../helpers/constants/routes'
export default class SendFooter extends Component {
@@ -27,6 +27,7 @@ export default class SendFooter extends Component {
sendErrors: PropTypes.object,
gasEstimateType: PropTypes.string,
gasIsLoading: PropTypes.bool,
+ mostRecentOverviewPage: PropTypes.string.isRequired,
}
static contextTypes = {
@@ -35,8 +36,9 @@ export default class SendFooter extends Component {
}
onCancel () {
- this.props.clearSend()
- this.props.history.push(DEFAULT_ROUTE)
+ const { clearSend, history, mostRecentOverviewPage } = this.props
+ clearSend()
+ history.push(mostRecentOverviewPage)
}
async onSubmit (event) {
diff --git a/ui/app/pages/send/send-footer/send-footer.container.js b/ui/app/pages/send/send-footer/send-footer.container.js
index b5b6f57d5..02379a9e6 100644
--- a/ui/app/pages/send/send-footer/send-footer.container.js
+++ b/ui/app/pages/send/send-footer/send-footer.container.js
@@ -32,6 +32,7 @@ import {
constructTxParams,
constructUpdatedTx,
} from './send-footer.utils'
+import { getMostRecentOverviewPage } from '../../../ducks/history/history'
export default connect(mapStateToProps, mapDispatchToProps)(SendFooter)
@@ -62,6 +63,7 @@ function mapStateToProps (state) {
sendErrors: getSendErrors(state),
gasEstimateType,
gasIsLoading: getGasIsLoading(state),
+ mostRecentOverviewPage: getMostRecentOverviewPage(state),
}
}
diff --git a/ui/app/pages/send/send-footer/tests/send-footer-component.test.js b/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
index 56b926c16..4e245573b 100644
--- a/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
+++ b/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
@@ -2,7 +2,7 @@ import React from 'react'
import assert from 'assert'
import { shallow } from 'enzyme'
import sinon from 'sinon'
-import { CONFIRM_TRANSACTION_ROUTE, DEFAULT_ROUTE } from '../../../../helpers/constants/routes'
+import { CONFIRM_TRANSACTION_ROUTE } from '../../../../helpers/constants/routes'
import SendFooter from '../send-footer.component.js'
import PageContainerFooter from '../../../../components/ui/page-container/page-container-footer'
@@ -48,6 +48,7 @@ describe('SendFooter Component', function () {
unapprovedTxs={{}}
update={propsMethodSpies.update}
sendErrors={{}}
+ mostRecentOverviewPage="mostRecentOverviewPage"
/>
), { context: { t: (str) => str, metricsEvent: () => ({}) } })
})
@@ -78,7 +79,7 @@ describe('SendFooter Component', function () {
assert.equal(historySpies.push.callCount, 0)
wrapper.instance().onCancel()
assert.equal(historySpies.push.callCount, 1)
- assert.equal(historySpies.push.getCall(0).args[0], DEFAULT_ROUTE)
+ assert.equal(historySpies.push.getCall(0).args[0], 'mostRecentOverviewPage')
})
})
diff --git a/ui/app/pages/send/send-header/send-header.component.js b/ui/app/pages/send/send-header/send-header.component.js
index 6cabadae6..0ab994bb5 100644
--- a/ui/app/pages/send/send-header/send-header.component.js
+++ b/ui/app/pages/send/send-header/send-header.component.js
@@ -1,13 +1,13 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import PageContainerHeader from '../../../components/ui/page-container/page-container-header'
-import { DEFAULT_ROUTE } from '../../../helpers/constants/routes'
export default class SendHeader extends Component {
static propTypes = {
clearSend: PropTypes.func,
history: PropTypes.object,
+ mostRecentOverviewPage: PropTypes.string,
titleKey: PropTypes.string,
}
@@ -16,8 +16,9 @@ export default class SendHeader extends Component {
}
onClose () {
- this.props.clearSend()
- this.props.history.push(DEFAULT_ROUTE)
+ const { clearSend, history, mostRecentOverviewPage } = this.props
+ clearSend()
+ history.push(mostRecentOverviewPage)
}
render () {
diff --git a/ui/app/pages/send/send-header/send-header.container.js b/ui/app/pages/send/send-header/send-header.container.js
index 587bb51f2..e79d359c7 100644
--- a/ui/app/pages/send/send-header/send-header.container.js
+++ b/ui/app/pages/send/send-header/send-header.container.js
@@ -2,11 +2,13 @@ import { connect } from 'react-redux'
import { clearSend } from '../../../store/actions'
import SendHeader from './send-header.component'
import { getTitleKey } from '../../../selectors'
+import { getMostRecentOverviewPage } from '../../../ducks/history/history'
export default connect(mapStateToProps, mapDispatchToProps)(SendHeader)
function mapStateToProps (state) {
return {
+ mostRecentOverviewPage: getMostRecentOverviewPage(state),
titleKey: getTitleKey(state),
}
}
diff --git a/ui/app/pages/send/send-header/tests/send-header-component.test.js b/ui/app/pages/send/send-header/tests/send-header-component.test.js
index bb4f2a9a4..c5c58739f 100644
--- a/ui/app/pages/send/send-header/tests/send-header-component.test.js
+++ b/ui/app/pages/send/send-header/tests/send-header-component.test.js
@@ -2,7 +2,6 @@ import React from 'react'
import assert from 'assert'
import { shallow } from 'enzyme'
import sinon from 'sinon'
-import { DEFAULT_ROUTE } from '../../../../helpers/constants/routes'
import SendHeader from '../send-header.component.js'
import PageContainerHeader from '../../../../components/ui/page-container/page-container-header'
@@ -25,6 +24,7 @@ describe('SendHeader Component', function () {
), { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } })
@@ -51,7 +51,7 @@ describe('SendHeader Component', function () {
assert.equal(historySpies.push.callCount, 0)
wrapper.instance().onClose()
assert.equal(historySpies.push.callCount, 1)
- assert.equal(historySpies.push.getCall(0).args[0], DEFAULT_ROUTE)
+ assert.equal(historySpies.push.getCall(0).args[0], 'mostRecentOverviewPage')
})
})
diff --git a/ui/app/pages/send/send-header/tests/send-header-container.test.js b/ui/app/pages/send/send-header/tests/send-header-container.test.js
deleted file mode 100644
index 790ceb88a..000000000
--- a/ui/app/pages/send/send-header/tests/send-header-container.test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
- clearSend: sinon.spy(),
-}
-
-proxyquire('../send-header.container.js', {
- 'react-redux': {
- connect: (ms, md) => {
- mapStateToProps = ms
- mapDispatchToProps = md
- return () => ({})
- },
- },
- '../../../store/actions': actionSpies,
- '../../../selectors': {
- getTitleKey: (s) => `mockTitleKey:${s}`,
- },
-})
-
-describe('send-header container', function () {
- describe('mapStateToProps()', function () {
- it('should map the correct properties to props', function () {
- assert.deepEqual(mapStateToProps('mockState'), {
- titleKey: 'mockTitleKey:mockState',
- })
- })
- })
-
- describe('mapDispatchToProps()', function () {
- describe('clearSend()', function () {
- it('should dispatch an action', function () {
- const dispatchSpy = sinon.spy()
- const mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-
- mapDispatchToPropsObject.clearSend()
- assert(dispatchSpy.calledOnce)
- assert(actionSpies.clearSend.calledOnce)
- })
- })
- })
-})
diff --git a/ui/app/pages/settings/settings.component.js b/ui/app/pages/settings/settings.component.js
index 2814ee9d7..866ed4be7 100644
--- a/ui/app/pages/settings/settings.component.js
+++ b/ui/app/pages/settings/settings.component.js
@@ -12,7 +12,6 @@ import SecurityTab from './security-tab'
import ContactListTab from './contact-list-tab'
import {
ALERTS_ROUTE,
- DEFAULT_ROUTE,
ADVANCED_ROUTE,
SECURITY_ROUTE,
GENERAL_ROUTE,
@@ -40,6 +39,7 @@ class SettingsPage extends PureComponent {
initialBreadCrumbRoute: PropTypes.string,
breadCrumbTextKey: PropTypes.string,
initialBreadCrumbKey: PropTypes.string,
+ mostRecentOverviewPage: PropTypes.string.isRequired,
}
static contextTypes = {
@@ -47,7 +47,7 @@ class SettingsPage extends PureComponent {
}
render () {
- const { history, backRoute, currentPath } = this.props
+ const { history, backRoute, currentPath, mostRecentOverviewPage } = this.props
return (
history.push(DEFAULT_ROUTE)}
+ onClick={() => history.push(mostRecentOverviewPage)}
/>
diff --git a/ui/app/pages/settings/settings.container.js b/ui/app/pages/settings/settings.container.js
index 503109cfa..61a443eb3 100644
--- a/ui/app/pages/settings/settings.container.js
+++ b/ui/app/pages/settings/settings.container.js
@@ -6,6 +6,7 @@ import { getAddressBookEntryName } from '../../selectors'
import { isValidAddress } from '../../helpers/utils/util'
import { ENVIRONMENT_TYPE_POPUP } from '../../../../app/scripts/lib/enums'
import { getEnvironmentType } from '../../../../app/scripts/lib/util'
+import { getMostRecentOverviewPage } from '../../ducks/history/history'
import {
CONNECTIONS_ROUTE,
@@ -87,6 +88,7 @@ const mapStateToProps = (state, ownProps) => {
initialBreadCrumbRoute,
breadCrumbTextKey,
initialBreadCrumbKey,
+ mostRecentOverviewPage: getMostRecentOverviewPage(state),
}
}
diff --git a/ui/app/selectors/selectors.js b/ui/app/selectors/selectors.js
index dc5929480..1e98b97d5 100644
--- a/ui/app/selectors/selectors.js
+++ b/ui/app/selectors/selectors.js
@@ -6,18 +6,6 @@ import {
checksumAddress,
getAccountByAddress,
} from '../helpers/utils/util'
-import { getSendToken } from './send'
-import { getTokens } from '../ducks/metamask/metamask'
-
-export const getSelectedTokenAddress = (state) => state.metamask.selectedTokenAddress
-
-export const getSelectedToken = createSelector(
- getTokens,
- getSelectedTokenAddress,
- (tokens, selectedTokenAddress) => {
- return tokens.find(({ address }) => address === selectedTokenAddress)
- }
-)
export function getNetworkIdentifier (state) {
const { metamask: { provider: { type, nickname, rpcTarget } } } = state
@@ -57,15 +45,6 @@ export function getAccountType (state) {
}
}
-export const getSelectedAsset = createSelector(
- getSelectedToken,
- getSendToken,
- (selectedToken, sendToken) => {
- const token = selectedToken || sendToken
- return token?.symbol || 'ETH'
- }
-)
-
export function getCurrentNetworkId (state) {
return state.metamask.network
}
@@ -327,10 +306,9 @@ export function getTargetDomainMetadata (state, request, defaultOrigin) {
return targetDomainMetadata
}
-export const getMetaMetricState = (state) => {
+export const getBackgroundMetaMetricState = (state) => {
return {
network: getCurrentNetworkId(state),
- activeCurrency: getSelectedAsset(state),
accountType: getAccountType(state),
metaMetricsId: state.metamask.metaMetricsId,
numberOfTokens: getNumberOfTokens(state),
diff --git a/ui/app/selectors/tests/send-selectors-test-data.js b/ui/app/selectors/tests/send-selectors-test-data.js
index cc042a23f..a5bd43892 100644
--- a/ui/app/selectors/tests/send-selectors-test-data.js
+++ b/ui/app/selectors/tests/send-selectors-test-data.js
@@ -117,7 +117,6 @@ const state = {
'time': 1400000000000,
},
],
- 'selectedTokenAddress': '0x8d6b81208414189a58339873ab429b6c47ab92d3',
'unapprovedMsgs': {
'0xabc': { id: 'unapprovedMessage1', 'time': 1650000000000 },
'0xdef': { id: 'unapprovedMessage2', 'time': 1550000000000 },
diff --git a/ui/app/store/actionConstants.js b/ui/app/store/actionConstants.js
index b784c9819..4a11aa111 100644
--- a/ui/app/store/actionConstants.js
+++ b/ui/app/store/actionConstants.js
@@ -28,7 +28,6 @@ export const LOCK_METAMASK = 'LOCK_METAMASK'
export const DISPLAY_WARNING = 'DISPLAY_WARNING'
export const HIDE_WARNING = 'HIDE_WARNING'
// accounts screen
-export const SET_SELECTED_TOKEN = 'SET_SELECTED_TOKEN'
export const SHOW_ACCOUNT_DETAIL = 'SHOW_ACCOUNT_DETAIL'
export const SHOW_ACCOUNTS_PAGE = 'SHOW_ACCOUNTS_PAGE'
export const SHOW_CONF_TX_PAGE = 'SHOW_CONF_TX_PAGE'
@@ -53,6 +52,7 @@ export const UPDATE_SEND_AMOUNT = 'UPDATE_SEND_AMOUNT'
export const UPDATE_SEND_ERRORS = 'UPDATE_SEND_ERRORS'
export const UPDATE_MAX_MODE = 'UPDATE_MAX_MODE'
export const UPDATE_SEND = 'UPDATE_SEND'
+export const UPDATE_SEND_TOKEN = 'UPDATE_SEND_TOKEN'
export const CLEAR_SEND = 'CLEAR_SEND'
export const GAS_LOADING_STARTED = 'GAS_LOADING_STARTED'
export const GAS_LOADING_FINISHED = 'GAS_LOADING_FINISHED'
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 2eaa33017..99aac3cac 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -1,7 +1,7 @@
import abi from 'human-standard-token-abi'
import pify from 'pify'
import getBuyEthUrl from '../../../app/scripts/lib/buy-eth-url'
-import { getTokenAddressFromTokenObject, checksumAddress } from '../helpers/utils/util'
+import { checksumAddress } from '../helpers/utils/util'
import { calcTokenBalance, estimateGas } from '../pages/send/send.utils'
import ethUtil from 'ethereumjs-util'
import { fetchLocale } from '../helpers/utils/i18n-helper'
@@ -729,6 +729,13 @@ export function updateSend (newSend) {
}
}
+export function updateSendToken (token) {
+ return {
+ type: actionConstants.UPDATE_SEND_TOKEN,
+ value: token,
+ }
+}
+
export function clearSend () {
return {
type: actionConstants.CLEAR_SEND,
@@ -1153,13 +1160,6 @@ export function lockMetamask () {
}
}
-export function setSelectedToken (tokenAddress) {
- return {
- type: actionConstants.SET_SELECTED_TOKEN,
- value: tokenAddress || null,
- }
-}
-
async function _setSelectedAddress (dispatch, address) {
log.debug(`background.setSelectedAddress`)
const tokens = await promisifiedBackground.setSelectedAddress(address)
@@ -1207,7 +1207,6 @@ export function showAccountDetail (address) {
type: actionConstants.SHOW_ACCOUNT_DETAIL,
value: address,
})
- dispatch(setSelectedToken())
if (unconnectedAccountAlertIsEnabled && switchingToUnconnectedAddress) {
dispatch(switchedToUnconnectedAccount())
await setSwitchToConnectedAlertShown(activeTabOrigin)
@@ -1293,12 +1292,10 @@ export function removeToken (address) {
export function addTokens (tokens) {
return (dispatch) => {
if (Array.isArray(tokens)) {
- dispatch(setSelectedToken(getTokenAddressFromTokenObject(tokens[0])))
return Promise.all(tokens.map(({ address, symbol, decimals }) => (
dispatch(addToken(address, symbol, decimals))
)))
} else {
- dispatch(setSelectedToken(getTokenAddressFromTokenObject(tokens)))
return Promise.all(
Object
.entries(tokens)
@@ -1435,7 +1432,6 @@ export function setProviderType (type) {
}
dispatch(setPreviousProvider(currentProviderType))
dispatch(updateProviderType(type))
- dispatch(setSelectedToken())
}
}
@@ -1483,8 +1479,6 @@ export function editRpc (oldRpc, newRpc, chainId, ticker = 'ETH', nickname, rpcP
return
}
- dispatch(setSelectedToken())
-
try {
await promisifiedBackground.updateAndSetCustomRpc(newRpc, chainId, ticker, nickname || newRpc, rpcPrefs)
} catch (error) {
@@ -1511,7 +1505,6 @@ export function setRpcTarget (newRpc, chainId, ticker = 'ETH', nickname) {
dispatch(displayWarning('Had a problem changing networks!'))
return
}
- dispatch(setSelectedToken())
}
}
@@ -1525,7 +1518,6 @@ export function delRpcTarget (oldRpc) {
dispatch(displayWarning('Had a problem removing network!'))
return reject(err)
}
- dispatch(setSelectedToken())
resolve()
})
})