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.

Sign up for GitHub

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

chore: Remove FeeBreakdownSection from Editor modal #4250

Merged
merged 2 commits into from
Feb 4, 2025
Merged

chore: Remove FeeBreakdownSection from Editor modal #4250

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f2ba9
chore: Remove `FeeBreakdownSection` from Editor modal
DafyddLlyr Feb 4, 2025
cd5596a
chore: Re-order sections
DafyddLlyr Feb 4, 2025
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
20 changes: 9 additions & 11 deletions editor.planx.uk/src/@planx/components/Pay/Editor/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { ComponentType as TYPES } from "@opensystemslab/planx-core/types";
import { parsePay, Pay, PAY_FN, validationSchema } from "@planx/components/Pay/model";
import {
parsePay,
Pay,
PAY_FN,
validationSchema,
} from "@planx/components/Pay/model";
import { Form, Formik } from "formik";
import React from "react";
import { ComponentTagSelect } from "ui/editor/ComponentTagSelect";
Expand All @@ -14,7 +19,6 @@ import { Switch } from "ui/shared/Switch";

import { ICONS } from "../../shared/icons";
import { EditorProps } from "../../shared/types";
import { FeeBreakdownSection } from "./FeeBreakdownSection";
import { GovPayMetadataSection } from "./GovPayMetadataSection";
import { InviteToPaySection } from "./InviteToPaySection";

Expand Down Expand Up @@ -66,12 +70,7 @@ const Component: React.FC<Props> = (props: Props) => {
/>
</InputRow>
<InputRow>
<Input
format="data"
name="fn"
value={PAY_FN}
disabled
/>
<Input format="data" name="fn" value={PAY_FN} disabled />
</InputRow>
</ModalSectionContent>
<ModalSectionContent>
Expand Down Expand Up @@ -101,9 +100,8 @@ const Component: React.FC<Props> = (props: Props) => {
</InputRow>
</ModalSectionContent>
</ModalSection>
<GovPayMetadataSection/>
<InviteToPaySection/>
<FeeBreakdownSection/>
<GovPayMetadataSection />
<InviteToPaySection />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small unrelated nit: have often thought that these final existing sections should be swapped ! Eg invite to pay first because impacts public form, then more information because similarly public facing, then Gov Pay metadata last (or before internal notes) because behind-the-scenes/internal only . Recognise this is totally outside of scope here though, maybe disorienting to change for current users !

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great shout! Done ✅

<MoreInformation
changeField={handleChange}
definitionImg={values.definitionImg}
Expand Down
18 changes: 0 additions & 18 deletions editor.planx.uk/src/@planx/components/Pay/Editor/FeeBreakdownSection.tsx
View file
Open in desktop

This file was deleted.

Loading