Handle mergeble entry after adding

fix #3368 auditor: @bridiver
brave · Aug 24, 2016 · eeadfc2 · eeadfc2
1 parent 2ea50f4
commit eeadfc2
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -552,12 +552,13 @@ const handleAppAction = (action) => {
           appState.getIn(['autofill', 'addresses']).filterNot((address) => {
             return Immutable.is(address, action.originalDetail.get('guid'))
           }))
-        if (action.originalDetail.get('guid') !== undefined) {
-          Filtering.removeAutofillAddress(action.originalDetail.get('guid').toJS())
-        }
 
         let addresses = appState.getIn(['autofill', 'addresses'])
         const guid = Filtering.addAutofillAddress(action.detail.toJS())
+        if (action.originalDetail.get('guid') !== undefined &&
+          !Immutable.is(Immutable.fromJS(guid), action.originalDetail.get('guid'))) {
+          Filtering.removeAutofillAddress(action.originalDetail.get('guid').toJS())
+        }
         appState = appState.setIn(['autofill', 'addresses'], addresses.push(Immutable.fromJS(guid)))
         break
       }
@@ -581,12 +582,13 @@ const handleAppAction = (action) => {
           appState.getIn(['autofill', 'creditCards']).filterNot((card) => {
             return Immutable.is(card, action.originalDetail.get('guid'))
           }))
-        if (action.originalDetail.get('guid') !== undefined) {
-          Filtering.removeAutofillCreditCard(action.originalDetail.get('guid').toJS())
-        }
 
         let creditCards = appState.getIn(['autofill', 'creditCards'])
         const guid = Filtering.addAutofillCreditCard(action.detail.toJS())
+        if (action.originalDetail.get('guid') !== undefined &&
+          !Immutable.is(Immutable.fromJS(guid), action.originalDetail.get('guid'))) {
+          Filtering.removeAutofillCreditCard(action.originalDetail.get('guid').toJS())
+        }
         appState = appState.setIn(['autofill', 'creditCards'], creditCards.push(Immutable.fromJS(guid)))
         break
       }