Merge branch 'release'

LedgerHQ · Sep 11, 2023 · 756150a · 756150a · vercel · Sep 11, 2023
2 parents 840b334 + 2f63108
commit 756150a
Show file tree

Hide file tree

Showing 353 changed files with 40,949 additions and 28,848 deletions.
diff --git a/.github/workflows/healthchecks-runners.yaml b/.github/workflows/healthchecks-runners.yaml
@@ -33,7 +33,7 @@ jobs:
       - uses: pnpm/action-setup@v2
         if: always()
         with:
-          version: 8.6
+          version: 8.7
           dest: ${{ runner.temp }}/setup-pnpm
       - uses: actions/setup-node@v3
         if: always()
@@ -158,7 +158,7 @@ jobs:
       - uses: pnpm/action-setup@v2
         if: always()
         with:
-          version: 8.6
+          version: 8.7
           dest: ${{ runner.temp }}/setup-pnpm
       - uses: actions/setup-node@v3
         if: always()
@@ -232,7 +232,7 @@ jobs:
       - uses: pnpm/action-setup@v2
         if: always()
         with:
-          version: 8.6
+          version: 8.7
           dest: ${{ runner.temp }}/setup-pnpm
       - uses: actions/setup-node@v3
         if: always()

diff --git a/.prototools b/.prototools
@@ -1,3 +1,3 @@
 node = "18.17.1"
 npm = "9.8.1"
-pnpm = "8.6.12"
+pnpm = "8.7.0"
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @ledgerhq/live-cli
 
