Merge branch 'develop' of github.com:LedgerHQ/ledger-live-desktop int…

…o LL-7231

.flowconfig

@@ -18,9 +18,6 @@ flow-defs
 module.system.node.resolve_dirname=./src
 module.system.node.resolve_dirname=node_modules
 module.name_mapper='^~' ->'<PROJECT_ROOT>/src'
-module.name_mapper='^@ui' ->'<PROJECT_ROOT>/ui-lib/lib'
-module.name_mapper='^@components' ->'<PROJECT_ROOT>/src/renderer/components'
-module.name_mapper='^@styles' ->'<PROJECT_ROOT>/src/renderer/styles'
 munge_underscores=true
 esproposal.optional_chaining=enable
 

.github/workflows/build-linux-prod.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
@@ -22,6 +22,8 @@ jobs:
           node-version: 14.x
       - name: install linux dependencies
         run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev
+      - name: install and switch to GCC 5.4
+        run: ./tools/g++-5.4/install.sh
       - name: get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"

.github/workflows/bundle-app.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   cancel-previous:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Cancel Previous Runs
         run: curl -i -L -X GET 'https://github-actions-live.ledger.tools/api/cancel-previous-run?runId=${{ github.run_id }}&owner=LedgerHQ&repo=ledger-live-desktop&branch=${{ github.event.pull_request.head.ref }}&headSha=${{ github.event.pull_request.head.sha }}'
@@ -72,7 +72,7 @@ jobs:
           path: dist/${{ steps.post-version.outputs.name }}-${{ steps.post-version.outputs.version }}-mac.dmg
 
   bundle-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: cancel-previous
     steps:
       - uses: ledgerhq/actions/[email protected]
@@ -94,6 +94,8 @@ jobs:
           git config user.name "Team Live"
       - name: install linux dependencies
         run: sudo apt-get update && sudo apt-get install libudev-dev libusb-1.0-0-dev
+      - name: install and switch to GCC 5.4
+        run: ./tools/g++-5.4/install.sh
       - name: get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"

.github/workflows/checks.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Cancel Previous Runs
         run: curl -i -L -X GET 'https://github-actions-live.ledger.tools/api/cancel-previous-run?runId=${{ github.run_id }}&owner=LedgerHQ&repo=ledger-live-desktop&branch=${{ github.event.pull_request.head.ref }}&headSha=${{ github.event.pull_request.head.sha }}'
@@ -30,6 +30,8 @@ jobs:
         if: always() && job.status != 'cancelled'
         with:
           node-version: 14.x
+      - name: install and switch to GCC 5.4
+        run: ./tools/g++-5.4/install.sh
       - name: get yarn cache
         if: always() && job.status != 'cancelled'
         id: yarn-cache

.github/workflows/sync-nightly-develop.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   sync-branches:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:

CONTRIBUTORS.md

@@ -0,0 +1,5 @@
+# Ledger Live contributors
+
+> External teams and individuals who help making Ledger Live better 🚀
+
+- ElrondTeam: `elrond` coin family integration

README.md

@@ -1,5 +1,6 @@
 **[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)

electron-builder-nightly.yml

@@ -57,3 +57,10 @@ files:
   - "!node_modules/sodium-native/prebuilds"
   - "!node_modules/sodium-native/tmp"
   # Exclude modules
+
+publish:
+  - provider: github
+  - provider: s3
+    bucket: ledger-live-download-sandbox
+    region: eu-west-1
+    acl: private

main.webpack.config.js

@@ -61,13 +61,6 @@ module.exports = {
   resolve: {
     alias: {
       "~": path.resolve(__dirname, "src"),
-      "@ui": path.resolve(__dirname, "ui-lib", "lib"),
-      "@components": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "components")
-        : path.resolve(__dirname, "src", "renderer", "components"),
-      "@styles": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "styles")
-        : path.resolve(__dirname, "src", "renderer", "styles"),
     },
   },
 };

package.json

@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.33.1",
+  "version": "2.34.0",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",
@@ -38,9 +38,7 @@
     "spectron": "jest \"tests/specs/.*\\.spec\\.js\" --maxWorkers=4",
     "spectron-inband": "jest \"tests/specs/.*\\.spec\\.js\" --runInBand",
     "spectron-coverage": "nyc report --reporter=text-lcov --temp-dir=tests/coverage | codecov --pipe --disable=gcov",
