Skip to content

Commit

Permalink
Merge remote-tracking branch 'ledger/develop' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
hakim-adamik committed Oct 12, 2023
2 parents 1886788 + 15ac2f2 commit 744f2bb
Show file tree
Hide file tree
Showing 493 changed files with 20,248 additions and 37,871 deletions.
6 changes: 6 additions & 0 deletions .changeset/cold-rats-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"ledger-live-desktop": patch
"live-mobile": patch
---

NFT screen/Stax: only display "custom lock screen" option if the user has connected a Stax once
5 changes: 5 additions & 0 deletions .changeset/empty-taxis-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

improve ble pairing deep links
5 changes: 5 additions & 0 deletions .changeset/four-camels-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Fix string display in lockscreen
5 changes: 5 additions & 0 deletions .changeset/gold-hats-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ledgerhq/live-cli": patch
---

Fixes in getAddress and bot command
5 changes: 5 additions & 0 deletions .changeset/light-ants-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Update Stax wording + add oldVersion -> newVersion to firmware update screen
5 changes: 5 additions & 0 deletions .changeset/metal-coats-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Update My Ledger provider wording in Experimental feature
5 changes: 5 additions & 0 deletions .changeset/mighty-birds-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

QR Code scan during Send paste address in input
5 changes: 5 additions & 0 deletions .changeset/old-moons-add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Custom lock screen: remove the "save logs" button if the error is a "refused on device" error
5 changes: 5 additions & 0 deletions .changeset/sharp-avocados-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@ledgerhq/live-common": patch
---

Fix WalletAPI fee strategy implementation
5 changes: 5 additions & 0 deletions .changeset/sharp-wombats-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Fix onboarding issues when closing quiz drawer
5 changes: 5 additions & 0 deletions .changeset/silver-experts-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

fix display thumbnail of a story
5 changes: 5 additions & 0 deletions .changeset/sixty-horses-joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Discover section : Apps Description changed to shortDescription
5 changes: 5 additions & 0 deletions .changeset/small-singers-melt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ledger-live-desktop": patch
---

Fix translation text
5 changes: 5 additions & 0 deletions .changeset/thin-news-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Create new bluetooth pairing flow screen for onboarding
8 changes: 8 additions & 0 deletions .changeset/twenty-bats-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@ledgerhq/errors": minor
"ledger-live-desktop": minor
"live-mobile": minor
"@ledgerhq/live-common": minor
---

Change network error to better suit node flakiness
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ _Replace this text by a clear and concise description of what this pull request

### ❓ Context

- **Impacted projects**: `` <!-- The list of end user projects impacted by the change. -->
- **Linked resource(s)**: `` <!-- Attach any ticket number if relevant. (JIRA / Github issue number) -->
- **Impacted projects**: `` <!-- Add the list of end user projects impacted by the change inside of the ` `, like so `LLM, LLD`. -->
- **Linked resource(s)**: [] <!-- Attach any ticket number if relevant inside the brackets, like so [LIVE-0000]. (JIRA / Github issue number) -->

### ✅ Checklist

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/generate-screenshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ jobs:
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
skip_python: true
skip_ruby: true
install_playwright: true
upgrade_npm: true
Expand Down Expand Up @@ -156,9 +155,9 @@ jobs:
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
skip_python: true
skip_ruby: true
install_playwright: true
no_pnpm_cache: true
pnpm_dest: ${{ runner.temp }}/setup-pnpm
aws-access-key: ${{ secrets.AWS_S3_CACHE_ACCESS_KEY }}
aws-secret-key: ${{ secrets.AWS_S3_CACHE_SECRET_KEY }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/healthchecks-runners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: pnpm/action-setup@v2
if: always()
with:
version: 8.7
version: 8.8
dest: ${{ runner.temp }}/setup-pnpm
- uses: actions/setup-node@v3
if: always()
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
- uses: pnpm/action-setup@v2
if: always()
with:
version: 8.7
version: 8.8
dest: ${{ runner.temp }}/setup-pnpm
- uses: actions/setup-node@v3
if: always()
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
- uses: pnpm/action-setup@v2
if: always()
with:
version: 8.7
version: 8.8
dest: ${{ runner.temp }}/setup-pnpm
- uses: actions/setup-node@v3
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
schedule:
# The "*" (#42, asterisk) character has special semantics in YAML, so this
# string has to be quoted.
- cron: "0/30 * * * *"
- cron: "* */6 * * *"
workflow_dispatch:

jobs:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-desktop-external.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ jobs:
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
skip_python: true
skip_ruby: true
install_playwright: true
- name: Run playwright tests [Linux => xvfb-run]
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ jobs:
with:
ref: ${{ env.REFNAME }}
base: ${{ inputs.base_ref }}
- uses: actions/setup-dotnet@v2
with:
dotnet-version: 2.1.816
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
Expand Down Expand Up @@ -201,7 +198,6 @@ jobs:
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
skip_python: true
skip_ruby: true
install_playwright: true
aws-access-key: ${{ secrets.AWS_S3_CACHE_ACCESS_KEY }}
Expand Down Expand Up @@ -267,12 +263,12 @@ jobs:
- uses: ./tools/actions/composites/setup-test-desktop
id: setup-test-desktop
with:
skip_python: true
skip_ruby: true
install_playwright: true
pnpm_dest: ${{ runner.temp }}/setup-pnpm
aws-access-key: ${{ secrets.AWS_S3_CACHE_ACCESS_KEY }}
aws-secret-key: ${{ secrets.AWS_S3_CACHE_SECRET_KEY }}
no_pnpm_cache: true
- name: Run playwright tests
id: tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .prototools
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
node = "18.18.0"
npm = "9.8.1"
pnpm = "8.7.0"
pnpm = "8.8.0"
6 changes: 6 additions & 0 deletions apps/cli/src/commands/bot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ export default {
throw new Error("Please define a SEED env variable to run this bot.");
}

if (arg.currency) {
// Remapping to match arg format in libs/ledger-live-common/src/bot/cli.ts
arg.filter = { currencies: [arg.currency] };
delete arg.currency;
}

return from(bot(arg));
},
};
1 change: 0 additions & 1 deletion apps/cli/src/commands/getAddress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export default {
throw new Error("--path is required");
}

