From e46a225c08e5a6c893d690fa3302623360859f46 Mon Sep 17 00:00:00 2001
From: Sam Warren <samwarren4@gmail.com>
Date: Wed, 16 Oct 2024 10:27:28 -0600
Subject: [PATCH 1/4] DEVOPS-50: Typo fix

---
 .../support-details/support-details.component.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.html b/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.html
index 448c09b408..594f95b3ea 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.html
+++ b/responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/support-details/support-details.component.html
@@ -335,7 +335,7 @@
 
                           @if (!checkDateRange()) {
                             <mat-error class="custom-mat-error">
-                              Valid To Date cannot be greater then the 30 days from the Valid From Date</mat-error
+                              Valid date cannot be greater than 30 days from the Valid from date</mat-error
                             >
                           }
                         </div>

From 3d940528e94aca95ebd0212ff587e162e84381aa Mon Sep 17 00:00:00 2001
From: Sam Warren <samwarren4@gmail.com>
Date: Thu, 17 Oct 2024 10:04:34 -0600
Subject: [PATCH 2/4] DEVOPS-15

---
 .../address-forms/can-address/can-address.component.html    | 6 +++++-
 .../address-forms/can-address/can-address.component.ts      | 1 +
 .../evacuee-profile-forms/address/address.component.html    | 4 +++-
 .../profile-components/address/address.component.html       | 4 +++-
 .../address-forms/can-address/can-address.component.html    | 6 +++++-
 .../address-forms/can-address/can-address.component.ts      | 1 +
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
index d3fd910a76..482cfcef7c 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
@@ -1,4 +1,8 @@
-<p>Please enter your address</p>
+@if (isMailingAddress) {
+  <p>Enter your mailing address</p>
+} @else {
+  <p>Enter the address of your primary residence</p>
+}
 <form [formGroup]="addressForm">
   <div class="row">
     <div class="col-md-5">
diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
index 766b505047..c504e81f2b 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
@@ -18,6 +18,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 })
 export class CanAddressComponent implements OnInit {
   @Input() addressForm: UntypedFormGroup;
+  @Input() isMailingAddress: boolean;
   filteredOptions: Observable<StateProvince[]>;
   provinces: StateProvince[] = [];
   country = { countryCode: 'CAN' };
diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
index d5a274f95a..bfbba83573 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
@@ -90,6 +90,7 @@
         <app-can-address
           *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'CAN'; else usa"
           [addressForm]="primaryAddressFormControl?.address"
+          [isMailingAddress]="false"
         >
         </app-can-address>
         <ng-template #usa>
@@ -190,7 +191,7 @@
           <div formGroupName="mailingAddress">
             <div class="row">
               <div class="col-md-5">
-                <p>In what <b>country</b> is your primary residence located?</p>
+                <p>In what <b>country</b> is your Mailing Address located?</p>
                 <mat-form-field appearance="outline">
                   <input
                     type="text"
@@ -228,6 +229,7 @@
           <app-can-address
             *ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'CAN'; else usa"
             [addressForm]="primaryAddressFormControl?.mailingAddress"
+            [isMailingAddress]="true"
           >
           </app-can-address>
           <ng-template #usa>
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
index 67656d3610..fe4ab3844a 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
+++ b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
@@ -99,6 +99,7 @@
           <app-can-address
             *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
             [addressForm]="primaryAddressFormGroup"
+            [isMailingAddress]="false"
           >
           </app-can-address>
           <ng-template #usa>
@@ -191,7 +192,7 @@
             <div formGroupName="mailingAddress">
               <div class="row">
                 <div class="col-md-5">
-                  <p>In what <b>country</b> is your primary residence located?</p>
+                  <p>In what <b>country</b> is your Mailing Address located?</p>
                   <mat-form-field appearance="outline">
                     <input
                       type="text"
@@ -233,6 +234,7 @@
             <app-can-address
               *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
               [addressForm]="mailingAddressFormGroup"
+              [isMailingAddress]="true"
             >
             </app-can-address>
             <ng-template #usa>
diff --git a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
index ede768a3a9..d902c142be 100644
--- a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
+++ b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
@@ -1,4 +1,8 @@
-<p><b>Enter the address of your primary residence</b></p>
+@if (isMailingAddress) {
+  <p>Enter your mailing address</p>
+} @else {
+  <p>Enter the address of your primary residence</p>
+}
 <div [formGroup]="addressForm">
   <div class="row">
     <div class="col-md-6">
diff --git a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
index b947b3e93e..c82574a249 100644
--- a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
+++ b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
@@ -29,6 +29,7 @@ import { MatFormField, MatLabel, MatError } from '@angular/material/form-field';
 })
 export class CanAddressComponent implements OnInit {
   @Input() addressForm: UntypedFormGroup;
+  @Input() isMailingAddress: boolean;
   filteredOptions: Observable<StateProvince[]>;
   provinces: StateProvince[] = [];
   country = { countryCode: 'CAN' };

From 394af95b45d2bb8f9a8b760e682a6aed7d0b16ca Mon Sep 17 00:00:00 2001
From: Sam Warren <samwarren4@gmail.com>
Date: Fri, 18 Oct 2024 09:46:50 -0600
Subject: [PATCH 3/4] DEVOPS-15: Updates from business feedback

---
 .../evacuee-profile-forms/address/address.component.html      | 4 ++--
 .../wizard/profile-components/address/address.component.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
index bfbba83573..da6d06d6de 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
@@ -126,7 +126,7 @@
       <div class="row">
         <div class="col-md-12">
           <label id="isNewMailingAddress-radio-group-label" class="requiredField"
-            >Is your <b>mailing address</b> the same as their primary residence above?</label
+            >Is your <b>mailing address</b> the same as your primary residence above?</label
           >
           <mat-radio-group
             formControlName="isNewMailingAddress"
@@ -191,7 +191,7 @@
           <div formGroupName="mailingAddress">
             <div class="row">
               <div class="col-md-5">
-                <p>In what <b>country</b> is your Mailing Address located?</p>
+                <p>In what <b>country</b> is your mailing address located?</p>
                 <mat-form-field appearance="outline">
                   <input
                     type="text"
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
index fe4ab3844a..00fb211f26 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
+++ b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
@@ -192,7 +192,7 @@
             <div formGroupName="mailingAddress">
               <div class="row">
                 <div class="col-md-5">
-                  <p>In what <b>country</b> is your Mailing Address located?</p>
+                  <p>In what <b>country</b> is your mailing address located?</p>
                   <mat-form-field appearance="outline">
                     <input
                       type="text"

From c9132035ee589b7ce74374529be3ac39dfd18426 Mon Sep 17 00:00:00 2001
From: Sam Warren <samwarren4@gmail.com>
Date: Fri, 18 Oct 2024 10:52:50 -0600
Subject: [PATCH 4/4] DEVOPS-15: Update language on responders and registrants
 address section

---
 .../can-address/can-address.component.html    |  5 --
 .../can-address/can-address.component.ts      |  1 -
 .../address/address.component.html            | 54 +++++++++---------
 .../address/address.component.html            | 56 +++++++++----------
 .../can-address/can-address.component.html    |  5 --
 .../can-address/can-address.component.ts      |  1 -
 6 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
index 482cfcef7c..9c21c60bd2 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
@@ -1,8 +1,3 @@
-@if (isMailingAddress) {
-  <p>Enter your mailing address</p>
-} @else {
-  <p>Enter the address of your primary residence</p>
-}
 <form [formGroup]="addressForm">
   <div class="row">
     <div class="col-md-5">
diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
index c504e81f2b..766b505047 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.ts
@@ -18,7 +18,6 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 })
 export class CanAddressComponent implements OnInit {
   @Input() addressForm: UntypedFormGroup;
-  @Input() isMailingAddress: boolean;
   filteredOptions: Observable<StateProvince[]>;
   provinces: StateProvince[] = [];
   country = { countryCode: 'CAN' };
diff --git a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
index da6d06d6de..d543807798 100644
--- a/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
+++ b/registrants/src/UI/embc-registrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
@@ -42,6 +42,7 @@
       </div>
 
       <div *ngIf="primaryAddressFormControl?.isBcAddress?.value === 'Yes'" class="row">
+        <p>Enter the address of your primary residence</p>
         <div class="col-md-12">
           <app-bc-address [addressForm]="primaryAddressFormControl?.address"></app-bc-address>
         </div>
@@ -86,30 +87,27 @@
             </div>
           </div>
         </div>
-
-        <app-can-address
-          *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'CAN'; else usa"
-          [addressForm]="primaryAddressFormControl?.address"
-          [isMailingAddress]="false"
-        >
-        </app-can-address>
+        <div *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'CAN'; else usa">
+          <p>Enter the address of your primary residence</p>
+          <app-can-address [addressForm]="primaryAddressFormControl?.address"> </app-can-address>
+        </div>
         <ng-template #usa>
-          <app-usa-address
-            *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'USA'; else other"
-            [addressForm]="primaryAddressFormControl?.address"
-          >
-          </app-usa-address>
+          <div *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'USA'; else other">
+            <p>Enter the address of your primary residence</p>
+            <app-usa-address [addressForm]="primaryAddressFormControl?.address"> </app-usa-address>
+          </div>
         </ng-template>
         <ng-template #other>
-          <app-other-address
+          <div
             *ngIf="
               primaryAddressFormControl?.address?.controls?.country?.value?.code !== 'USA' &&
               primaryAddressFormControl?.address?.controls?.country?.value?.code !== 'CAN' &&
               primaryAddressFormControl?.address?.controls?.country?.value !== null
             "
-            [addressForm]="primaryAddressFormControl?.address"
           >
-          </app-other-address>
+            <p>Enter the address of your primary residence</p>
+            <app-other-address [addressForm]="primaryAddressFormControl?.address"> </app-other-address>
+          </div>
         </ng-template>
       </div>
       <!-- </form> -->
@@ -182,6 +180,7 @@
         </div>
 
         <div *ngIf="primaryAddressFormControl?.isBcMailingAddress.value === 'Yes'" class="row">
+          <p>Enter your mailing address</p>
           <div class="col-md-12">
             <app-bc-address [addressForm]="primaryAddressFormControl?.mailingAddress"></app-bc-address>
           </div>
@@ -225,30 +224,29 @@
               </div>
             </div>
           </div>
-
-          <app-can-address
-            *ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'CAN'; else usa"
-            [addressForm]="primaryAddressFormControl?.mailingAddress"
-            [isMailingAddress]="true"
-          >
-          </app-can-address>
+          <div *ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'CAN'; else usa">
+            <p>Enter your mailing address</p>
+            <app-can-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-can-address>
+          </div>
           <ng-template #usa>
-            <app-usa-address
+            <div
               *ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'USA'; else other"
-              [addressForm]="primaryAddressFormControl?.mailingAddress"
             >
-            </app-usa-address>
+              <p>Enter your mailing address</p>
+              <app-usa-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-usa-address>
+            </div>
           </ng-template>
           <ng-template #other>
-            <app-other-address
+            <div
               *ngIf="
                 primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code !== 'USA' &&
                 primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code !== 'CAN' &&
                 primaryAddressFormControl?.mailingAddress?.controls?.country?.value !== null
               "
-              [addressForm]="primaryAddressFormControl?.mailingAddress"
             >
-            </app-other-address>
+              <p>Enter your mailing address</p>
+              <app-other-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-other-address>
+            </div>
           </ng-template>
         </div>
       </div>
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
index 00fb211f26..d0069de0e5 100644
--- a/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
+++ b/responders/src/UI/embc-responder/src/app/feature-components/wizard/profile-components/address/address.component.html
@@ -52,6 +52,7 @@
 
         <div *ngIf="primaryAddressFormControl?.isBcAddress?.value === 'Yes'" class="row">
           <div class="col-md-12">
+            <p>Enter the address of your primary residence</p>
             <app-bc-address [addressForm]="primaryAddressFormGroup"></app-bc-address>
           </div>
         </div>
@@ -95,30 +96,27 @@
               </div>
             </div>
           </div>
-
-          <app-can-address
-            *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
-            [addressForm]="primaryAddressFormGroup"
-            [isMailingAddress]="false"
-          >
-          </app-can-address>
+          <div *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa">
+            <p>Enter the address of your primary residence</p>
+            <app-can-address [addressForm]="primaryAddressFormGroup"> </app-can-address>
+          </div>
           <ng-template #usa>
-            <app-usa-address
-              *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other"
-              [addressForm]="primaryAddressFormGroup"
-            >
-            </app-usa-address>
+            <div *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other">
+              <p>Enter the address of your primary residence</p>
+              <app-usa-address [addressForm]="primaryAddressFormGroup"> </app-usa-address>
+            </div>
           </ng-template>
           <ng-template #other>
-            <app-other-address
+            <div
               *ngIf="
                 primaryAddressFormGroup?.controls?.country?.value?.code !== 'USA' &&
                 primaryAddressFormGroup?.controls?.country?.value?.code !== 'CAN' &&
                 primaryAddressFormGroup?.controls?.country?.value !== null
               "
-              [addressForm]="primaryAddressFormGroup"
             >
-            </app-other-address>
+              <p>Enter the address of your primary residence</p>
+              <app-other-address [addressForm]="primaryAddressFormGroup"> </app-other-address>
+            </div>
           </ng-template>
         </div>
 
@@ -184,6 +182,7 @@
 
           <div *ngIf="primaryAddressFormControl?.isBcMailingAddress.value === 'Yes'" class="row">
             <div class="col-md-12">
+              <p>Enter your mailing address</p>
               <app-bc-address [addressForm]="mailingAddressFormGroup"></app-bc-address>
             </div>
           </div>
@@ -230,30 +229,27 @@
                 </div>
               </div>
             </div>
-
-            <app-can-address
-              *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
-              [addressForm]="mailingAddressFormGroup"
-              [isMailingAddress]="true"
-            >
-            </app-can-address>
+            <div *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa">
+              <p>Enter your mailing address</p>
+              <app-can-address [addressForm]="mailingAddressFormGroup"> </app-can-address>
+            </div>
             <ng-template #usa>
-              <app-usa-address
-                *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other"
-                [addressForm]="mailingAddressFormGroup"
-              >
-              </app-usa-address>
+              <div *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other">
+                <p>Enter your mailing address</p>
+                <app-usa-address [addressForm]="mailingAddressFormGroup"> </app-usa-address>
+              </div>
             </ng-template>
             <ng-template #other>
-              <app-other-address
+              <div
                 *ngIf="
                   mailingAddressFormGroup?.controls?.country?.value?.code !== 'USA' &&
                   mailingAddressFormGroup?.controls?.country?.value?.code !== 'CAN' &&
                   mailingAddressFormGroup?.controls?.country?.value !== null
                 "
-                [addressForm]="mailingAddressFormGroup"
               >
-              </app-other-address>
+                <p>Enter your mailing address</p>
+                <app-other-address [addressForm]="mailingAddressFormGroup"> </app-other-address>
+              </div>
             </ng-template>
           </div>
         </div>
diff --git a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
index d902c142be..2845c61508 100644
--- a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
+++ b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
@@ -1,8 +1,3 @@
-@if (isMailingAddress) {
-  <p>Enter your mailing address</p>
-} @else {
-  <p>Enter the address of your primary residence</p>
-}
 <div [formGroup]="addressForm">
   <div class="row">
     <div class="col-md-6">
diff --git a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
index c82574a249..b947b3e93e 100644
--- a/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
+++ b/responders/src/UI/embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.ts
@@ -29,7 +29,6 @@ import { MatFormField, MatLabel, MatError } from '@angular/material/form-field';
 })
 export class CanAddressComponent implements OnInit {
   @Input() addressForm: UntypedFormGroup;
-  @Input() isMailingAddress: boolean;
   filteredOptions: Observable<StateProvince[]>;
   provinces: StateProvince[] = [];
   country = { countryCode: 'CAN' };