diff --git a/api.planx.uk/modules/send/email/index.test.ts b/api.planx.uk/modules/send/email/index.test.ts index 4481c258c1..a50aefe3c0 100644 --- a/api.planx.uk/modules/send/email/index.test.ts +++ b/api.planx.uk/modules/send/email/index.test.ts @@ -118,7 +118,9 @@ describe(`sending an application by email to a planning office`, () => { .expect(200) .then((res) => { expect(res.body).toEqual({ - message: 'Successfully sent "Submit" email', + message: `Successfully sent to email`, + inbox: "planners@southwark.gov.uk", + govuk_notify_template: "Submit", }); }); }); diff --git a/api.planx.uk/modules/send/email/index.ts b/api.planx.uk/modules/send/email/index.ts index 93df80543f..3794eee09f 100644 --- a/api.planx.uk/modules/send/email/index.ts +++ b/api.planx.uk/modules/send/email/index.ts @@ -69,7 +69,9 @@ export async function sendToEmail( ); return res.status(200).send({ - message: `Successfully sent "Submit" email`, + message: `Successfully sent to email`, + inbox: sendToEmail, + govuk_notify_template: "Submit", }); } catch (error) { return next({ diff --git a/api.planx.uk/modules/send/s3/index.ts b/api.planx.uk/modules/send/s3/index.ts index 3f074bd5c7..350fc43629 100644 --- a/api.planx.uk/modules/send/s3/index.ts +++ b/api.planx.uk/modules/send/s3/index.ts @@ -36,7 +36,7 @@ export async function sendToS3( if (!powerAutomateWebhookURL || !powerAutomateAPIKey) { return next({ status: 400, - message: `Send to S3 is not enabled for this local authority (${localAuthority})`, + message: `Upload to S3 is not enabled for this local authority (${localAuthority})`, }); } diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx index 0c329ca55b..25972d2755 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/Submissions/EventsLog.tsx @@ -65,13 +65,13 @@ const EventsLog: React.FC = ({ - + Event Status - + Date @@ -81,8 +81,8 @@ const EventsLog: React.FC = ({ - {submissions.map((submission) => ( - + {submissions.map((submission, i) => ( + ))}
@@ -94,7 +94,7 @@ const CollapsibleRow: React.FC = (submission) => { const [open, setOpen] = useState(false); return ( - + *": { borderBottom: "unset" } }}> = (submission) => { > {submission.eventType === "Pay" ? : } - {submission.eventType} + {submission.eventType} {submission.retry && ` [Retry]`} @@ -116,13 +116,6 @@ const CollapsibleRow: React.FC = (submission) => { ) : ( )} - {submission.retry && ( - - )} {format(new Date(submission.createdAt), "dd/MM/yy hh:mm:ss")}