Fixes recover flow when seed is corrupted

Resolves brave#13583 Auditors: Test Plan:
NejcZdovc · Mar 26, 2018 · 5dbe566 · 5dbe566
1 parent 68ecb38
commit 5dbe566
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -1160,6 +1160,12 @@ const onWalletRecovery = (state, error, result) => {
     state = ledgerState.setInfoProp(state, 'walletQR', Immutable.Map())
     state = ledgerState.setInfoProp(state, 'addresses', Immutable.Map())
 
+    const status = ledgerState.getAboutProp(state, 'status')
+
+    if (status === ledgerStatuses.CORRUPTED_SEED) {
+      state = ledgerState.setAboutProp(state, 'status', '')
+    }
+
     callback(error, result)
 
     if (balanceTimeoutId) {
@@ -1647,9 +1653,13 @@ const getStateInfo = (state, parsedData) => {
     state = ledgerState.setAboutProp(state, 'status', ledgerStatuses.IN_PROGRESS)
   }
 
-  let passphrase = ledgerClient.prototype.getWalletPassphrase(parsedData)
-  if (passphrase) {
-    newInfo.passphrase = passphrase.join(' ')
+  try {
+    let passphrase = ledgerClient.prototype.getWalletPassphrase(parsedData)
+    if (passphrase) {
+      newInfo.passphrase = passphrase.join(' ')
+    }
+  } catch (e) {
+    console.error(e)
   }
 
   state = ledgerState.mergeInfoProp(state, newInfo)

diff --git a/app/common/state/ledgerState.js b/app/common/state/ledgerState.js
@@ -570,6 +570,16 @@ const ledgerState = {
     }
 
     return state.setIn(['ledger', 'about', prop], value)
+  },
+
+  getAboutProp: (state, prop) => {
+    state = validateState(state)
+
+    if (prop == null) {
+      return null
+    }
+
+    return state.getIn(['ledger', 'about', prop])
   }
 }
 

diff --git a/test/unit/app/common/state/ledgerStateTest.js b/test/unit/app/common/state/ledgerStateTest.js
@@ -609,4 +609,17 @@ describe('ledgerState unit test', function () {
       assert.deepEqual(result.toJS(), expectedState.toJS())
     })
   })
+
+  describe('getAboutProp', function () {
+    it('null case', function () {
+      const result = ledgerState.getAboutProp(defaultState)
+      assert.equal(result, null)
+    })
+
+    it('prop is set', function () {
+      const state = defaultState.setIn(['ledger', 'about', 'status'], 'corrupted')
+      const result = ledgerState.getAboutProp(state, 'status')
+      assert.equal(result, 'corrupted')
+    })
+  })
 })