From b9ed41b499786eb90eabb28382227ce4db0a98ac Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Mon, 23 Oct 2023 13:42:36 -0700
Subject: [PATCH 01/11] show both named and numbered option for LTD company

---
 src/components/new-request/search.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index f223fd1ea..d8e490f56 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -240,7 +240,7 @@
       <!-- Restoration / Reinstatement flow -->
       <template v-else-if="isRestoration">
         <BusinessLookupFetch />
-        <CompanyType v-if="getSearchBusiness && isBcRestorable && isSupportedRestoration(getEntityTypeCd)" />
+        <CompanyType v-if="getSearchBusiness && isBcRestorable" />
         <Jurisdiction
           v-if="isSelectedXproAndRestorable"
           cols="12"
@@ -250,7 +250,7 @@
         <!-- federal sub-flow -->
         <XproFederalBullets v-if="isFederal && getSearchBusiness" />
 
-        <template v-if="(isRestorable && !isFederal) && (isNamedCompany || !isSupportedRestoration(getEntityTypeCd))">
+        <template v-if="isRestorable && !isFederal && isNamedCompany">
           <v-col
             cols="12"
             :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
@@ -622,8 +622,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     if (this.isRestoration) {
       if (this.getEntityTypeCd && this.isNamedCompany && !this.isFederal) return true
       if (this.getEntityTypeCd && this.isSelectedXproAndRestorable && !this.isFederal) return true
-      if (this.getSearchBusiness && this.isBcRestorable &&
-        !this.isSupportedRestoration(this.getEntityTypeCd)) return true
+      if (this.getSearchBusiness && this.isBcRestorable && this.isNamedCompany) return true
     }
 
     // Conditional for Continuation In Flow.

From b6293d89ad325d2a9d3945a85d697c349c265ff9 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Mon, 23 Oct 2023 15:40:12 -0700
Subject: [PATCH 02/11] Go to COLIN

---
 src/components/new-request/search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index d8e490f56..dee55eaa4 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -291,7 +291,7 @@
             :href="colinLink"
             target="_blank"
           >
-            Go to Corporate Online to {{ isConversion ? 'Alter' : 'Register' }}
+            Go to Corporate Online to {{ isConversion ? 'Alter' : isRestoration ? 'Restore' : 'Register'}}
             <v-icon
               right
               small

From 71e797fbbdb712fe745910882272cb8ca43fc199 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Mon, 23 Oct 2023 15:51:06 -0700
Subject: [PATCH 03/11] update version after rebasing

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3f6a7e0e7..4404cf046 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "name-request",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.3.0",
+      "version": "5.3.1",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/breadcrumb": "2.1.24",
diff --git a/package.json b/package.json
index 3a82c8d41..f9effdb7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",

From cfb610329afc368b916a9c0eafe2ae42bba58b8a Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Mon, 23 Oct 2023 16:33:47 -0700
Subject: [PATCH 04/11] create getter for COLIN text

---
 src/components/new-request/search.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index dee55eaa4..65a48bf34 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -291,7 +291,7 @@
             :href="colinLink"
             target="_blank"
           >
-            Go to Corporate Online to {{ isConversion ? 'Alter' : isRestoration ? 'Restore' : 'Register'}}
+            {{ colinButtonText }}
             <v-icon
               right
               small
@@ -563,6 +563,20 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     return false
   }
 
