Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
Merge pull request #3285 from LedgerHQ/develop
Browse files Browse the repository at this point in the history
Prepare 2.16.0
  • Loading branch information
gre authored Nov 6, 2020
2 parents e95b121 + 274a099 commit 1232919
Show file tree
Hide file tree
Showing 144 changed files with 13,639 additions and 1,750 deletions.
62 changes: 62 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: "CodeQL"

on:
push:
branches: [develop, master]
pull_request:
# The branches below must be a subset of the branches above
branches: [develop]
schedule:
- cron: '0 4 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,7 @@ dist
src/renderer/generated/
tests/specs/__image_snapshots__/__diff_output__
tests/tmp

# Yalc
.yalc
yalc.lock
74 changes: 37 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@
},
"dependencies": {
"@hot-loader/react-dom": "^16.13.0",
"@ledgerhq/devices": "^5.26.0",
"@ledgerhq/devices": "^5.28.0",
"@ledgerhq/electron-updater": "^4.2.2",
"@ledgerhq/errors": "^5.26.0",
"@ledgerhq/hw-transport": "^5.26.0",
"@ledgerhq/hw-transport-http": "^5.26.0",
"@ledgerhq/hw-transport-node-hid-singleton": "^5.26.0",
"@ledgerhq/errors": "^5.28.0",
"@ledgerhq/hw-transport": "^5.28.0",
"@ledgerhq/hw-transport-http": "^5.28.0",
"@ledgerhq/hw-transport-node-hid-singleton": "^5.28.0",
"@ledgerhq/ledger-core": "6.9.1",
"@ledgerhq/live-common": "^15.5.0",
"@ledgerhq/logs": "^5.26.0",
"@ledgerhq/live-common": "^15.7.7",
"@ledgerhq/logs": "^5.28.0",
"@tippyjs/react": "^4.0.2",
"@trust/keyto": "^1.0.1",
"animated": "^0.2.2",
"async": "^3.2.0",
"axios": "^0.20.0",
"axios": "^0.21.0",
"bignumber.js": "^9.0.0",
"chart.js": "^2.9.3",
"color": "^3.1.2",
"chart.js": "^2.9.4",
"color": "^3.1.3",
"d3": "^5.16.0",
"dotenv": "^8.2.0",
"electron-context-menu": "^2.3.0",
"ethereumjs-tx": "^2.1.1",
"form-data": "^3.0.0",
"fuse.js": "^3.6.1",
"getos": "^3.2.1",
"i18next": "^19.7.0",
"i18next": "^19.8.3",
"invariant": "^2.2.4",
"ip": "^1.1.5",
"isomorphic-unfetch": "^3.0.0",
"isomorphic-unfetch": "^3.1.0",
"jsqr": "^1.3.1",
"lodash": "^4.17.20",
"lru-cache": "^5.1.1",
"measure-scrollbar": "^1.1.0",
"moment": "^2.28.0",
"moment": "^2.29.1",
"node-abi": "^2.19.1",
"openpgp": "^4.10.8",
"os-locale": "^5.0.0",
Expand All @@ -80,15 +80,15 @@
"qs": "^6.9.4",
"raven": "^2.6.4",
"raven-js": "^3.27.2",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-hot-loader": "^4.13.0",
"react-i18next": "^11.7.3",
"react-key-handler": "^1.2.0-beta.3",
"react-lottie": "^1.2.3",
"react-markdown": "^4.3.0",
"react-motion": "^0.5.2",
"react-redux": "^7.2.1",
"react-redux": "^7.2.2",
"react-router-dom": "^5.2.0",
"react-select": "^3.1.0",
"react-spring": "^8.0.27",
Expand All @@ -108,10 +108,10 @@
"source-map-support": "^0.5.19",
"styled-components": "^5.2.0",
"styled-system": "^5.1.5",
"tippy.js": "^6.2.6",
"tippy.js": "^6.2.7",
"tree-kill": "^1.2.2",
"uncontrollable": "^7.1.1",
"uuid": "^8.3.0",
"uuid": "^8.3.1",
"winston": "^3.2.1",
"winston-transport": "^4.3.0",
"write-file-atomic": "^3.0.3",
Expand All @@ -121,20 +121,20 @@
"devDependencies": {
"@actions/core": "^1.2.6",
"@actions/github": "^4.0.0",
"@babel/core": "^7.12.0",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-export-default-from": "^7.10.1",
"@babel/plugin-proposal-export-namespace-from": "^7.12.0",
"@babel/core": "^7.12.3",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-proposal-export-default-from": "^7.12.1",
"@babel/plugin-proposal-export-namespace-from": "^7.12.1",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.1",
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
"@babel/preset-env": "^7.12.0",
"@babel/preset-flow": "^7.10.1",
"@babel/preset-react": "^7.10.1",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
"@babel/preset-env": "^7.12.1",
"@babel/preset-flow": "^7.12.1",
"@babel/preset-react": "^7.12.1",
"@octokit/rest": "^18.0.6",
"babel-cli": "^6.26.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^25.1.0",
"babel-jest": "^26.6.1",
"babel-loader": "^8.1.0",
"babel-plugin-module-resolver": "^4.0.0",
"babel-plugin-styled-components": "^1.11.1",
Expand All @@ -146,18 +146,18 @@
"electron-builder": "22.8.0",
"electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0",
"eslint": "^7.9.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-standard": "^14.1.1",
"eslint": "^7.12.1",
"eslint-config-prettier": "^6.15.0",
"eslint-config-standard": "^15.0.1",
"eslint-plugin-flowtype": "^5.1.3",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jest": "^23.19.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jest": "^24.1.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.2",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-standard": "^4.0.2",
"execa": "^4.0.2",
"express": "^4.17.1",
"file-loader": "^6.1.0",
Expand All @@ -167,8 +167,8 @@
"hard-source-webpack-plugin": "^0.13.1",
"hasha": "^5.2.0",
"html-webpack-plugin": "^3.2.0",
"jest": "^25.1.0",
"jest-image-snapshot": "^4.1.0",
"jest": "^26.6.1",
"jest-image-snapshot": "^4.2.0",
"listr": "^0.14.3",
"listr-verbose-renderer": "^0.6.0",
"prettier": "^1.19.1",
Expand Down
25 changes: 20 additions & 5 deletions src/config/urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ export const supportLinkByTokenType = {
export const urls = {
liveHome: "https://www.ledger.com/pages/ledger-live",

// Social
twitter: "https://twitter.com/Ledger",
github: "https://github.com/LedgerHQ/ledger-live-desktop",
reddit: "https://www.reddit.com/r/ledgerwallet/",

social: {
twitter: "https://twitter.com/Ledger",
github: "https://github.com/LedgerHQ/ledger-live-desktop",
reddit: "https://www.reddit.com/r/ledgerwallet/",
facebook: "https://www.facebook.com/Ledger/",
},
// Campaigns
promoNanoX:
"https://www.ledger.com/pages/ledger-nano-x#utm_source=Ledger%20Live%20Desktop%20App&utm_medium=Ledger%20Live&utm_campaign=Ledger%20Live%20Desktop%20-%20Banner%20LNX",
Expand Down Expand Up @@ -71,6 +72,16 @@ export const urls = {
"https://shop.ledger.com/products/ledger-backup-pack?utm_source=ledger_live&utm_medium=self_referral&utm_content=banner_desktop",
ledgerAcademy:
"https://www.ledger.com/academy/?utm_source=ledger_live&utm_medium=self_referral&utm_content=banner_desktop",
ongoingScams: "https://www.ledger.com/ongoing-phishing-campaigns",
},
helpModal: {
gettingStarted:
"https://www.ledger.com/start?utm_source=ledger_live&utm_medium=self_referral&utm_content=help_desktop",
helpCenter:
"https://support.ledger.com/hc/en-us?utm_source=ledger_live&utm_medium=self_referral&utm_content=help_desktop",
ledgerAcademy:
"https://www.ledger.com/academy/?utm_source=ledger_live&utm_medium=self_referral&utm_content=help_desktop",
status: "https://status.ledger.com",
},
swap: {
info: "https://www.ledger.com/swap",
Expand All @@ -90,4 +101,8 @@ export const urls = {
BitcoinCashHardforkOct2020Warning:
"https://www.ledger.com/bitcoin-cash-fork-15-november-2020-what-it-means-for-you",
},
compound: "https://support.ledger.com/hc/en-us/articles/360017215099",
compoundTnC: "https://shop.ledger.com/pages/ledger-live-terms-of-use",
approvedOperation:
"https://support.ledger.com/hc/en-us/articles/115005307809-Track-your-transaction",
};
2 changes: 2 additions & 0 deletions src/internal/commands/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import testCrash from "./testCrash";
import testInterval from "./testInterval";
import appOpExec from "./appOpExec";
import initSwap from "./initSwap";
import websocketBridge from "./websocketBridge";
import { commands as bridgeProxyCommands } from "~/renderer/bridge/proxy-commands";

export const commandsById = {
Expand All @@ -39,6 +40,7 @@ export const commandsById = {
initSwap,
testCrash,
testInterval,
websocketBridge,
};

export type Commands = typeof commandsById;
Expand Down
Loading

0 comments on commit 1232919

Please sign in to comment.