Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/tame-turkeys-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": minor
---

Adjust UI changes

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React, { useCallback, useEffect } from "react";
import { Flex, VerticalTimeline, Text } from "@ledgerhq/react-ui";
import { Flex, VerticalTimeline, Link, Icons } from "@ledgerhq/react-ui";
import { useTranslation } from "react-i18next";
import { StepText } from "./shared";
import ContinueOnDeviceWithAnim from "./ContinueOnDeviceWithAnim";
import { DeviceModelId } from "@ledgerhq/types-devices";
import { getDeviceModel } from "@ledgerhq/devices";
import ExternalLink from "~/renderer/components/ExternalLink";
import CharonPng from "./assets/charon.png";
import SecretRecoveryPhrasePng from "./assets/secret-recovery-phrase.png";
import { trackPage, useTrack } from "~/renderer/analytics/segment";
import { CharonStatus } from "@ledgerhq/live-common/hw/extractOnboardingState";
import { openURL } from "~/renderer/linking";
import Animation from "~/renderer/animations";
import CHARON from "~/renderer/animations/charon/charon.json";

export type SeedPathStatus =
| "choice_new_or_restore"
Expand Down Expand Up @@ -78,11 +78,18 @@ const SeedStep = ({ seedPathStatus, deviceModelId, charonSupported, charonStatus
{seedPathStatus === "new_seed" ? (
<Flex flexDirection="column">
<Flex alignItems="center" justifyContent="center" flexDirection="column">
<Flex style={{ width: 220, height: 170, overflow: "visible" }}>
<Flex
style={{
width: 220,
height: 150,
overflow: "visible",
justifyContent: "center",
}}
>
<img
src={SecretRecoveryPhrasePng}
alt="Secret Recovery Phrase"
style={{ width: 220, height: 220 }}
style={{ height: 220, objectFit: "contain" }}
/>
</Flex>
{/* @ts-expect-error weird props issue with React 18 */}
Expand Down Expand Up @@ -174,7 +181,7 @@ const SeedStep = ({ seedPathStatus, deviceModelId, charonSupported, charonStatus
paddingTop: 20,
}}
>
<img src={CharonPng} alt="Charon" style={{ height: 220, objectFit: "contain" }} />
<Animation animation={CHARON as object} />
</Flex>
{/* @ts-expect-error weird props issue with React 18 */}
<StepText mb={6} fontWeight="semiBold" variant="largeLineHeight" color="neutral.c100">
Expand All @@ -184,17 +191,16 @@ const SeedStep = ({ seedPathStatus, deviceModelId, charonSupported, charonStatus
<StepText mb={6} textAlign="center">
{t("syncOnboarding.manual.seedContent.backupCharonDescription")}
</StepText>

<Flex flexDirection="column" color="neutral.c100" mb={6}>
<ExternalLink
label={
<Text fontWeight="bold" variant="body" color="neutral.c80">
{t("syncOnboarding.manual.seedContent.backupCharonCta")}
</Text>
}
<Link
alwaysUnderline
Icon={() => <Icons.ExternalLink size="S" />}
onClick={handleLearnMoreClick}
isInternal={false}
/>
style={{ justifyContent: "flex-start" }}
textProps={{ fontSize: 14 }}
>
{t("syncOnboarding.manual.seedContent.backupCharonCta")}
</Link>
</Flex>
</Flex>

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ import { useTrackOnboardingFlow } from "~/analytics/hooks/useTrackOnboardingFlow
import { HOOKS_TRACKING_LOCATIONS } from "~/analytics/hooks/variables";
import { ExternalLinkMedium } from "@ledgerhq/native-ui/assets/icons";
import SecretRecoveryPhraseImage from "./assets/srp.png";
import CharonImage from "./assets/charon.png";
import BackgroundBlue from "./assets/BackgroundBlue";
import BackgroundRed from "./assets/BackgroundRed";
import Animation from "~/components/Animation";
import CHARON from "~/animations/device/charon/charon.json";

const { BodyText, SubtitleText } = VerticalTimeline;

Expand Down Expand Up @@ -712,8 +713,8 @@ export const SyncOnboardingCompanion: React.FC<SyncOnboardingCompanionProps> = (
<TrackScreen category="Set up device: Step 3 Charon Backup Success" />
) : null}
<Flex alignItems="center" justifyContent="center">
<Flex style={{ overflow: "visible", height: 100 }} mt={3}>
<Image resizeMode="contain" source={CharonImage} style={{ height: 170 }} />
<Flex style={{ overflow: "visible", height: 100 }} mt={3} mb={6}>
<Animation style={{ height: 100 }} source={CHARON} />
</Flex>
<Text variant="h5" fontWeight="semiBold" mb={6}>
{t("syncOnboarding.seedStep.backupCharon.title")}
Expand Down
Loading