+  /** Retrieve text for COLIN button based on selected action/flow */
+  get colinButtonText (): string {
+    var colinText = ''
+    if (this.isConversion) {
+      colinText = 'Alter'
+    } else if (this.isRestoration) {
+      colinText = 'Restore'
+    } else if (this.isChangeName) {
+      colinText = 'Change Name'
+    } else {
+      colinText = 'Register'
+    } return 'Go to Corporate Online to ' + colinText
+  }
+
   /** Retrieve text based on selected action/flow */
   get actionNowButtonText (): string {
     if (this.isContinuationIn) return 'Continue In Now'

From f495ad9e87a33ba472479575c3edab334510b7e8 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Wed, 25 Oct 2023 09:57:30 -0700
Subject: [PATCH 05/11] fix the error on Xpro company

---
 src/components/new-request/search.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index 65a48bf34..7a4d9d671 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -240,7 +240,7 @@
       <!-- Restoration / Reinstatement flow -->
       <template v-else-if="isRestoration">
         <BusinessLookupFetch />
-        <CompanyType v-if="getSearchBusiness && isBcRestorable" />
+        <CompanyType v-if="getSearchBusiness && isBcRestorable && isNumberedEntityType" />
         <Jurisdiction
           v-if="isSelectedXproAndRestorable"
           cols="12"
@@ -250,7 +250,7 @@
         <!-- federal sub-flow -->
         <XproFederalBullets v-if="isFederal && getSearchBusiness" />
 
-        <template v-if="isRestorable && !isFederal && isNamedCompany">
+        <template v-if="(isRestorable && !isFederal) && (isNamedCompany || !isSupportedRestoration(getEntityTypeCd))">
           <v-col
             cols="12"
             :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
@@ -636,7 +636,8 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     if (this.isRestoration) {
       if (this.getEntityTypeCd && this.isNamedCompany && !this.isFederal) return true
       if (this.getEntityTypeCd && this.isSelectedXproAndRestorable && !this.isFederal) return true
-      if (this.getSearchBusiness && this.isBcRestorable && this.isNamedCompany) return true
+      if (this.getSearchBusiness && this.isBcRestorable &&
+        !this.isSupportedRestoration(this.getEntityTypeCd)) return true
     }
 
     // Conditional for Continuation In Flow.

From e08c17d59d02684e0bfc8d4ba62e9b3292ddb5e3 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Wed, 25 Oct 2023 12:06:18 -0700
Subject: [PATCH 06/11] fix the error when no supported FF

---
 src/components/new-request/search.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index 7a4d9d671..c099c98e7 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -250,7 +250,7 @@
         <!-- federal sub-flow -->
         <XproFederalBullets v-if="isFederal && getSearchBusiness" />
 
-        <template v-if="(isRestorable && !isFederal) && (isNamedCompany || !isSupportedRestoration(getEntityTypeCd))">
+        <template v-if="(isRestorable && !isFederal) && (isNamedCompany || isCooperative || isCreditUnion || isSelectedCompanyXPro)">
           <v-col
             cols="12"
             :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
@@ -459,6 +459,10 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     return (this.getEntityTypeCd === EntityTypes.CP)
   }
 
+  get isCreditUnion (): boolean {
+    return (this.getEntityTypeCd === EntityTypes.FI)
+  }
+
   get isSociety (): boolean {
     return (this.isSocietyEnabled() && this.getEntityTypeCd === EntityTypes.SO)
   }
@@ -636,8 +640,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     if (this.isRestoration) {
       if (this.getEntityTypeCd && this.isNamedCompany && !this.isFederal) return true
       if (this.getEntityTypeCd && this.isSelectedXproAndRestorable && !this.isFederal) return true
-      if (this.getSearchBusiness && this.isBcRestorable &&
-        !this.isSupportedRestoration(this.getEntityTypeCd)) return true
+      if (this.getSearchBusiness && this.isBcRestorable && (this.isNamedCompany || this.isCooperative || this.isCreditUnion)) return true
     }
 
     // Conditional for Continuation In Flow.

From be8cbbfe2a4eef7f8febb72d02d050f64af56473 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Wed, 25 Oct 2023 12:19:08 -0700
Subject: [PATCH 07/11] update version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d992d5142..3c32c5b16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "name-request",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "name-request",
-      "version": "5.3.2",
+      "version": "5.3.3",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/breadcrumb": "2.1.24",
diff --git a/package.json b/package.json
index f17939342..90e0a3d7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "private": true,
   "appName": "Name Request UI",
   "sbcName": "SBC Common Components",

