From 19a03d20c07c1ab5e89506bd10004f082dbefecb Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Fri, 13 Nov 2020 12:34:03 -0600
Subject: [PATCH] Properly detect U2F errors in hardware wallet

---
 ui/app/pages/create-account/connect-hardware/index.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/app/pages/create-account/connect-hardware/index.js b/ui/app/pages/create-account/connect-hardware/index.js
index ef7ef9c38..8e80d3775 100644
--- a/ui/app/pages/create-account/connect-hardware/index.js
+++ b/ui/app/pages/create-account/connect-hardware/index.js
@@ -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', [