From 4b8e94f7268f0a0868d55de04968ec417b475b71 Mon Sep 17 00:00:00 2001
From: CameronEYDS <53542131+cameron-eyds@users.noreply.github.com>
Date: Wed, 17 Apr 2024 13:12:27 -0700
Subject: [PATCH] NonRes Exemption Updates + Transfer Feedback Content  (#1833)

* Mhr Feedback Updates and Bugs

* clean up

* styling cleanup

* FF revert
---
 ppr-ui/package-lock.json                      |  4 +-
 ppr-ui/package.json                           |  2 +-
 ppr-ui/src/components/common/Breadcrumb.vue   |  8 ++-
 .../HomeOwners/AddEditHomeOwner.vue           |  6 +--
 .../HomeOwners/HomeOwnerGroups.vue            |  7 ++-
 .../HomeOwners/HomeOwnersTable.vue            | 25 +++++----
 .../components/tombstone/TombstoneDynamic.vue |  8 +--
 .../composables/exemption/useExemptions.ts    | 22 +++++++-
 .../fees/factories/useFeeSummary.ts           |  7 +--
 .../mhrRegistration/useHomeOwners.ts          |  7 ++-
 ppr-ui/src/enums/registrationTypes.ts         |  2 +-
 .../exemption-interfaces/ExemptionIF.ts       |  5 +-
 ppr-ui/src/resources/breadcrumbs.ts           |  5 ++
 .../resources/exemptions/componentContent.ts  | 53 ++++++++++++++++++-
 ppr-ui/src/resources/tableHeaders.ts          |  2 +-
 ppr-ui/src/store/state/state-model.ts         |  5 +-
 .../src/views/exemption/ExemptionDetails.vue  |  9 ++--
 .../src/views/exemption/ExemptionReview.vue   | 18 ++++---
 ppr-ui/src/views/exemption/Exemptions.vue     | 10 ++--
 .../views/mhrInformation/MhrInformation.vue   | 13 +++--
 20 files changed, 163 insertions(+), 55 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index ae5c7e1ae..9fc2ecb59 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.0.87",
+  "version": "3.1.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.0.87",
+      "version": "3.1.0",
       "dependencies": {
         "@bcrs-shared-components/input-field-date-picker": "^1.0.0",
         "@lemoncode/fonk": "^1.5.1",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index db1bc90fb..8bb464371 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.0.87",
+  "version": "3.1.0",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/components/common/Breadcrumb.vue b/ppr-ui/src/components/common/Breadcrumb.vue
index da0d7dfb2..be0e7d0de 100644
--- a/ppr-ui/src/components/common/Breadcrumb.vue
+++ b/ppr-ui/src/components/common/Breadcrumb.vue
@@ -82,7 +82,7 @@ import { RouteNames } from '@/enums'
 import { getRoleProductCode } from '@/utils'
 import { storeToRefs } from 'pinia'
 import { UnitNotesInfo } from '@/resources/unitNotes'
-import { useMhrCorrections } from '@/composables'
+import { useExemptions, useMhrCorrections } from '@/composables'
 
 export default defineComponent({
   name: 'Breadcrumb',
@@ -90,6 +90,7 @@ export default defineComponent({
     const route = useRoute()
     const router = useRouter()
     const { isMhrCorrection } = useMhrCorrections()
+    const { exemptionLabel } = useExemptions()
     const {
       // Getters
       getRegistrationNumber,
@@ -179,7 +180,10 @@ export default defineComponent({
           mhrUnitNoteBreadcrumb[3].text = UnitNotesInfo[getMhrUnitNoteType.value].header
           return mhrUnitNoteBreadcrumb
         } else if (path?.includes('exemption')) {
-          return tombstoneBreadcrumbExemption
+          const exemptionBreadcrumb = [...tombstoneBreadcrumbExemption]
+          exemptionBreadcrumb[2].text = `MHR Number ${getMhrInformation.value.mhrNumber}`
+          exemptionBreadcrumb[3].text = exemptionLabel.value
+          return exemptionBreadcrumb
         } else {
           const registrationBreadcrumb = [...tombstoneBreadcrumbRegistration]
           registrationBreadcrumb[1].text = roleBasedBreadcrumbTitle || registrationBreadcrumb[1].text
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
index 26fb94dab..826e183c4 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
@@ -389,7 +389,7 @@
                 :ripple="false"
                 @click="remove()"
               >
-                <span>{{ isCurrentOwner(owner) ? 'Delete' : 'Remove' }}</span>
+                <span>{{ isCurrentOwner(owner) ? 'Delete' : 'Remove' }} Owner</span>
               </v-btn>
 
               <span class="float-right">
@@ -587,10 +587,6 @@ export default defineComponent({
       TransToExec.prefillOwnerAsExecOrAdmin(defaultHomeOwner)
     }
 
-    if (isFrozenMhr.value && !isFrozenMhrDueToAffidavit.value) {
-      defaultHomeOwner.partyType = HomeOwnerPartyTypes.OWNER_IND
-    }
-
     const allFractionalData = (getTransferOrRegistrationHomeOwnerGroups() || [{}]).map(group => {
       return {
         groupId: group.groupId || 1,
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerGroups.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerGroups.vue
index 5eeec3a1a..36725d308 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerGroups.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerGroups.vue
@@ -1,15 +1,14 @@
 <template>
   <div id="mhr-home-owner-groups">
     <label class="generic-label">
-      Multiple Groups of Owners (Tenants in Common)
+      Tenants in Common
     </label>
     <ul class="my-2 pl-6">
       <li>
-        Select a group if you have <b>multiple groups of owners</b> (tenants in common).
+        Select a group if the tenancy type is tenants in common.
       </li>
       <li>
-        Leave this empty if you have <b>only one owner</b> (sole ownership), or
-        <b>one group of owners</b> (joint tenancy).
+        <b>Note</b>: Do not select a group if this is a sole ownership, or joint tenancy.
       </li>
     </ul>
     <v-select
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
index e94504eda..0a30385b5 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -265,7 +265,7 @@
                         <v-btn
                           variant="plain"
                           color="primary"
-                          class="px-0 mr-n1"
+                          class="menu-drop-down-btn px-0 mr-n2"
                           :disabled="isAddingMode || isGlobalEditingMode"
                           v-bind="props"
                         >
@@ -286,7 +286,7 @@
                             >
                               mdi-delete
                             </v-icon>
-                            <span class="ml-1 remove-btn-text">Remove</span>
+                            <span class="ml-1 remove-btn-text">Remove Owner</span>
                           </v-list-item-subtitle>
                         </v-list-item>
                       </v-list>
@@ -348,7 +348,7 @@
                         <v-btn
                           variant="plain"
                           color="primary"
-                          class="px-0"
+                          class="menu-drop-down-btn"
                           :disabled="isAddingMode || isGlobalEditingMode"
                           v-bind="props"
                         >
@@ -386,7 +386,7 @@
                             >
                               mdi-delete
                             </v-icon>
-                            <span class="ml-1 remove-btn-text">Delete</span>
+                            <span class="ml-1 remove-btn-text">Delete Owner</span>
                           </v-list-item-subtitle>
                         </v-list-item>
                       </v-list>
@@ -417,7 +417,7 @@
                       <v-icon size="small">
                         mdi-delete
                       </v-icon>
-                      <span>Delete</span>
+                      <span>Delete Owner</span>
                       <v-divider
                         v-if="enableTransferOwnerMenuActions(item)"
                         class="ma-0 pl-3"
@@ -429,7 +429,7 @@
                       v-if="isRemovedHomeOwner(item) || isChangedOwner(item)"
                       variant="plain"
                       color="primary"
-                      class="mr-n4"
+                      class="mx-0 px-0"
                       :ripple="false"
                       :disabled="
                         isAddingMode || isEditingMode || isGlobalEditingMode || isDisabledForSJTChanges(item)
@@ -461,7 +461,7 @@
                           <v-btn
                             variant="plain"
                             color="primary"
-                            class="px-0 mr-n3"
+                            class="menu-drop-down-btn mr-n4"
                             :disabled="isAddingMode || isGlobalEditingMode || isDisabledForSJTChanges(item)"
                             v-bind="props"
                           >
@@ -502,7 +502,7 @@
                               >
                                 mdi-delete
                               </v-icon>
-                              <span class="ml-1 remove-btn-text">Delete</span>
+                              <span class="ml-1 remove-btn-text">Delete Owner</span>
                             </v-list-item-subtitle>
                           </v-list-item>
                         </v-list>
@@ -1324,8 +1324,7 @@ export default defineComponent({
 
     .owner-info {
       width: 100%;
-      display: block;
-      display: inline-table;
+      display: inline-flex;
 
       td {
         white-space: normal;
@@ -1367,6 +1366,12 @@ export default defineComponent({
     color: #1669bb !important;
     opacity: 0.4 !important;
   }
+
+  .row-actions {
+    padding-right: 30px;
+    display: inline-flex;
+    justify-content: flex-end;
+  }
 }
 
 .home-owners-table:not(.review-mode) .group-header-slot {
diff --git a/ppr-ui/src/components/tombstone/TombstoneDynamic.vue b/ppr-ui/src/components/tombstone/TombstoneDynamic.vue
index adc454172..084457ffe 100755
--- a/ppr-ui/src/components/tombstone/TombstoneDynamic.vue
+++ b/ppr-ui/src/components/tombstone/TombstoneDynamic.vue
@@ -91,7 +91,7 @@
 
     <!-- Mhr Amend/Correct Btns -->
     <v-row
-      v-if="isMhrInformation && isMhrChangesEnabled"
+      v-if="isMhrInformation && isMhrChangesEnabled && !isNonResExemption"
       noGutters
       class="mt-2 mb-n4"
     >
@@ -179,7 +179,7 @@ import { useStore } from '@/store/store'
 import { formatExpiryDate, pacificDate } from '@/utils'
 import { RegistrationTypeIF } from '@/interfaces'
 import { MhApiStatusTypes, MhUIStatusTypes } from '@/enums'
-import { useMhrCorrections, useMhrInformation, useTransportPermits } from '@/composables'
+import { useExemptions, useMhrCorrections, useMhrInformation, useTransportPermits } from '@/composables'
 import { storeToRefs } from 'pinia'
 import { MhrCorrectionClient, MhrCorrectionStaff, MhrPublicAmendment } from '@/resources'
 import MhrStatusCorrection from '@/components/mhrRegistration/MhrStatusCorrection.vue'
@@ -204,6 +204,7 @@ export default defineComponent({
       getMhrOriginalTransportPermitRegStatus
     } = storeToRefs(useStore())
     const { isFrozenMhr } = useMhrInformation()
+    const { isNonResExemption } = useExemptions()
     const { initMhrCorrection, isMhrChangesEnabled, isMhrCorrection } = useMhrCorrections()
 
     const { isAmendLocationActive } = useTransportPermits()
@@ -250,11 +251,12 @@ export default defineComponent({
       showAmendedRegStatusBadge: computed((): boolean => {
         // list all conditions to show the Amended badge
         return isAmendLocationActive.value
-      }),
+      })
     })
 
     return {
       isMhrCorrection,
+      isNonResExemption,
       initMhrCorrection,
       isMhrChangesEnabled,
       MhrCorrectionStaff,
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
index 4f3cbfbb8..9deb4ff8f 100644
--- a/ppr-ui/src/composables/exemption/useExemptions.ts
+++ b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -10,7 +10,14 @@ import {
   parseAccountToSubmittingParty, removeEmptyProperties
 } from '@/utils'
 import { ExemptionIF, IndividualNameIF, MhRegistrationSummaryIF, PartyIF, UnitNoteIF } from '@/interfaces'
-import { APIMhrDescriptionTypes, MhApiStatusTypes, RouteNames, UnitNoteDocTypes, UnitNoteStatusTypes } from '@/enums'
+import {
+  APIMhrDescriptionTypes,
+  MhApiStatusTypes,
+  RouteNames,
+  UIRegistrationTypes,
+  UnitNoteDocTypes,
+  UnitNoteStatusTypes
+} from '@/enums'
 
 export const useExemptions = () => {
   const { goToRoute } = useNavigation()
@@ -40,6 +47,18 @@ export const useExemptions = () => {
     return getMhrExemption.value?.note?.documentType === UnitNoteDocTypes.NON_RESIDENTIAL_EXEMPTION
   })
 
+  /** Returns Exemption type label **/
+  const exemptionLabel: ComputedRef<string> = computed((): string => {
+    switch (getMhrExemption.value?.note?.documentType) {
+      case UnitNoteDocTypes.RESIDENTIAL_EXEMPTION_ORDER:
+        return UIRegistrationTypes.RESIDENTIAL_EXEMPTION
+      case UnitNoteDocTypes.NON_RESIDENTIAL_EXEMPTION:
+        return UIRegistrationTypes.NON_RESIDENTIAL_EXEMPTION
+      default:
+        return ''
+    }
+  })
+
   /** Navigate to Exemptions Home route **/
   const goToExemptions = async (exemptionType: UnitNoteDocTypes): Promise<void> => {
     await initExemption(exemptionType)
@@ -151,6 +170,7 @@ export const useExemptions = () => {
     isExemptionEnabled,
     isNonResExemptionEnabled,
     isNonResExemption,
+    exemptionLabel,
     goToExemptions,
     updateValidation,
     buildExemptionPayload,
diff --git a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
index 58620cfce..6c7bdb272 100644
--- a/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
+++ b/ppr-ui/src/composables/fees/factories/useFeeSummary.ts
@@ -93,11 +93,12 @@ export function getFeeSummary (
     if (isStaff) return { ...defaultFeeSummaries[FeeSummaryDefaults.NO_FEE] }
     return { ...defaultFeeSummaries[FeeSummaryDefaults.SEARCH_7] }
   }
-  if ([FeeSummaryTypes.NEW_MHR, FeeSummaryTypes.RESIDENTIAL_EXEMPTION, FeeSummaryTypes.NON_RESIDENTIAL_EXEMPTION]
-    .includes(feeType)
-  ) {
+  if ([FeeSummaryTypes.NEW_MHR, FeeSummaryTypes.RESIDENTIAL_EXEMPTION].includes(feeType)) {
     return { ...defaultFeeSummaries[FeeSummaryDefaults.DEFAULT_50] }
   }
+  if(feeType === FeeSummaryTypes.NON_RESIDENTIAL_EXEMPTION) {
+    return { ...defaultFeeSummaries[FeeSummaryDefaults.NO_FEE] }
+  }
   if (feeType === FeeSummaryTypes.MHR_COMBINED_SEARCH) {
     if (isStaff && isStaffClientPayment) return { ...defaultFeeSummaries[FeeSummaryDefaults.SEARCH_15] }
     if (isStaff) return { ...defaultFeeSummaries[FeeSummaryDefaults.NO_FEE] }
diff --git a/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts b/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts
index 0f85b8d40..759f17e13 100644
--- a/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts
+++ b/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts
@@ -237,11 +237,16 @@ export function useHomeOwners (isMhrTransfer: boolean = false, isMhrCorrection:
         return { title: 'Group ' + groupNumber, value: (i + 1) }
       })
 
+    // Append a new group label to the last item in dropDown
+    if (dropDownItems.length > 0 && isAddingHomeOwner) {
+      dropDownItems[dropDownItems.length - 1].title += ' (New Group)'
+    }
+
     // Remove first group option when there is existing SO/JT
     if (!showGroups.value && homeOwnerGroups.length && isMhrTransfer) dropDownItems.shift()
 
     // Handle Edit Defaults
-    if (!dropDownItems.length) return [{ title: 'Group 1', value: DEFAULT_GROUP_ID }]
+    if (!dropDownItems.length) return [{ title: 'Group 1 (New Group)', value: DEFAULT_GROUP_ID }]
 
     // Only return groups that have NOT been REMOVED
     return dropDownItems.filter(item => {
diff --git a/ppr-ui/src/enums/registrationTypes.ts b/ppr-ui/src/enums/registrationTypes.ts
index 1cb4115b5..21a71dc1b 100644
--- a/ppr-ui/src/enums/registrationTypes.ts
+++ b/ppr-ui/src/enums/registrationTypes.ts
@@ -110,7 +110,7 @@ export enum UIRegistrationTypes {
   TRANSITION_MH = 'M.H. Transition',
   TRANSFER_OF_SALE = 'Sale or Gift',
   TRANSFER_DUE_TO_DEATH = 'Sale or Gift due to death',
-  NON_RESIDENTIAL_EXEMPTION = 'None Residential Exemption',
+  NON_RESIDENTIAL_EXEMPTION = 'Non-Residential Exemption',
   RESIDENTIAL_EXEMPTION = 'Residential Exemption',
   TRANSPORT_PERMIT = 'Transport Permit'
 }
diff --git a/ppr-ui/src/interfaces/exemption-interfaces/ExemptionIF.ts b/ppr-ui/src/interfaces/exemption-interfaces/ExemptionIF.ts
index 1dcab5a4a..3ba9ec0a0 100644
--- a/ppr-ui/src/interfaces/exemption-interfaces/ExemptionIF.ts
+++ b/ppr-ui/src/interfaces/exemption-interfaces/ExemptionIF.ts
@@ -1,5 +1,5 @@
 import { PartyIF } from '@/interfaces'
-import { UnitNoteDocTypes } from '@/enums'
+import { NonResConvertedReasons, NonResDestroyedReasons, UnitNoteDocTypes } from '@/enums'
 
 export interface ExemptionIF {
   documentId: string
@@ -10,6 +10,9 @@ export interface ExemptionIF {
   note: {
     documentType: UnitNoteDocTypes
     remarks: string
+    destroyed?: boolean
+    nonResidentialReason?: NonResDestroyedReasons|NonResConvertedReasons
+    nonResidentialOther?: string
   }
 }
 
diff --git a/ppr-ui/src/resources/breadcrumbs.ts b/ppr-ui/src/resources/breadcrumbs.ts
index a7badfa9f..81d7ea406 100644
--- a/ppr-ui/src/resources/breadcrumbs.ts
+++ b/ppr-ui/src/resources/breadcrumbs.ts
@@ -212,6 +212,11 @@ export const tombstoneBreadcrumbExemption: Array<BreadcrumbIF> = [
     to: { name: RouteNames.DASHBOARD },
     text: 'My Asset Registries'
   },
+  {
+    disabled: false,
+    to: { name: RouteNames.MHR_INFORMATION },
+    text: 'MHR Number'
+  },
   {
     disabled: true,
     text: 'Residential Exemption',
diff --git a/ppr-ui/src/resources/exemptions/componentContent.ts b/ppr-ui/src/resources/exemptions/componentContent.ts
index 4292efdeb..3afd68894 100644
--- a/ppr-ui/src/resources/exemptions/componentContent.ts
+++ b/ppr-ui/src/resources/exemptions/componentContent.ts
@@ -9,7 +9,8 @@ export const docIdContent: ContentIF = {
 export const exRemarksContent: ContentIF = {
   title: 'Remarks',
   sideLabel: 'Add Remarks',
-  description: 'Remarks will be shown when a search result is produced for this manufactured home.'
+  description: 'Add additional information about this exemption if necessary. Remarks will be shown when a search' +
+    ' result is produced for this manufactured home.'
 }
 
 export const exConfirmRequirements: Array<RequirementsConfigIF> = [
@@ -132,3 +133,53 @@ export const exCertifyInfoContent: ContentIF = {
   sideLabel: 'Confirm Authorization',
   mailAddressInfo: 'Test Address'
 }
+
+export const nonResExConfirmRequirements: Array<RequirementsConfigIF> = [
+  {
+    boldText: 'Non-Residential Exemption form ',
+    regularText: 'meets the following requirements:',
+    bullets: [
+      'It has been signed by either a) the registered owner(s) (individually or by a duly authorized representative' +
+      ' of an organization), or b) person(s) with the authority to act on behalf of the registered owner(s).',
+      'All signatures have been witnessed by an independent third party, and the name and occupation of each witness' +
+      ' has been recorded.'
+    ],
+    note: ' If the Non-Residential Exemption form has been signed by a person acting on behalf of a registered owner,' +
+      ' the person submitting this application must provide evidence of the authority by which the signatory' +
+      ' was authorized. Such authorization must be granted by one of the following: power of attorney, ' +
+      'representation agreement, or committee.'
+  },
+  {
+    boldText: 'A valid Tax Certificate that confirms that no property taxes are unpaid.'
+  },
+  {
+    boldText: 'Home location and homeowner(s) named in the Manufactured Home Registry match ',
+    regularText: 'the home location and current ownership of the home on the Residential Exemption form.'
+  },
+  {
+    boldText: 'Must have one of the following ',
+    regularText: 'that shows the name and home location and at least one of the homeowners as ' +
+      'also being an owner or a pending owner of the land where the home is located:',
+    bullets: [
+      'Land Title Search, dated within 30 days of today, or',
+      'evidence of a pending freehold transfer.'
+    ]
+  },
+  {
+    boldText: 'Legal Land Description on the Land Title Search or pending freehold transfer matches ',
+    regularText: 'the registered manufactured home location information. One or more of the following must correspond' +
+      ' and there should be no material differences in the location descriptions:',
+    bullets: [
+      'PID,',
+      'Lot / land district / plan number, or',
+      'District lot / land district'
+    ]
+  },
+  {
+    boldText: 'Personal Property Registry lien search has been completed',
+    regularText: ' and there are no liens on the home that block the exemption. If a lien exists, have it discharged' +
+      ' or obtain a Letter of Consent from the secured party prior to applying for a residential exemption.',
+    note: ' Liens that stop the exemption include Family Maintenance Enforcement Act, Family Relations Act, BC' +
+      ' Second Mortgage, Land Tax Deferment Act. (Confirm with Policy)'
+  }
+]
diff --git a/ppr-ui/src/resources/tableHeaders.ts b/ppr-ui/src/resources/tableHeaders.ts
index 913cffc4a..a36c87c30 100644
--- a/ppr-ui/src/resources/tableHeaders.ts
+++ b/ppr-ui/src/resources/tableHeaders.ts
@@ -888,7 +888,7 @@ export const homeOwnersTableHeaders: Array<BaseHeaderIF> = [
     value: 'mailingAddress'
   },
   {
-    class: 'column-lg',
+    class: 'column-md',
     sortable: false,
     text: 'Phone Number',
     value: 'phoneNumber',
diff --git a/ppr-ui/src/store/state/state-model.ts b/ppr-ui/src/store/state/state-model.ts
index a4c0b156e..a6570451a 100644
--- a/ppr-ui/src/store/state/state-model.ts
+++ b/ppr-ui/src/store/state/state-model.ts
@@ -503,7 +503,10 @@ export const stateModel: StateModelIF = {
     nonResidential: null,
     note: {
       documentType: null,
-      remarks: ''
+      remarks: '',
+      destroyed: null,
+      nonResidentialReason: null,
+      nonResidentialOther: null
     }
   },
   mhrExemptionValidation: {
diff --git a/ppr-ui/src/views/exemption/ExemptionDetails.vue b/ppr-ui/src/views/exemption/ExemptionDetails.vue
index b99d6bdb4..641976b4e 100644
--- a/ppr-ui/src/views/exemption/ExemptionDetails.vue
+++ b/ppr-ui/src/views/exemption/ExemptionDetails.vue
@@ -21,9 +21,9 @@
 
         <CautionBox
           class="mt-9"
-          setMsg="The homeowner and home location information in the residential exemption form, the manufactured home
-          registry, and the land title must align. If the current MHR registration information is inaccurate, the
-          register must be updated prior to proceeding with this application for Residential Exemption."
+          :setMsg="`The homeowner and home location information in the ${exemptionLabel.toLowerCase()} form and the
+            manufactured home registry must align. If the current MHR registration information is
+           inaccurate, the register must be updated prior to proceeding with this application for a ${exemptionLabel}.`"
         />
 
         <SimpleHelpToggle
@@ -171,7 +171,7 @@ export default defineComponent({
   props: { showErrors: { type: Boolean, default: false } },
   setup () {
     const { route } = useNavigation()
-    const { isNonResExemption, updateValidation } = useExemptions()
+    const { exemptionLabel, isNonResExemption, updateValidation } = useExemptions()
     const { setValidation, setMhrExemptionNote, setMhrExemptionValue } = useStore()
     const { getMhrExemption, isRoleStaffReg, hasLien } = storeToRefs(useStore())
 
@@ -194,6 +194,7 @@ export default defineComponent({
     })
 
     return {
+      exemptionLabel,
       getMhrExemption,
       docIdContent,
       exRemarksContent,
diff --git a/ppr-ui/src/views/exemption/ExemptionReview.vue b/ppr-ui/src/views/exemption/ExemptionReview.vue
index a023eb201..6f190731d 100644
--- a/ppr-ui/src/views/exemption/ExemptionReview.vue
+++ b/ppr-ui/src/views/exemption/ExemptionReview.vue
@@ -41,7 +41,7 @@
             class="ml-0 icon-large"
             src="@/assets/svgs/ic_exemption.svg"
           >
-          <label class="font-weight-bold pl-2">Residential Exemption</label>
+          <label class="font-weight-bold pl-2">{{ exemptionLabel }}</label>
         </header>
       </template>
     </ReviewCard>
@@ -129,10 +129,12 @@
           <template #contentSlot>
             <ListRequirements
               class="mb-4"
-              :requirements="isRoleStaffReg ? exConfirmRequirements : exConfirmRequirementsQs"
+              :requirements="isRoleStaffReg
+                ? isNonResExemption ? nonResExConfirmRequirements : exConfirmRequirements
+                : exConfirmRequirementsQs"
             />
             <p
-              v-if="isRoleStaffReg"
+              v-if="isRoleStaffReg && !isNonResExemption"
               class="ml-9 hint-message"
             >
               If there is a Personal Property Security Act (PPSA) security interest registered against this manufactured
@@ -154,7 +156,7 @@
 
       <!-- Staff Payment -->
       <section
-        v-if="isRoleStaffReg"
+        v-if="isRoleStaffReg && !isNonResExemption"
         class="mt-13"
       >
         <h2>Staff Payment</h2>
@@ -188,7 +190,8 @@ import {
   attentionExemptionConfig,
   exCertifyInfoContent,
   exConfirmRequirements,
-  exConfirmRequirementsQs
+  exConfirmRequirementsQs,
+  nonResExConfirmRequirements
 } from '@/resources'
 import { ConfirmCompletion } from '@/components/mhrTransfers'
 import { ListRequirements } from '@/components/userAccess/ReviewConfirm'
@@ -237,7 +240,7 @@ export default defineComponent({
       isRoleQualifiedSupplier,
       hasLien
     } = storeToRefs(useStore())
-    const { updateValidation } = useExemptions()
+    const { exemptionLabel, isNonResExemption, updateValidation } = useExemptions()
     const { onStaffPaymentDataUpdate } = usePayment()
 
     const localState = reactive({
@@ -274,7 +277,9 @@ export default defineComponent({
 
     return {
       RouteNames,
+      exemptionLabel,
       isRoleStaffReg,
+      isNonResExemption,
       isRoleQualifiedSupplier,
       getStaffPayment,
       getMhrExemption,
@@ -286,6 +291,7 @@ export default defineComponent({
       exCertifyInfoContent,
       exConfirmRequirements,
       exConfirmRequirementsQs,
+      nonResExConfirmRequirements,
       onStaffPaymentDataUpdate,
       getMhrExemptionValidation,
       parseSubmittingPartyToAccountInfo,
diff --git a/ppr-ui/src/views/exemption/Exemptions.vue b/ppr-ui/src/views/exemption/Exemptions.vue
index dabb9056c..8c5f14c57 100644
--- a/ppr-ui/src/views/exemption/Exemptions.vue
+++ b/ppr-ui/src/views/exemption/Exemptions.vue
@@ -26,7 +26,7 @@
               class="soft-corners-top"
             >
               <v-col cols="auto">
-                <h1>Residential Exemption</h1>
+                <h1>{{ exemptionLabel }}</h1>
               </v-col>
             </v-row>
             <Stepper
@@ -53,7 +53,9 @@
                 :setShowButtons="false"
                 :setRightOffset="true"
                 :setShowFeeSummary="true"
-                :setFeeType="FeeSummaryTypes.RESIDENTIAL_EXEMPTION"
+                :setFeeType="isNonResExemption
+                  ? FeeSummaryTypes.NON_RESIDENTIAL_EXEMPTION
+                  : FeeSummaryTypes.RESIDENTIAL_EXEMPTION"
                 data-test-id="exemption-fee-summary"
               />
             </aside>
@@ -112,7 +114,7 @@ export default defineComponent({
     const { isAuthenticated } = useAuth()
     const { isRouteName, goToDash, route } = useNavigation()
     const { parseMhrInformation } = useMhrInformation()
-    const { buildExemptionPayload } = useExemptions()
+    const { buildExemptionPayload, exemptionLabel, isNonResExemption } = useExemptions()
     const { setRegTableNewItem, setUnsavedChanges } = useStore()
     const {
       getMhrExemptionSteps,
@@ -193,6 +195,8 @@ export default defineComponent({
       submit,
       emitError,
       isRouteName,
+      exemptionLabel,
+      isNonResExemption,
       getMhrExemptionSteps,
       FeeSummaryTypes,
       getMhrExemption,
diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
index e2eef46d1..1e2bdbf6f 100644
--- a/ppr-ui/src/views/mhrInformation/MhrInformation.vue
+++ b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
@@ -406,21 +406,22 @@
                         class="pl-1"
                         color="primary"
                         :ripple="false"
-                        :disabled="isFrozenMhrDueToAffidavit || ((hasLien && !isLienRegistrationTypeSA) &&
-                          (!isRoleStaffReg || isChangeLocationActive || disableRoleBaseTransfer))"
+                        :disabled="isFrozenMhrDueToAffidavit || isFrozenMhrDueToUnitNote ||
+                          ((hasLien && !isLienRegistrationTypeSA) &&
+                            (!isRoleStaffReg || isChangeLocationActive || disableRoleBaseTransfer))"
                         @click="toggleTypeSelector()"
                       >
                         <span v-if="!showTransferType">
                           <v-icon
                             color="primary"
                             size="small"
-                          >mdi-pencil</v-icon> Change
+                          >mdi-pencil</v-icon> Change Ownership
                         </span>
                         <span v-else>
                           <v-icon
                             color="primary"
                             size="small"
-                          >mdi-close</v-icon> Cancel Owner Change
+                          >mdi-close</v-icon> Cancel Ownership Change
                         </span>
                       </v-btn>
                     </v-col>
@@ -761,7 +762,8 @@ export default defineComponent({
       getUiTransferType,
       parseMhrInformation,
       initDraftMhrInformation,
-      parseSubmittingPartyInfo
+      parseSubmittingPartyInfo,
+      isFrozenMhrDueToUnitNote
     } = useMhrInformation()
     const {
       setValidation,
@@ -1520,6 +1522,7 @@ export default defineComponent({
       isValidTransfer,
       getLienInfo,
       outOfDateOwnersDialogOptions,
+      isFrozenMhrDueToUnitNote,
 
       // transport permit
       isValidTransportPermit,