Skip to content

Commit 7005136

Browse files
committed
re-arrange eligibility item
1 parent 50648da commit 7005136

3 files changed

Lines changed: 43 additions & 52 deletions

File tree

src/ui/screens/eligibilty-overview/components/EligibilityOverviewBanner.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ const EligibilityOverviewBanner = ({ t, eligible }) => {
3333
return (
3434
<HBox sx={{
3535
backgroundColor: eligibilityBannerType.backgroundColor,
36-
padding: '6px 10px',
36+
padding: "8px 12px",
3737
borderRadius: theme.shape.borderRadius,
38+
alignItems: 'center',
3839
}}>
3940
<Typography>{t(eligibilityBannerType.text)}</Typography>
4041
</HBox>

src/ui/screens/eligibilty-overview/components/EligibilityOverviewItem.js

Lines changed: 38 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -45,52 +45,21 @@ const EligibilityOverviewItem = ({ t, item, eligible }) => {
4545
}}
4646
>
4747
<VBox sx={{ gap: 2 }}>
48-
<Typography variant='h2' sx={{ color: color, fontWeight: '400', wordBreak: 'break-word' }}>
49-
{item.title}
50-
</Typography>
51-
{item.status === "beta" && (
52-
<Typography variant='body1' sx={{ color: 'blue.main' }}>
53-
Beta
48+
<HBox sx={{ alignItems: 'flex-end', gap: 2, flexWrap: 'wrap' }}>
49+
<Typography variant='h2' sx={{ color: color, fontWeight: '400', wordBreak: 'break-word' }}>
50+
{item.title}
5451
</Typography>
55-
)}
56-
<Typography variant="body1">
52+
{item.status === "beta" && (
53+
<Typography variant='body1' sx={{ color: 'blue.main' }}>
54+
Beta
55+
</Typography>
56+
)}
57+
</HBox>
58+
<Typography variant="body1" sx={{ wordBreak: 'break-word' }}>
5759
{item.description}
5860
</Typography>
5961
</VBox>
6062
</HBox>
61-
<HBox sx={{
62-
flex: '1 1 auto',
63-
gap: 2,
64-
flexWrap: 'wrap',
65-
justifyContent: 'flex-end'
66-
}}>
67-
<VBox
68-
sx={{ alignItems: 'flex-end', gap: 1, flexWrap: 'wrap' }}
69-
>
70-
{eligible === 'indeterminate' &&
71-
<HBox>
72-
<RegularButton
73-
variant={'pinkContained'}
74-
onClick={() => {
75-
clearSelectedTopics()
76-
setSelectedBenefit(item.id);
77-
}}
78-
text={'app.browseAll.checkElBtn'}
79-
link={`/onboarding-welcome/${item.id}`}
80-
size='small'
81-
/>
82-
</HBox>
83-
}
84-
<HBox>
85-
<RegularButton
86-
variant={'blueHollow'}
87-
text={'app.browseAll.learnMoreBtn'}
88-
link={`/benefit-page/${item.id}`}
89-
size='small'
90-
/>
91-
</HBox>
92-
</VBox>
93-
</HBox>
9463
</HBox>
9564
<VBox sx={{ gap: 2 }}>
9665
<HBox sx={{ flexWrap: 'wrap', gap: 1 }}>
@@ -104,16 +73,37 @@ const EligibilityOverviewItem = ({ t, item, eligible }) => {
10473
)
10574
)}
10675
</HBox>
107-
{
108-
eligible !== 'indeterminate' && (
109-
<>
110-
<Divider sx={{ color: 'dark.light', borderStyle: 'dashed' }} />
76+
<Divider sx={{ color: 'dark.light', borderStyle: 'dashed' }} />
77+
<HBox sx={{ flexWrap: 'wrap', gap: 2, alignItems: 'center' }}>
78+
{
79+
eligible !== 'indeterminate' && (
11180
<HBox>
11281
<EligibilityOverviewBanner t={t} eligible={eligible} />
11382
</HBox>
114-
</>
115-
)
116-
}
83+
)
84+
}
85+
{eligible === 'indeterminate' &&
86+
87+
<RegularButton
88+
variant={'pinkContained'}
89+
onClick={() => {
90+
clearSelectedTopics()
91+
setSelectedBenefit(item.id);
92+
}}
93+
text={'app.browseAll.checkElBtn'}
94+
link={`/onboarding-welcome/${item.id}`}
95+
size='small'
96+
/>
97+
98+
}
99+
<RegularButton
100+
variant={'blueHollow'}
101+
text={'app.browseAll.learnMoreBtn'}
102+
link={`/benefit-page/${item.id}`}
103+
size='small'
104+
/>
105+
</HBox>
106+
117107
</VBox>
118108
</VBox>
119109
);

src/ui/screens/landing-page/LandingPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
2-
import { useStore } from "../../shared-components/ViewportUpdater";
3-
import { VBox } from "../../shared-components/LayoutBoxes";
4-
import Layout from "../../shared-components/Layout";
2+
import { useStore } from "@/ui/shared-components/ViewportUpdater";
3+
import { VBox } from "@/ui/shared-components/LayoutBoxes";
4+
import Layout from "@/ui/shared-components/Layout";
55
import LandingPageHowItWorks from "./sections/how-it-works/LandingPageHowItWorks";
66
import LandingPagePrinciples from "./sections/principles/LandingPagePrinciples";
77
import LandingPageTeam from "./sections/team/LandingPageTeam";

0 commit comments

Comments
 (0)