Merge branch 'develop' into CSR-2287-fix-copy-alignment

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

@@ -46,19 +46,10 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { applicationConfig } from "@/constants/application-config";
 import store from "@/store";
-import router from "@/router";
 
 export default {
     name: "insurance-company",
     async beforeRouteEnter(to, from, next) {
-        //force reload if redirected from external application
-        if (from.redirectedFrom === undefined && !sessionStorage.getItem("reloaded")) {
-            sessionStorage.setItem("reloaded", "true");
-            router.go(0);
-        } else {
-            sessionStorage.removeItem("reloaded");
-        }
-
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const insuranceCompanyListPromise = baseMixin.methods.dispatchStoreActionWithLogging(
@@ -83,6 +74,10 @@ 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) {
@@ -102,6 +97,9 @@ export default {
         },
     },
     methods: {
+        handlePageShow() {
+            window.location.reload();
+        },
         isCashParentAccountNumber() {
             return (
                 applicationConfig.CASH_PARENT_ACCOUNT_NUMBER.toString() ===