From 238f5f49880b516bb7b45976828c7c29db68b8f0 Mon Sep 17 00:00:00 2001
From: meganwong <megan.a.wong@gov.bc.ca>
Date: Thu, 28 Nov 2024 16:39:03 -0800
Subject: [PATCH 1/4] Add logic for displaying name change button

---
 .../existing-request/nr-approved-gray-box.vue | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/components/existing-request/nr-approved-gray-box.vue b/app/src/components/existing-request/nr-approved-gray-box.vue
index 72ab4ee58..27733c181 100644
--- a/app/src/components/existing-request/nr-approved-gray-box.vue
+++ b/app/src/components/existing-request/nr-approved-gray-box.vue
@@ -18,6 +18,20 @@
         </v-btn>
       </div>
 
+      <div
+        v-else-if="showNameChangeButton"
+        class="d-flex justify-center my-1"
+      >
+        <v-btn
+          class="change-name-now-btn mt-30"
+          min-width="20rem"
+          :disabled="disabled"
+          @click="$emit('goToEntityDashboard')"
+        >
+          <strong>Change Name Now</strong>
+        </v-btn>
+      </div>
+
       <div
         v-else-if="showIncorporateButton"
         class="d-flex justify-center my-1"
@@ -219,6 +233,10 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
     return (this.getNr.request_action_cd === NrRequestActionCodes.CONVERSION)
   }
 
+  get isNameChange (): boolean {
+    return (this.getNr.request_action_cd === NrRequestActionCodes.CHANGE_NAME)
+  }
+
   get isNewBusiness (): boolean {
     return (this.getNr.request_action_cd === NrRequestActionCodes.NEW_BUSINESS)
   }
@@ -257,6 +275,11 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
     return (this.isContinuationIn && this.isApprovedOrConsentUnRequired)
   }
 
+  /** True if the Change Name Now button should be shown. */
+  get showNameChangeButton (): boolean {
+    return (this.isNameChange && this.isApprovedOrConsentUnRequired)
+  }
+
   get isAllowAlterOnline (): boolean {
     return this.isAlterOnline(this.getNr.requestTypeCd)
   }

From aa3baf249a74e7d5143dc8d9ad5883f5bd496c6e Mon Sep 17 00:00:00 2001
From: meganwong <megan.a.wong@gov.bc.ca>
Date: Thu, 28 Nov 2024 16:43:07 -0800
Subject: [PATCH 2/4] update patch version

---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index c3b4f799c..fceeff41e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.5.11",
+  "version": "5.5.12",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",

From 5ebdaf3218c175369d3a5c605b1bf6ec35a80c36 Mon Sep 17 00:00:00 2001
From: meganwong <megan.a.wong@gov.bc.ca>
Date: Thu, 28 Nov 2024 17:11:49 -0800
Subject: [PATCH 3/4] Add feature flag check

---
 .../existing-request/nr-approved-gray-box.vue | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/src/components/existing-request/nr-approved-gray-box.vue b/app/src/components/existing-request/nr-approved-gray-box.vue
index 27733c181..eaac7a641 100644
--- a/app/src/components/existing-request/nr-approved-gray-box.vue
+++ b/app/src/components/existing-request/nr-approved-gray-box.vue
@@ -18,20 +18,6 @@
         </v-btn>
       </div>
 
-      <div
-        v-else-if="showNameChangeButton"
-        class="d-flex justify-center my-1"
-      >
-        <v-btn
-          class="change-name-now-btn mt-30"
-          min-width="20rem"
-          :disabled="disabled"
-          @click="$emit('goToEntityDashboard')"
-        >
-          <strong>Change Name Now</strong>
-        </v-btn>
-      </div>
-
       <div
         v-else-if="showIncorporateButton"
         class="d-flex justify-center my-1"
@@ -178,6 +164,34 @@
         </div>
       </div>
 
+      <div
+          v-else-if="showNameChangeButton"
+          class="d-flex justify-center my-1"
+        >
+          <v-btn
+            v-if="showOpenExternalIcon"
+            class="change-name-now-external-btn mt-30"
+            min-width="20rem"
+            :disabled="disabled"
+            @click="$emit('goToCorpOnline')"
+          >
+            <strong>Change Name Now</strong>
+          &nbsp;
+            <v-icon small>
+              mdi-open-in-new
+            </v-icon>
+          </v-btn>
+          <v-btn
+            v-else
+            class="change-name-now-btn mt-30"
+            min-width="20rem"
+            :disabled="disabled"
+            @click="$emit('goToEntityDashboard')"
+          >
+            <strong>Change Name Now</strong>
+          </v-btn>
+        </div>
+
       <p
         v-else
         class="mt-30"
@@ -288,6 +302,7 @@ export default class NrApprovedGrayBox extends Mixins(CommonMixin) {
     if (this.showAmalgamateNowButton && !this.isSupportedAmalgamation(this.getNr.entity_type_cd)) return true
     if (this.showAlterNowButton && !this.isSupportedAlteration(this.getNr.requestTypeCd)) return true
     if (this.showBeginContinuationButton && !this.isSupportedContinuationIn(this.getNr.entity_type_cd)) return true
+    if (this.showNameChangeButton && !this.isSupportedChangeName(this.getNr.entity_type_cd)) return true
     return false
   }
 

From 3652e907ee203a4d2179ceda520441d4ee243297 Mon Sep 17 00:00:00 2001
From: meganwong <megan.a.wong@gov.bc.ca>
Date: Thu, 28 Nov 2024 17:14:52 -0800
Subject: [PATCH 4/4] lint fix

---
 .../existing-request/nr-approved-gray-box.vue | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/src/components/existing-request/nr-approved-gray-box.vue b/app/src/components/existing-request/nr-approved-gray-box.vue
index eaac7a641..92654833c 100644
--- a/app/src/components/existing-request/nr-approved-gray-box.vue
+++ b/app/src/components/existing-request/nr-approved-gray-box.vue
@@ -165,32 +165,32 @@
       </div>
 
       <div
-          v-else-if="showNameChangeButton"
-          class="d-flex justify-center my-1"
+        v-else-if="showNameChangeButton"
+        class="d-flex justify-center my-1"
+      >
+        <v-btn
+          v-if="showOpenExternalIcon"
+          class="change-name-now-external-btn mt-30"
+          min-width="20rem"
+          :disabled="disabled"
+          @click="$emit('goToCorpOnline')"
         >
-          <v-btn
-            v-if="showOpenExternalIcon"
-            class="change-name-now-external-btn mt-30"
-            min-width="20rem"
-            :disabled="disabled"
-            @click="$emit('goToCorpOnline')"
-          >
-            <strong>Change Name Now</strong>
+          <strong>Change Name Now</strong>
           &nbsp;
-            <v-icon small>
-              mdi-open-in-new
-            </v-icon>
-          </v-btn>
-          <v-btn
-            v-else
-            class="change-name-now-btn mt-30"
-            min-width="20rem"
-            :disabled="disabled"
-            @click="$emit('goToEntityDashboard')"
-          >
-            <strong>Change Name Now</strong>
-          </v-btn>
-        </div>
+          <v-icon small>
+            mdi-open-in-new
+          </v-icon>
+        </v-btn>
+        <v-btn
+          v-else
+          class="change-name-now-btn mt-30"
+          min-width="20rem"
+          :disabled="disabled"
+          @click="$emit('goToEntityDashboard')"
+        >
+          <strong>Change Name Now</strong>
+        </v-btn>
+      </div>
 
       <p
         v-else