Merge pull request #7467 from brave/fix/7466

fix "Cannot read property 'size' of undefined" error when getting persistent state
brave · Mar 3, 2017 · 96dfd5c · 96dfd5c
2 parents a3de55a + 0362926
commit 96dfd5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/common/state/tabState.js b/app/common/state/tabState.js
@@ -184,6 +184,9 @@ const api = {
     state = makeImmutable(state)
 
     let tabs = state.get('tabs')
+    if (!tabs) {
+      return state
+    }
     for (let i = 0; i < tabs.size; i++) {
       tabs = tabs.deleteIn([i, field])
     }

diff --git a/test/unit/app/common/state/tabStateTest.js b/test/unit/app/common/state/tabStateTest.js
@@ -483,6 +483,11 @@ describe('tabState unit tests', function () {
       const expectedAppState = defaultAppState.set('tabs', tabsWithoutField)
       assert.deepEqual(newAppState, expectedAppState)
     })
+    it('returns the state (unchanged) if tabs is falsey', function () {
+      const emptyTabState = defaultAppState.delete('tabs')
+      const newAppState = tabState.removeTabField(emptyTabState, 'loginRequiredDetail')
+      assert.equal(newAppState, emptyTabState)
+    })
   })
 
   describe('getPersistentState', function () {