-    "generate-screenshots": "PWD=$(pwd); cd docker; docker run -v \"$PWD:/github/workspace\" -w \"/github/workspace\" --rm -it $(docker build -q .)",
-    "storybook": "cd ui-lib && yarn storybook",
-    "build-storybook": "cd ui-lib && yarn build-storybook"
+    "generate-screenshots": "PWD=$(pwd); cd docker; docker run -v \"$PWD:/github/workspace\" -w \"/github/workspace\" --rm -it $(docker build -q .)"
   },
   "dependencies": {
     "@electron/remote": "^1.2.1",
@@ -52,7 +50,7 @@
     "@ledgerhq/hw-transport-http": "6.7.0",
     "@ledgerhq/hw-transport-node-hid-singleton": "6.7.0",
     "@ledgerhq/ledger-core": "6.13.0",
-    "@ledgerhq/live-common": "^21.5.1",
+    "@ledgerhq/live-common": "^21.7.0",
     "@ledgerhq/logs": "6.2.0",
     "@polkadot/react-identicon": "0.85.3",
     "@tippyjs/react": "^4.2.5",
@@ -77,7 +75,7 @@
     "invariant": "^2.2.4",
     "ip": "^1.1.5",
     "isomorphic-unfetch": "^3.1.0",
-    "json-rpc-2.0": "^0.2.16",
+    "json-rpc-2.0": "^0.2.19",
     "jsqr": "^1.4.0",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",

preloader.webpack.config.js

@@ -77,13 +77,6 @@ module.exports = {
   resolve: {
     alias: {
       "~": path.resolve(__dirname, "src"),
-      "@ui": path.resolve(__dirname, "ui-lib", "lib"),
-      "@components": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "components")
-        : path.resolve(__dirname, "src", "renderer", "components"),
-      "@styles": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "styles")
-        : path.resolve(__dirname, "src", "renderer", "styles"),
     },
   },
 };

renderer.webpack.config.js

@@ -96,13 +96,6 @@ module.exports = {
   resolve: {
     alias: {
       "~": path.resolve(__dirname, "src"),
-      "@ui": path.resolve(__dirname, "ui-lib", "lib"),
-      "@components": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "components")
-        : path.resolve(__dirname, "src", "renderer", "components"),
-      "@styles": process.env.REBRANDING
-        ? path.resolve(__dirname, "ui-lib", "lib", "styles")
-        : path.resolve(__dirname, "src", "renderer", "styles"),
     },
   },
 };

src/config/urls.js

@@ -195,4 +195,7 @@ export const urls = {
     "https://shop.ledger.com/pages/ledger-live-terms-of-use?utm_source=ledger_live_desktop&utm_medium=self_referral&utm_content=compoundTnC",
   approvedOperation:
     "https://support.ledger.com/hc/en-us/articles/360020849134-Track-your-transaction?docs=true",
+  elrond: {
+    website: "https://elrond.com",
+  },
 };

src/internal/commands/getAppAndVersion.js

@@ -0,0 +1,19 @@
+// @flow
+import type { Observable } from "rxjs";
+import { withDevice } from "@ledgerhq/live-common/lib/hw/deviceAccess";
+import getAppAndVersion from "@ledgerhq/live-common/lib/hw/getAppAndVersion";
+import { from } from "rxjs";
+
+type Input = {
+  deviceId: string,
+};
+
+const cmd = ({
+  deviceId,
+}: Input): Observable<{
+  name: string,
+  version: string,
+  flags: number | Buffer,
+}> => withDevice(deviceId)(transport => from(getAppAndVersion(transport)));
+
+export default cmd;

src/internal/commands/index.js

@@ -24,6 +24,7 @@ import websocketBridge from "./websocketBridge";
 import checkSignatureAndPrepare from "./checkSignatureAndPrepare";
 import getTransactionId from "./getTransactionId";
 import scanDescriptors from "./scanDescriptors";
