diff options
Diffstat (limited to 'ui/app/components/pages')
-rw-r--r-- | ui/app/components/pages/create-account/connect-hardware/index.js | 15 | ||||
-rw-r--r-- | ui/app/components/pages/home.js | 12 |
2 files changed, 17 insertions, 10 deletions
diff --git a/ui/app/components/pages/create-account/connect-hardware/index.js b/ui/app/components/pages/create-account/connect-hardware/index.js index cc3761c04..3f66e7098 100644 --- a/ui/app/components/pages/create-account/connect-hardware/index.js +++ b/ui/app/components/pages/create-account/connect-hardware/index.js @@ -17,6 +17,7 @@ class ConnectHardwareForm extends Component { selectedAccount: null, accounts: [], browserSupported: true, + unlocked: false, } } @@ -32,9 +33,14 @@ class ConnectHardwareForm extends Component { } - async componentDidMount () { + componentDidMount () { + this.checkIfUnlocked() + } + + async checkIfUnlocked () { const unlocked = await this.props.checkHardwareStatus('trezor') if (unlocked) { + this.setState({unlocked: true}) this.getPage(0) } } @@ -66,12 +72,12 @@ class ConnectHardwareForm extends Component { if (accounts.length) { // If we just loaded the accounts for the first time - // show the global alert - if (this.state.accounts.length === 0) { + // (device previously locked) show the global alert + if (this.state.accounts.length === 0 && !this.state.unlocked) { this.showTemporaryAlert() } - const newState = {} + const newState = { unlocked: true } // Default to the first account if (this.state.selectedAccount === null) { accounts.forEach((a, i) => { @@ -112,6 +118,7 @@ class ConnectHardwareForm extends Component { btnText: this.context.t('connectToTrezor'), selectedAccount: null, accounts: [], + unlocked: false, }) }).catch(e => { this.setState({ error: e.toString() }) diff --git a/ui/app/components/pages/home.js b/ui/app/components/pages/home.js index 38aa02dae..5e3fdc9af 100644 --- a/ui/app/components/pages/home.js +++ b/ui/app/components/pages/home.js @@ -27,19 +27,17 @@ const { NOTICE_ROUTE, } = require('../../routes') +const { unconfirmedTransactionsCountSelector } = require('../../selectors/confirm-transaction') + class Home extends Component { componentDidMount () { const { history, - unapprovedTxs = {}, - unapprovedMsgCount = 0, - unapprovedPersonalMsgCount = 0, - unapprovedTypedMessagesCount = 0, + unconfirmedTransactionsCount = 0, } = this.props // unapprovedTxs and unapproved messages - if (Object.keys(unapprovedTxs).length || - unapprovedTypedMessagesCount + unapprovedMsgCount + unapprovedPersonalMsgCount > 0) { + if (unconfirmedTransactionsCount > 0) { history.push(CONFIRM_TRANSACTION_ROUTE) } } @@ -167,6 +165,7 @@ Home.propTypes = { isPopup: PropTypes.bool, isMouseUser: PropTypes.bool, t: PropTypes.func, + unconfirmedTransactionsCount: PropTypes.number, } function mapStateToProps (state) { @@ -230,6 +229,7 @@ function mapStateToProps (state) { // state needed to get account dropdown temporarily rendering from app bar selected, + unconfirmedTransactionsCount: unconfirmedTransactionsCountSelector(state), } } |