Skip to content

Commit 9dfbca6

Browse files
authored
fix: campaign application (#1976)
- fix order of fields (make the goal the last field on the 3-rd step) - remove "Membership" from the list of campaign types (it's a system type)
1 parent 90d9973 commit 9dfbca6

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

src/components/client/campaign-application/steps/CampaignApplicationBasic.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default function CampaignApplicationBasic() {
5858
/>
5959
</Grid>
6060
<Grid item xs={12}>
61-
<CampaignTypeSelect name="applicationBasic.campaignType" />
61+
<CampaignTypeSelect name="applicationBasic.campaignType" hideSystemTypes={true} />
6262
</Grid>
6363
<Grid item xs={12}>
6464
<StyledFormTextField

src/components/client/campaign-application/steps/CampaignApplicationDetails.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ export default function CampaignApplicationDetails({ files, setFiles }: Props) {
2222
<StyledStepHeading variant="h4">{t('steps.details.title')}</StyledStepHeading>
2323
</Grid>
2424
<Grid item container spacing={6} justifyContent="space-between" direction="row">
25-
<Grid item xs={12}>
26-
<FormTextField
27-
type="text"
28-
name="applicationDetails.cause"
29-
label={t('steps.details.cause')}
30-
multiline
31-
rows={3}
32-
/>
33-
</Grid>
3425
<Grid item xs={12}>
3526
<FormTextField
3627
type="text"
@@ -50,6 +41,15 @@ export default function CampaignApplicationDetails({ files, setFiles }: Props) {
5041
rows={5}
5142
/>
5243
</Grid>
44+
<Grid item xs={12}>
45+
<FormTextField
46+
type="text"
47+
name="applicationDetails.cause"
48+
label={t('steps.details.cause')}
49+
multiline
50+
rows={3}
51+
/>
52+
</Grid>
5353
<Grid item xs={12}>
5454
<FileUpload
5555
buttonLabel={t('steps.details.documents')}

src/components/client/campaigns/CampaignTypeSelect.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import { useCampaignTypesList } from 'common/hooks/campaigns'
44
import { useField } from 'formik'
55
import { useTranslation } from 'next-i18next'
66

7-
export default function CampaignTypeSelect({ name = 'campaignTypeId' }) {
7+
const systemTypes = ['Membership']
8+
9+
export default function CampaignTypeSelect({ name = 'campaignTypeId', hideSystemTypes = false }) {
810
const { t } = useTranslation()
911
const { data } = useCampaignTypesList()
1012
const [field, meta] = useField(name)
@@ -21,11 +23,13 @@ export default function CampaignTypeSelect({ name = 'campaignTypeId' }) {
2123
<MenuItem value="" disabled>
2224
{t('campaigns:campaign.type')}
2325
</MenuItem>
24-
{data?.map((campaignType, index) => (
25-
<MenuItem key={index} value={campaignType.id}>
26-
{campaignType.name}
27-
</MenuItem>
28-
))}
26+
{data
27+
?.filter((campaignType) => !hideSystemTypes || !systemTypes.includes(campaignType?.name))
28+
?.map((campaignType, index) => (
29+
<MenuItem key={index} value={campaignType.id}>
30+
{campaignType.name}
31+
</MenuItem>
32+
))}
2933
</Select>
3034
{helperText && <FormHelperText error>{helperText}</FormHelperText>}
3135
</FormControl>

0 commit comments

Comments
 (0)