+import getAppAndVersion from "./getAppAndVersion";
 import { commands as bridgeProxyCommands } from "~/renderer/bridge/proxy-commands";
 
 export const commandsById = {
@@ -53,6 +54,7 @@ export const commandsById = {
   websocketBridge,
   scanDescriptors,
   signMessage,
+  getAppAndVersion,
 };
 
 export type Commands = typeof commandsById;

src/renderer/Default.js

@@ -12,6 +12,7 @@ import Manager from "~/renderer/screens/manager";
 import Exchange from "~/renderer/screens/exchange";
 import Swap from "~/renderer/screens/exchange/swap";
 import Swap2 from "~/renderer/screens/exchange/Swap2";
+import USBTroubleshooting from "~/renderer/screens/USBTroubleshooting";
 import Account from "~/renderer/screens/account";
 import WalletConnect from "~/renderer/screens/WalletConnect";
 import Asset from "~/renderer/screens/asset";
@@ -42,12 +43,14 @@ import AnalyticsConsole from "~/renderer/components/AnalyticsConsole";
 import DebugMock from "~/renderer/components/debug/DebugMock";
 import { DebugWrapper } from "~/renderer/components/debug/shared";
 import useDeeplink from "~/renderer/hooks/useDeeplinking";
+import useUSBTroubleshooting from "~/renderer/hooks/useUSBTroubleshooting";
 import ModalsLayer from "./ModalsLayer";
 import { ToastOverlay } from "~/renderer/components/ToastOverlay";
 import Drawer from "~/renderer/drawers/Drawer";
 import UpdateBanner from "~/renderer/components/Updater/Banner";
 import FirmwareUpdateBanner from "~/renderer/components/FirmwareUpdateBanner";
 import useEnv from "~/renderer/hooks/useEnv";
+import pkg from "../../package.json";
 
 export const TopBannerContainer: ThemedComponent<{}> = styled.div`
   position: sticky;
@@ -58,12 +61,57 @@ export const TopBannerContainer: ThemedComponent<{}> = styled.div`
   }
 `;
 
+const NightlyLayerR = () => {
+  const children = [];
+  const w = 200;
+  const h = 100;
+  for (let y = 0.5; y < 20; y++) {
+    for (let x = 0.5; x < 20; x++) {
+      children.push(
+        <div
+          style={{
+            position: "absolute",
+            textAlign: "center",
+            top: y * h,
+            left: x * w,
+            transform: "rotate(-45deg)",
+          }}
+        >
+          NIGHTLY
+          <br />
+          {__APP_VERSION__}
+        </div>,
+      );
+    }
+  }
+  return (
+    <div
+      style={{
+        position: "fixed",
+        pointerEvents: "none",
+        opacity: 0.1,
+        color: "#777",
+        width: "100%",
+        height: "100%",
+        top: 0,
+        right: 0,
+        zIndex: 999999999999,
+      }}
+    >
+      {children}
+    </div>
+  );
+};
+
+const NightlyLayer = React.memo(NightlyLayerR);
+
 export default function Default() {
   const location = useLocation();
   const ref: React$ElementRef<any> = useRef();
   const isSwapV2Enabled = useEnv("EXPERIMENTAL_SWAP") && __DEV__;
   const SwapComponent = useMemo(() => (isSwapV2Enabled ? Swap2 : Swap), [isSwapV2Enabled]);
   useDeeplink();
+  useUSBTroubleshooting();
 
   // every time location changes, scroll back up
   useEffect(() => {
@@ -153,12 +201,18 @@ export default function Default() {
                           render={(props: any) => <Asset {...props} />}
                         />
                         <Route path="/swap" render={props => <SwapComponent {...props} />} />
+                        <Route
+                          path="/USBTroubleshooting"
+                          render={props => <USBTroubleshooting {...props} />}
+                        />
                       </Switch>
                     </Page>
                     <Drawer />
                     <ToastOverlay />
                   </Box>
 
+                  {pkg.name === "ledger-live-desktop-nightly" ? <NightlyLayer /> : null}
+
                   <LibcoreBusyIndicator />
                   <DeviceBusyIndicator />
                   <KeyboardContent sequence="BJBJBJ">

src/renderer/ModalsLayer.js

@@ -36,6 +36,7 @@ const ModalsLayer = ({ visibleModals }: *) => {
     ({ name, MODAL_SHOW_ONCE }) =>
       MODAL_SHOW_ONCE && global.sessionStorage.setItem(name, Date.now()),
   );
+
   return (
     <Transition
       in={filteredModals.length > 0}

src/renderer/actions/settings.js

@@ -55,6 +55,8 @@ export const setCounterValue = (counterValue: string) =>
 export const setLanguage = (language: ?string) => saveSettings({ language });
 export const setTheme = (theme: ?string) => saveSettings({ theme });
 export const setRegion = (region: ?string) => saveSettings({ region });
+export const setUSBTroubleshootingIndex = (USBTroubleshootingIndex?: number) =>
+  saveSettings({ USBTroubleshootingIndex });
 
 export function useHideEmptyTokenAccounts() {
   const dispatch = useDispatch();

src/renderer/components/ConnectTroubleshooting.js

@@ -5,7 +5,6 @@ import styled from "styled-components";
 import Box from "~/renderer/components/Box";
 import Text from "~/renderer/components/Text";
 import ConnectTroubleshootingHelpButton from "~/renderer/components/ConnectTroubleshootingHelpButton";
-import RepairDeviceButton from "~/renderer/components/RepairDeviceButton";
 import type { ThemedComponent } from "~/renderer/styles/StyleProvider";
 
 type Props = {
@@ -23,7 +22,7 @@ const Wrapper: ThemedComponent<{}> = styled(Box).attrs({
   max-width: 550px;
 `;
 
-const ConnectTroubleshooting = ({ appearsAfterDelay = 15000, onRepair }: Props) => {
+const ConnectTroubleshooting = ({ appearsAfterDelay = 15000 }: Props) => {
   const [visible, setVisible] = useState(false);
   useEffect(() => {
     const timeout = setTimeout(() => setVisible(true), appearsAfterDelay);
@@ -37,7 +36,6 @@ const ConnectTroubleshooting = ({ appearsAfterDelay = 15000, onRepair }: Props)
           <Trans i18nKey="connectTroubleshooting.desc" />
         </Text>
       </Box>
-      {onRepair ? <RepairDeviceButton onRepair={onRepair} /> : null}
       <Box flex="1" />
       <ConnectTroubleshootingHelpButton buttonProps={{ primary: true }} />
     </Wrapper>