ref: genericize EndPageBlock

opengovsg · Apr 3, 2024 · 017cfb3 · 017cfb3
1 parent 7342138
commit 017cfb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx b/frontend/src/features/public-form/components/FormEndPage/FormEndPage.tsx
@@ -44,7 +44,7 @@ export const FormEndPage = ({
             focusOnMount
             {...endPageProps}
             colorTheme={colorTheme}
-            previousSubmissionId={previousSubmissionId}
+            isButtonHidden={!!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
@@ -16,7 +16,7 @@ export interface EndPageBlockProps {
   submissionData: SubmissionData
   colorTheme?: FormColorTheme
   focusOnMount?: boolean
-  previousSubmissionId?: string
+  isButtonHidden?: boolean
 }
 
 export const EndPageBlock = ({
@@ -25,7 +25,7 @@ export const EndPageBlock = ({
   submissionData,
   colorTheme = FormColorTheme.Blue,
   focusOnMount,
-  previousSubmissionId,
+  isButtonHidden,
 }: EndPageBlockProps): JSX.Element => {
   const focusRef = useRef<HTMLDivElement>(null)
   useEffect(() => {
@@ -55,8 +55,6 @@ export const EndPageBlock = ({
     return 'You have successfully submitted your response.'
   }, [formTitle])
 
-  const disableSubmitResponseButton = !!previousSubmissionId //disable for MRF 2nd respondent onwards
-
   return (
     <>
       <Box ref={focusRef}>
@@ -84,7 +82,7 @@ export const EndPageBlock = ({
           </Text>
         </Box>
         <Box mt="2.25rem">
-          {disableSubmitResponseButton || (
+          {isButtonHidden || (
             <Button
               as="a"
               href={endPage.buttonLink || window.location.href}