+## 22.11.3
+
+### Patch Changes
+
+- Updated dependencies [[`e0cc3a0841`](https://github.com/LedgerHQ/ledger-live/commit/e0cc3a08415de84b9d3ce828444248a043a9d699), [`18b4a47b48`](https://github.com/LedgerHQ/ledger-live/commit/18b4a47b4878a23695a50096b7770134883b8a2e), [`5d20c326a0`](https://github.com/LedgerHQ/ledger-live/commit/5d20c326a038a430a38f28815ba65af71152118b), [`b2e8c1053e`](https://github.com/LedgerHQ/ledger-live/commit/b2e8c1053e57c763575c9c4d77d1daca8ef566fe), [`1c6deb2336`](https://github.com/LedgerHQ/ledger-live/commit/1c6deb2336a8b76517cc4d367f76dca24f9228dc), [`3ec5739f8a`](https://github.com/LedgerHQ/ledger-live/commit/3ec5739f8a4e3ff81da468cd91036b7b271dfd06), [`bfd4fef405`](https://github.com/LedgerHQ/ledger-live/commit/bfd4fef405f832489cc5258330e6483260c896d2)]:
+  - @ledgerhq/live-common@31.7.0
+  - @ledgerhq/coin-framework@0.5.3
+  - @ledgerhq/cryptoassets@9.12.1
+
 ## 22.11.2
 
 ### Patch Changes

diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "22.11.2",
+  "version": "22.11.3",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -71,7 +71,7 @@
     "@ledgerhq/types-live": "workspace:^",
     "@types/command-line-args": "^5.2.0",
     "@types/lodash": "^4.14.177",
-    "@types/node": "^17.0.15",
+    "@types/node": "^18.0.0",
     "@types/pako": "^2.0.0",
     "ts-node": "^10.4.0"
   }

diff --git a/apps/ledger-live-desktop/CHANGELOG.md b/apps/ledger-live-desktop/CHANGELOG.md
@@ -1,5 +1,45 @@
 # ledger-live-desktop
 
+## 2.68.1
+
+### Patch Changes
+
+- [#4613](https://github.com/LedgerHQ/ledger-live/pull/4613) [`e499949b1e`](https://github.com/LedgerHQ/ledger-live/commit/e499949b1e890b1efc7233596ac1a439a7963b1d) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - trigger lld prerelease build
+
+## 2.68.1-next.0
+
+### Patch Changes
+
+- [#4613](https://github.com/LedgerHQ/ledger-live/pull/4613) [`e499949b1e`](https://github.com/LedgerHQ/ledger-live/commit/e499949b1e890b1efc7233596ac1a439a7963b1d) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - trigger lld prerelease build
+
+## 2.68.0
+
+### Minor Changes
+
+- [#4476](https://github.com/LedgerHQ/ledger-live/pull/4476) [`b2e8c1053e`](https://github.com/LedgerHQ/ledger-live/commit/b2e8c1053e57c763575c9c4d77d1daca8ef566fe) Thanks [@KVNLS](https://github.com/KVNLS)! - Add modelId and modelIdList in meta object when we do an export with the qrcode
+
+### Patch Changes
+
+- Update broken readme environment variable link.
+
+- [#4552](https://github.com/LedgerHQ/ledger-live/pull/4552) [`ca8d064bab`](https://github.com/LedgerHQ/ledger-live/commit/ca8d064babf4df3babbdd4ba03f4be742d805edb) Thanks [@mitchellv-ledger](https://github.com/mitchellv-ledger)! - add new tag to earn in main side bar
+
+- [#4174](https://github.com/LedgerHQ/ledger-live/pull/4174) [`5d20c326a0`](https://github.com/LedgerHQ/ledger-live/commit/5d20c326a038a430a38f28815ba65af71152118b) Thanks [@sarneijim](https://github.com/sarneijim)! - Support customFees in swap web app mode
+
+- [#4540](https://github.com/LedgerHQ/ledger-live/pull/4540) [`bfd4fef405`](https://github.com/LedgerHQ/ledger-live/commit/bfd4fef405f832489cc5258330e6483260c896d2) Thanks [@haammar-ledger](https://github.com/haammar-ledger)! - Hardcode Ledger validator details for Solana
+
+- [#4509](https://github.com/LedgerHQ/ledger-live/pull/4509) [`a35135437b`](https://github.com/LedgerHQ/ledger-live/commit/a35135437bef6fcd44925a240f0f4894eeb565da) Thanks [@sshmaxime](https://github.com/sshmaxime)! - Added Storyly SDK along with its base hook and component
+
+- [#4562](https://github.com/LedgerHQ/ledger-live/pull/4562) [`61b1f38193`](https://github.com/LedgerHQ/ledger-live/commit/61b1f38193dc53824e35e3cf2d683330846d9f91) Thanks [@mle-gall](https://github.com/mle-gall)! - Final Stax pixel polished on LLD
+
+- Updated dependencies [[`e0cc3a0841`](https://github.com/LedgerHQ/ledger-live/commit/e0cc3a08415de84b9d3ce828444248a043a9d699), [`18b4a47b48`](https://github.com/LedgerHQ/ledger-live/commit/18b4a47b4878a23695a50096b7770134883b8a2e), [`5d20c326a0`](https://github.com/LedgerHQ/ledger-live/commit/5d20c326a038a430a38f28815ba65af71152118b), [`916d6975e5`](https://github.com/LedgerHQ/ledger-live/commit/916d6975e52f4f83291a9ce1a3e7e60dbccb5b20), [`b2e8c1053e`](https://github.com/LedgerHQ/ledger-live/commit/b2e8c1053e57c763575c9c4d77d1daca8ef566fe), [`916d6975e5`](https://github.com/LedgerHQ/ledger-live/commit/916d6975e52f4f83291a9ce1a3e7e60dbccb5b20), [`1c6deb2336`](https://github.com/LedgerHQ/ledger-live/commit/1c6deb2336a8b76517cc4d367f76dca24f9228dc), [`3ec5739f8a`](https://github.com/LedgerHQ/ledger-live/commit/3ec5739f8a4e3ff81da468cd91036b7b271dfd06), [`bfd4fef405`](https://github.com/LedgerHQ/ledger-live/commit/bfd4fef405f832489cc5258330e6483260c896d2), [`41a38e953b`](https://github.com/LedgerHQ/ledger-live/commit/41a38e953b17075b5ab7bec307c147d8f74b7501)]:
+  - @ledgerhq/live-common@31.7.0
+  - @ledgerhq/coin-framework@0.5.3
+  - @ledgerhq/react-ui@0.14.9
+  - @ledgerhq/coin-evm@0.6.1
+  - @ledgerhq/domain-service@1.1.10
+  - @ledgerhq/evm-tools@1.0.6
+
 ## 2.67.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-desktop/README.md b/apps/ledger-live-desktop/README.md
@@ -144,7 +144,7 @@ NO_DEBUG_DEVICE=1
 NO_DEBUG_COUNTERVALUES=1
 ```
 
-other envs can be seen in [live-common:src/env.ts](https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledger-live-common/src/env.ts)
+other envs can be seen in [libs/src/env.ts](https://github.com/LedgerHQ/ledger-live/blob/develop/libs/env/src/env.ts)
 
 ### Run tests
 

diff --git a/apps/ledger-live-desktop/RELEASE_NOTES.md b/apps/ledger-live-desktop/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+# 2.68.1
+
+This release includes minor bug fixes and security improvements.
+
 # 2.66.0
 
 ### 🚀 Features

diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -13,7 +13,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.67.0",
+  "version": "2.68.1",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",
@@ -123,6 +123,7 @@
     "rxjs7": "npm:[email protected]",
     "secp256k1": "^4.0.2",
     "semver": "^7.1.3",
+    "storyly-web": "^1.4.1",
     "styled-components": "^5.3.3",
     "styled-system": "^5.1.5",
     "timemachine": "^0.3.2",
@@ -146,9 +147,9 @@
     "@sentry/cli": "^2.13.0",
     "@sentry/types": "^7.47.0",
     "@testing-library/dom": "^9.3.1",
-    "@testing-library/jest-dom": "^5.17.0",
+    "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "12",
-    "@testing-library/react-hooks": "^4.0.1",
+    "@testing-library/react-hooks": "^8.0.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/chart.js": "2.9.37",
     "@types/color": "^3.0.3",
@@ -189,7 +190,7 @@
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "execa": "^7.0.0",
+    "execa": "^8.0.0",
     "hasha": "^5.2.2",
     "jest": "^29.6.1",
     "jest-canvas-mock": "^2.5.2",

diff --git a/apps/ledger-live-desktop/src/renderer/animations/stax/USBConnectionAndPin.json b/apps/ledger-live-desktop/src/renderer/animations/stax/USBConnectionAndPin.json
diff --git a/apps/ledger-live-desktop/src/renderer/animations/stax/USBConnectionSuccess.json b/apps/ledger-live-desktop/src/renderer/animations/stax/USBConnectionSuccess.json
diff --git a/apps/ledger-live-desktop/src/renderer/components/DeviceAction/animations.ts b/apps/ledger-live-desktop/src/renderer/components/DeviceAction/animations.ts
@@ -135,6 +135,10 @@ import STAX_signTransaction from "~/renderer/animations/stax/signTransaction.jso
 import STAX_allowConnection from "~/renderer/animations/stax/allowConnection.json";
 // @ts-ignore
 import STAX_confirmLockscreen from "~/renderer/animations/stax/confirmLockscreen.json";
+// @ts-ignore
+import STAX_USB_connection_success from "~/renderer/animations/stax/USBConnectionSuccess.json";
+// @ts-ignore
+import STAX_plug_and_pin from "~/renderer/animations/stax/USBConnectionAndPin.json";
 
 /* eslint-enable camelcase */
 type ThemedAnimation = Record<Theme["theme"], Record<string, unknown>>;
@@ -149,7 +153,8 @@ export type AnimationKey =
   | "firmwareUpdating"
   | "installLoading"
   | "confirmLockscreen"
-  | "recoverWithProtect";
+  | "recoverWithProtect"
+  | "connectionSuccess";
 type DeviceAnimations = { [key in AnimationKey]: ThemedAnimation };
 
 const nanoS: DeviceAnimations = {
@@ -197,6 +202,10 @@ const nanoS: DeviceAnimations = {
     light: NANO_X_LIGHT_recoverWithProtect,
     dark: NANO_X_DARK_recoverWithProtect,
   },
+  connectionSuccess: {
+    light: STAX_USB_connection_success,
+    dark: STAX_USB_connection_success,
+  },
 };
 
 const nanoX: DeviceAnimations = {
@@ -244,6 +253,10 @@ const nanoX: DeviceAnimations = {
     light: NANO_X_LIGHT_recoverWithProtect,
     dark: NANO_X_DARK_recoverWithProtect,
   },
+  connectionSuccess: {
+    light: STAX_USB_connection_success,
+    dark: STAX_USB_connection_success,
+  },
 };
 
 const nanoSP: DeviceAnimations = {
@@ -291,12 +304,16 @@ const nanoSP: DeviceAnimations = {
     light: NANO_X_LIGHT_recoverWithProtect,
     dark: NANO_X_DARK_recoverWithProtect,
   },
+  connectionSuccess: {
+    light: STAX_USB_connection_success,
+    dark: STAX_USB_connection_success,
+  },
 };
 
 const stax: DeviceAnimations = {
   plugAndPinCode: {
-    light: STAX_enterPin,
-    dark: STAX_enterPin,
+    light: STAX_plug_and_pin,
+    dark: STAX_plug_and_pin,
   },
   enterPinCode: {
     light: STAX_enterPin,
@@ -338,6 +355,10 @@ const stax: DeviceAnimations = {
     light: NANO_X_LIGHT_recoverWithProtect,
     dark: NANO_X_DARK_recoverWithProtect,
   },
+  connectionSuccess: {
+    light: STAX_USB_connection_success,
+    dark: STAX_USB_connection_success,
+  },
 };
 
 const blue: DeviceAnimations = {
@@ -386,6 +407,10 @@ const blue: DeviceAnimations = {
     light: NANO_X_LIGHT_recoverWithProtect,
     dark: NANO_X_DARK_recoverWithProtect,
   },
+  connectionSuccess: {
+    light: STAX_USB_connection_success,
+    dark: STAX_USB_connection_success,
+  },
 };
 
 type Animations = {

diff --git a/apps/ledger-live-desktop/src/renderer/components/Exporter/QRCodeExporter.tsx b/apps/ledger-live-desktop/src/renderer/components/Exporter/QRCodeExporter.tsx
@@ -1,18 +1,27 @@
 import React, { PureComponent } from "react";
 import { Buffer } from "buffer";
+import { DeviceModelId } from "@ledgerhq/devices";
+import { DeviceModelInfo } from "@ledgerhq/types-live";
 import { createStructuredSelector } from "reselect";
 import { connect } from "react-redux";
 import styled from "styled-components";
 import { dataToFrames } from "qrloop";
 import { Settings, encode } from "@ledgerhq/live-common/cross";
 import { activeAccountsSelector } from "~/renderer/reducers/accounts";
-import { exportSettingsSelector } from "~/renderer/reducers/settings";
+import {
+  exportSettingsSelector,
+  lastSeenDeviceSelector,
+  devicesModelListSelector,
+} from "~/renderer/reducers/settings";
+
 import QRCode from "~/renderer/components/QRCode";
 import { Account } from "@ledgerhq/types-live";
 
 const mapStateToProps = createStructuredSelector({
   accounts: (state, props) => props.accounts || activeAccountsSelector(state),
   settings: exportSettingsSelector,
+  device: state => lastSeenDeviceSelector(state) || null,
+  devices: state => devicesModelListSelector(state) || [],
 });
 
 const QRCodeContainer = styled.div`
@@ -30,6 +39,8 @@ type OwnProps = {
 type Props = OwnProps & {
   accounts: Account[];
   settings: Settings;
+  devices: DeviceModelId[];
+  device: DeviceModelInfo | null;
 };
 class QRCodeExporter extends PureComponent<
   Props,
@@ -45,10 +56,12 @@ class QRCodeExporter extends PureComponent<
 
   constructor(props: Props) {
     super(props);
-    const { accounts, settings } = props;
+    const { accounts, settings, device, devices } = props;
     const data = encode({
       accounts,
       settings,
+      modelId: device?.modelId,
+      modelIdList: devices,
       exporterName: "desktop",
       exporterVersion: __APP_VERSION__,
     });

diff --git a/apps/ledger-live-desktop/src/renderer/components/MainSideBar/index.tsx b/apps/ledger-live-desktop/src/renderer/components/MainSideBar/index.tsx
@@ -227,6 +227,7 @@ const MainSideBar = () => {
   const displayBlueDot = useManagerBlueDot(lastSeenDevice);
 
   const referralProgramConfig = useFeature("referralProgramDesktopSidebar");
+  const ptxEarnConfig = useFeature("ptxEarn");
   const recoverFeature = useFeature("protectServicesDesktop");
   const handleCollapse = useCallback(() => {
     dispatch(setSidebarCollapsed(!collapsed));
@@ -442,6 +443,13 @@ const MainSideBar = () => {
                     onClick={handleClickEarn}
                     isActive={location.pathname === "/earn"}
                     collapsed={secondAnim}
+                    NotifComponent={
+                      ptxEarnConfig?.params?.isNew ? (
+                        <CustomTag active type="plain" size="small">
+                          {t("common.new")}
+                        </CustomTag>
+                      ) : null
+                    }
                   />
                 </FeatureToggle>
                 <SideBarListItem

diff --git a/...ledger-live-desktop/src/renderer/components/PostOnboardingHub/PostOnboardingActionRow.tsx b/...ledger-live-desktop/src/renderer/components/PostOnboardingHub/PostOnboardingActionRow.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback } from "react";
-import { Flex, IconsLegacy, Tag, Text } from "@ledgerhq/react-ui";
+import { Flex, Icons, Tag, Text } from "@ledgerhq/react-ui";
 import { useTranslation } from "react-i18next";
 // import { useHistory } from "react-router-dom";
 import { PostOnboardingActionState, PostOnboardingAction } from "@ledgerhq/types-live";
@@ -42,8 +42,8 @@ const PostOnboardingActionRow: React.FC<Props> = props => {
             },
           })}
     >
-      <Flex flexDirection="row" alignItems="center" flexShrink={1}>
-        <Icon size="M" color={completed ? "neutral.c70" : "primary.c80"} />
+      <Flex flexDirection="row" alignItems="flex-start" flexShrink={1}>
+        <Icon size="M" color={completed ? "neutral.c60" : "primary.c80"} />
         <Flex ml={6} flexDirection="column" justifyContent="center" flex={1}>
           <Text
             variant="largeLineHeight"
@@ -73,9 +73,9 @@ const PostOnboardingActionRow: React.FC<Props> = props => {
           </Tag>
         ) : null}
         {completed ? (
-          <IconsLegacy.CheckAloneMedium color="success.c50" size={16} />
+          <Icons.Check color="success.c70" size={"M"} />
         ) : (
-          <IconsLegacy.ChevronRightMedium color="neutral.c100" size={16} />
+          <Icons.ChevronRight color="neutral.c100" size={"M"} />
         )}
       </Flex>
     </ActionRowWrapper>

diff --git a/apps/ledger-live-desktop/src/renderer/components/PostOnboardingScreen/index.tsx b/apps/ledger-live-desktop/src/renderer/components/PostOnboardingScreen/index.tsx
@@ -31,7 +31,14 @@ const PostOnboardingScreen = () => {
           flow={"post-onboarding"}
         />
 
-        <Text variant="paragraph" fontSize={48} mb={8} whiteSpace="pre-wrap">
+        <Text
+          variant="paragraph"
+          fontSize={40}
+          mb={8}
+          fontWeight="semiBold"
+          lineHeight="120%"
+          whiteSpace="pre-wrap"
+        >
           {allDone
             ? t("postOnboarding.postOnboardingScreen.titleCompleted")
             : t("postOnboarding.postOnboardingScreen.title")}