Merge branch 'hotfix'

.github/workflows/build-desktop.yml

@@ -57,10 +57,15 @@ jobs:
     env:
       NODE_OPTIONS: "--max-old-space-size=7168"
     steps:
+      - name: generate token
+        id: generate-token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.GH_BOT_APP_ID }}
+          private_key: ${{ secrets.GH_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.sha }}
-
       - name: Setup git user
         uses: LedgerHQ/ledger-live/tools/actions/composites/setup-git-user@develop
 
@@ -92,6 +97,17 @@ jobs:
         uses: LedgerHQ/ledger-live/tools/actions/composites/setup-build-desktop@develop
         with:
           os: ${{ matrix.config.name }}
+      - name: Retrieving internal assets
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          repository: LedgerHQ/ledger-live-internal-assets
+          token: ${{ steps.generate-token.outputs.token }}
+          path: ledger-live-internal-assets
+
+      - name: Replace assets
+        id: assets
+        run: pnpm desktop assets:replace
 
       - name: Build the app
         id: build-app

.github/workflows/build-mobile.yml

@@ -41,6 +41,12 @@ jobs:
     env:
       NODE_OPTIONS: "--max-old-space-size=7168"
     steps:
+      - name: generate token
+        id: generate-token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.GH_BOT_APP_ID }}
+          private_key: ${{ secrets.GH_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.sha }}
@@ -68,10 +74,19 @@ jobs:
       - name: Get short SHA
         id: slug
         run: echo "sha8=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Retrieving internal assets
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          repository: LedgerHQ/ledger-live-internal-assets
+          token: ${{ steps.generate-token.outputs.token }}
+          path: ledger-live-internal-assets
       - name: make local version
         env:
           VERSION: ${{ steps.version.outputs.clean }}-sha.${{ steps.slug.outputs.sha8 }}
         run: cd apps/ledger-live-mobile && npm version $VERSION
+      - name: Replace assets
+        run: pnpm mobile assets:replace
       - name: build the app
         env:
           ANDROID_KEYSTORE_PASS: staging
@@ -96,6 +111,12 @@ jobs:
     env:
       NODE_OPTIONS: "--max-old-space-size=7168"
     steps:
+      - name: generate token
+        id: generate-token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.GH_BOT_APP_ID }}
+          private_key: ${{ secrets.GH_BOT_PRIVATE_KEY }}
       - uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref || github.sha }}
@@ -113,6 +134,15 @@ jobs:
           turbo-server-token: ${{ secrets.TURBOREPO_SERVER_TOKEN }}
       - name: install dependencies
         run: pnpm i --filter="live-mobile..." --filter="ledger-live" --no-frozen-lockfile --unsafe-perm
+      - name: Retrieving internal assets
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          repository: LedgerHQ/ledger-live-internal-assets
+          token: ${{ steps.generate-token.outputs.token }}
+          path: ledger-live-internal-assets
+      - name: Replace assets
+        run: pnpm mobile assets:replace
       - name: bundle ios and android js
         run: |
           pnpm build:llm:deps --api="http://127.0.0.1:${{ steps.caches.outputs.port }}" --token="${{ secrets.TURBOREPO_SERVER_TOKEN }}" --team="foo"

.github/workflows/release-final.yml

@@ -129,7 +129,7 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: "ledgerhq",
               repo: "ledger-live-build",
