betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

Répare le bug avec le paneau d'option dans le comparateur

pull/2782/head
Johan Girod 2023-07-26 14:32:28 +02:00
parent cd35b666c1
commit 6a887f4cf6
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
site/source/pages/assistants/choix-du-statut/comparateur.tsx
View File

@ -85,17 +85,23 @@ function useStatutComparaison(): EngineComparison {
const situation = useRawSituation()
const engine = useEngine()
return useMemo(
const namedEngines = useMemo(
() =>
possibleStatuts.map((statut) => ({
name: statut,
engine: engine.shallowCopy().setSituation({
...situation,
...getSituationFromStatut(statut, isAutoEntrepreneurACREEnabled),
}),
engine: engine.shallowCopy(),
})) as EngineComparison,
[possibleStatuts, isAutoEntrepreneurACREEnabled]
[possibleStatuts]
)
for (const { name, engine } of namedEngines) {
engine.setSituation({
...situation,
...getSituationFromStatut(name, isAutoEntrepreneurACREEnabled),
})
}
return namedEngines
}
const SASUEIAE: StatutType[] = ['SASU', 'EI', 'AE']
@ -130,7 +136,7 @@ function getSituationFromStatut(
statut === 'SASU'
? "'SAS'"
: statut === 'EURL'
? "'EURL'"
? "'SARL'"
: statut === 'AE'
? "'EI'"
: statut === 'SELARLU'

17
site/source/pages/simulateurs/comparaison-statuts/components/ModifierOptions.tsx
View File

@ -13,7 +13,7 @@ import { Drawer } from '@/design-system/drawer'
import { ArrowRightIcon, InfoIcon } from '@/design-system/icons'
import { Grid, Spacing } from '@/design-system/layout'
import { Strong } from '@/design-system/typography'
import { H2, H4, H5 } from '@/design-system/typography/heading'
import { H2, H3, H5 } from '@/design-system/typography/heading'
import { Link, StyledLink } from '@/design-system/typography/link'
import { Body } from '@/design-system/typography/paragraphs'
import { answerQuestion } from '@/store/actions/actions'
@ -120,14 +120,13 @@ const ModifierOptions = ({
<Trans>Modifier mes options</Trans>
</H2>
<Spacing md />
<Flex>
<H4 as="h2">Bénéficier de l'ACRE</H4>
<H3>
Bénéficier de l'ACRE{' '}
<ExplicableRule
dottedName="dirigeant . exonérations . ACRE"
title="Bénéficier de l'ACRE"
/>
</Flex>
</H3>
<Body>
L'aide à la création ou à la reprise d'une entreprise (Acre) consiste
@ -146,7 +145,7 @@ const ModifierOptions = ({
<Trans>En savoir plus</Trans>
</Button>
}
<H5 as="h3">Choisir mon option de simulation</H5>
<H5 as="h4">Choisir mon option de simulation</H5>
<div aria-live="polite">
<FlexCentered>
<SwitchInput
@ -181,7 +180,7 @@ const ModifierOptions = ({
</div>
<Spacing md />
<H4 as="h2">Quelle imposition pour mon entreprise ?</H4>
<H3>Quelle imposition pour mon entreprise ?</H3>
<Body>
Vous pouvez{' '}
<Strong>
@ -203,7 +202,7 @@ const ModifierOptions = ({
</>
)}
</Body>
<H5 as="h3">
<H5 as="h4">
Choisir mon option de simulation (pour {notAutoEntrepreneur?.name})
</H5>
<Message type="secondary">
@ -245,7 +244,7 @@ const ModifierOptions = ({
}}
key="imposition"
aria-labelledby="questionHeader"
engine={namedEngines[0].engine}
engine={namedEngines[1].engine}
/>
{autoEntrepreneurEngine && (
<>