m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Merge pull request #4851 from MetaMask/fix-trezor-alert

Browse Source 
Fix trezor "Hardware wallet connected" alert
This commit is contained in:
Dan Finlay 2018-07-23 11:58:29 -07:00 committed by GitHub
commit b208d33b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/app/components/pages/create-account/connect-hardware/index.js
View File

@ -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() })