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

feat(social-insurance): UI changes #16942

Merged
merged 8 commits into from
Nov 24, 2024
Merged

feat(social-insurance): UI changes #16942

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b602f32
feat: ini
thorkellmani Nov 19, 2024
6dcbe9d
fix: switch link
thorkellmani Nov 21, 2024
9ad78ca
Merge branch 'main' into fix/payment-plan-display
thorkellmani Nov 22, 2024
01cc907
Merge branch 'main' into fix/payment-plan-display
thorkellmani Nov 22, 2024
2c9c975
chore: remove mocks
thorkellmani Nov 22, 2024
d65b406
Merge remote-tracking branch 'refs/remotes/origin/fix/payment-plan-di…
thorkellmani Nov 22, 2024
501e1e5
Merge branch 'main' into fix/payment-plan-display
thorkellmani Nov 22, 2024
560ee3c
Merge branch 'main' into fix/payment-plan-display
kodiakhq[bot] Nov 24, 2024
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
38 changes: 17 additions & 21 deletions libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
CardLoader,
FootNote,
IntroHeader,
IntroWrapper,
LinkButton,
m as coreMessages,
formatDate,
Expand Down Expand Up @@ -75,16 +76,14 @@ const IncomePlan = () => {
const { data, loading, error } = useGetIncomePlanQuery()

return (
<Box>
<IntroHeader
title={formatMessage(coreMessages.incomePlan)}
intro={formatMessage(coreMessages.incomePlanDescription)}
serviceProviderSlug={'tryggingastofnun'}
serviceProviderTooltip={formatMessage(
coreMessages.socialInsuranceTooltip,
)}
/>

<IntroWrapper
title={formatMessage(coreMessages.incomePlan)}
intro={formatMessage(coreMessages.incomePlanDescription)}
serviceProviderSlug={'tryggingastofnun'}
serviceProviderTooltip={formatMessage(
coreMessages.socialInsuranceTooltip,
)}
>
{error && !loading ? (
<Problem error={error} noBorder={false} />
) : loading ? (
Expand Down Expand Up @@ -146,17 +145,15 @@ const IncomePlan = () => {
heading={formatMessage(coreMessages.incomePlan)}
cta={{
label: formatMessage(m.viewIncomePlan),
url: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlanDetail,
url:
data.socialInsuranceIncomePlan.status ===
SocialInsuranceIncomePlanStatus.IN_PROGRESS
? `${document.location.origin}/${formatMessage(
m.incomePlanModifyLink,
)}`
: SocialInsuranceMaintenancePaths.SocialInsuranceMaintenanceIncomePlanDetail,
thorkellmani marked this conversation as resolved.
Show resolved Hide resolved
variant: 'text',
}}
tag={
data?.socialInsuranceIncomePlan?.status
? parseTag(
data.socialInsuranceIncomePlan?.status,
formatMessage,
)
: undefined
}
/>
) : (
<ActionCard
Expand All @@ -183,8 +180,7 @@ const IncomePlan = () => {
)}
</Stack>
)}
<FootNote serviceProviderSlug="tryggingastofnun" />
</Box>
</IntroWrapper>
)
}

Expand Down