Merge branch 'develop' into releases/2.36.x

LedgerHQ · Dec 7, 2021 · 77747ec · 77747ec
2 parents b0fc758 + e7f5162
commit 77747ec
Show file tree

Hide file tree

Showing 12 changed files with 245 additions and 196 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 **[We are hiring, join us! 👨‍💻👩‍💻](https://jobs.lever.co/ledger/?department=Engineering)**
 
-
 # Ledger Live (desktop) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/ledger-wallet/localized.svg)](https://crowdin.com/project/ledger-wallet)
 
 - Related: [ledger-live-mobile](https://github.com/ledgerhq/ledger-live-mobile)
@@ -29,6 +28,7 @@ The latest stable release is available on [ledger.com/ledger-live](https://www.l
 Previous versions and pre-releases can be downloaded on here from the [Releases](https://github.com/LedgerHQ/ledger-live-desktop/releases) section.
 
 ### Compatibility
+
 - macOS 10.14+
 - Windows 8.1+ (x64)
 - Linux (x64)
@@ -47,7 +47,7 @@ Ledger Live releases are signed. The automatic update mechanism makes use of the
 - [Yarn 1.x](https://classic.yarnpkg.com/) (Classic)
 - [Python](https://www.python.org/) 2.7 or 3.5+
 - A C/C++ toolchain (see [node-gyp documentation](https://github.com/nodejs/node-gyp#on-unix))
-- On Linux: ```sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev```
+- On Linux: `sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev`
 
 ## Install
 
@@ -72,6 +72,48 @@ yarn start
 yarn dist
 ```
 
+## Debug
+
+If you are using [Visual Studio Code](https://code.visualstudio.com/) IDE, here is a [Launch Configuration](https://code.visualstudio.com/docs/nodejs/nodejs-debugging#_launch-configuration) that should allow you to run and debug the main process as well as the render process of the application.
+
+As stated in the [debugging documentation](https://code.visualstudio.com/docs/editor/debugging), this file should be named `launch.json` and located under the `.vscode` folder.
+
+```json
+{
+  "version": "0.2.0",
+  "compounds": [
+    {
+      "name": "Run and Debug LLD",
+      "configurations": ["Debug Main Process", "Debug Renderer Process"],
+      "stopAll": true
+    }
+  ],
+  "configurations": [
+    {
+      "name": "Debug Main Process",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "yarn",
+      "args": ["start"],
+      "outputCapture": "std",
+      "resolveSourceMapLocations": null,
+      "env": {
+        "ELECTRON_ARGS": "--remote-debugging-port=8315"
+      }
+    },
+    {
+      "name": "Debug Renderer Process",
+      "type": "chrome",
+      "request": "attach",
+      "address": "localhost",
+      "port": 8315,
+      "timeout": 60000
+    }
+  ]
+}
+```
+
 ---
 
 ## Config (optional helpers)
@@ -97,22 +139,27 @@ other envs can be seen in [live-common:src/env.js](https://github.com/LedgerHQ/l
 ### Run tests
 
 In a terminal you need to have webpack dev server running
+
 ```bash
 yarn start
 ```
 
 In an other terminal you need to launch the webdriver/electron container. First run will be slow.
 Next ones will be fast unless some changes are made to the container or package.json. You need to kill and re run the command if package.json changed. Make sure you are running Docker.
+
 ```bash
 yarn start-electron-webdriver
 ```
 
 You can point VNCViewer to `localhost::5900` to check what is happening in the container. `secret` is the password.
 Then you can launch tests.
+
 ```bash
 yarn spectron
 ```
+
 or
+
 ```bash
 node_modules/.bin/jest tests/specs/<FILEREGEX>.spec.js
 ```
@@ -165,4 +212,3 @@ src
 ├── network.js : network implementation. will eventually move back to live-common.
 └── sentry : related to bug report API
 ```
-
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "@ledgerhq/hw-transport-http": "6.15.0",
     "@ledgerhq/hw-transport-node-hid-singleton": "6.11.2",
     "@ledgerhq/ledger-core": "6.14.5",
-    "@ledgerhq/live-common": "^21.19.5",
+    "@ledgerhq/live-common": "21.20.1",
     "@ledgerhq/logs": "6.10.0",
     "@polkadot/react-identicon": "0.86.5",
     "@tippyjs/react": "^4.2.6",

diff --git a/playwright/specs/settings.spec.ts-snapshots/settings-experimental-page-win32.png b/playwright/specs/settings.spec.ts-snapshots/settings-experimental-page-win32.png
diff --git a/src/renderer/components/OperationsList/AmountCell.js b/src/renderer/components/OperationsList/AmountCell.js
@@ -50,7 +50,7 @@ class AmountCell extends PureComponent<Props> {
             <Element operation={operation} unit={unit} currency={currency} />
           </Cell>
         )}
-        {!amount.isZero() && (
+        {(!amount.isZero() || AmountElement) && (
           <Cell>
             {AmountElement ? (
               <AmountElement

diff --git a/src/renderer/components/OperationsList/ConfirmationCheck.js b/src/renderer/components/OperationsList/ConfirmationCheck.js
@@ -40,12 +40,15 @@ const border = p =>
     : p.isConfirmed
     ? 0
     : `1px solid ${
-        p.type === "IN" ? p.marketColor : rgba(p.theme.colors.palette.text.shade60, 0.2)
+        p.type === "IN" || p.type === "NFT_IN"
+          ? p.marketColor
+          : rgba(p.theme.colors.palette.text.shade60, 0.2)
       }`;
 
 function inferColor(p) {
   switch (p.type) {
     case "IN":
+    case "NFT_IN":
       return p.marketColor;
     case "FREEZE":
       return p.theme.colors.wallet;

diff --git a/static/i18n/de/app.json b/static/i18n/de/app.json
@@ -318,22 +318,22 @@
           "postalCodePlaceholder": "Geben Sie Ihre Postleitzahl ein",
           "dateOfBirthPlaceholder": "TT.MM.JJJJ",
           "firstNameError": "Geben Sie Ihren Vornamen ein, um fortzufahren",
-          "lastNameError": "Enter your last name to continue",
-          "street1Error": "Enter your address",
-          "cityError": "Enter the city you live in the USA",
-          "postalCodeError": "Enter a valid US ZIP code",
-          "dateOfBirthError": "Enter your date of birth",
-          "dateOfBirthValidationError": "Enter a valid date of birth"
+          "lastNameError": "Geben Sie Ihren Nachnamen ein, um fortzufahren",
+          "street1Error": "Geben Sie Ihre Adresse ein",
+          "cityError": "Geben Sie die Stadt ein, in der Sie in den USA leben",
+          "postalCodeError": "Geben Sie eine gültige US-Postleitzahl ein",
+          "dateOfBirthError": "Geben Sie Ihr Geburtsdatum ein",
+          "dateOfBirthValidationError": "Geben Sie ein gültiges Geburtsdatum ein"
         }
       }
     },
     "exchangeDrawer": {
-      "title": "Confirm your Exchange",
+      "title": "Swap bestätigen",
       "completed": {
-        "title": "Pending Operation",
-        "description": "Your Swap operation has been sent to the network for confirmation. It may take up to an hour before you receive your {{targetCurrency}}.",
-        "disclaimer": "Take note of your Swap ID number in case you’d need assistance from <0><0>{{provider}}</0> support</0>.",
-        "seeDetails": "See details"
+        "title": "Vorgang ausstehend",
+        "description": "Ihr Tauschvorgang (Swap) wurde zur Bestätigung an das Netzwerk gesendet. Es kann bis zu einer Stunde dauern, bis Sie Ihre {{targetCurrency}} erhalten.",
+        "disclaimer": "Notieren Sie sich Ihre Swap-ID-Nummer, falls Sie Unterstützung von <0><0>{{provider}}</0> Unterstützung</0> benötigen.",
+        "seeDetails": "Siehe Details"
       }
     }
   },
@@ -1069,9 +1069,9 @@
       "cta": "Jetzt kaufen"
     },
     "familyPack": {
-      "title": "Family pack",
-      "description": "Get your family and friends into crypto with 3 Nano S at a discounted price",
-      "cta": "Buy family pack"
+      "title": "Familien-Paket",
+      "description": "Begeistern Sie Ihre Familie und Freunde für Krypto mit 3 Nano S zu einem ermäßigten Preis",
+      "cta": "Familien-Paket kaufen"
     },
     "polkaStake": {
       "title": "POLKADOT Staking",
@@ -1115,7 +1115,7 @@
     "disconnected": "Getrennt",
     "connected": "Verbunden",
     "connecting": "Verbinde ...",
-    "invalidAccount": "Invalid account id",
+    "invalidAccount": "Ungültige Konto-ID",
     "steps": {
       "paste": {
         "title": "Link einfügen",
@@ -1125,7 +1125,7 @@
       "confirm": {
         "title": "Verbinden",
         "details": "Will sich mit dem folgenden Ethereum-Konto über Ihren Wallet verbinden:",
-        "deeplinkDetails": "Wants to connect to Ledger Live. Choose your Ethereum account:"
+        "deeplinkDetails": "Mit Ledger Live verbinden. Wählen Sie Ihr Ethereum-Konto"
       }
     },
     "connectedscreen": {
@@ -1176,36 +1176,36 @@
   "NFT": {
     "viewer": {
       "actions": {
-        "send": "Send",
-        "open": "Open in {{viewer}}"
+        "send": "Senden",
+        "open": "In {{viewer}} öffnen"
       },
       "attributes": {
-        "properties": "Properties",
-        "description": "Description",
-        "contract": "Contract address",
+        "properties": "Eigenschaften",
+        "description": "Beschreibung",
+        "contract": "Vertragsadresse",
         "tokenId": "Token ID",
-        "quantity": "Quantity"
+        "quantity": "Menge"
       }
     },
     "collections": {
-      "title": "NFT (Non Fungible Tokens) Collections",
-      "receiveCTA": "Receive NFT",
-      "galleryCTA": "See Gallery",
-      "seeMore": "See more collections",
-      "seeAll": "See all collections",
-      "seeLess": "See less"
+      "title": "NFT (Non Fungible Tokens) Sammlungen",
+      "receiveCTA": "NFT erhalten",
+      "galleryCTA": "Galerie ansehen",
+      "seeMore": "Weitere Sammlungen ansehen",
+      "seeAll": "Alle Sammlungen anzeigen",
+      "seeLess": "Weniger anzeigen"
     },
     "gallery": {
-      "title": "All NFT",
+      "title": "Alle NFT",
       "collection": {
         "header": {
-          "sendCTA": "Send",
-          "contract": "Contract: {{contract}}"
+          "sendCTA": "Senden",
+          "contract": "Vertrag: {{contract}}"
         },
         "operationList": {
-          "header": "Latest Operations",
-          "OUT": "Sent",
-          "IN": "Received"
+          "header": "Letzte Aktionen",
+          "OUT": "Gesendet",
+          "IN": "Empfangen"
         }
       },
       "tokensList": {
@@ -1299,7 +1299,7 @@
       "noOperationOnLastAccount": "Sie können kein neues Konto hinzufügen, bevor Sie Guthaben auf Ihrem <1><0>{{accountName}}</0></1> Konto erhalten haben",
       "noAccountToCreate": "Es wurde kein <1><0>{{currencyName}}}}</0></1> Konto gefunden, das erstellt werden kann",
       "showAllAddressTypes": "Alle Adresstypen anzeigen",
-      "showAllAddressTypesTooltip": "Only change the address type if you need to receive {{family}} on other address formats."
+      "showAllAddressTypesTooltip": "Ändern Sie nur den Adresstyp wenn Sie {{family}} in anderen Adressformaten erhalten möchten."
     },
     "supportLinks": {
       "segwit_or_native_segwit": "Segwit oder Native Segwit?"
@@ -1355,10 +1355,10 @@
     "details": "{{ currency }} Details",
     "multipleAddresses": "Warum mehrere Adressen?",
     "nft": {
-      "name": "Token Name",
-      "contract": "Token Contract",
+      "name": "Token-Name",
+      "contract": "Token-Vertrag",
       "id": "Token (NFT) ID",
-      "amount": "Amount"
+      "amount": "Betrag"
     },
     "extra": {
       "frozenAmount": "Eingefrorener Betrag",
@@ -1420,12 +1420,12 @@
       "payoutNetworkFeesTooltip": "Dieser Betrag wird nicht auf Ihrem Gerät angezeigt"
     },
     "swap2": {
-      "amountSent": "Amount to send",
-      "amountReceived": "Amount to receive",
-      "provider": "Provider",
-      "fees": "Network Fees",
-      "sourceAccount": "Source Account",
-      "targetAccount": "Target Account"
+      "amountSent": "Zu sendender Betrag",
+      "amountReceived": "Betrag, den Sie erhalten",
+      "provider": "Anbieter",
+      "fees": "Netzwerk-Gebühren",
+      "sourceAccount": "Abbuchungskonto",
+      "targetAccount": "Zielkonto"
     },
     "sell": {
       "notice": "Überprüfen Sie die Verkaufsdetails auf Ihrem Gerät, bevor Sie sie senden. Die Adressen werden sicher ausgetauscht, sodass Sie diese nicht verifizieren müssen.",
@@ -1440,10 +1440,10 @@
       "appOnDeviceSearch": "Installierte Apps suchen..."
     },
     "disconnected": {
-      "title": "Looks like an app is open on your device",
-      "subtitle": "Reopening the Manager will quit the app on your device",
-      "ctaReopen": "Reopen Manager",
-      "ctaPortfolio": "Back to Portfolio"
+      "title": "Es sieht so aus, als ob eine App auf Ihrem Gerät geöffnet ist",
+      "subtitle": "Beim erneuten Öffnen des Managers wird die App auf Ihrem Gerät beendet",
+      "ctaReopen": "Manager erneut öffnen",
+      "ctaPortfolio": "Zurück zum Portfolio"
     },
     "deviceStorage": {
       "freeSpace": "<0>{{space}}</0> frei",
@@ -1543,11 +1543,11 @@
       "update": "Firmware-Update",
       "updateBtn": "Firmware aktualisieren",
       "banner": {
-        "warning": "Update Firmware to {{latestFirmware}} is available",
-        "cta": "Go to manager",
+        "warning": "Update-Firmware zu {{latestFirmware}} ist verfügbar",
+        "cta": "Zum Manager gehen",
         "old": {
-          "warning": "Device firmware version too old to be updated. Contact Ledger Support for a replacement.",
-          "cta": "Contact support"
+          "warning": "Geräte-Firmware-Version zu alt, um aktualisiert zu werden. Kontaktieren Sie den Ledger-Support für einen Ersatz.",
+          "cta": "Support kontaktieren"
         },
         "cta2": "Firmware aktualisieren"
       },

diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json
@@ -1441,8 +1441,8 @@
     },
     "disconnected": {
       "title": "Parece que una aplicación está abierta en tu dispositivo",
-      "subtitle": "Reopening the Manager will quit the app on your device",
-      "ctaReopen": "Reopen Manager",
+      "subtitle": "Volver a abrir el Manager cerrará la aplicación en tu dispositivo",
+      "ctaReopen": "Volver a abrir el Manager",
       "ctaPortfolio": "Volver al Portfolio"
     },
     "deviceStorage": {