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

Jump to bottom

fix(front-878): make onboarding german cgus text clickable #621

Merged
merged 2 commits into from
Feb 20, 2024
Merged

fix(front-878): make onboarding german cgus text clickable #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a10728
fix(front-878): make onboarding german cgus text clickable
ncomont Feb 20, 2024
f1b682e
review
ncomont Feb 20, 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
39 changes: 32 additions & 7 deletions clients/onboarding/src/pages/company/OnboardingCompanyRegistration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ const styles = StyleSheet.create({
},
tcuCheckbox: {
top: 3, // center checkbox with text
flexDirection: "row",
alignItems: "center",
},
link: {
color: colors.partner[500],
Expand Down Expand Up @@ -326,6 +328,30 @@ export const OnboardingCompanyRegistration = ({
style={styles.tcuCheckbox}
>
<LakeCheckbox value={value} isError={isNotNullish(error)} />
<Space width={8} />

<LakeText>
{formatNestedMessage("step.finalize.terms", {
firstLink: (
<Link target="blank" to={tcuUrl} style={styles.link}>
{t("emailPage.firstLink")}

<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
secondLink: (
<Link
target="blank"
to={tcuDocumentUri ?? "#"}
style={styles.link}
>
{t("emailPage.secondLink", { partner: projectName })}

<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
})}
</LakeText>
</Pressable>
)}
</Field>
Expand All @@ -334,10 +360,9 @@ export const OnboardingCompanyRegistration = ({
</>
)}

<LakeText>
{formatNestedMessage(
haveToAcceptTcu ? "step.finalize.terms" : "emailPage.terms",
{
{!haveToAcceptTcu && (
<LakeText>
{formatNestedMessage("emailPage.terms", {
firstLink: (
<Link target="blank" to={tcuUrl} style={styles.link}>
{t("emailPage.firstLink")}
Expand All @@ -352,9 +377,9 @@ export const OnboardingCompanyRegistration = ({
<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
},
)}
</LakeText>
})}
</LakeText>
)}
</Box>

{haveToAcceptTcu && (
Expand Down
39 changes: 32 additions & 7 deletions clients/onboarding/src/pages/individual/OnboardingIndividualEmail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ const styles = StyleSheet.create({
},
tcuCheckbox: {
top: 3, // center checkbox with text
flexDirection: "row",
alignItems: "center",
},
link: {
color: colors.partner[500],
Expand Down Expand Up @@ -195,6 +197,30 @@ export const OnboardingIndividualEmail = ({
style={styles.tcuCheckbox}
>
<LakeCheckbox value={value} isError={isNotNullish(error)} />
<Space width={8} />

<LakeText>
{formatNestedMessage("step.finalize.terms", {
firstLink: (
<Link target="blank" to={tcuUrl} style={styles.link}>
{t("emailPage.firstLink")}

<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
secondLink: (
<Link
target="blank"
to={tcuDocumentUri ?? "#"}
style={styles.link}
>
{t("emailPage.secondLink", { partner: projectName })}

<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
})}
</LakeText>
</Pressable>
)}
</Field>
Expand All @@ -203,10 +229,9 @@ export const OnboardingIndividualEmail = ({
</>
)}

<LakeText>
{formatNestedMessage(
haveToAcceptTcu ? "step.finalize.terms" : "emailPage.terms",
{
{!haveToAcceptTcu && (
<LakeText>
{formatNestedMessage("emailPage.terms", {
firstLink: (
<Link target="blank" to={tcuUrl} style={styles.link}>
{t("emailPage.firstLink")}
Expand All @@ -221,9 +246,9 @@ export const OnboardingIndividualEmail = ({
<Icon name="open-filled" size={16} style={styles.linkIcon} />
</Link>
),
},
)}
</LakeText>
})}
</LakeText>
)}
</Box>

{haveToAcceptTcu && (
Expand Down
Loading