Merge branch 'develop' into feature/CSR-347

azure-pipelines.yml

@@ -30,6 +30,7 @@ resources:
 
 variables:
   - group: Digital-Infrastructure
+  - group: FixMyGlass-BuildBranches
 
 stages:
   # PR's
@@ -47,6 +48,7 @@ stages:
   # Dev Build/Deploy
   - ${{ else }}:
     - stage: Dev
+      condition: eq(variables['Build.SourceBranch'], variables['dev-branch'] )
       variables:
         - group: FixMyGlassDev
       jobs:
@@ -88,6 +90,7 @@ stages:
 
   # QA Build/Deploy
     - stage: Qa
+      condition: eq(variables['Build.SourceBranch'], variables['qa-branch'] )
       variables:
         - group: FixMyGlassQa
       jobs:

src/common-components/loading-modal/loading-modal.vue

@@ -10,7 +10,7 @@
             Please wait...
         </div>
         <div class="text-center fs-5 loading-modal-text">
-            This process can take up 20 seconds.
+            This process can take up to 20 seconds.
         </div>
        </section>
     </div>

src/layouts/address-lookup/address-lookup.vue

@@ -265,14 +265,20 @@ export default {
 		},
 		navigateForward(carEntered, carsFound) {
 			if (carsFound.length == 1) {
+				// if a different vehicle is found than the one entered and the selected glass
+				// is not available for that vehicle
 				if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
 					this.$router.navigateAfterSave(
+						// then navigate back to "vehicle-damage", and display vehicle changed alert
+						// on that page
 						this.navigationScenarios.CONTINUING_WITH_DIFFERENT_GLASS,
 						this.$route, {}, {
 							displayVehicleChangeAlert: true
 						}, {}
 					);
 				} else {
+					// otherwise 
+					this.$refs.loadingModal.showModal();
 					navigateAfterSaveToHeritageFunnel(this.$route);
 				}				
 			} else if (carsFound.length > 1) {

src/styles/common-error-styles.scss

@@ -115,14 +115,17 @@ html {
     color: $red;
     font-size: .875rem;
     font-weight: 500;
+    height: 1.5rem; 
+    margin-top: .25rem !important; 
   }
 
   .form-test-invalid {
     &.btn.btn-primary {
-      color: $gray;
+      color: $gray-600;
       background: $gray-200;
       cursor: pointer;
       pointer-events: all;
+      font-weight: $font-weight-normal;
     }
     &.btn.btn-primary:hover,
     &.btn.btn-primary:focus,

src/ux-components/alert/alert.vue

@@ -130,7 +130,7 @@ export default {
   }
   & p {
     font-size: 14px;
-    margin-bottom: 0px;
+    margin-bottom: 0.25rem !important;
   }
 }
 </style>

src/ux-components/text-link/text-link.vue

@@ -44,7 +44,6 @@ a {
   &.navigation-link {
     color: $black;
     line-height: 26px;
-    text-transform: capitalize;
     white-space: nowrap;
   }
   &.footer-link {