From 6684b55e49c0bbb32b4c8746deb81291a02cd8f8 Mon Sep 17 00:00:00 2001
From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:21:59 +0800
Subject: [PATCH 1/4] fix: update report copy

---
 .../settings/components/FormIssueNotificationToggle.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx b/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx
index 2ba9e21dd0..08c96687f9 100644
--- a/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx
+++ b/frontend/src/features/admin-form/settings/components/FormIssueNotificationToggle.tsx
@@ -26,7 +26,7 @@ export const FormIssueNotificationToggle = (): JSX.Element => {
       <Toggle
         isLoading={mutateFormIssueNotification.isLoading}
         isChecked={hasIssueNotification}
-        label="Enable email notifications for reports made by respondents"
+        label="Receive email notifications for issues reported by respondents"
         description="You will receive a maximum of one email per form, per day if there are any issues reported."
         onChange={() => handleToggleIssueNotification()}
       />

From 827845a5d5d0dfdd0253cf66c1853707b0eb121c Mon Sep 17 00:00:00 2001
From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:24:33 +0800
Subject: [PATCH 2/4] fix: use own tooltip component

---
 frontend/src/components/Toggle/Toggle.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Toggle/Toggle.tsx b/frontend/src/components/Toggle/Toggle.tsx
index 46b8e93c04..c7c2984a0d 100644
--- a/frontend/src/components/Toggle/Toggle.tsx
+++ b/frontend/src/components/Toggle/Toggle.tsx
@@ -5,8 +5,6 @@ import {
   Flex,
   forwardRef,
   Icon,
-  Tooltip,
-  TooltipProps,
   useMultiStyleConfig,
 } from '@chakra-ui/react'
 
@@ -14,6 +12,8 @@ import { TOGGLE_THEME_KEY } from '~/theme/components/Toggle'
 
 import { BxsHelpCircle } from '~assets/icons/BxsHelpCircle'
 import { BxsInfoCircle } from '~assets/icons/BxsInfoCircle'
+import Tooltip from '~components/Tooltip'
+import { TooltipProps } from '~components/Tooltip/Tooltip'
 
 import FormLabel from '../FormControl/FormLabel'
 

From 4b73106b9ca0bb9b227c02bd0364b82ca4e6e56e Mon Sep 17 00:00:00 2001
From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:36:18 +0800
Subject: [PATCH 3/4] fix: change toast for report

---
 frontend/src/features/admin-form/settings/mutations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/features/admin-form/settings/mutations.ts b/frontend/src/features/admin-form/settings/mutations.ts
index f532b78669..f5ee9eb74c 100644
--- a/frontend/src/features/admin-form/settings/mutations.ts
+++ b/frontend/src/features/admin-form/settings/mutations.ts
@@ -173,7 +173,7 @@ export const useMutateFormSettings = () => {
       onSuccess: (newData) => {
         handleSuccess({
           newData,
-          toastDescription: `Email notifications for reports are now ${
+          toastDescription: `Email notifications for issues reported are now ${
             newData.hasIssueNotification ? 'enabled' : 'disabled'
           } on your form.`,
         })

From 4cc796cd4801fe9b84abb55270f45f832899ead5 Mon Sep 17 00:00:00 2001
From: Kevin Foong <55353265+kevin9foong@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:46:57 +0800
Subject: [PATCH 4/4] feat: update mrf email notif copy

---
 .../settings/components/MrfFormEmailSection.tsx      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx b/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx
index f6f14cf8e3..08ee76cf05 100644
--- a/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx
+++ b/frontend/src/features/admin-form/settings/components/MrfFormEmailSection.tsx
@@ -143,16 +143,12 @@ const MrfEmailNotificationsForm = ({
   return (
     <form onSubmit={handleSubmit(onSubmit)}>
       <Box>
-        <Text textStyle="h3" textColor="secondary.500" mb="0.25rem">
-          Workflow outcome notifications
-        </Text>
         <Text textStyle="body-1" textColor="secondary.700" mb="1.5rem">
-          Send an email to inform selected respondents when the form and/or
-          workflow is complete.
+          Select who to notify when the form and/or workflow is complete:
         </Text>
         <Box>
           <FormLabel mb="0.75rem" textColor="secondary.700">
-            Notify respondent in Step 1
+            Respondent in Step 1
           </FormLabel>
           <Skeleton isLoaded={!isLoading}>
             <Controller
@@ -177,7 +173,7 @@ const MrfEmailNotificationsForm = ({
         </Box>
         <Box my="1.5rem">
           <FormLabel mb="0.75rem" textColor="secondary.700">
-            Notify other respondents in your workflow
+            Other respondents in your workflow
           </FormLabel>
           <Skeleton isLoaded={!isLoading}>
             <Controller
@@ -219,7 +215,7 @@ const MrfEmailNotificationsForm = ({
             tooltipPlacement="top"
             tooltipText="Include the admin's email to inform them whenever a workflow is completed"
           >
-            Notify other parties
+            Others
           </FormLabel>
           <Controller
             name={OTHER_PARTIES_EMAIL_INPUT_NAME}