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

🐛 : [BUGFIX] Fix trad of Update firmware banner when updating selected language #6933

Merged
merged 2 commits into from
May 24, 2024
Merged

🐛 : [BUGFIX] Fix trad of Update firmware banner when updating selected language #6933

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
7708732
🐛 : [BUGFIX] Fix trad of Update firmware banner when updating selecte…
mcayuelas-ledger May 24, 2024
ce9a054
use <Text/>
mcayuelas-ledger May 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
5 changes: 5 additions & 0 deletions .changeset/curvy-yaks-study.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Fix trad of Update firmware banner when updating selected language
22 changes: 8 additions & 14 deletions apps/ledger-live-desktop/src/renderer/components/FirmwareUpdateBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useContext } from "react";
import { Trans } from "react-i18next";
import { useTranslation } from "react-i18next";
import { useSelector } from "react-redux";
import { useLocation, useHistory } from "react-router-dom";
import { getEnv } from "@ledgerhq/live-env";
Expand All @@ -8,9 +8,10 @@ import TopBanner, { FakeLink } from "~/renderer/components/TopBanner";
import getCleanVersion from "~/renderer/screens/manager/FirmwareUpdate/getCleanVersion";
import { UpdaterContext } from "~/renderer/components/Updater/UpdaterContext";
import { VISIBLE_STATUS } from "./Updater/Banner";
import { IconsLegacy } from "@ledgerhq/react-ui";
import { IconsLegacy, Text } from "@ledgerhq/react-ui";
const FirmwareUpdateBanner = ({ old, right }: { old?: boolean; right?: React.ReactNode }) => {
const history = useHistory();
const { t } = useTranslation();
const location = useLocation();
const latestFirmware = useSelector(latestFirmwareSelector);
const visibleFirmwareVersion =
Expand Down Expand Up @@ -43,20 +44,13 @@ const FirmwareUpdateBanner = ({ old, right }: { old?: boolean; right?: React.Rea
content={{
Icon: IconsLegacy.NanoFoldedMedium,
message: (
<Trans
i18nKey={
old ? "manager.firmware.banner.old.warning" : "manager.firmware.banner.warning"
}
values={{
<Text color="neutral.c00">
{t(old ? "manager.firmware.banner.old.warning" : "manager.firmware.banner.warning", {
latestFirmware: visibleFirmwareVersion,
}}
/>
),
right: right || (
<FakeLink onClick={onClick}>
<Trans i18nKey={"manager.firmware.banner.cta"} />
</FakeLink>
})}
</Text>
),
right: right || <FakeLink onClick={onClick}>{t("manager.firmware.banner.cta")}</FakeLink>,
}}
status={"warning"}
/>
Expand Down
Loading