Merge branch 'develop' into feature/CSR-1073

src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue

@@ -1,5 +1,10 @@
 <template>
     <div class="text-center">
+        <label
+            for="mobileLocationLinkPromptId"
+            :aria-label="mobileLocationLinkPromptText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
                 ref="mobileLocationLink"
@@ -10,6 +15,10 @@
                 @click-event="openModal"
                 aria-label="Modal window" />
         </div>
+        <textBlock
+            :customText="mobileFeeText"
+            cmsWidgetName="MobileFeeDisclaimerWidget"
+            typeStyle="caption" />
     </div>
     <modal
         :ref="modalName"
@@ -80,6 +89,9 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent(this.linkWidgetName, "HeaderText");
+        },
         mobileLocationLinkText() {
             if (
                 this.addressModel.streetAddress !== null &&

src/layouts/service-location/service-location.vue

@@ -10,21 +10,11 @@
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
-            <div class="text-center">
-                <label
-                    for="mobileLocationLinkPromptId"
-                    :aria-label="mobileLocationLinkPromptText"
-                    class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-                    v-html="mobileLocationLinkPromptText"></label>
-            </div>
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
-            <div class="text-center">
-                <textBlock :customText="mobileFeeDisclaimerText" typeStyle="caption" />
-            </div>
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -49,7 +39,6 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
 import store from "@/store";
-import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "service-location",
@@ -196,7 +185,6 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
-        textBlock,
     },
 };
 </script>