From c0b1c061adcf41d96b6aea603706f20797e69fa8 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Tue, 23 Apr 2024 07:52:16 -0700
Subject: [PATCH] Misc UXA for Exemptions

---
 ppr-ui/src/assets/svgs/ic_exemption2.svg         |  4 ++++
 ppr-ui/src/components/tables/common/TableRow.vue |  6 +++---
 .../src/composables/exemption/useExemptions.ts   |  2 +-
 ppr-ui/src/utils/feature-flags.ts                | 16 ++++++++--------
 ppr-ui/src/views/exemption/ExemptionReview.vue   |  5 ++---
 5 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 ppr-ui/src/assets/svgs/ic_exemption2.svg

diff --git a/ppr-ui/src/assets/svgs/ic_exemption2.svg b/ppr-ui/src/assets/svgs/ic_exemption2.svg
new file mode 100644
index 000000000..62be45a56
--- /dev/null
+++ b/ppr-ui/src/assets/svgs/ic_exemption2.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 9.67999C3.5 5.19799 7.0625 2.29999 11 2.29999C14.9375 2.29999 18.5 5.19799 18.5 9.67999C18.5 10.8084 18.143 12.015 17.4296 13.3005C14.7006 13.3381 12.5 15.5621 12.5 18.3C12.5 18.5307 12.5156 18.7577 12.5459 18.9801C12.0602 19.4134 11.545 19.8534 11 20.3C6.00313 16.205 3.5 12.668 3.5 9.67999ZM9.125 9.49999C9.125 10.49 9.96875 11.3 11 11.3C12.0312 11.3 12.875 10.49 12.875 9.49999C12.875 8.50999 12.0312 7.69999 11 7.69999C9.96875 7.69999 9.125 8.50999 9.125 9.49999Z" fill="#1669BB"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5758 15.3L17.6333 17.2425L15.6908 15.3L14.6333 16.3575L16.5758 18.3L14.6333 20.2425L15.6908 21.3L17.6333 19.3575L19.5758 21.3L20.6333 20.2425L18.6908 18.3L20.6333 16.3575L19.5758 15.3Z" fill="#1669BB"/>
+</svg>
diff --git a/ppr-ui/src/components/tables/common/TableRow.vue b/ppr-ui/src/components/tables/common/TableRow.vue
index 490bf0a3d..b45c581d2 100644
--- a/ppr-ui/src/components/tables/common/TableRow.vue
+++ b/ppr-ui/src/components/tables/common/TableRow.vue
@@ -502,7 +502,7 @@
                   <img
                     alt="exemption-icon"
                     class="ml-0 icon-small"
-                    src="@/assets/svgs/ic_exemption.svg"
+                    src="@/assets/svgs/ic_exemption2.svg"
                   >
                   <span class="ml-1">Re-Register Home</span>
                 </v-list-item-subtitle>
@@ -531,7 +531,7 @@
                         <img
                           alt="exemption-icon"
                           class="ml-0 icon-small"
-                          src="@/assets/svgs/ic_exemption.svg"
+                          src="@/assets/svgs/ic_exemption2.svg"
                         >
                         Residential Exemption
                       </span>
@@ -546,7 +546,7 @@
                     <img
                       alt="exemption-icon"
                       class="ml-0 icon-small"
-                      src="@/assets/svgs/ic_exemption.svg"
+                      src="@/assets/svgs/ic_exemption2.svg"
                     >
                     <span class="ml-1">Residential Exemption</span>
                   </span>
diff --git a/ppr-ui/src/composables/exemption/useExemptions.ts b/ppr-ui/src/composables/exemption/useExemptions.ts
index 9717379d6..330bfe328 100644
--- a/ppr-ui/src/composables/exemption/useExemptions.ts
+++ b/ppr-ui/src/composables/exemption/useExemptions.ts
@@ -171,7 +171,7 @@ export const useExemptions = () => {
       reg =>
         [APIMhrDescriptionTypes.RESIDENTIAL_EXEMPTION.toString(),
           APIMhrDescriptionTypes.NON_RESIDENTIAL_EXEMPTION.toString()].includes(reg.registrationDescription) &&
-        (reg.statusType === MhApiStatusTypes.EXEMPT || reg.statusType === MhApiStatusTypes.ACTIVE)
+        [MhApiStatusTypes.EXEMPT, MhApiStatusTypes.ACTIVE, MhApiStatusTypes.FROZEN].includes(reg.statusType)
     ).length > 0
   }
 
diff --git a/ppr-ui/src/utils/feature-flags.ts b/ppr-ui/src/utils/feature-flags.ts
index bea7d356c..5c18cd505 100644
--- a/ppr-ui/src/utils/feature-flags.ts
+++ b/ppr-ui/src/utils/feature-flags.ts
@@ -10,14 +10,14 @@ export const defaultFlagSet: LDFlagSet = {
   'search-registration-number': true,
   'search-serial-number': true,
   'mhr-ui-enabled': true, // Mhr Search - default true: Should remove from codebase
-  'mhr-registration-enabled': true, // Enables MHR table tab
-  'mhr-staff-correction-enabled': true, // Enables access to staff mhr correction
-  'mhr-transfer-enabled': true, // Enables changes to base MHR HomeOwners within the MHR Information flow
-  'mhr-exemption-enabled': true,
-  'mhr-non-res-exemption-enabled': true, // Enables Non-Residential Exemption for Staff
-  'mhr-transport-permit-enabled': true,
-  'mhr-amend-transport-permit-enabled': true,
-  'mhr-user-access-enabled': true,
+  'mhr-registration-enabled': false, // Enables MHR table tab
+  'mhr-staff-correction-enabled': false, // Enables access to staff mhr correction
+  'mhr-transfer-enabled': false, // Enables changes to base MHR HomeOwners within the MHR Information flow
+  'mhr-exemption-enabled': false,
+  'mhr-non-res-exemption-enabled': false, // Enables Non-Residential Exemption for Staff
+  'mhr-transport-permit-enabled': false,
+  'mhr-amend-transport-permit-enabled': false,
+  'mhr-user-access-enabled': false,
   'sentry-enable': false, // by default, no sentry logs
   'banner-text': '' // by default, there is no banner text
 }
diff --git a/ppr-ui/src/views/exemption/ExemptionReview.vue b/ppr-ui/src/views/exemption/ExemptionReview.vue
index 1dc08755e..009bd728e 100644
--- a/ppr-ui/src/views/exemption/ExemptionReview.vue
+++ b/ppr-ui/src/views/exemption/ExemptionReview.vue
@@ -39,7 +39,7 @@
           <img
             alt="exemption-icon"
             class="ml-0 icon-large"
-            src="@/assets/svgs/ic_exemption.svg"
+            src="@/assets/svgs/ic_exemption2.svg"
           >
           <label class="font-weight-bold pl-2">{{ exemptionLabel }}</label>
         </header>
@@ -247,8 +247,7 @@ export default defineComponent({
     const localState = reactive({
       nonResidentialDisplayReason: computed((): string => {
         const reason = getMhrExemptionNote.value?.nonResidentialReason === 'Other'
-          ? `${getMhrExemptionNote.value?.nonResidentialReason} '${getMhrExemptionNote.value?.nonResidentialOther ||
-          '(Not Entered)'}'`
+          ? `${getMhrExemptionNote.value?.nonResidentialOther || '(Not Entered)'}`
           : getMhrExemptionNote.value?.nonResidentialReason
         return`Reason for the Non-Residential Exemption: ${getMhrExemptionNote.value?.nonResidentialOption} - ${reason}`
       }),