diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 1bc3c0945..246ce2986 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -470,6 +470,10 @@ export default { shopListButton: shopListButton, lastSelectedInshopOrDropoffProvider: null, selectedMobileFirstAppointment: false, + isShowMobileFirstAppt: experimentMixin.methods.hasSettingEqualTo( + experimentSettings.SHOW_MOBILE_FIRST_APPT, + "true" + ), }; }, async beforeRouteEnter(to, from, next) { @@ -1196,6 +1200,8 @@ export default { }, async initializeDatePicker() { + this.isShowMobileFirstAppt && this.showLoadingModal(); + this.selectedDate = null; const includeMobileTimeSlots = this.isServiceableMobile; @@ -1233,6 +1239,8 @@ export default { this.setDisplayWaitList(); } } + + this.isShowMobileFirstAppt && this.hideLoadingModal(); }, getScheduleApiResponse, getServiceZipCtuCodeFromStore() { @@ -1349,6 +1357,9 @@ export default { showLoadingModal() { this.$refs.loadingModal.showModal(); }, + hideLoadingModal() { + this.$refs.loadingModal.hideModal(); + }, async forwardButtonAction() { this.navigatingForward = true; var ctu = this.zipCodeCtu; @@ -1747,10 +1758,6 @@ export default { }, async showMobileFirstModal() { if (!this.selectedRouteCodeData?.routeCode) { - const isShowMobileFirstAppt = experimentMixin.methods.hasSettingEqualTo( - experimentSettings.SHOW_MOBILE_FIRST_APPT, - "true" - ); const pmMobileDays = experimentMixin.methods.getSettingValue( experimentSettings.SHOW_PM_MOBILE_DAYS ); @@ -1805,7 +1812,7 @@ export default { ); } - if (isShowMobileFirstAppt) { + if (this.isShowMobileFirstAppt) { if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) { preSelectedMobileAppointment = firstMobilePMAppt; } else if (