Merge pull request #626 from topcoder-platform/issue-624

Author: jmgasper

src/apps/self-service/src/actions/autoSave.js

@@ -21,11 +21,6 @@ export const triggerCookieClear = () => ({
   type: ACTIONS.AUTO_SAVE.TRIGGER_COOKIE_CLEARED,
 });
 
-export const autoSaveCookieCleared = (isCookieCleared) => ({
-  type: ACTIONS.AUTO_SAVE.COOKIE_CLEARED,
-  payload: isCookieCleared,
-});
-
 export const sendAutoSavedPatch = (dataToSave, challengeId) => (dispatch) => {
   patchChallenge(dataToSave, challengeId)
     .then((patched) => {

src/apps/self-service/src/config/constants/work.constants.js

@@ -97,7 +97,6 @@ export const ACTIONS = {
         SET_ITEM: "SET_ITEM",
     },
     AUTO_SAVE: {
-        COOKIE_CLEARED: "COOKIE_CLEARED",
         TRIGGER_AUTO_SAVE: "TRIGGER_AUTO_SAVE",
         INIT_ERRORED: "INIT_ERRORED",
         TRIGGER_COOKIE_CLEARED: "TRIGGER_COOKIE_CLEARED",

src/apps/self-service/src/containers/products/review/Review.jsx

@@ -167,10 +167,10 @@ const Review = ({
       )
       .then((res) => {
         activateChallenge(challengeId);
+        clearPreviousForm();
         navigate(nextPageUrl || `${selfServiceRootRoute}/thank-you`);
         setProgressItem(8);
         setPaymentFailed(false);
-        clearPreviousForm();
       })
       .catch(() => {
         setPaymentFailed(true);

src/apps/self-service/src/reducers/autoSave.js

@@ -6,7 +6,6 @@ import { ACTIONS } from "../config";
 
 const initialState = {
   triggered: false,
-  cookieCleared: false,
   initErrored: null,
   forced: false,
 };
@@ -20,11 +19,6 @@ const autoSaveReducer = (state = initialState, action) => {
         forced: action.payload.isForced,
         isLoggedIn: action.payload.isLoggedIn,
       };
-    case ACTIONS.AUTO_SAVE.COOKIE_CLEARED:
-      return {
-        ...state,
-        cookieCleared: action.payload,
-      };
     case ACTIONS.AUTO_SAVE.INIT_ERRORED:
       return {
         ...state,

src/apps/self-service/src/utils/autoSaveBeforeLogin.js

@@ -6,7 +6,6 @@ import "moment-timezone";
 import { EnvironmentConfig } from "~/config";
 
 import {
-  autoSaveCookieCleared,
   sendAutoSavedPatch,
   storeAutoSavedCookie,
 } from "../actions/autoSave";
@@ -54,11 +53,10 @@ export const saveUpdatesMiddleware = ({ dispatch, getState }) => {
 
   const clearCache = () => {
     clearAutoSavedForm();
-    dispatch(autoSaveCookieCleared(true));
   };
 
   const clearCachedCookie = (autoSave) => {
-    if (autoSave.triggered && !autoSave.cookieCleared) {
+    if (autoSave.triggered && getCookie(AUTO_SAVE_FORM)) {
       clearCache();
     }
   };