Merge pull request #7919 from opengovsg/release_v6.164.0

build: release v6.164.0

CHANGELOG.md

@@ -4,8 +4,17 @@ 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.164.0](https://github.com/opengovsg/FormSG/compare/v6.163.0...v6.164.0)
+
+- feat(approvals-ga): p1 changes   [`#7918`](https://github.com/opengovsg/FormSG/pull/7918)
+- build: merge release v6.163.0 to develop [`#7916`](https://github.com/opengovsg/FormSG/pull/7916)
+- fix: fixed cursor appearance for inactive logic block [`#7917`](https://github.com/opengovsg/FormSG/pull/7917)
+- build: release v6.163.0 [`#7914`](https://github.com/opengovsg/FormSG/pull/7914)
+
 #### [v6.163.0](https://github.com/opengovsg/FormSG/compare/v6.162.0...v6.163.0)
 
+> 19 November 2024
+
 - chore: update package-lock [`#7907`](https://github.com/opengovsg/FormSG/pull/7907)
 - fix(deps): bump nodemailer and @types/nodemailer [`#7891`](https://github.com/opengovsg/FormSG/pull/7891)
 - chore(deps-dev): bump lint-staged from 15.2.7 to 15.2.10 [`#7899`](https://github.com/opengovsg/FormSG/pull/7899)
@@ -20,9 +29,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: remove jest-axios-mock, jest-localstorage-mock [`#7893`](https://github.com/opengovsg/FormSG/pull/7893)
 - fix(mail): failure to render mail [`#7890`](https://github.com/opengovsg/FormSG/pull/7890)
 - fix: replace trash icon in MRF steps [`#7885`](https://github.com/opengovsg/FormSG/pull/7885)
+- chore: bump version to v6.163.0 [`7fa5e57`](https://github.com/opengovsg/FormSG/commit/7fa5e57727d21b2e99bab86200493b6e4e585215)
 - chore: bump version to v6.162.0 [`c1b4ecf`](https://github.com/opengovsg/FormSG/commit/c1b4ecf2c9840c5be8af44e791145bb43b1447d0)
 - update trash icon to pencil icon, remove delete functionality in InactiveStepBlock [`ae4db1d`](https://github.com/opengovsg/FormSG/commit/ae4db1d772781b6733deba75eae8442bcd4e33df)
-- removed edit function on entire step box [`7394d00`](https://github.com/opengovsg/FormSG/commit/7394d007a3fa8a92bbf8f2e04f584b57351a35ab)
 
 #### [v6.162.0](https://github.com/opengovsg/FormSG/compare/v6.161.0...v6.162.0)
 

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-frontend",
-  "version": "6.163.0",
+  "version": "6.164.0",
   "homepage": ".",
   "type": "module",
   "private": true,

frontend/src/components/Toggle/Toggle.tsx

@@ -5,15 +5,15 @@ import {
   Flex,
   forwardRef,
   Icon,
-  Tooltip,
-  TooltipProps,
   useMultiStyleConfig,
 } from '@chakra-ui/react'
 
 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'
 

frontend/src/features/admin-form/create/logic/components/LogicContent/InactiveLogicBlock/InactiveLogicBlock.tsx

@@ -96,7 +96,7 @@ export const InactiveLogicBlock = ({
         bg="white"
         border="1px solid"
         borderColor="neutral.300"
-        cursor={isPreventEdit ? 'not-allowed' : 'pointer'}
+        cursor={isPreventEdit ? 'not-allowed' : 'auto'}
         aria-disabled={isPreventEdit}
       >
         <Stack

frontend/src/features/admin-form/create/workflow/components/WorkflowContent/InactiveStepBlock/InactiveStepBlock.tsx

@@ -132,10 +132,9 @@ export const InactiveStepBlock = ({
         borderColor="neutral.300"
         transitionProperty="common"
         transitionDuration="normal"
-        cursor={isPreventEdit ? 'not-allowed' : 'pointer'}
+        cursor={isPreventEdit ? 'not-allowed' : 'auto'}
         disabled={isPreventEdit}
         aria-disabled={isPreventEdit}
-        pointerEvents="none"
       >
         <Stack spacing="1.5rem" p={{ base: '1.5rem', md: '2rem' }}>
           <StepLabel stepNumber={stepNumber} />

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()}
       />

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}

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.`,
         })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "6.163.0",
+  "version": "6.164.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"