diff --git a/src/components/bcros/filing/CommonTemplate.vue b/src/components/bcros/filing/CommonTemplate.vue index c6d8fa62..1a98cf34 100644 --- a/src/components/bcros/filing/CommonTemplate.vue +++ b/src/components/bcros/filing/CommonTemplate.vue @@ -38,7 +38,6 @@ -
@@ -107,7 +106,10 @@ if (filing.value.commentsCount && filing.value.commentsLink) { const isStatusPaid = computed(() => isFilingStatus(filing.value, FilingStatusE.PAID)) const isStatusApproved = computed(() => isFilingStatus(filing.value, FilingStatusE.APPROVED)) -const isShowBody = ref(false) + +const url = useRequestURL() +const expandedFilingId = url.searchParams.get('filing_id') +const isShowBody = ref(expandedFilingId && expandedFilingId === filing?.value?.filingId?.toString()) const showDetails = () => { if (filing.value.documents === undefined && filing.value.documentsLink) { diff --git a/src/components/bcros/filing/item/AmalgamationFiling.vue b/src/components/bcros/filing/item/AmalgamationFiling.vue index 3ffee604..ddf6fed9 100644 --- a/src/components/bcros/filing/item/AmalgamationFiling.vue +++ b/src/components/bcros/filing/item/AmalgamationFiling.vue @@ -10,14 +10,19 @@
{{ $t('text.filing.amalgamation.complete') }} -

{{ currentBusinessName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}.

+

+ {{ currentBusinessName || bootstrapName }} {{ $t('text.filing.amalgamation.successfullyAmalgamated') }}. +

-

{{ $t('text.filing.amalgamation.systemCompletedProcessing') }}

+

+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }} +

@@ -40,5 +45,5 @@ const props = defineProps({ filing: { type: Object as PropType, required: true } }) -const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER') +const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap()) diff --git a/src/components/bcros/filing/item/ContinuationIn.vue b/src/components/bcros/filing/item/ContinuationIn.vue index 7cc1fdc3..7379d6a2 100644 --- a/src/components/bcros/filing/item/ContinuationIn.vue +++ b/src/components/bcros/filing/item/ContinuationIn.vue @@ -31,10 +31,14 @@
-
+
{{ $t('text.filing.continuation.incorporationComplete') }} -

{{ currentBusinessName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }}

-

{{ $t('text.filing.common.systemCompletedProcessingFiling') }}

+

+ {{ currentBusinessName || bootstrapName }} {{ $t('text.filing.continuation.hasBeenSuccessfullyContinuedIn') }} +

+

+ {{ $t('text.filing.common.systemCompletedProcessingFiling') }} +

@@ -54,5 +58,5 @@ const props = defineProps({ const isStatusRejected = isFilingStatus(props.filing, FilingStatusE.REJECTED) const isStatusCompleted = isFilingStatus(props.filing, FilingStatusE.COMPLETED) -const tempRegNumber = !!sessionStorage.getItem('TEMP_REG_NUMBER') +const { isBootstrapFiling, bootstrapName } = storeToRefs(useBcrosBusinessBootstrap()) diff --git a/src/components/bcros/filing/item/IncorporationApplication.vue b/src/components/bcros/filing/item/IncorporationApplication.vue index e264fa19..9f54b004 100644 --- a/src/components/bcros/filing/item/IncorporationApplication.vue +++ b/src/components/bcros/filing/item/IncorporationApplication.vue @@ -11,15 +11,17 @@