Skip to content

Commit

Permalink
Merge branch 'main' of github.com:theopensystemslab/planx-new into je…
Browse files Browse the repository at this point in the history
…ss/remove-feature-map
  • Loading branch information
jessicamcinchak committed Sep 6, 2024
2 parents a54c9b6 + cdfc48d commit 9b48836
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion editor.planx.uk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.10",
"@mui/utils": "^5.15.11",
"@opensystemslab/map": "1.0.0-alpha.3",
"@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#ec52620",
"@opensystemslab/map": "1.0.0-alpha.2",
"@tiptap/core": "^2.4.0",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-bubble-menu": "^2.1.13",
Expand Down
12 changes: 6 additions & 6 deletions editor.planx.uk/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions editor.planx.uk/src/components/Feedback/FeedbackForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const FeedbackForm: React.FC<FormProps> = ({ inputs, handleSubmit }) => {
<Formik initialValues={initialValues} onSubmit={handleSubmit}>
<StyledForm>
<FeedbackDisclaimer>
Do not share personal or financial information in your feedback. If
you do we’ll act according to our{" "}
Don't share any personal or financial information in your feedback. If
you do we will act according to our{" "}
<Link
href="https://www.planx.uk/privacy"
target="_blank"
Expand All @@ -67,10 +67,9 @@ const FeedbackForm: React.FC<FormProps> = ({ inputs, handleSubmit }) => {
</FeedbackDisclaimer>
<FormInputs inputs={inputs} />
<FeedbackDisclaimer>
This information is not monitored frequently by planning officers, do
not use it to provide extra information or queries with regard to your
application or project. Any information of this nature will be
disregarded.
The information collected here isn't monitored by planning officers.
Don't use it to give extra information about your project or
submission. If you do, it cannot be used to assess your project.
</FeedbackDisclaimer>
<Button
type="submit"
Expand Down

0 comments on commit 9b48836

Please sign in to comment.