asDerivationMode(arg.derivationMode as string);
return withDevice(arg.device || "")(t =>
from(
getAddress(t, {
Expand Down
6 changes: 5 additions & 1 deletion apps/ledger-live-desktop/src/renderer/animations/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import Lottie, { LottieProps } from "react-lottie";
import { Flex } from "@ledgerhq/react-ui";
import { getEnv } from "@ledgerhq/live-env";
const Animation = ({
animation,
loop = true,
Expand Down Expand Up @@ -34,7 +35,10 @@ const Animation = ({
isClickToPauseDisabled
ariaRole="animation"
isPaused={isPaused}
isStopped={isStopped}
isStopped={
// in case of playwright tests, we want to completely stop the animation
!!getEnv("PLAYWRIGHT_RUN") || isStopped
}
options={{
loop: loop,
autoplay: autoplay,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,7 @@ export default function IsUnlocked({ children }: { children: React.ReactNode }):
icon={<Logo size={50} />}
/>
<PageTitle>{t("common.lockScreen.title")}</PageTitle>
<LockScreenDesc>
{t("common.lockScreen.subTitle")}
<br />
{t("common.lockScreen.description")}
</LockScreenDesc>
<LockScreenDesc>{t("common.lockScreen.description")}</LockScreenDesc>
<Box horizontal alignItems="center">
<Box
style={{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const AppInstallItem = ({ appName, state, itemProgress, productName, i }: Props)
</Flex>
<Flex flexDirection="column">
<Text ml={3} fontSize={3}>
{appName}
{t("onboardingAppInstall.progress.app", { appName })}
</Text>
{state === ItemState.Skipped ? (
<Text ml={3} color="neutral.c70" fontSize={2}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ const OnboardingAppInstallStep = ({ device, deviceToRestore, onComplete, onError
: t("onboardingAppInstall.default.title", { productName })}
</Text>
<Text variant="paragraphLineHeight" color="neutral.c70" textAlign="center" mt={2}>
{t(`onboardingAppInstall.${deviceToRestore ? "restore" : "default"}.subtitle`)}
{t(`onboardingAppInstall.${deviceToRestore ? "restore" : "default"}.subtitle`, {
productName,
})}
</Text>
<Flex pt={8} pb={2} justifyContent="space-between">
<Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const SendFeeMode = ({ isAdvanceMode, setAdvanceMode }: Props) => {
const setAdvanced = useCallback(() => setAdvanceMode(true), [setAdvanceMode]);
const setStandard = useCallback(() => setAdvanceMode(false), [setAdvanceMode]);
return (
<Box horizontal alignItems="center" justifyContent="space-between">
<Box data-test-id="send-fee-mode" horizontal alignItems="center" justifyContent="space-between">
<LabelWithExternalIcon
onClick={() => {
openURL(urls.feesMoreInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ const SoftwareCheckContent = ({
<Button variant="main" size="small" outline={false} onClick={onClickViewUpdate}>
{updateSkippable
? t("syncOnboarding.manual.softwareCheckContent.firmwareUpdate.resumeUpdateCTA")
: t("syncOnboarding.manual.softwareCheckContent.firmwareUpdate.viewUpdateCTA")}
: t("syncOnboarding.manual.softwareCheckContent.firmwareUpdate.viewUpdateCTA", {
modelName,
})}
</Button>
{updateSkippable ? (
<Button
Expand Down Expand Up @@ -164,7 +166,9 @@ const SoftwareCheckContent = ({
{t("syncOnboarding.manual.softwareCheckContent.whyPerformChecksLink")}
</Link>
<Button onClick={onClickStartChecks} variant="main" size="large" outline={false}>
{t("syncOnboarding.manual.softwareCheckContent.startChecksCTA")}
{t("syncOnboarding.manual.softwareCheckContent.startChecksCTA", {
modelName,
})}
</Button>
</Flex>
) : null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const ErrorDrawer: React.FC<Props> = ({ error, onClickRetry, closeable = false }
onClickRetry();
}}
>
{t("syncOnboarding.manual.softwareCheckContent.genuineCheckErrorDrawer.retryCTA")}
{t("common.tryAgain")}
</Button>
)}
</DrawerFooter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { Divider, Flex, VerticalTimeline } from "@ledgerhq/react-ui";
import { useTranslation } from "react-i18next";
import { Divider, Flex, VerticalTimeline, Text } from "@ledgerhq/react-ui";
import { useTranslation, Trans } from "react-i18next";
import { StepText } from "./shared";
import ContinueOnDeviceWithAnim from "./ContinueOnDeviceWithAnim";
import { DeviceModelId } from "@ledgerhq/types-devices";
Expand All @@ -26,11 +26,21 @@ const SeedStep = ({ seedPathStatus, deviceModelId }: Props) => {
<Flex flexDirection="column">
{seedPathStatus === "new_seed" ? (
<Flex flexDirection="column">
<StepText>
{t("syncOnboarding.manual.seedContent.newSeedDescription", {
<StepText mb={6}>
{t("syncOnboarding.manual.seedContent.newSeedDescription1", {
productName,
})}
</StepText>
<StepText mb={6}>
<Trans i18nKey="syncOnboarding.manual.seedContent.newSeedDescription2">
<Text fontWeight="bold" variant="body" color="neutral.c80">
{""}
</Text>
</Trans>
</StepText>
<StepText mb={6}>{t("syncOnboarding.manual.seedContent.newSeedDescription3")}</StepText>
<StepText mb={6}>{t("syncOnboarding.manual.seedContent.newSeedDescription4")}</StepText>
<StepText>{t("syncOnboarding.manual.seedContent.newSeedDescription5")}</StepText>
<ContinueOnDeviceWithAnim
deviceModelId={deviceModelId}
text={t("syncOnboarding.manual.seedContent.newSeedContinueOnDevice", {
Expand Down Expand Up @@ -63,18 +73,38 @@ const SeedStep = ({ seedPathStatus, deviceModelId }: Props) => {
<StepText>{t("syncOnboarding.manual.seedContent.restoreSeed", { productName })}</StepText>
<ContinueOnDeviceWithAnim
deviceModelId={deviceModelId}
text={t("syncOnboarding.manual.continueOnDevice", { productName })}
text={t("syncOnboarding.manual.seedContent.followInstructions", { productName })}
/>
</>
) : seedPathStatus === "recover_seed" ? (
<StepText>{t("syncOnboarding.manual.seedContent.recoverSeed")}</StepText>
) : (
<Flex flexDirection="column">
<StepText>
<StepText mb={6}>
{t("syncOnboarding.manual.seedContent.selection", {
productName,
})}
</StepText>
<StepText mb={6}>
<Trans
i18nKey="syncOnboarding.manual.seedContent.selectionNewLedger"
values={{ deviceName: productName }}
>
<Text fontWeight="bold" variant="body" color="neutral.c80">
{""}
</Text>
</Trans>
</StepText>
<StepText>
<Trans
i18nKey="syncOnboarding.manual.seedContent.selectionRestore"
values={{ deviceName: productName }}
>
<Text fontWeight="bold" variant="body" color="neutral.c80">
{""}
</Text>
</Trans>
</StepText>
<ContinueOnDeviceWithAnim
deviceModelId={deviceModelId}
text={t("syncOnboarding.manual.seedContent.selectionContinueOnDevice", {
Expand Down
Loading

2 comments on commit 744f2bb

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bot] Testing with 'Nitrogen' ($0.00) ⏲ 5ms

What is the bot and how does it work? Everything is documented here!

Details of the 0 mutations
Portfolio ($0.00) – Details of the 0 currencies
Spec (accounts) State Remaining Runs (est) funds?

Performance ⏲ 5ms

Time spent for each spec: (total across mutations)

Spec (accounts) preload scan re-sync tx status sign op broadcast test destination test
TOTAL N/A N/A N/A N/A N/A N/A N/A N/A

What is the bot and how does it work? Everything is documented here!

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bot] Testing with 'Nitrogen' ($0.00) ⏲ 3.00ms

What is the bot and how does it work? Everything is documented here!

Details of the 0 mutations
Portfolio ($0.00) – Details of the 0 currencies
Spec (accounts) State Remaining Runs (est) funds?

Performance ⏲ 3.00ms

Time spent for each spec: (total across mutations)

Spec (accounts) preload scan re-sync tx status sign op broadcast test destination test
TOTAL N/A N/A N/A N/A N/A N/A N/A N/A

What is the bot and how does it work? Everything is documented here!

Please sign in to comment.