Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(approvals-ga): p1 changes #7918

Merged
merged 4 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/Toggle/Toggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/features/admin-form/settings/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.`,
})
Expand Down
Loading