From c7b4c659db060ef192680f74d937030579e8624a Mon Sep 17 00:00:00 2001
From: stevenc987 <steven.chen@gov.bc.ca>
Date: Tue, 29 Sep 2026 16:17:19 +0000
Subject: [PATCH 1/6] 35053-Investigate and Fix: Name Request UI - Estimated
 review date Incorrect

Signed-off-by: stevenc987 <steven.chen@gov.bc.ca>
---
 app/package.json         |  2 +-
 app/src/store/getters.ts | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/package.json b/app/package.json
index a94310a33..a309bb90d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.10.5",
+  "version": "5.10.6",
   "private": true,
   "engines": {
     "node": ">=24"
diff --git a/app/src/store/getters.ts b/app/src/store/getters.ts
index 56eeff3cb..630a16cb6 100644
--- a/app/src/store/getters.ts
+++ b/app/src/store/getters.ts
@@ -116,6 +116,10 @@ export const getNrState = (state: StateIF): NrState => {
   return state.newRequestModel.nr.state
 }
 
+export const getNrSubmittedDate = (state: StateIF): Date => {
+  return state.newRequestModel.nr.submittedDate
+}
+
 export const getLocation = (state: StateIF): Location => {
   return state.newRequestModel.location
 }
@@ -1337,11 +1341,10 @@ export const getRegularWaitTime = (state: StateIF): string | number => {
   return '-'
 }
 
-function formatDate (statVal: number): string {
-  const today = new Date()
-  const result = new Date(today)
+function formatDate(statVal: number, submittedDate: Date): string {
+  const result = new Date(submittedDate)
 
-  result.setDate(today.getDate() + statVal)
+  result.setDate(result.getDate() + statVal)
   const formatted = result.toLocaleDateString('en-CA', {
     year: 'numeric',
     month: 'long',
@@ -1356,10 +1359,10 @@ function formatDate (statVal: number): string {
 
 export const getRegularEstimateReviewDate = (state: StateIF): string => {
   const flagVal = GetFeatureFlag('hardcoded_regular_wait_time')
-  if (flagVal > 0) return formatDate(flagVal)
+  if (flagVal > 0) return formatDate(flagVal, getNrSubmittedDate(state))
   if (flagVal < 0) return '-'
 
   const statVal = getStats(state)?.regular_wait_time
-  if (statVal > 0) return formatDate(statVal)
+  if (statVal > 0) return formatDate(statVal, getNrSubmittedDate(state))
   return '-'
-}
+}
\ No newline at end of file

From b6d7e9d92f98f8b5e8de0b1c9f79d926e0281a83 Mon Sep 17 00:00:00 2001
From: Oluwapizzy <adeyinkapaul10@gmail.com>
Date: Mon, 28 Sep 2026 17:58:40 -0400
Subject: [PATCH 2/6] fix:  Authenticated can users pay by credit card as a
 guest even with an incomplete account setup

---
 app/src/App.vue                               |  37 ++++
 .../components/dialogs/payment-complete.vue   | 165 ++++++++++++------
 app/src/mixins/payment-mixin.ts               |   6 +-
 app/src/plugins/authHelper.ts                 |  15 ++
 app/src/services/auth-services.ts             |   5 +-
 app/tests/unit/auth-helper.spec.ts            |  36 ++++
 6 files changed, 210 insertions(+), 54 deletions(-)
 create mode 100644 app/tests/unit/auth-helper.spec.ts

diff --git a/app/src/App.vue b/app/src/App.vue
index 4e7813ee6..142d62247 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -140,6 +140,7 @@ import SbcHeader from 'sbc-common-components/src/components/SbcHeader.vue'
 import SbcFooter from 'sbc-common-components/src/components/SbcFooter.vue'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import NamexServices from './services/namex-services'
+import AuthServices from '@/services/auth-services'
 import { PAYMENT_REQUIRED } from 'http-status-codes'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module'
 
@@ -319,6 +320,42 @@ export default class App extends Mixins(
       // clear NR data for next time
       sessionStorage.removeItem('NR_DATA')
     }
+
+    this.affiliateNrAfterAccountCreation()
+  }
+
+  /**
+   * After a guest payment, the user may leave to create a Registries account.
+   * When they return with an account, attach the submitted NR to it.
+   * newBusiness stays false so it doesn't start incorporation.
+   */
+  private async affiliateNrAfterAccountCreation (): Promise<void> {
+    const raw = sessionStorage.getItem('PENDING_NR_AFFILIATION')
+    if (!raw) return
+
+    let accountId = 0
+    try {
+      accountId = +JSON.parse(sessionStorage.getItem('CURRENT_ACCOUNT') || '{}')?.id || 0
+    } catch {
+      accountId = 0
+    }
+    if (!accountId) return
+
+    let nr
+    try {
+      nr = JSON.parse(raw)
+    } catch (error) {
+      sessionStorage.removeItem('PENDING_NR_AFFILIATION')
+      console.error('affiliateNrAfterAccountCreation =', error) // eslint-disable-line no-console
+      return
+    }
+
+    sessionStorage.removeItem('PENDING_NR_AFFILIATION')
+    try {
+      await AuthServices.createNrAffiliation(accountId, nr, false)
+    } catch (error) {
+      console.error('affiliateNrAfterAccountCreation =', error) // eslint-disable-line no-console
+    }
   }
 
   /** Fetches and stores the current JS date. */
diff --git a/app/src/components/dialogs/payment-complete.vue b/app/src/components/dialogs/payment-complete.vue
index a7d3033b2..fdaa8a5f4 100644
--- a/app/src/components/dialogs/payment-complete.vue
+++ b/app/src/components/dialogs/payment-complete.vue
@@ -1,52 +1,84 @@
 <template>
-  <v-dialog
-    max-width="45rem"
-    :value="showModal"
-    persistent
-  >
-    <v-card>
-      <v-card-title class="d-flex justify-space-between mt-n3">
-        <div>Payment Successful</div>
-        <v-btn
-          icon
-          large
-          class="dialog-close"
-          @click="hideModal()"
-        >
-          <v-icon>mdi-close</v-icon>
-        </v-btn>
-      </v-card-title>
-
-      <v-card-text class="copy-normal pt-4">
-        <PaymentConfirm
-          :nrNum="getNrNum"
-          :applicant="getApplicant"
-          :nameChoices="getNameChoices"
-          :name="getName"
-          :summary="summary"
-          :receipt="paymentReceipt"
-        />
-      </v-card-text>
-
-      <v-card-actions class="pt-1 justify-center">
-        <v-btn
-          id="receipt-download-btn"
-          class="primary px-4"
-          :loading="loading"
-          @click="downloadReceipt()"
-        >
-          <span>Download Receipt</span>
-        </v-btn>
-        <v-btn
-          id="receipt-close-btn"
-          class="button-blue px-4"
-          @click="hideModal()"
-        >
-          <span>Done</span>
-        </v-btn>
-      </v-card-actions>
-    </v-card>
-  </v-dialog>
+  <div>
+    <v-dialog
+      max-width="45rem"
+      :value="showModal"
+      persistent
+    >
+      <v-card>
+        <v-card-title class="d-flex justify-space-between mt-n3">
+          <div>Payment Successful</div>
+          <v-btn
+            icon
+            large
+            class="dialog-close"
+            @click="hideModal()"
+          >
+            <v-icon>mdi-close</v-icon>
+          </v-btn>
+        </v-card-title>
+
+        <v-card-text class="copy-normal pt-4">
+          <PaymentConfirm
+            :nrNum="getNrNum"
+            :applicant="getApplicant"
+            :nameChoices="getNameChoices"
+            :name="getName"
+            :summary="summary"
+            :receipt="paymentReceipt"
+          />
+        </v-card-text>
+
+        <v-card-actions class="pt-1 justify-center">
+          <v-btn
+            id="receipt-download-btn"
+            class="primary px-4"
+            :loading="loading"
+            @click="downloadReceipt()"
+          >
+            <span>Download Receipt</span>
+          </v-btn>
+          <v-btn
+            id="receipt-close-btn"
+            class="button-blue px-4"
+            @click="hideModal()"
+          >
+            <span>Done</span>
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <v-dialog
+      :value="showCompleteAccount"
+      max-width="45rem"
+      persistent
+    >
+      <v-card>
+        <v-card-title>Complete your BC Registries account</v-card-title>
+        <v-card-text class="copy-normal pt-4">
+          Your name request has been submitted for review. Would you like to complete your
+          BC Registries account?
+        </v-card-text>
+        <v-card-actions class="pt-1 justify-center">
+          <v-btn
+            id="complete-account-dismiss-btn"
+            class="button-blue px-4"
+            @click="dismissAccountRegistration()"
+          >
+            <span>Not now</span>
+          </v-btn>
+          <v-btn
+            id="complete-account-btn"
+            class="primary px-4"
+            @click="completeAccountRegistration()"
+          >
+            <span>Complete your Registries Account</span>
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </div>
 </template>
 
 <script lang="ts">
@@ -54,11 +86,12 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { useStore, usePaymentStore } from '@/store'
 import PaymentConfirm from '@/components/payment/payment-confirm.vue'
-import { NrState } from '@/enums'
+import { NrState, PaymentAction } from '@/enums'
 import { CommonMixin, PaymentMixin, PaymentSessionMixin } from '@/mixins'
 import { ActionBindingIF } from '@/interfaces/store-interfaces'
 import { NameChoicesIF } from '@/interfaces'
 import NamexServices from '@/services/namex-services'
+import { getBusinessHomeLoginUrl, isLoggedInWithoutRegistriesAccount, Navigate } from '@/plugins'
 
 @Component({
   components: {
@@ -72,6 +105,7 @@ export default class PaymentCompleteDialog extends Mixins(
 ) {
   @Getter(useStore) getName!: string
   @Getter(useStore) getNrNum!: string
+  @Getter(useStore) getNrState!: NrState
   @Getter(useStore) getNameChoices!: NameChoicesIF
   @Getter(usePaymentStore) paymentCompleteModalIsVisible!: boolean
 
@@ -84,6 +118,9 @@ export default class PaymentCompleteDialog extends Mixins(
   incompletePaymentRetries = 5
   isRetrying = false
 
+  /** Shown after a guest credit-card payment when the login has no Registries account. */
+  showCompleteAccount = false
+
   /** Whether this modal should be shown (per store property). */
   get showModal (): boolean {
     return this.paymentCompleteModalIsVisible
@@ -130,14 +167,42 @@ export default class PaymentCompleteDialog extends Mixins(
    * NOTE: This method makes use of the PaymentSectionMixin class!
    */
   async fetchData () {
-    const { sessionPaymentId, sessionNrId } = this
+    const { sessionPaymentId, sessionNrId, sessionPaymentAction } = this
     await this.fetchNr()
     await this.fetchPaymentData(sessionPaymentId, +sessionNrId)
     if (!this.isRetrying) {
       this.cleanUpSessionStorage()
+      this.offerAccountRegistration(sessionPaymentAction)
     }
   }
 
+  /**
+   * After the name request is submitted, offer account creation option.
+   * Upgrade, renew, and resubmit payments are not the first submission.
+   */
+  offerAccountRegistration (action: string): void {
+    if (action !== PaymentAction.CREATE) return
+    if (this.getNrState === NrState.PENDING_PAYMENT) return
+    if (!isLoggedInWithoutRegistriesAccount()) return
+    this.showCompleteAccount = true
+  }
+
+  dismissAccountRegistration (): void {
+    this.showCompleteAccount = false
+  }
+
+  /** Sends the user to Business Home account creation and affiliates the NR when they return. */
+  completeAccountRegistration (): void {
+    sessionStorage.setItem('PENDING_NR_AFFILIATION', JSON.stringify({
+      nrNum: this.getNrNum,
+      applicants: {
+        phoneNumber: this.getApplicant?.phoneNumber || '',
+        emailAddress: this.getApplicant?.emailAddress || ''
+      }
+    }))
+    Navigate(getBusinessHomeLoginUrl(window.location.href))
+  }
+
   cleanUpSessionStorage () {
     ['payment', 'paymentInProgress', 'paymentId', 'paymentToken', 'nrId'].forEach(key => sessionStorage.removeItem(key))
   }
diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts
index 102e62571..28538aaa4 100644
--- a/app/src/mixins/payment-mixin.ts
+++ b/app/src/mixins/payment-mixin.ts
@@ -10,7 +10,7 @@ import { StaffPaymentIF, RefundParamsIF, NameRequestI, ErrorI, CreatePaymentPara
   NameRequestPaymentResponse } from '@/interfaces'
 import NamexServices from '@/services/namex-services'
 import { PaymentRequiredError } from '@/errors'
-import { Navigate } from '@/plugins'
+import { isLoggedInWithoutRegistriesAccount, Navigate } from '@/plugins'
 
 const namexApiUrl = sessionStorage.getItem('NAMEX_API_URL')
 
@@ -477,7 +477,9 @@ export class PaymentMixin extends Mixins(ActionMixin) {
     }
 
     const keycloakToken = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken)
-    if (keycloakToken) {
+    // A BCSC or BCeID login with no Registries account pays by credit card as a guest.
+    // Sending the token without Account-Id is what makes that payment fail.
+    if (keycloakToken && !isLoggedInWithoutRegistriesAccount()) {
       headers['Authorization'] = `Bearer ${keycloakToken}`
       headers['Content-Type'] = 'application/json'
     }
diff --git a/app/src/plugins/authHelper.ts b/app/src/plugins/authHelper.ts
index 525f4c063..c4c9a50fc 100644
--- a/app/src/plugins/authHelper.ts
+++ b/app/src/plugins/authHelper.ts
@@ -40,3 +40,18 @@ export function getKeycloakRoles (): Array<string> {
   }
   throw new Error('Error getting Keycloak roles')
 }
+
+/**
+ * True when a BC Services Card or BCeID session exists and auth-api has no Registries account.
+ * Staff are excluded: they pay without a public Registries account.
+ */
+export function isLoggedInWithoutRegistriesAccount (): boolean {
+  const token = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken)
+  if (!token) return false
+  if (sessionStorage.getItem(SessionStorageKeys.CurrentAccount)) return false
+  try {
+    return !getKeycloakRoles().includes('staff')
+  } catch {
+    return true
+  }
+}
diff --git a/app/src/services/auth-services.ts b/app/src/services/auth-services.ts
index dd605dfee..777ca0d04 100644
--- a/app/src/services/auth-services.ts
+++ b/app/src/services/auth-services.ts
@@ -14,8 +14,9 @@ export default class AuthServices {
    * Creates an affiliation for the specified account and NR.
    * Returns response on error.
    */
-  static async createNrAffiliation (accountId: number, nr: any): Promise<any> {
-    const url = `${this.authApiUrl}/orgs/${accountId}/affiliations?newBusiness=true`
+  static async createNrAffiliation (accountId: number, nr: any, newBusiness = true): Promise<any> {
+    const newBusinessParam = newBusiness ? '?newBusiness=true' : ''
+    const url = `${this.authApiUrl}/orgs/${accountId}/affiliations${newBusinessParam}`
     const requestBody: CreateNRAffiliationRequestBody = {
       businessIdentifier: nr.nrNum,
       phone: nr.applicants?.phoneNumber || '',
diff --git a/app/tests/unit/auth-helper.spec.ts b/app/tests/unit/auth-helper.spec.ts
new file mode 100644
index 000000000..003f4e437
--- /dev/null
+++ b/app/tests/unit/auth-helper.spec.ts
@@ -0,0 +1,36 @@
+import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
+import { isLoggedInWithoutRegistriesAccount } from '@/plugins/authHelper'
+
+function tokenWithRoles (roles: string[]): string {
+  const payload = btoa(JSON.stringify({ sub: 'user-1', roles }))
+    .replace(/\+/g, '-')
+    .replace(/\//g, '_')
+    .replace(/=+$/, '')
+  return `header.${payload}.signature`
+}
+
+describe('isLoggedInWithoutRegistriesAccount', () => {
+  beforeEach(() => {
+    sessionStorage.clear()
+  })
+
+  it('is false when there is no Keycloak session', () => {
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(false)
+  })
+
+  it('is false when the session already has a Registries account', () => {
+    sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['public']))
+    sessionStorage.setItem(SessionStorageKeys.CurrentAccount, JSON.stringify({ id: 1 }))
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(false)
+  })
+
+  it('is false for staff, who pay without a public Registries account', () => {
+    sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['staff']))
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(false)
+  })
+
+  it('is true for a BCSC or BCeID login with no Registries account', () => {
+    sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['public']))
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(true)
+  })
+})

From 6107c14486fb5423b10d844243d18c7381cc691b Mon Sep 17 00:00:00 2001
From: Oluwapizzy <adeyinkapaul10@gmail.com>
Date: Mon, 28 Sep 2026 18:30:00 -0400
Subject: [PATCH 3/6] fix: removed non-encrypted entities

---
 app/src/App.vue                               | 19 ++++++-------------
 .../components/dialogs/payment-complete.vue   | 14 ++++++--------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/src/App.vue b/app/src/App.vue
index 142d62247..ab13ce59f 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -326,12 +326,11 @@ export default class App extends Mixins(
 
   /**
    * After a guest payment, the user may leave to create a Registries account.
-   * When they return with an account, attach the submitted NR to it.
+   * When they return with an account, load the name request and attach it.
    * newBusiness stays false so it doesn't start incorporation.
    */
   private async affiliateNrAfterAccountCreation (): Promise<void> {
-    const raw = sessionStorage.getItem('PENDING_NR_AFFILIATION')
-    if (!raw) return
+    if (sessionStorage.getItem('PENDING_NR_AFFILIATION') !== 'true') return
 
     let accountId = 0
     try {
@@ -341,18 +340,12 @@ export default class App extends Mixins(
     }
     if (!accountId) return
 
-    let nr
-    try {
-      nr = JSON.parse(raw)
-    } catch (error) {
-      sessionStorage.removeItem('PENDING_NR_AFFILIATION')
-      console.error('affiliateNrAfterAccountCreation =', error) // eslint-disable-line no-console
-      return
-    }
-
     sessionStorage.removeItem('PENDING_NR_AFFILIATION')
     try {
-      await AuthServices.createNrAffiliation(accountId, nr, false)
+      const nr = await NamexServices.getNameRequest(false)
+      if (!nr?.nrNum) return
+      const applicants = Array.isArray(nr.applicants) ? nr.applicants[0] : nr.applicants
+      await AuthServices.createNrAffiliation(accountId, { nrNum: nr.nrNum, applicants }, false)
     } catch (error) {
       console.error('affiliateNrAfterAccountCreation =', error) // eslint-disable-line no-console
     }
diff --git a/app/src/components/dialogs/payment-complete.vue b/app/src/components/dialogs/payment-complete.vue
index fdaa8a5f4..3982406f7 100644
--- a/app/src/components/dialogs/payment-complete.vue
+++ b/app/src/components/dialogs/payment-complete.vue
@@ -191,15 +191,13 @@ export default class PaymentCompleteDialog extends Mixins(
     this.showCompleteAccount = false
   }
 
-  /** Sends the user to Business Home account creation and affiliates the NR when they return. */
+  /**
+   * Sends the user to Business Home account creation.
+   * Phone and email stay out of this flag. On return, the name request is loaded
+   * again with the guest lookup the app already uses.
+   */
   completeAccountRegistration (): void {
-    sessionStorage.setItem('PENDING_NR_AFFILIATION', JSON.stringify({
-      nrNum: this.getNrNum,
-      applicants: {
-        phoneNumber: this.getApplicant?.phoneNumber || '',
-        emailAddress: this.getApplicant?.emailAddress || ''
-      }
-    }))
+    sessionStorage.setItem('PENDING_NR_AFFILIATION', 'true')
     Navigate(getBusinessHomeLoginUrl(window.location.href))
   }
 

From 3ccf4a463b4fb3129bf6f7c90cae30561d99dc42 Mon Sep 17 00:00:00 2001
From: Oluwapizzy <adeyinkapaul10@gmail.com>
Date: Mon, 28 Sep 2026 18:31:25 -0400
Subject: [PATCH 4/6] fix: removed non-encrypted entities

---
 app/src/components/dialogs/payment-complete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/components/dialogs/payment-complete.vue b/app/src/components/dialogs/payment-complete.vue
index 3982406f7..f8a3bc9d8 100644
--- a/app/src/components/dialogs/payment-complete.vue
+++ b/app/src/components/dialogs/payment-complete.vue
@@ -193,7 +193,7 @@ export default class PaymentCompleteDialog extends Mixins(
 
   /**
    * Sends the user to Business Home account creation.
-   * Phone and email stay out of this flag. On return, the name request is loaded
+   * On return, the name request is loaded
    * again with the guest lookup the app already uses.
    */
   completeAccountRegistration (): void {

From d1028d6dfdf963c42785bdc36ba89b90a6f5b647 Mon Sep 17 00:00:00 2001
From: Oluwapizzy <adeyinkapaul10@gmail.com>
Date: Tue, 29 Sep 2026 06:14:45 -0400
Subject: [PATCH 5/6] fix: added helper func for null or undefined header check

---
 app/src/mixins/payment-mixin.ts    |  8 ++++++--
 app/src/plugins/authHelper.ts      | 18 +++++++++++++++++-
 app/tests/unit/auth-helper.spec.ts | 12 ++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/src/mixins/payment-mixin.ts b/app/src/mixins/payment-mixin.ts
index 28538aaa4..a21fb54ac 100644
--- a/app/src/mixins/payment-mixin.ts
+++ b/app/src/mixins/payment-mixin.ts
@@ -486,8 +486,12 @@ export class PaymentMixin extends Mixins(ActionMixin) {
 
     const currentAccount = sessionStorage.getItem(SessionStorageKeys.CurrentAccount)
     if (currentAccount) {
-      const parsedAccountInfo = JSON.parse(currentAccount)
-      headers['Account-Id'] = parsedAccountInfo.id
+      try {
+        const accountId = JSON.parse(currentAccount)?.id
+        if (accountId) headers['Account-Id'] = accountId
+      } catch {
+        // Header stores "" or "undefined" when the login has no Registries account.
+      }
     }
 
     return headers
diff --git a/app/src/plugins/authHelper.ts b/app/src/plugins/authHelper.ts
index c4c9a50fc..a394e9558 100644
--- a/app/src/plugins/authHelper.ts
+++ b/app/src/plugins/authHelper.ts
@@ -41,6 +41,22 @@ export function getKeycloakRoles (): Array<string> {
   throw new Error('Error getting Keycloak roles')
 }
 
+/**
+ * True when session storage holds a Registries account id.
+ * The header writes CURRENT_ACCOUNT as "" when auth-api returns no account.
+ * That value is not an account.
+ */
+function hasRegistriesAccount (): boolean {
+  const raw = sessionStorage.getItem(SessionStorageKeys.CurrentAccount)
+  if (!raw || raw === 'undefined' || raw === 'null') return false
+  try {
+    const account = JSON.parse(raw)
+    return !!(account && typeof account === 'object' && account.id)
+  } catch {
+    return false
+  }
+}
+
 /**
  * True when a BC Services Card or BCeID session exists and auth-api has no Registries account.
  * Staff are excluded: they pay without a public Registries account.
@@ -48,7 +64,7 @@ export function getKeycloakRoles (): Array<string> {
 export function isLoggedInWithoutRegistriesAccount (): boolean {
   const token = sessionStorage.getItem(SessionStorageKeys.KeyCloakToken)
   if (!token) return false
-  if (sessionStorage.getItem(SessionStorageKeys.CurrentAccount)) return false
+  if (hasRegistriesAccount()) return false
   try {
     return !getKeycloakRoles().includes('staff')
   } catch {
diff --git a/app/tests/unit/auth-helper.spec.ts b/app/tests/unit/auth-helper.spec.ts
index 003f4e437..4257fd66c 100644
--- a/app/tests/unit/auth-helper.spec.ts
+++ b/app/tests/unit/auth-helper.spec.ts
@@ -33,4 +33,16 @@ describe('isLoggedInWithoutRegistriesAccount', () => {
     sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['public']))
     expect(isLoggedInWithoutRegistriesAccount()).toBe(true)
   })
+
+  it('is true when the header stored an empty account', () => {
+    sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['public']))
+    sessionStorage.setItem(SessionStorageKeys.CurrentAccount, JSON.stringify(''))
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(true)
+  })
+
+  it('is true when the stored account has no id', () => {
+    sessionStorage.setItem(SessionStorageKeys.KeyCloakToken, tokenWithRoles(['public']))
+    sessionStorage.setItem(SessionStorageKeys.CurrentAccount, JSON.stringify({}))
+    expect(isLoggedInWithoutRegistriesAccount()).toBe(true)
+  })
 })

From 0a3ce250e6543bb35a18a1200e07ad9e3bc5c246 Mon Sep 17 00:00:00 2001
From: stevenc987 <steven.chen@gov.bc.ca>
Date: Tue, 29 Sep 2026 16:37:33 +0000
Subject: [PATCH 6/6] 35053-Investigate and Fix: Name Request UI - Estimated
 review date Incorrect

Signed-off-by: stevenc987 <steven.chen@gov.bc.ca>
---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index a309bb90d..36868bd53 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "name-request",
-  "version": "5.10.6",
+  "version": "5.10.7",
   "private": true,
   "engines": {
     "node": ">=24"