From a343824667585d919db99dcb1bcab661bd1d5d80 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Thu, 8 Aug 2024 02:36:49 -0700
Subject: [PATCH 1/5] Update styling for buttons

---
 strr-web/app.config.ts                               | 4 +++-
 strr-web/components/bcros/status-card/StatusCard.vue | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/strr-web/app.config.ts b/strr-web/app.config.ts
index cb425010..a51d7e53 100644
--- a/strr-web/app.config.ts
+++ b/strr-web/app.config.ts
@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 export default defineAppConfig({
   ui: {
     primary: 'blue',
@@ -7,7 +8,8 @@ export default defineAppConfig({
       variant: {
         solid: 'hover:bg-opacity-[.92] hover:bg-{color}-500',
         editButton: 'text-primary border-0 border-r-2 border-gray focus-visible:ring-2 focus-visible:ring-primary',
-        removeButton: 'text-primary border-0 focus-visible:ring-2 focus-visible:ring-primary'
+        removeButton: 'text-primary border-0 focus-visible:ring-2 focus-visible:ring-primary',
+        ghost: 'focus-visible:ring-0 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary'
       }
     },
     formGroup: {
diff --git a/strr-web/components/bcros/status-card/StatusCard.vue b/strr-web/components/bcros/status-card/StatusCard.vue
index c7cb8d1f..5a1b36b8 100644
--- a/strr-web/components/bcros/status-card/StatusCard.vue
+++ b/strr-web/components/bcros/status-card/StatusCard.vue
@@ -20,7 +20,7 @@
       <BcrosButtonsPrimary
         :action="() => navigateTo(`/application-details/${applicationId}`, { open: { target: '_blank' } })"
         :label="tRegistrationStatus('view')"
-        class-name="px-4 py-1"
+        class-name="px-4 py-1 mobile:grow-0"
         variant="ghost"
       />
 
@@ -28,7 +28,7 @@
         v-if="isCertificateIssued"
         :action="() => downloadCertificate(applicationId.toString())"
         :label="tRegistrationStatus('download')"
-        class-name="px-4 py-1"
+        class-name="px-4 py-1 mobile:grow-0"
         variant="ghost"
       />
     </div>

From 0acf039ae786a516cfa0dec46cfd702ee932eb8d Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Thu, 8 Aug 2024 14:00:39 -0700
Subject: [PATCH 2/5] Add Applications Count to Dashboard

---
 strr-web/enums/application-status-e.ts  |  8 ++++----
 strr-web/enums/registration-status-e.ts | 10 +++++-----
 strr-web/lang/en.json                   |  2 +-
 strr-web/layouts/wideGutters.vue        | 13 -------------
 strr-web/package.json                   |  2 +-
 strr-web/pages/application-status.vue   | 15 +++++++++------
 6 files changed, 20 insertions(+), 30 deletions(-)
 delete mode 100644 strr-web/layouts/wideGutters.vue

diff --git a/strr-web/enums/application-status-e.ts b/strr-web/enums/application-status-e.ts
index 4d28a6fb..a3da60cf 100644
--- a/strr-web/enums/application-status-e.ts
+++ b/strr-web/enums/application-status-e.ts
@@ -2,9 +2,9 @@ export enum ApplicationStatusE {
   DRAFT = 'DRAFT',
   SUBMITTED = 'SUBMITTED',
   PAID = 'PAID',
-  APPROVED = 'APPROVED',
-  ADDITIONAL_INFO_REQUESTED = 'ADDITIONAL_INFO_REQUESTED',
   UNDER_REVIEW = 'UNDER_REVIEW',
-  REJECTED = 'REJECTED',
-  PROVISIONAL = 'PROVISIONAL'
+  ADDITIONAL_INFO_REQUESTED = 'ADDITIONAL_INFO_REQUESTED',
+  APPROVED = 'APPROVED',
+  PROVISIONAL = 'PROVISIONAL',
+  REJECTED = 'REJECTED'
 }
diff --git a/strr-web/enums/registration-status-e.ts b/strr-web/enums/registration-status-e.ts
index a401f47d..cb501f1d 100644
--- a/strr-web/enums/registration-status-e.ts
+++ b/strr-web/enums/registration-status-e.ts
@@ -1,10 +1,10 @@
 export enum RegistrationStatusE {
-  DENIED = 'DENIED',
-  APPROVED = 'APPROVED',
-  ISSUED = 'ISSUED',
-  REJECTED = 'REJECTED',
+  SUBMITTED = 'SUBMITTED',
   PENDING = 'PENDING',
   UNDER_REVIEW = 'UNDER_REVIEW',
   MORE_INFO_NEEDED = 'MORE_INFO_NEEDED',
-  SUBMITTED = 'SUBMITTED'
+  APPROVED = 'APPROVED',
+  ISSUED = 'ISSUED',
+  REJECTED = 'REJECTED',
+  DENIED = 'DENIED'
 }
diff --git a/strr-web/lang/en.json b/strr-web/lang/en.json
index 0afcd091..0a123650 100644
--- a/strr-web/lang/en.json
+++ b/strr-web/lang/en.json
@@ -131,7 +131,7 @@
     "applied": "APPLIED",
     "provisional": "PROVISIONAL",
     "create": "Create New Registration",
-    "myRegApplication": "My Registration Application",
+    "myRegApplication": "My Registration Applications",
     "title": "My STR Registry Dashboard",
     "view": "View",
     "download": "Download Certificate",
diff --git a/strr-web/layouts/wideGutters.vue b/strr-web/layouts/wideGutters.vue
deleted file mode 100644
index d8a27c51..00000000
--- a/strr-web/layouts/wideGutters.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <div data-cy="default-layout">
-    <div class="flex justify-between flex-col min-h-screen">
-      <BcrosHeader />
-      <div class="flex grow justify-center">
-        <div class="grow px-4 pt-[75px] mobile:pt-[20px] max-w-[1360px]">
-          <NuxtPage />
-        </div>
-      </div>
-      <BcrosFooter :extra-space="false" />
-    </div>
-  </div>
-</template>
diff --git a/strr-web/package.json b/strr-web/package.json
index c20cd66f..6f675011 100644
--- a/strr-web/package.json
+++ b/strr-web/package.json
@@ -14,7 +14,7 @@
     "lint:fix": "eslint --cache --ext '.ts,.vue' . --max-warnings 0 --fix",
     "preview": "nuxt preview",
     "postinstall": "nuxt prepare",
-    "test": "vitest run --coverage && cp ./coverage/cobertura-coverage.xml ./coverage.xml",
+    "test": "vitest run",
     "test:cov": "vitest run --coverage && cp ./coverage/cobertura-coverage.xml ./coverage.xml",
     "test:e2e": "cypress open",
     "test:e2e:firefox": "cypress run firefox",
diff --git a/strr-web/pages/application-status.vue b/strr-web/pages/application-status.vue
index 79a0e887..14afc645 100644
--- a/strr-web/pages/application-status.vue
+++ b/strr-web/pages/application-status.vue
@@ -3,11 +3,14 @@
     <BcrosTypographyH1
       :text="tRegistrationStatus('title')"
       data-cy="accountPageTitle"
-      class-name="mobile:mx-[8px] pb-[32px] mobile:pb-[24px]"
+      class-name="pb-[32px] mobile:pb-[24px]"
     />
     <div>
-      <div class="px-[8px] flex flex-row justify-between">
-        <BcrosTypographyH2 :text="tRegistrationStatus('myRegApplication')" class-name="mobile:pt-[0px]" />
+      <div class="flex flex-row justify-between">
+        <BcrosTypographyH2
+          :text="`${tRegistrationStatus('myRegApplication')} (${applicationsCount})`"
+          class-name="mobile:pt-[0px]"
+        />
         <BcrosButtonsPrimary
           :label="tRegistrationStatus('create')"
           :action="() => navigateTo('/create-account')"
@@ -70,7 +73,7 @@
         </div>
       </div>
     </div>
-    <div class="w-full h-[120px] bg-white desktop:hidden flex justify-center items-center p-[8px]">
+    <div class="w-full h-[120px] desktop:hidden flex justify-center items-center">
       <BcrosButtonsPrimary
         :label="tRegistrationStatus('create')"
         :action="() => navigateTo('/create-account')"
@@ -84,7 +87,7 @@
 import { ApplicationI } from '~/interfaces/application-i'
 
 definePageMeta({
-  layout: 'wide-gutters'
+  layout: 'wide-no-space'
 })
 
 const tRegistrationStatus = (translationKey: string) => useTranslation().t(`registrationStatus.${translationKey}`)
@@ -93,5 +96,5 @@ const { getApplications } = useApplications()
 const { getChipFlavour } = useChipFlavour()
 const applications = ref<(ApplicationI | undefined)[]>()
 applications.value = await getApplications()
-
+const applicationsCount = applications.value?.length || 0
 </script>

From e77f984953d62208b742751d4627cef6a4f05db0 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Thu, 8 Aug 2024 14:11:49 -0700
Subject: [PATCH 3/5] Use new composables for Translations

---
 strr-web/components/bcros/banner/banner.vue                   | 2 +-
 .../bcros/existing-accounts-list/ExistingAccountsList.vue     | 2 +-
 strr-web/components/bcros/fee-widget/FeeWidget.vue            | 2 +-
 strr-web/components/bcros/footer/Footer.vue                   | 2 +-
 strr-web/components/bcros/form-section/FormSection.vue        | 2 +-
 .../bcros/form-section/contact-information/ContactDetails.vue | 2 +-
 .../bcros/form-section/contact-information/ContactInfo.vue    | 2 +-
 .../bcros/form-section/contact-information/CraInfo.vue        | 2 +-
 .../bcros/form-section/contact-information/Form.vue           | 2 +-
 .../bcros/form-section/contact-information/MailingAddress.vue | 2 +-
 .../bcros/form-section/principal-residence/Form.vue           | 2 +-
 strr-web/components/bcros/form-section/property/Address.vue   | 2 +-
 strr-web/components/bcros/form-section/property/Details.vue   | 2 +-
 strr-web/components/bcros/form-section/property/Form.vue      | 2 +-
 .../components/bcros/form-section/property/ListingDetails.vue | 2 +-
 strr-web/components/bcros/form-section/review/Declaration.vue | 2 +-
 strr-web/components/bcros/form-section/review/Form.vue        | 2 +-
 strr-web/components/bcros/form-section/review/Subsection.vue  | 2 +-
 strr-web/components/bcros/header/Header.vue                   | 2 +-
 strr-web/components/bcros/status-card/StatusCard.vue          | 2 +-
 strr-web/components/bcros/stepper/Stepper.vue                 | 2 +-
 strr-web/components/bcros/stepper/StepperFooter.vue           | 2 +-
 strr-web/composables/useChipFlavour.ts                        | 2 +-
 strr-web/package.json                                         | 2 +-
 strr-web/pages/account-select.vue                             | 2 +-
 .../[applicationId]/auto-approval/index.vue                   | 2 +-
 strr-web/pages/application-details/[applicationId]/index.vue  | 2 +-
 .../pages/application-details/[applicationId]/ltsa/index.vue  | 2 +-
 strr-web/pages/create-account-pre/[id].vue                    | 2 +-
 strr-web/pages/create-account.vue                             | 2 +-
 strr-web/pages/finalization.vue                               | 2 +-
 strr-web/pages/listing-details/[listingId].vue                | 2 +-
 strr-web/pages/registry-dashboard.vue                         | 2 +-
 strr-web/pages/success/[id].vue                               | 2 +-
 .../pages/success/[registrationId]/invoice/[paymentId].vue    | 2 +-
 strr-web/pages/terms-of-service.vue                           | 2 +-
 strr-web/tests/unit/components/chip/Chip.spec.ts              | 2 +-
 .../form-section/contact-information/ContactInfo.spec.ts      | 4 ++--
 .../form-section/contact-information/CraInfo.spec.ts          | 4 ++--
 strr-web/tests/unit/composables/useChipFlavour.spec.ts        | 2 +-
 40 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/strr-web/components/bcros/banner/banner.vue b/strr-web/components/bcros/banner/banner.vue
index 7906f55d..a82b93ee 100644
--- a/strr-web/components/bcros/banner/banner.vue
+++ b/strr-web/components/bcros/banner/banner.vue
@@ -61,7 +61,7 @@
 <script setup lang="ts">
 
 const { hideButtons = true } = defineProps<{ hideButtons?: boolean }>()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tBanner = (text: string) => t(`banner.${text}`)
 const {
   issueRegistration,
diff --git a/strr-web/components/bcros/existing-accounts-list/ExistingAccountsList.vue b/strr-web/components/bcros/existing-accounts-list/ExistingAccountsList.vue
index 03bfab69..eac75cf1 100644
--- a/strr-web/components/bcros/existing-accounts-list/ExistingAccountsList.vue
+++ b/strr-web/components/bcros/existing-accounts-list/ExistingAccountsList.vue
@@ -60,7 +60,7 @@
 import { formState } from '@/stores/strr'
 
 const { accounts } = defineProps<{ accounts: OrgI[] }>()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const { goToCreateAccount, goToCreateSbcAccount } = useBcrosNavigate()
 const { switchCurrentAccount } = useBcrosAccount()
 
diff --git a/strr-web/components/bcros/fee-widget/FeeWidget.vue b/strr-web/components/bcros/fee-widget/FeeWidget.vue
index 8f452c29..57612b2a 100644
--- a/strr-web/components/bcros/fee-widget/FeeWidget.vue
+++ b/strr-web/components/bcros/fee-widget/FeeWidget.vue
@@ -53,7 +53,7 @@
 
 import useScreenSize from '../../../composables/useScreenSize'
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const folded = ref(false)
 const isMobile = ref(false)
 
diff --git a/strr-web/components/bcros/footer/Footer.vue b/strr-web/components/bcros/footer/Footer.vue
index 35305d95..7c34494e 100644
--- a/strr-web/components/bcros/footer/Footer.vue
+++ b/strr-web/components/bcros/footer/Footer.vue
@@ -49,7 +49,7 @@
 
 <script setup lang="ts">
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const version = useRuntimeConfig().public.version
 
 const { extraSpace } = defineProps<{ extraSpace?: boolean }>()
diff --git a/strr-web/components/bcros/form-section/FormSection.vue b/strr-web/components/bcros/form-section/FormSection.vue
index b0e0c515..9eb446a7 100644
--- a/strr-web/components/bcros/form-section/FormSection.vue
+++ b/strr-web/components/bcros/form-section/FormSection.vue
@@ -26,6 +26,6 @@ const { title, optional, divider, className } = defineProps<{
   className?: string
 }>()
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 </script>
diff --git a/strr-web/components/bcros/form-section/contact-information/ContactDetails.vue b/strr-web/components/bcros/form-section/contact-information/ContactDetails.vue
index 7db98b92..41647a66 100644
--- a/strr-web/components/bcros/form-section/contact-information/ContactDetails.vue
+++ b/strr-web/components/bcros/form-section/contact-information/ContactDetails.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const { isPrimary } = defineProps<{
   isPrimary: boolean
diff --git a/strr-web/components/bcros/form-section/contact-information/ContactInfo.vue b/strr-web/components/bcros/form-section/contact-information/ContactInfo.vue
index f3af1da8..f95e5abb 100644
--- a/strr-web/components/bcros/form-section/contact-information/ContactInfo.vue
+++ b/strr-web/components/bcros/form-section/contact-information/ContactInfo.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const {
   isPrimary,
diff --git a/strr-web/components/bcros/form-section/contact-information/CraInfo.vue b/strr-web/components/bcros/form-section/contact-information/CraInfo.vue
index b36c0f34..e9fcf3bc 100644
--- a/strr-web/components/bcros/form-section/contact-information/CraInfo.vue
+++ b/strr-web/components/bcros/form-section/contact-information/CraInfo.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const socialInsuranceNumber = defineModel<string>('socialInsuranceNumber')
 const businessNumber = defineModel<string>('businessNumber')
diff --git a/strr-web/components/bcros/form-section/contact-information/Form.vue b/strr-web/components/bcros/form-section/contact-information/Form.vue
index b98e55e2..cb84e279 100644
--- a/strr-web/components/bcros/form-section/contact-information/Form.vue
+++ b/strr-web/components/bcros/form-section/contact-information/Form.vue
@@ -118,7 +118,7 @@
 
 <script setup lang="ts">
 import { formState } from '@/stores/strr'
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const monthError = ref('')
 
 const {
diff --git a/strr-web/components/bcros/form-section/contact-information/MailingAddress.vue b/strr-web/components/bcros/form-section/contact-information/MailingAddress.vue
index a68ea105..9aa44251 100644
--- a/strr-web/components/bcros/form-section/contact-information/MailingAddress.vue
+++ b/strr-web/components/bcros/form-section/contact-information/MailingAddress.vue
@@ -55,7 +55,7 @@
 <script setup lang="ts">
 import { CountryItem } from '@/interfaces/address-i'
 import countries from '@/utils/countries.json'
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const country = defineModel<string>('country')
 const address = defineModel<string>('address')
diff --git a/strr-web/components/bcros/form-section/principal-residence/Form.vue b/strr-web/components/bcros/form-section/principal-residence/Form.vue
index 1462b29d..6465eb13 100644
--- a/strr-web/components/bcros/form-section/principal-residence/Form.vue
+++ b/strr-web/components/bcros/form-section/principal-residence/Form.vue
@@ -152,7 +152,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tPrincipalResidence = (translationKey: string) => t(`createAccount.principalResidence.${translationKey}`)
 
 const reasonError = ref()
diff --git a/strr-web/components/bcros/form-section/property/Address.vue b/strr-web/components/bcros/form-section/property/Address.vue
index 4a787e35..f8819a1f 100644
--- a/strr-web/components/bcros/form-section/property/Address.vue
+++ b/strr-web/components/bcros/form-section/property/Address.vue
@@ -78,7 +78,7 @@
 <script setup lang="ts">
 import { CountryItem } from '@/interfaces/address-i'
 import countries from '@/utils/countries.json'
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const country = defineModel<string>('country')
 const address = defineModel<string>('address')
diff --git a/strr-web/components/bcros/form-section/property/Details.vue b/strr-web/components/bcros/form-section/property/Details.vue
index 958b9bcc..2abd06ac 100644
--- a/strr-web/components/bcros/form-section/property/Details.vue
+++ b/strr-web/components/bcros/form-section/property/Details.vue
@@ -56,7 +56,7 @@
 
 <script setup lang="ts">
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const propertyType = defineModel<string>('propertyType')
 const ownershipType = defineModel<string>('ownershipType')
diff --git a/strr-web/components/bcros/form-section/property/Form.vue b/strr-web/components/bcros/form-section/property/Form.vue
index 139cdb6d..75502377 100644
--- a/strr-web/components/bcros/form-section/property/Form.vue
+++ b/strr-web/components/bcros/form-section/property/Form.vue
@@ -73,7 +73,7 @@ watch(canadaPostAddress, (newAddress) => {
   }
 })
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const isValid = ref(false)
 const listingURLErrors = ref<(({
diff --git a/strr-web/components/bcros/form-section/property/ListingDetails.vue b/strr-web/components/bcros/form-section/property/ListingDetails.vue
index c0186616..68176b7b 100644
--- a/strr-web/components/bcros/form-section/property/ListingDetails.vue
+++ b/strr-web/components/bcros/form-section/property/ListingDetails.vue
@@ -71,6 +71,6 @@ const emitValidate = (index: number) => {
 
 const listingDetails = defineModel<{ url: string }[]>('listingDetails')
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 </script>
diff --git a/strr-web/components/bcros/form-section/review/Declaration.vue b/strr-web/components/bcros/form-section/review/Declaration.vue
index 983f5b59..8fafa36f 100644
--- a/strr-web/components/bcros/form-section/review/Declaration.vue
+++ b/strr-web/components/bcros/form-section/review/Declaration.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const tReview = (translationKey: string) => t(`createAccount.review.${translationKey}`)
 
diff --git a/strr-web/components/bcros/form-section/review/Form.vue b/strr-web/components/bcros/form-section/review/Form.vue
index c477a6ec..cc9f3adc 100644
--- a/strr-web/components/bcros/form-section/review/Form.vue
+++ b/strr-web/components/bcros/form-section/review/Form.vue
@@ -164,7 +164,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const { secondaryContact, isComplete } = defineProps<{ secondaryContact: boolean, isComplete: boolean }>()
 
diff --git a/strr-web/components/bcros/form-section/review/Subsection.vue b/strr-web/components/bcros/form-section/review/Subsection.vue
index 70a327c3..66d47957 100644
--- a/strr-web/components/bcros/form-section/review/Subsection.vue
+++ b/strr-web/components/bcros/form-section/review/Subsection.vue
@@ -59,7 +59,7 @@
 
 <script setup lang="ts">
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tContact = (translationKey: string) => t(`createAccount.contactForm.${translationKey}`)
 
 const { state, primary } = defineProps<{
diff --git a/strr-web/components/bcros/header/Header.vue b/strr-web/components/bcros/header/Header.vue
index 79125cfe..1568ead8 100644
--- a/strr-web/components/bcros/header/Header.vue
+++ b/strr-web/components/bcros/header/Header.vue
@@ -84,7 +84,7 @@ import hamburgerIcon from '~/assets/icons/hamburger.svg'
 
 const props = defineProps<{ personMode?: boolean }>()
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const {
   goToAccountInfo,
   goToBcrosHome,
diff --git a/strr-web/components/bcros/status-card/StatusCard.vue b/strr-web/components/bcros/status-card/StatusCard.vue
index 5a1b36b8..30540aa3 100644
--- a/strr-web/components/bcros/status-card/StatusCard.vue
+++ b/strr-web/components/bcros/status-card/StatusCard.vue
@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import { AlertsFlavourE, RegistrationStatusE, ApplicationStatusE } from '#imports'
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistrationStatus = (translationKey: string) => t(`registrationStatus.${translationKey}`)
 
 const { getCertificate } = useRegistrations()
diff --git a/strr-web/components/bcros/stepper/Stepper.vue b/strr-web/components/bcros/stepper/Stepper.vue
index 6ea94062..408cdc43 100644
--- a/strr-web/components/bcros/stepper/Stepper.vue
+++ b/strr-web/components/bcros/stepper/Stepper.vue
@@ -92,6 +92,6 @@ const emit = defineEmits<{
   changeStep: [stepIndex: number] // named tuple syntax
 }>()
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 </script>
diff --git a/strr-web/components/bcros/stepper/StepperFooter.vue b/strr-web/components/bcros/stepper/StepperFooter.vue
index 25430a95..4e4d9322 100644
--- a/strr-web/components/bcros/stepper/StepperFooter.vue
+++ b/strr-web/components/bcros/stepper/StepperFooter.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const {
   isFirstStep,
diff --git a/strr-web/composables/useChipFlavour.ts b/strr-web/composables/useChipFlavour.ts
index d31f98f1..3a595a3e 100644
--- a/strr-web/composables/useChipFlavour.ts
+++ b/strr-web/composables/useChipFlavour.ts
@@ -1,5 +1,5 @@
 export const useChipFlavour = () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const tRegistryDashboardStatus = (translationKey: string) => t(`registryDashboard.statusChip.${translationKey}`)
 
   const getChipFlavour = (status: string): StatusChipFlavoursI['flavour'] => {
diff --git a/strr-web/package.json b/strr-web/package.json
index 6f675011..5c3c7b7b 100644
--- a/strr-web/package.json
+++ b/strr-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strr-web",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Short Term Rental Registration UI - Mono repo workspace",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
diff --git a/strr-web/pages/account-select.vue b/strr-web/pages/account-select.vue
index d5002bc8..1551c52b 100644
--- a/strr-web/pages/account-select.vue
+++ b/strr-web/pages/account-select.vue
@@ -20,7 +20,7 @@
 <script setup lang="ts">
 import { AlertsFlavourE } from '#imports'
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 
 const alertFlavour: AlertsFlavourE = AlertsFlavourE.INFO
 
diff --git a/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue b/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue
index 43c9851e..2b10e342 100644
--- a/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue
+++ b/strr-web/pages/application-details/[applicationId]/auto-approval/index.vue
@@ -48,7 +48,7 @@ import { AlertsFlavourE } from '#imports'
 import { AutoApprovalDataI } from '~/interfaces/auto-approval-data-i'
 
 const route = useRoute()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistrationStatus = (translationKey: string) => t(`registrationStatus.${translationKey}`)
 const tApplicationDetails = (translationKey: string) => t(`applicationDetails.${translationKey}`)
 const tAutoApproval = (translationKey: string) => t(`autoApproval.${translationKey}`)
diff --git a/strr-web/pages/application-details/[applicationId]/index.vue b/strr-web/pages/application-details/[applicationId]/index.vue
index d20cab17..b9b67498 100644
--- a/strr-web/pages/application-details/[applicationId]/index.vue
+++ b/strr-web/pages/application-details/[applicationId]/index.vue
@@ -229,7 +229,7 @@
 import { propertyTypeMap } from '~/utils/propertyTypeMap'
 
 const route = useRoute()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistrationStatus = (translationKey: string) => t(`registrationStatus.${translationKey}`)
 const tApplicationDetails = (translationKey: string) => t(`applicationDetails.${translationKey}`)
 const tPropertyForm = (translationKey: string) => t(`createAccount.propertyForm.${translationKey}`)
diff --git a/strr-web/pages/application-details/[applicationId]/ltsa/index.vue b/strr-web/pages/application-details/[applicationId]/ltsa/index.vue
index ab0d3627..7deb5859 100644
--- a/strr-web/pages/application-details/[applicationId]/ltsa/index.vue
+++ b/strr-web/pages/application-details/[applicationId]/ltsa/index.vue
@@ -125,7 +125,7 @@ import { AlertsFlavourE } from '#imports'
 import { LtsaDataI } from '~/interfaces/ltsa-data-i'
 
 const route = useRoute()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistrationStatus = (translationKey: string) => t(`registrationStatus.${translationKey}`)
 const tApplicationDetails = (translationKey: string) => t(`applicationDetails.${translationKey}`)
 const tLtsa = (translationKey: string) => t(`ltsa.${translationKey}`)
diff --git a/strr-web/pages/create-account-pre/[id].vue b/strr-web/pages/create-account-pre/[id].vue
index 66a3bc9c..1ae408e5 100644
--- a/strr-web/pages/create-account-pre/[id].vue
+++ b/strr-web/pages/create-account-pre/[id].vue
@@ -89,7 +89,7 @@ onMounted(() => {
   updateFees()
 })
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const { userFullName, userFirstName, userLastName } = useBcrosAccount()
 
 const toggleAddSecondary = () => {
diff --git a/strr-web/pages/create-account.vue b/strr-web/pages/create-account.vue
index bd672911..e10b555f 100644
--- a/strr-web/pages/create-account.vue
+++ b/strr-web/pages/create-account.vue
@@ -83,7 +83,7 @@ const updateFees = async () => {
   fee.value = await getFeeAmount()
 }
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const { userFullName, userFirstName, userLastName, updateTosAcceptance, me } = useBcrosAccount()
 
 const { createApplication } = useApplications()
diff --git a/strr-web/pages/finalization.vue b/strr-web/pages/finalization.vue
index 4f01cc24..e06fecad 100644
--- a/strr-web/pages/finalization.vue
+++ b/strr-web/pages/finalization.vue
@@ -103,7 +103,7 @@
 <script setup lang="ts">
 import { SbcCreationResponseE } from '~/enums/sbc-creation-response-e'
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tFinalization = (translationKey: string) => t(`finalization.${translationKey}`)
 const { userFullName } = useBcrosAccount()
 const { createSbcRegistration } = useRegistrations()
diff --git a/strr-web/pages/listing-details/[listingId].vue b/strr-web/pages/listing-details/[listingId].vue
index aa0b4768..3bcb1c1c 100644
--- a/strr-web/pages/listing-details/[listingId].vue
+++ b/strr-web/pages/listing-details/[listingId].vue
@@ -50,7 +50,7 @@ import axios from 'axios'
 
 const route = useRoute()
 const fetchedRegistration = ref()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tApplicationConfirm = (translationKey: string) => t(`createAccount.applicationConfirm.${translationKey}`)
 
 const listingId = route.params.listingId
diff --git a/strr-web/pages/registry-dashboard.vue b/strr-web/pages/registry-dashboard.vue
index 2c62cc1a..02b35523 100644
--- a/strr-web/pages/registry-dashboard.vue
+++ b/strr-web/pages/registry-dashboard.vue
@@ -105,7 +105,7 @@
 import { PaginatedRegistrationsI } from '~/interfaces/paginated-registrations-i'
 import { PaginationI } from '~/interfaces/pagination-i'
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistryDashboard = (translationKey: string) => t(`registryDashboard.${translationKey}`)
 const { getChipFlavour } = useChipFlavour()
 
diff --git a/strr-web/pages/success/[id].vue b/strr-web/pages/success/[id].vue
index 867721a1..627023ef 100644
--- a/strr-web/pages/success/[id].vue
+++ b/strr-web/pages/success/[id].vue
@@ -50,7 +50,7 @@ import axios from 'axios'
 
 const route = useRoute()
 const fetchedRegistration = ref()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tApplicationConfirm = (translationKey: string) => t(`createAccount.applicationConfirm.${translationKey}`)
 
 const {
diff --git a/strr-web/pages/success/[registrationId]/invoice/[paymentId].vue b/strr-web/pages/success/[registrationId]/invoice/[paymentId].vue
index 5db6abb6..d92c92a7 100644
--- a/strr-web/pages/success/[registrationId]/invoice/[paymentId].vue
+++ b/strr-web/pages/success/[registrationId]/invoice/[paymentId].vue
@@ -52,7 +52,7 @@
 
 const route = useRoute()
 const fetchedRegistration = ref()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tApplicationConfirm = (translationKey: string) => t(`createAccount.applicationConfirm.${translationKey}`)
 
 const { goToAccountInfo } = useBcrosNavigate()
diff --git a/strr-web/pages/terms-of-service.vue b/strr-web/pages/terms-of-service.vue
index d831a748..3e143178 100644
--- a/strr-web/pages/terms-of-service.vue
+++ b/strr-web/pages/terms-of-service.vue
@@ -24,7 +24,7 @@
 
 <script setup lang="ts">
 
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tTos = (translationKey: string) => t(`tos.${translationKey}`)
 
 const { updateTosAcceptance, acceptTos } = useBcrosAccount()
diff --git a/strr-web/tests/unit/components/chip/Chip.spec.ts b/strr-web/tests/unit/components/chip/Chip.spec.ts
index a0747954..e488d991 100644
--- a/strr-web/tests/unit/components/chip/Chip.spec.ts
+++ b/strr-web/tests/unit/components/chip/Chip.spec.ts
@@ -9,7 +9,7 @@ const i18n = createI18n({
 })
 
 it('can mount Chip component', async () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const { getChipFlavour } = useChipFlavour()
   const tRegistryDashboardStatus = (translationKey: string) => t(`registryDashboard.statusChip.${translationKey}`)
 
diff --git a/strr-web/tests/unit/components/form-section/contact-information/ContactInfo.spec.ts b/strr-web/tests/unit/components/form-section/contact-information/ContactInfo.spec.ts
index cb7ea939..eb98e1cc 100644
--- a/strr-web/tests/unit/components/form-section/contact-information/ContactInfo.spec.ts
+++ b/strr-web/tests/unit/components/form-section/contact-information/ContactInfo.spec.ts
@@ -10,7 +10,7 @@ const i18n = createI18n({
 })
 
 it('can mount primary Contact Form Section component', async () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const contactDetails = await mountSuspended(BcrosFormSectionContactInformationContactInfo,
     {
       global: { plugins: [i18n] },
@@ -21,7 +21,7 @@ it('can mount primary Contact Form Section component', async () => {
 })
 
 it('can mount secondary Contact Form Section component', async () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const contactDetails = await mountSuspended(BcrosFormSectionContactInformationContactInfo,
     {
       global: { plugins: [i18n] },
diff --git a/strr-web/tests/unit/components/form-section/contact-information/CraInfo.spec.ts b/strr-web/tests/unit/components/form-section/contact-information/CraInfo.spec.ts
index 0c48adeb..5aaa30ed 100644
--- a/strr-web/tests/unit/components/form-section/contact-information/CraInfo.spec.ts
+++ b/strr-web/tests/unit/components/form-section/contact-information/CraInfo.spec.ts
@@ -9,7 +9,7 @@ const i18n = createI18n({
 })
 
 it('can mount primary CRA Details Form Section component', async () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const craInfo = await mountSuspended(BcrosFormSectionContactInformationCraInfo,
     {
       global: { plugins: [i18n] },
@@ -20,7 +20,7 @@ it('can mount primary CRA Details Form Section component', async () => {
 })
 
 it('can mount secondary CRA Details Form Section component', async () => {
-  const t = useNuxtApp().$i18n.t
+  const { t } = useTranslation()
   const craInfo = await mountSuspended(BcrosFormSectionContactInformationCraInfo,
     {
       global: { plugins: [i18n] },
diff --git a/strr-web/tests/unit/composables/useChipFlavour.spec.ts b/strr-web/tests/unit/composables/useChipFlavour.spec.ts
index e70b0930..bde07a35 100644
--- a/strr-web/tests/unit/composables/useChipFlavour.spec.ts
+++ b/strr-web/tests/unit/composables/useChipFlavour.spec.ts
@@ -2,7 +2,7 @@
 import { it, expect } from 'vitest'
 
 const { getChipFlavour } = useChipFlavour()
-const t = useNuxtApp().$i18n.t
+const { t } = useTranslation()
 const tRegistryDashboardStatus = (translationKey: string) => t(`registryDashboard.statusChip.${translationKey}`)
 
 it('returns correct value for denied status', () => {

From 7ee102bdca8b8acca7d4091ea551bca21aa7ae68 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Thu, 8 Aug 2024 14:19:51 -0700
Subject: [PATCH 4/5] Update pull-request template

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9dda57a0..f8478da8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,6 @@
-*Issue:*https://github.com/bcgov/entity/issues/
+*Issue:*
+
+- bcgov/entity/issues/
 
 *Description of changes:*
 

From ab87b69ec89323bf841a9496fbc05a067cd097b2 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Thu, 8 Aug 2024 14:24:43 -0700
Subject: [PATCH 5/5] Update confirmation text

---
 strr-web/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strr-web/lang/en.json b/strr-web/lang/en.json
index 0a123650..83b19bb2 100644
--- a/strr-web/lang/en.json
+++ b/strr-web/lang/en.json
@@ -157,7 +157,7 @@
       "submitted": "Application Submitted",
       "altTextConfirm": "Confirmation check mark",
       "submittedForProperty": "Short term registry application submitted for the following property:",
-      "teamWillReview": "Your application will be reviewed by our team and we will email you with next steps.",
+      "teamWillReview": "Your application will be reviewed by our team. Please check your dashboard for your application periodically.",
       "links": "Helpful Links",
       "status": "View your application status",
       "dashboard": "in your dashboard",