Merge remote-tracking branch 'remotes/origin/#523' into allfunctionality

Author: boriskovar-m2ms

js/components/preview/compounds/redux/dispatchActions.js

@@ -215,16 +215,16 @@ export const handleClickOnCompound = ({ event, data, majorViewStage, index }) =>
   }
 };
 
-export const handleBuyList = ({ isSelected, data }) => (dispatch, getState) => {
+export const handleBuyList = ({ isSelected, data, skipTracking }) => (dispatch, getState) => {
   let compoundId = data.compoundId;
   dispatch(setHighlightedCompoundId(compoundId));
 
   if (isSelected === false) {
     dispatch(removeSelectedCompoundClass(compoundId));
-    dispatch(removeFromToBuyList(data, compoundId, true));
+    dispatch(removeFromToBuyList(data, compoundId, skipTracking));
   } else {
     dispatch(addSelectedCompoundClass(data.class, compoundId));
-    dispatch(appendToBuyList(Object.assign({}, data), compoundId, true));
+    dispatch(appendToBuyList(Object.assign({}, data), compoundId, skipTracking));
   }
 };
 

js/reducers/tracking/dispatchActions.js

@@ -926,14 +926,16 @@ const restoreCartActions = (orderedActionList, majorViewStage) => async (dispatc
   );
   if (shoppingCartActions) {
     shoppingCartActions.forEach(action => {
-      shoppingCartItems.push(action.item);
+      if (action.item) {
+        shoppingCartItems.push(action.item);
+      }
     });
   }
 
   shoppingCartItems.forEach(item => {
     let data = item;
     if (data) {
-      dispatch(handleBuyList({ isSelected: true, data }));
+      dispatch(handleBuyList({ isSelected: true, data, skipTracking: true }));
     }
   });
 
@@ -2013,7 +2015,7 @@ const handleShoppingCartAction = (action, isAdd) => (dispatch, getState) => {
   if (action) {
     let data = action.item;
     if (data) {
-      dispatch(handleBuyList({ isSelected: isAdd, data }));
+      dispatch(handleBuyList({ isSelected: isAdd, data, skipTracking: false }));
     }
   }
 };