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

Merge pull request #9880 from darkwing/hardware-error

Browse Source 
Properly detect U2F errors in hardware wallet
This commit is contained in:
David Walsh 2020-11-13 13:51:08 -06:00 committed by GitHub
commit 9b42ead095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@ import { getMostRecentOverviewPage } from '../../../ducks/history/history'
import SelectHardware from './select-hardware'
import AccountList from './account-list'
const U2F_ERROR = 'U2F'
class ConnectHardwareForm extends Component {
state = {
error: null,
@ -130,8 +132,8 @@ class ConnectHardwareForm extends Component {
const errorMessage = e.message
if (errorMessage === 'Window blocked') {
this.setState({ browserSupported: false, error: null })
} else if (e.indexOf('U2F') > -1) {
this.setState({ error: 'U2F' })
} else if (errorMessage.includes(U2F_ERROR)) {
this.setState({ error: U2F_ERROR })
} else if (
errorMessage !== 'Window closed' &&
errorMessage !== 'Popup closed'
@ -200,7 +202,7 @@ class ConnectHardwareForm extends Component {
}
renderError() {
if (this.state.error === 'U2F') {
if (this.state.error === U2F_ERROR) {
return (
<p className="hw-connect__error">
{this.context.t('troubleConnectingToWallet', [