-              ref: "main",
+              ref: "feat/DSDK-13125-live-assets",
               workflow_id: "release-desktop.yml",
               inputs: {
                 branch: "main"
@@ -144,7 +144,7 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: "ledgerhq",
               repo: "ledger-live-build",
-              ref: "main",
+              ref: "feat/DSDK-13125-live-assets",
               workflow_id: "release-mobile.yml",
               inputs: {
                 ref: "main"

.github/workflows/release-prerelease.yml

@@ -116,7 +116,7 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: "ledgerhq",
               repo: "ledger-live-build",
-              ref: "main",
+              ref: "feat/DSDK-13125-live-assets",
               workflow_id: "pre-desktop.yml",
               inputs: {
                 ref: "${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.ref_name }}",
@@ -131,7 +131,7 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: "ledgerhq",
               repo: "ledger-live-build",
-              ref: "main",
+              ref: "feat/DSDK-13125-live-assets",
               workflow_id: "pre-mobile.yml",
               inputs: {
                 ref: "${{ github.event_name == 'workflow_dispatch' && inputs.ref || github.ref_name }}",

apps/cli/CHANGELOG.md

@@ -1,5 +1,49 @@
 # @ledgerhq/live-cli
 
+## 24.4.1
+
+### Patch Changes
+
+- Updated dependencies [[`af3d126`](https://github.com/LedgerHQ/ledger-live/commit/af3d126b524dbacf606e3beb56246608f2243eca)]:
+  - @ledgerhq/types-devices@6.25.2
+  - @ledgerhq/coin-framework@0.16.1
+  - @ledgerhq/coin-bitcoin@0.7.1
+  - @ledgerhq/live-common@34.6.1
+  - @ledgerhq/hw-transport@6.31.2
+  - @ledgerhq/hw-transport-node-hid@6.29.3
+  - @ledgerhq/live-wallet@0.4.1
+  - @ledgerhq/live-countervalues@0.2.3
+  - @ledgerhq/hw-app-btc@10.4.1
+  - @ledgerhq/hw-transport-http@6.30.2
+  - @ledgerhq/hw-transport-mocker@6.29.2
+  - @ledgerhq/hw-transport-node-speculos@6.29.2
+
+## 24.4.1-hotfix.1
+
+### Patch Changes
+
+- Updated dependencies [[`af3d126`](https://github.com/LedgerHQ/ledger-live/commit/af3d126b524dbacf606e3beb56246608f2243eca)]:
+  - @ledgerhq/types-devices@6.25.2-hotfix.0
+  - @ledgerhq/live-common@34.6.1-hotfix.1
+  - @ledgerhq/live-wallet@0.4.1-hotfix.1
+
+## 24.4.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ledgerhq/coin-framework@0.16.1-hotfix.0
+  - @ledgerhq/coin-bitcoin@0.7.1-hotfix.0
+  - @ledgerhq/live-common@34.6.1-hotfix.0
+  - @ledgerhq/hw-transport@6.31.2-hotfix.0
+  - @ledgerhq/hw-transport-node-hid@6.29.3-hotfix.0
+  - @ledgerhq/live-wallet@0.4.1-hotfix.0
+  - @ledgerhq/live-countervalues@0.2.3-hotfix.0
+  - @ledgerhq/hw-app-btc@10.4.1-hotfix.0
+  - @ledgerhq/hw-transport-http@6.30.2-hotfix.0
+  - @ledgerhq/hw-transport-mocker@6.29.2-hotfix.0
+  - @ledgerhq/hw-transport-node-speculos@6.29.2-hotfix.0
+
 ## 24.4.0
 
 ### Minor Changes

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",

apps/ledger-live-desktop/CHANGELOG.md

@@ -1,5 +1,85 @@
 # ledger-live-desktop
 
+## 2.84.1
+
+### Patch Changes
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`e87b017`](https://github.com/LedgerHQ/ledger-live/commit/e87b017b2d1cfaf22b8703045fbcbfee6796a119) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - fix(LLD): AccountList not showing the correct name and balance for tokens
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`86ae0ac`](https://github.com/LedgerHQ/ledger-live/commit/86ae0acac0a6450ad12a60df30f958368af1300c) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - Fix sentry error & troubleshoot animation theme
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`c4c9113`](https://github.com/LedgerHQ/ledger-live/commit/c4c91130c1bf3ce954be41fa1de20902fc8723e7) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - Fix onboarding error when device connected.
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`d1138d3`](https://github.com/LedgerHQ/ledger-live/commit/d1138d333a65e11b231f020a42ae62c64b91734e) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - Upadate Europa assets
+
+- Updated dependencies [[`0b12c90`](https://github.com/LedgerHQ/ledger-live/commit/0b12c9040d6ee0a326b1d5effd261ddee2db452f), [`af3d126`](https://github.com/LedgerHQ/ledger-live/commit/af3d126b524dbacf606e3beb56246608f2243eca)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 2.84.1-hotfix.3
+
+### Patch Changes
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`c4c9113`](https://github.com/LedgerHQ/ledger-live/commit/c4c91130c1bf3ce954be41fa1de20902fc8723e7) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - Fix onboarding error when device connected.
+
+- Updated dependencies [[`af3d126`](https://github.com/LedgerHQ/ledger-live/commit/af3d126b524dbacf606e3beb56246608f2243eca)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 2.84.1-hotfix.2
+
+### Patch Changes
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`86ae0ac`](https://github.com/LedgerHQ/ledger-live/commit/86ae0acac0a6450ad12a60df30f958368af1300c) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - Fix sentry error & troubleshoot animation theme
+
+## 2.84.1-hotfix.1
+
+### Patch Changes
+
+- [#7291](https://github.com/LedgerHQ/ledger-live/pull/7291) [`b3010eb`](https://github.com/LedgerHQ/ledger-live/commit/b3010ebcf99fe06436960d023fffd1cc549eea4a) Thanks [@jdabbech-ledger](https://github.com/jdabbech-ledger)! - Upadate Europa assets
+
+- Updated dependencies [[`5d508e5`](https://github.com/LedgerHQ/ledger-live/commit/5d508e5cfd296e458746adf176dd292aa884f7ea)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 2.84.1-hotfix.0
+
+### Patch Changes
+
+- [#7390](https://github.com/LedgerHQ/ledger-live/pull/7390) [`3298ccb`](https://github.com/LedgerHQ/ledger-live/commit/3298ccb398ccd703f84f79a6d58ee71f5c2a77d9) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - fix(LLD): AccountList not showing the correct name and balance for tokens
+
 ## 2.84.0
 
 ### Minor Changes

apps/ledger-live-desktop/RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+# 2.84.1
+
+### 🐛 Fix
+
+Some users reported issues when trying to top up their CL Card. This has been fixed.
+
 # 2.84.0
 
 ### 🗑 Removed features

apps/ledger-live-desktop/package.json

@@ -13,7 +13,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.84.0",
+  "version": "2.84.1",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",
@@ -47,7 +47,8 @@
     "test:playwright:clean": "git clean -fdX tests/artifacts",
     "typecheck": "node scripts/typecheck.js",
     "check": "pnpm lint; pnpm typecheck",
-    "unimported": "unimported"
+    "unimported": "unimported",
+    "assets:replace": "zx ./scripts/replace-assets.mjs"
   },
   "dependencies": {
     "@braze/web-sdk": "^4.6.3",

apps/ledger-live-desktop/scripts/replace-assets.mjs

@@ -0,0 +1,14 @@
+#!/usr/bin/env zx
+import "zx/globals";
+import fs from "fs";
+import path from "path";
+
+const basePath = path.join(__dirname, "..", "..", "..");
+const srcPath = path.join(__dirname, "..", "src");
+const replaceAssetsPath = path.join(basePath, "ledger-live-internal-assets", "apps", "ledger-live-desktop", "src");
+
+async function replaceAssets(){
+  await fs.promises.cp(replaceAssetsPath, srcPath, { recursive: true, force: true});
+}
+
+await replaceAssets();

apps/ledger-live-desktop/src/renderer/components/CustomImage/CustomLockScreenDeviceAction/index.tsx

@@ -128,6 +128,7 @@ const CustomImageDeviceAction: React.FC<Props> = withRemountableWrapper(props =>
           deviceModelId={deviceModelId}
           progress={progress}
           source={source}
+          type={type}
         />
       ) : imageCommitRequested && device ? (
         <RenderImageCommitRequested

apps/ledger-live-desktop/src/renderer/components/CustomImage/CustomLockScreenDeviceAction/stepsRendering.tsx

@@ -51,11 +51,13 @@ export const RenderLoadingImage = ({
   progress,
   source,
   deviceModelId,
+  type,
 }: {
   deviceModelId: CLSSupportedDeviceModelId;
   device: Device;
   progress: number | undefined;
   source?: string;
+  type: Theme["theme"];
 }) => {
   const { t } = useTranslation();
   return (
@@ -68,7 +70,7 @@ export const RenderLoadingImage = ({
     >
       <AnimationWrapper>
         <FramedPicture
-          frameConfig={getFramedPictureConfig("transfer", deviceModelId)}
+          frameConfig={getFramedPictureConfig("transfer", deviceModelId, type)}
           source={source}
           loadingProgress={progress}
         />
@@ -114,7 +116,7 @@ export const RenderImageCommitRequested = ({
       <DeviceBlocker />
       <AnimationWrapper>
         <FramedPicture
-          frameConfig={getFramedPictureConfig("transfer", deviceModelId)}
+          frameConfig={getFramedPictureConfig("preview", deviceModelId, type)}
           source={source}
           background={
             <Animation animation={getDeviceAnimation(device.modelId, type, "confirmLockscreen")} />

apps/ledger-live-desktop/src/renderer/components/CustomImage/FramedPicture.tsx

@@ -48,6 +48,7 @@ export type FramedPictureConfig = {
   innerTop: number;
   innerBottomHeight: number;
   borderRightRadius: number;
+  borderLeftRadius?: number;
   /** source of the background image */
   backgroundSource?: string;
 };
@@ -86,6 +87,7 @@ const FramedPicture: React.FC<Props> = ({
     innerTop,
     innerLeft,
     borderRightRadius,
+    borderLeftRadius,
     innerBottomHeight,
     backgroundSource,
   } = scaleFrameConfig(frameConfig, scale || 1);
@@ -129,6 +131,8 @@ const FramedPicture: React.FC<Props> = ({
                   objectFit: "fill",
                   borderTopRightRadius: borderRightRadius,
                   borderBottomRightRadius: borderRightRadius,
+                  borderTopLeftRadius: borderLeftRadius,
+                  borderBottomLeftRadius: borderLeftRadius,
                 }}
               />
             ) : null}

apps/ledger-live-desktop/src/renderer/components/CustomImage/ImageGrayscalePreview.tsx

@@ -229,7 +229,7 @@ const ImageGrayscalePreview: React.FC<Props> = props => {
       />
       {previewResult ? (
         <FramedPicture
-          frameConfig={getFramedPictureConfig("transfer", deviceModelId)}
+          frameConfig={getFramedPictureConfig("transfer", deviceModelId, theme.colors.palette.type)}
           source={previewResult?.imageBase64DataUri}
         />
       ) : null}