diff --git a/old-ui/app/account-detail.js b/old-ui/app/account-detail.js
index 70d07bbd0..a6767c207 100644
--- a/old-ui/app/account-detail.js
+++ b/old-ui/app/account-detail.js
@@ -27,7 +27,6 @@ function mapStateToProps (state) {
identities: state.metamask.identities,
keyrings: state.metamask.keyrings,
warning: state.appState.warning,
- toastMsg: state.appState.toastMsg,
accounts,
address: state.metamask.selectedAddress,
accountDetail: state.appState.accountDetail,
@@ -68,7 +67,6 @@ AccountDetailScreen.prototype.render = function () {
h('.account-detail-section.full-flex-height', [
h(ToastComponent, {
- msg: props.toastMsg,
isSuccess: false,
}),
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js
index 827d86647..fd5a2306d 100644
--- a/old-ui/app/components/account-dropdowns.js
+++ b/old-ui/app/components/account-dropdowns.js
@@ -42,6 +42,7 @@ class AccountDropdowns extends Component {
labels: {},
isProxy: false,
contractProps: null,
+ preventToast: false,
}
this.accountSelectorToggleClassName = 'accounts-selector'
this.optionsMenuToggleClassName = 'account-dropdown'
@@ -131,6 +132,7 @@ class AccountDropdowns extends Component {
this.props.actions.showAccountDetail(address)
if (ifHardwareAcc(keyring)) {
if (isLedger(keyring.type)) {
+
const hdPaths = getHdPaths()
return new Promise((resolve, reject) => {
this.props.actions.connectHardwareAndUnlockAddress(LEDGER, hdPaths[1].value, address)
@@ -142,10 +144,17 @@ class AccountDropdowns extends Component {
})
})
.catch(e => {
- this.props.actions.displayWarning((e && e.message) || e)
- this.props.actions.displayToast(e)
+ if (!this.state.preventToast) {
+ this.props.actions.displayToast(e)
+ } else {
+ this.setState({preventToast: false})
+ }
})
+ } else {
+ this.setState({preventToast: true})
}
+ } else {
+ this.setState({preventToast: true})
}
}
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js
index ff5bed21e..63b5ed3dd 100644
--- a/old-ui/app/components/pending-tx.js
+++ b/old-ui/app/components/pending-tx.js
@@ -26,6 +26,7 @@ const { tokenInfoGetter, calcTokenAmount } = require('../../../ui/app/token-util
const BigNumber = require('bignumber.js')
const ethNetProps = require('eth-net-props')
import { getMetaMaskAccounts } from '../../../ui/app/selectors'
+import ToastComponent from './toast'
const MIN_GAS_PRICE_BN = new BN('0')
const MIN_GAS_LIMIT_BN = new BN('21000')
@@ -168,6 +169,9 @@ PendingTx.prototype.render = function () {
h('div', {
key: txMeta.id,
}, [
+ h(ToastComponent, {
+ isSuccess: false,
+ }),
h('form#pending-tx-form', {
onSubmit: this.onSubmit.bind(this),
diff --git a/old-ui/app/components/send/send-contract.js b/old-ui/app/components/send/send-contract.js
index a1502b68b..84c042214 100644
--- a/old-ui/app/components/send/send-contract.js
+++ b/old-ui/app/components/send/send-contract.js
@@ -152,7 +152,7 @@ class SendTransactionScreen extends PersistentForm {