Merge pull request #2099 from Safelite/Feature/Digital/CSR-2066

CSR-2066

src/helpers/heritage-integration/navigation-helper.js

@@ -106,7 +106,11 @@ export async function getImplicitNavigation(toRoute) {
     Used to navigate to the heritage funnel with the correct query string and url.
 */
 
-export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) {
+export async function navigateToHeritageFunnel({
+    shouldSaveSession,
+    pageNameToLog,
+    cleanupBeforeNavigateExternalMethod = null,
+}) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (eval(log)) {
         console.log("------------- Navigate to heritage start -----------------");
@@ -143,6 +147,8 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
     ) {
         heritageParms["forceEndToEndInsurance"] = true;
     }
+    //Cleanup Before Navigate to External
+    cleanupBeforeNavigateExternalMethod?.();
 
     // clear the heritage session that may still exist after an order was already submitted
     if (window.sessionStorage.getItem("createNewSessionForHeritage") !== null) {

src/layouts/insurance-company/insurance-company.vue

@@ -74,10 +74,6 @@ export default {
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
-            //Reload page if serve from bfcache.
-            if (performance.getEntriesByType("navigation")[0].type === "back_forward") {
-                vm.handlePageShow();
-            }
             vm.setCmsContent(resultMap.cmsContent);
             vm.originalList = resultMap.insuranceCompanyList;
             if (store.getters.externalParameterState?.isExternalParameter) {
@@ -97,9 +93,6 @@ export default {
         },
     },
     methods: {
-        handlePageShow() {
-            window.location.reload();
-        },
         isCashParentAccountNumber() {
             return (
                 applicationConfig.CASH_PARENT_ACCOUNT_NUMBER.toString() ===
@@ -145,6 +138,7 @@ export default {
             navigateToHeritageFunnel({
                 shouldSaveSession: true,
                 pageNameToLog: "insurance-company",
+                cleanupBeforeNavigateExternalMethod: this.$refs.navbar.removeLoader,
             });
         },
     },