From 8f0c5ada0433551924006466ab407ffa1f49aeab Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 31 Mar 2025 15:32:24 -0400
Subject: [PATCH] Loading modal refactor

---
 src/mixins/base-mixin.js | 6 ++++++
 src/router/index.js      | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 6fd6075ab..151d17dd9 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -230,6 +230,12 @@ export default {
             return "widget-name-" + this.cmsWidgetName;
         },
     },
+
+    mounted() {
+        if (!store.getters.externalParameterState?.isExternalParameter) {
+            showFmgLoadingModal(false);
+        }
+    },
 };
 
 function encodeUriData(payload) {
diff --git a/src/router/index.js b/src/router/index.js
index 2230a652d..345790734 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -433,9 +433,6 @@ router.afterEach(async (to, from) => {
             await saveSession({ pageNameToLog: to.query.fmgPage });
         }
     }
-    if (!store.getters.externalParameterState?.isExternalParameter) {
-        showFmgLoadingModal(false);
-    }
 
     // Push page view to GA
     analyticsMixin.methods.pushPageViewToGA();