Reorder condition for initial contact selection

By putting government user check first, it only checks the parcel owners length if not a government user.
bcgov · Jun 11, 2024 · 8508e93 · 8508e93
1 parent 2b22432
commit 8508e93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...rc/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts b/...rc/app/features/applications/edit-submission/primary-contact/primary-contact.component.ts
@@ -240,10 +240,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni
     // onSelectOwner only not called on first load of page
     if (selectedOwner) {
       this.onSelectOwner(selectedOwner.uuid);
-    } else if (parcelOwners.length === 1) {
-      this.onSelectOwner(parcelOwners[0].uuid);
     } else if (this.isGovernmentUser) {
       this.onSelectGovernment();
+    } else if (parcelOwners.length === 1) {
+      this.onSelectOwner(parcelOwners[0].uuid);
     }
 
     if (this.isGovernmentUser && this.selectedLocalGovernment) {

diff --git a/...p/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts b/...p/features/notice-of-intents/edit-submission/primary-contact/primary-contact.component.ts
@@ -242,10 +242,10 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni
     // onSelectOwner only not called on first load of page
     if (selectedOwner) {
       this.onSelectOwner(selectedOwner.uuid);
-    } else if (parcelOwners.length === 1) {
-      this.onSelectOwner(parcelOwners[0].uuid);
     } else if (this.isGovernmentUser) {
       this.onSelectGovernment();
+    } else if (parcelOwners.length === 1) {
+      this.onSelectOwner(parcelOwners[0].uuid);
     }
 
     if (this.selectedLocalGovernment) {