From 57e56d43cccfee5655f3f5867f1e27dafd509f39 Mon Sep 17 00:00:00 2001
From: Kathleen Koh <kathleen@open.gov.sg>
Date: Wed, 3 Apr 2024 00:16:14 +0800
Subject: [PATCH] fix: correcting submission button bug for MRF

---
 .../public-form/components/FormEndPage/FormEndPage.tsx    | 8 +++++++-
 .../components/FormEndPage/components/EndPageBlock.tsx    | 8 +++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx b/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx
index c3eb632e64..f467587122 100644
--- a/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx
+++ b/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx
@@ -2,7 +2,10 @@ import { Container, Flex, Stack, StackDivider } from '@chakra-ui/react'
 
 import { FormColorTheme, FormDto } from '~shared/types/form'
 
-import { SubmissionData } from '~features/public-form/PublicFormContext'
+import {
+  SubmissionData,
+  usePublicFormContext,
+} from '~features/public-form/PublicFormContext'
 
 import { EndPageBlock } from './components/EndPageBlock'
 import { FeedbackBlock, FeedbackFormInput } from './components/FeedbackBlock'
@@ -23,6 +26,8 @@ export const FormEndPage = ({
   colorTheme,
   ...endPageProps
 }: FormEndPageProps): JSX.Element => {
+  const { previousSubmissionId } = usePublicFormContext()
+
   return (
     <Container w="42.5rem" maxW="100%" p={0}>
       <Flex flexDir="column" align="center">
@@ -39,6 +44,7 @@ export const FormEndPage = ({
             focusOnMount
             {...endPageProps}
             colorTheme={colorTheme}
+            previousSubmissionId={previousSubmissionId}
           />
           {isFeedbackSectionHidden ? null : (
             <FeedbackBlock
diff --git a/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx b/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx
index ae9a09d0df..e982261a76 100644
--- a/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx
+++ b/frontend/src/features/public-form/components/FormEndPage/components/EndPageBlock.tsx
@@ -8,10 +8,7 @@ import { useMdComponents } from '~hooks/useMdComponents'
 import Button from '~components/Button'
 import { MarkdownText } from '~components/MarkdownText'
 
-import {
-  SubmissionData,
-  usePublicFormContext,
-} from '~features/public-form/PublicFormContext'
+import { SubmissionData } from '~features/public-form/PublicFormContext'
 
 export interface EndPageBlockProps {
   formTitle: FormDto['title'] | undefined
@@ -19,6 +16,7 @@ export interface EndPageBlockProps {
   submissionData: SubmissionData
   colorTheme?: FormColorTheme
   focusOnMount?: boolean
+  previousSubmissionId?: string
 }
 
 export const EndPageBlock = ({
@@ -27,6 +25,7 @@ export const EndPageBlock = ({
   submissionData,
   colorTheme = FormColorTheme.Blue,
   focusOnMount,
+  previousSubmissionId,
 }: EndPageBlockProps): JSX.Element => {
   const focusRef = useRef<HTMLDivElement>(null)
   useEffect(() => {
@@ -56,7 +55,6 @@ export const EndPageBlock = ({
     return 'You have successfully submitted your response.'
   }, [formTitle])
 
-  const { previousSubmissionId } = usePublicFormContext()
   const disableSubmitResponseButton = !!previousSubmissionId //disable for MRF 2nd respondent onwards
 
   return (