From 96628aa3b4dd5abae00b429486139431a8b3bf05 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 1/2] fix: correcting submission button bug for MRF

---
 .../components/FormEndPage/FormEndPage.tsx           |  8 +++++++-
 .../FormEndPage/components/EndPageBlock.tsx          | 12 ++++--------
 2 files changed, 11 insertions(+), 9 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..0be32c2a16 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}
+            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
index ae9a09d0df..d141ce524b 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
+  isButtonHidden?: boolean
 }
 
 export const EndPageBlock = ({
@@ -27,6 +25,7 @@ export const EndPageBlock = ({
   submissionData,
   colorTheme = FormColorTheme.Blue,
   focusOnMount,
+  isButtonHidden,
 }: EndPageBlockProps): JSX.Element => {
   const focusRef = useRef<HTMLDivElement>(null)
   useEffect(() => {
@@ -56,9 +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 (
     <>
       <Box ref={focusRef}>
@@ -86,7 +82,7 @@ export const EndPageBlock = ({
           </Text>
         </Box>
         <Box mt="2.25rem">
-          {disableSubmitResponseButton || (
+          {isButtonHidden || (
             <Button
               as="a"
               href={endPage.buttonLink || window.location.href}

From c1c7ac29e6bd8e2c3ab80b2fde22f84b778f1b4f Mon Sep 17 00:00:00 2001
From: Justyn Oh <justynoh@gmail.com>
Date: Wed, 3 Apr 2024 11:05:04 +0800
Subject: [PATCH 2/2] chore: bump version to 6.114.1

---
 CHANGELOG.md               | 9 +++++++++
 frontend/package-lock.json | 4 ++--
 frontend/package.json      | 2 +-
 package-lock.json          | 4 ++--
 package.json               | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2b73ab608..81d3e1218d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v6.114.1](https://github.com/opengovsg/FormSG/compare/v6.114.0...v6.114.1)
+
+- build: release v6.114.0 [`#7226`](https://github.com/opengovsg/FormSG/pull/7226)
+- fix: correcting submission button bug for MRF [`7342138`](https://github.com/opengovsg/FormSG/commit/73421387daf8f3a33c0030a43c81bb11190ee198)
+- ref: genericize EndPageBlock [`017cfb3`](https://github.com/opengovsg/FormSG/commit/017cfb36457cbe293360c963f3d66257e5172907)
+
 #### [v6.114.0](https://github.com/opengovsg/FormSG/compare/v6.113.0...v6.114.0)
 
+> 2 April 2024
+
 - fix: prefill myinfo dropdown field options when faking sample submission data [`#7225`](https://github.com/opengovsg/FormSG/pull/7225)
 - feat(mrf): attachments [`#7181`](https://github.com/opengovsg/FormSG/pull/7181)
 - fix(mrf): design review add workflow page [`#7218`](https://github.com/opengovsg/FormSG/pull/7218)
@@ -55,6 +63,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump the npm_and_yarn group group with 2 updates [`#7151`](https://github.com/opengovsg/FormSG/pull/7151)
 - chore(deps): bump fast-xml-parser, @aws-sdk/client-secrets-manager and @aws-sdk/client-ssm in /functions/form-payment-reconciliation [`#6490`](https://github.com/opengovsg/FormSG/pull/6490)
 - build: release v6.113.0 [`#7148`](https://github.com/opengovsg/FormSG/pull/7148)
+- chore: bump version to v6.114.0 [`993e31e`](https://github.com/opengovsg/FormSG/commit/993e31eabdcd9884933cab15d9fd46acc8705aec)
 
 #### [v6.113.0](https://github.com/opengovsg/FormSG/compare/v6.112.0...v6.113.0)
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c1c1ee0030..7c218095f9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "form-frontend",
-  "version": "6.114.0",
+  "version": "6.114.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "form-frontend",
-      "version": "6.114.0",
+      "version": "6.114.1",
       "hasInstallScript": true,
       "dependencies": {
         "@chakra-ui/react": "^1.8.6",
diff --git a/frontend/package.json b/frontend/package.json
index aadc7cc914..8923259d69 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.114.0",
+  "version": "6.114.1",
   "homepage": ".",
   "private": true,
   "dependencies": {
diff --git a/package-lock.json b/package-lock.json
index bb5df3654d..7daf3683ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "FormSG",
-  "version": "6.114.0",
+  "version": "6.114.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "FormSG",
-      "version": "6.114.0",
+      "version": "6.114.1",
       "hasInstallScript": true,
       "dependencies": {
         "@aws-sdk/client-cloudwatch-logs": "^3.536.0",
diff --git a/package.json b/package.json
index 18f77016a7..e4c87bb64e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.114.0",
+  "version": "6.114.1",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"