From b12103e01c8849d83f2ef62e02f81781a986e5c5 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Wed, 25 Oct 2023 16:06:10 -0700
Subject: [PATCH 08/11] create a local getter

---
 src/components/new-request/search.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index c099c98e7..f938bd434 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -250,7 +250,7 @@
         <!-- federal sub-flow -->
         <XproFederalBullets v-if="isFederal && getSearchBusiness" />
 
-        <template v-if="(isRestorable && !isFederal) && (isNamedCompany || isCooperative || isCreditUnion || isSelectedCompanyXPro)">
+        <template v-if="showRestoreNameInput">
           <v-col
             cols="12"
             :md="(showDesignation || isSelectedXproAndRestorable) ? '8' : '12'"
@@ -467,6 +467,14 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
     return (this.isSocietyEnabled() && this.getEntityTypeCd === EntityTypes.SO)
   }
 
+  /** Whether to show the name input field when trying to restore a historical company. */
+  get showRestoreNameInput (): boolean {
+    const isPromptNameInput = (this.isNamedCompany || this.isCooperative || this.isCreditUnion || this.isSelectedXproAndRestorable)
+    return (
+      this.isRestorable && isPromptNameInput && !this.isFederal
+    )
+  }
+
   get showActionNowButton (): boolean {
     // Conditional for Continuation In Flow.
     if (

From ba74fa8b48cb9efa190937124a0655b2fb072699 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Thu, 26 Oct 2023 09:12:33 -0700
Subject: [PATCH 09/11] add comments with showRestoreNameInput

---
 src/components/new-request/search.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index f938bd434..d33b39249 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -469,6 +469,9 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
 
   /** Whether to show the name input field when trying to restore a historical company. */
   get showRestoreNameInput (): boolean {
+    // We should show the name input field if the named radio button was used,
+    // or with some special cases that if it is a coop(CP), or a credit union(FI).
+    // Also, if it is a extrapros company, we should also have name input field when it is not a Canada Federal.
     const isPromptNameInput = (this.isNamedCompany || this.isCooperative || this.isCreditUnion || this.isSelectedXproAndRestorable)
     return (
       this.isRestorable && isPromptNameInput && !this.isFederal

From 167c52477da00bfaccde06bacbe884a5291c9dc7 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Thu, 26 Oct 2023 09:35:33 -0700
Subject: [PATCH 10/11] fix some small errors

---
 src/components/new-request/search.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index d33b39249..d722df4e9 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -580,7 +580,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
 
   /** Retrieve text for COLIN button based on selected action/flow */
   get colinButtonText (): string {
-    var colinText = ''
+    var colinText = 'use this NR'
     if (this.isConversion) {
       colinText = 'Alter'
     } else if (this.isRestoration) {
@@ -589,7 +589,8 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
       colinText = 'Change Name'
     } else {
       colinText = 'Register'
-    } return 'Go to Corporate Online to ' + colinText
+    } 
+    return 'Go to Corporate Online to ' + colinText
   }
 
   /** Retrieve text based on selected action/flow */

From 5d8e3dc878c7b6c644c747e0d7decdc6cff208a9 Mon Sep 17 00:00:00 2001
From: tshyun24 <shaoyun.tong@gov.bc.ca>
Date: Thu, 26 Oct 2023 09:42:52 -0700
Subject: [PATCH 11/11] trailing space

---
 src/components/new-request/search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/new-request/search.vue b/src/components/new-request/search.vue
index d722df4e9..408df0e53 100644
--- a/src/components/new-request/search.vue
+++ b/src/components/new-request/search.vue
@@ -589,7 +589,7 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
       colinText = 'Change Name'
     } else {
       colinText = 'Register'
-    } 
+    }
     return 'Go to Corporate Online to ' + colinText
   }