From 2232fda569b8e04ce84c2fdb3f806a6022e83f20 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:46 +0100 Subject: [PATCH 01/18] New translations app.json (Spanish) --- static/i18n/es/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json index 0b8a461a..431ac6ee 100644 --- a/static/i18n/es/app.json +++ b/static/i18n/es/app.json @@ -271,7 +271,7 @@ "identifier": "Identificador", "mcuTitle": "Actualizando MCU", "mcuFirst": "Desconecta el cable USB de tu dispositivo.", - "mcuSecond": "Pulsa el botón izquierdo y mantenlo pulsado mientras conectas de nuevo el cable USB hasta que aparezca la pantalla de procesamiento.", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "Si te lo pide el dispositivo, introduce tu código pin para finalizar el proceso.", "successTitle": "Firmware actualizado", "successText": "Puedes volver a instalar las aplicaciones en tu dispositivo" From 9d5604a8cf1f0bcacc9ff2ed478da58ac7ddad3b Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:48 +0100 Subject: [PATCH 02/18] New translations app.json (Chinese Simplified) --- static/i18n/zh/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/zh/app.json b/static/i18n/zh/app.json index 505d2b23..44644636 100644 --- a/static/i18n/zh/app.json +++ b/static/i18n/zh/app.json @@ -271,7 +271,7 @@ "identifier": "Identifier", "mcuTitle": "正在更新 MCU", "mcuFirst": "从设备上断开 USB 数据线连接", - "mcuSecond": "重新连接 USB 接口时，按住左键，直到显示处理屏幕", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "如在设备上显示了要求，则请输入您的 pin 码以完成该过程", "successTitle": "固件已更新", "successText": "您可在设备上重新安装应用程序" From 6f82fb0050d81bfa9c2b10e795996f2164784d1a Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:50 +0100 Subject: [PATCH 03/18] New translations app.json (French) --- static/i18n/fr/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/fr/app.json b/static/i18n/fr/app.json index 17eeea58..bc3471ca 100644 --- a/static/i18n/fr/app.json +++ b/static/i18n/fr/app.json @@ -271,7 +271,7 @@ "identifier": "Identifier", "mcuTitle": "Mise à jour du MCU", "mcuFirst": "Disconnect the USB cable from your device", - "mcuSecond": "Maintenez le bouton gauche enfoncé tout en reconnectant le câble USB jusqu’à ce que l’écran de traitement apparaisse.", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "If asked on device, please enter your pin code to finish the process", "successTitle": "Firmware updated", "successText": "Vous pouvez réinstaller les applications sur votre appareil." From 1f5833c1bb37d3f82318954197f713627cc36dc3 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:52 +0100 Subject: [PATCH 04/18] New translations app.json (Japanese) --- static/i18n/ja/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/ja/app.json b/static/i18n/ja/app.json index 54603407..e8159ac0 100644 --- a/static/i18n/ja/app.json +++ b/static/i18n/ja/app.json @@ -271,7 +271,7 @@ "identifier": "識別子", "mcuTitle": "MCUを更新しています", "mcuFirst": "機器からUSBケーブルを外します", - "mcuSecond": "USBケーブルを再接続している間、処理画面が表示されるまで左ボタンを押し続けます", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "機器上で指示が表示されたら、ピンコードを入力してプロセスを終了します", "successTitle": "ファームウェアが更新されました", "successText": "機器にアプリを再インストールしてください" From ad0bfe803c7455e06829a718b0222eca75e29243 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:54 +0100 Subject: [PATCH 05/18] New translations app.json (Korean) --- static/i18n/ko/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/ko/app.json b/static/i18n/ko/app.json index c7323495..06b7ba20 100644 --- a/static/i18n/ko/app.json +++ b/static/i18n/ko/app.json @@ -271,7 +271,7 @@ "identifier": "식별자", "mcuTitle": "MCU 업데이트", "mcuFirst": "장치에서 USB 케이블 분리", - "mcuSecond": "USB 케이블을 다시 연결하는 동안 처리 화면이 나타날 때까지 왼쪽 버튼을 길게 누르십시오.", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "장치에서 요구하는 경우 PIN 코드를 입력하여 처리를 완료하십시오.", "successTitle": "펌웨어 업데이트됨", "successText": "장치에 앱을 다시 설치하실 수 있습니다." From bf2191f3e1443c1f3342a7308e9b02b2a3d38330 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Fri, 25 Jan 2019 16:43:56 +0100 Subject: [PATCH 06/18] New translations app.json (Russian) --- static/i18n/ru/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/ru/app.json b/static/i18n/ru/app.json index 18f3a8fc..11ed5aba 100644 --- a/static/i18n/ru/app.json +++ b/static/i18n/ru/app.json @@ -271,7 +271,7 @@ "identifier": "Идентификатор", "mcuTitle": "Обновление микроконтроллера", "mcuFirst": "Отсоедините USB-кабель от устройства.", - "mcuSecond": "Нажмите и удерживайте левую кнопку во время повторного подключения USB-кабеля до тех пор, пока не появится экран обработки.", + "mcuSecond": "Press the left button and hold it while you reconnect the USB cable until the bootloader screen appears", "mcuPin": "При необходимости для завершения процесса в появившемся окне на устройстве введите PIN-код.", "successTitle": "Встроенное ПО обновлено", "successText": "Можно повторно установить приложения на устройстве." From 90b062d3bc8192a5783e813d5d33dfdcd582db51 Mon Sep 17 00:00:00 2001 From: "Valentin D. Pinkman" Date: Fri, 25 Jan 2019 17:31:21 +0100 Subject: [PATCH 07/18] add two new affiliates --- src/components/ExchangePage/index.js | 14 +++ .../ExchangePage/logos/btcdirect.js | 67 ++++++++++ .../ExchangePage/logos/coinberry.js | 116 ++++++++++++++++++ src/config/urls.js | 2 + static/i18n/en/app.json | 6 +- 5 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 src/components/ExchangePage/logos/btcdirect.js create mode 100644 src/components/ExchangePage/logos/coinberry.js diff --git a/src/components/ExchangePage/index.js b/src/components/ExchangePage/index.js index 76fd5505..0a1e46a9 100644 --- a/src/components/ExchangePage/index.js +++ b/src/components/ExchangePage/index.js @@ -17,6 +17,8 @@ import ChangellyLogo from './logos/changelly' import CoinmamaLogo from './logos/bigmama' import SimplexLogo from './logos/simplex' import PaybisLogo from './logos/paybis' +import Coinberry from './logos/coinberry' +import BtcDirect from './logos/btcdirect' type Props = { t: T, @@ -89,6 +91,18 @@ const cards = shuffle([ url: urls.thorSwap, logo: ThorSwap, }, + { + key: 'coinberry', + id: 'coinberry', + url: urls.coinberry, + logo: , + }, + { + key: 'btcDirect', + id: 'btcDirect', + url: urls.btcDirect, + logo: , + }, ]) class ExchangePage extends PureComponent { diff --git a/src/components/ExchangePage/logos/btcdirect.js b/src/components/ExchangePage/logos/btcdirect.js new file mode 100644 index 00000000..70840be4 --- /dev/null +++ b/src/components/ExchangePage/logos/btcdirect.js @@ -0,0 +1,67 @@ +// @flow + +import React from 'react' + +const styles = { + fill: '#0086fb', +} + +const inner = ( + <> + + + + + + + + + + + + + + +) + +export default ({ width }: { width: number }) => ( + + {inner} + +) diff --git a/src/components/ExchangePage/logos/coinberry.js b/src/components/ExchangePage/logos/coinberry.js new file mode 100644 index 00000000..46396d39 --- /dev/null +++ b/src/components/ExchangePage/logos/coinberry.js @@ -0,0 +1,116 @@ +// @flow + +import React from 'react' + +const styles = { + blue: { + fill: '#334F93', + }, + pink: { + fill: '#EC2D6E', + }, +} + +const inner = ( + <> + + + + + + + + + + + + + + + + + +) + +export default ({ width }: { width: number }) => ( + + {inner} + +) diff --git a/src/config/urls.js b/src/config/urls.js index 54aa8e8a..6139333d 100644 --- a/src/config/urls.js +++ b/src/config/urls.js @@ -34,6 +34,8 @@ export const urls = { changeNow: 'https://changenow.io?link_id=80ab1d8ad846e7', thorSwap: 'https://www.thorswap.com/?utm_source=Wallet&utm_medium=ledger&utm_campaign=EmbedLink&utm_content=Link1', + coinberry: 'https://www.coinberry.com/?utm_source=ledger', + btcDirect: 'https://btcdirect.eu/en-gb?partnerId=261', // Errors errors: { diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 9b7e69c9..cd491ddb 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis is an institutional trading firm offering liquidity and borrow for digital currencies, including bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin, and XRP.", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From f4c267151ce255476367f01a53c68feddab98f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sun, 27 Jan 2019 15:41:19 +0100 Subject: [PATCH 08/18] Allow to flag disabled currencies so they still keep in sync --- src/bridge/BridgeSyncContext.js | 3 ++- src/reducers/currenciesStatus.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bridge/BridgeSyncContext.js b/src/bridge/BridgeSyncContext.js index de1a5aa9..b3211ffb 100644 --- a/src/bridge/BridgeSyncContext.js +++ b/src/bridge/BridgeSyncContext.js @@ -77,7 +77,8 @@ class Provider extends Component { return } - if (currencyDownStatusLocal(this.props.currenciesStatus, account.currency)) { + const downStatus = currencyDownStatusLocal(this.props.currenciesStatus, account.currency) + if (downStatus && !downStatus.keepSync) { next() return } diff --git a/src/reducers/currenciesStatus.js b/src/reducers/currenciesStatus.js index 3e98562a..6cd11071 100644 --- a/src/reducers/currenciesStatus.js +++ b/src/reducers/currenciesStatus.js @@ -15,6 +15,7 @@ export type CurrencyStatus = { message: string, link: string, nonce: number, + keepSync?: boolean, // even if something is happening, make live still stay in sync } export type CurrenciesStatusState = CurrencyStatus[] From 882b00619cdbcf7c7696008f52d7c2b782a6e1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sun, 27 Jan 2019 15:48:52 +0100 Subject: [PATCH 09/18] add warning flag too --- src/components/CurrenciesStatusBanner.js | 11 +++++++++-- src/reducers/currenciesStatus.js | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/CurrenciesStatusBanner.js b/src/components/CurrenciesStatusBanner.js index df9af8f2..e4c040b0 100644 --- a/src/components/CurrenciesStatusBanner.js +++ b/src/components/CurrenciesStatusBanner.js @@ -116,7 +116,11 @@ class BannerItem extends PureComponent<{ render() { const { item, t } = this.props return ( - + @@ -159,8 +163,11 @@ const styles = { left: 32, bottom: 32, }, + warning: { + background: colors.orange, + }, banner: { - background: colors.alertRed, + background: colors.warning, overflow: 'hidden', borderRadius: 4, fontSize: 13, diff --git a/src/reducers/currenciesStatus.js b/src/reducers/currenciesStatus.js index 6cd11071..b582fa87 100644 --- a/src/reducers/currenciesStatus.js +++ b/src/reducers/currenciesStatus.js @@ -15,6 +15,7 @@ export type CurrencyStatus = { message: string, link: string, nonce: number, + warning?: boolean, // display as a warning keepSync?: boolean, // even if something is happening, make live still stay in sync } From dbbcb923b8ac9c425873be29c4557151a16cac61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sun, 27 Jan 2019 16:00:40 +0100 Subject: [PATCH 10/18] Fixes 'split' of undefined during a Firmware Update LL-926 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 87dc89a4..4c72134b 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@ledgerhq/hw-transport": "^4.32.0", "@ledgerhq/hw-transport-node-hid": "^4.32.0", "@ledgerhq/ledger-core": "2.0.0-rc.16", - "@ledgerhq/live-common": "4.14.0", + "@ledgerhq/live-common": "4.14.1", "animated": "^0.2.2", "async": "^2.6.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index 5de18eda..f5c6e48d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1738,10 +1738,10 @@ bindings "^1.3.0" nan "^2.6.2" -"@ledgerhq/live-common@4.14.0": - version "4.14.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.14.0.tgz#56ecac0a21f0d77a66a57d5ce9e2159b426e0ec7" - integrity sha512-oKvb/QZrG2XzVvq/IM+73lyw33VlyDu03hmYFCR48U2DGao/SCFOH8J0vQZK/U9VTSqpnC8mEZKQhNOQkf5hoA== +"@ledgerhq/live-common@4.14.1": + version "4.14.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/live-common/-/live-common-4.14.1.tgz#8475702328e7f0694a861de4510a8f1da648e68d" + integrity sha512-mQuptnSup+CHB9hzU1vIv8rllDJjHeDBURID9Z5kZv89F3TFQgCADxCh3AOuubx3Jz4/cK8BIq5cvsmMRCWnuA== dependencies: "@aeternity/ledger-app-api" "0.0.4" "@ledgerhq/errors" "^4.32.0" From 26d340848b421ec7c3217a71ade14b62a338da0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Mon, 28 Jan 2019 11:11:29 +0100 Subject: [PATCH 11/18] Update CurrenciesStatusBanner.js --- src/components/CurrenciesStatusBanner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CurrenciesStatusBanner.js b/src/components/CurrenciesStatusBanner.js index e4c040b0..1b2123e7 100644 --- a/src/components/CurrenciesStatusBanner.js +++ b/src/components/CurrenciesStatusBanner.js @@ -167,7 +167,7 @@ const styles = { background: colors.orange, }, banner: { - background: colors.warning, + background: colors.alertRed, overflow: 'hidden', borderRadius: 4, fontSize: 13, From c100c461d81064ab506502d3a9e30418b251e595 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:13 +0100 Subject: [PATCH 12/18] New translations app.json (Spanish) --- static/i18n/es/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/es/app.json b/static/i18n/es/app.json index 431ac6ee..cc49c77a 100644 --- a/static/i18n/es/app.json +++ b/static/i18n/es/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis es una empresa comercial institucional que ofrece liquidez y préstamos en monedas digitales, incluidas bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin y XRP.", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From e5ae9d41cf3bb10be27a0fd032394d45a8c980ca Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:15 +0100 Subject: [PATCH 13/18] New translations app.json (Chinese Simplified) --- static/i18n/zh/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/zh/app.json b/static/i18n/zh/app.json index 44644636..184a506a 100644 --- a/static/i18n/zh/app.json +++ b/static/i18n/zh/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis 是一家机构交易公司，提供数字货币流动性和借贷服务，包括比特币、比特币现金、以太币、以太坊经典、莱特币和 XRP。", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From 858a258aa09718f3e6850156ec14224a77b8c91d Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:17 +0100 Subject: [PATCH 14/18] New translations app.json (French) --- static/i18n/fr/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/fr/app.json b/static/i18n/fr/app.json index bc3471ca..0b552869 100644 --- a/static/i18n/fr/app.json +++ b/static/i18n/fr/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis est une société de commerce institutionnelle offrant de la liquidité et des prêts de monnaies numériques, dont bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin et XRP.", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From db45ddf2ad4f12be30c3b43d2a9b46a66f2ae4d6 Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:19 +0100 Subject: [PATCH 15/18] New translations app.json (Japanese) --- static/i18n/ja/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/ja/app.json b/static/i18n/ja/app.json index e8159ac0..061d9139 100644 --- a/static/i18n/ja/app.json +++ b/static/i18n/ja/app.json @@ -174,7 +174,9 @@ "genesis": "GenesisはBitcoinやBitcoin Cash、Ethereum、Ethereum Classic、Litecoin、XRPといったデジタル通貨の流動性や借入を提供する機関トレーディング会社です。", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From 98e74370185c4a430946b8b9cca6e939cc8afcde Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:22 +0100 Subject: [PATCH 16/18] New translations app.json (Korean) --- static/i18n/ko/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/ko/app.json b/static/i18n/ko/app.json index 06b7ba20..bd1cb2e8 100644 --- a/static/i18n/ko/app.json +++ b/static/i18n/ko/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis는 유동성을 제공하고 Bitcoin, Bitcoin cash, Ethereum, Ethereum Classic, Litecoin, XRP 등의 디지털 통화에 대한 대출을 실시하는 기관 거래 회사입니다.", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From cd61ba0c56e31fa7a9ded35ada715bb62d6ba99d Mon Sep 17 00:00:00 2001 From: ledger-bot <37080477+ledger-bot@users.noreply.github.com> Date: Mon, 28 Jan 2019 11:21:25 +0100 Subject: [PATCH 17/18] New translations app.json (Russian) --- static/i18n/ru/app.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/i18n/ru/app.json b/static/i18n/ru/app.json index 11ed5aba..3fc7df2d 100644 --- a/static/i18n/ru/app.json +++ b/static/i18n/ru/app.json @@ -174,7 +174,9 @@ "genesis": "Genesis — это институциональная торговая фирма, предлагающая ликвидность и займы для цифровых валют, включая биткоин, биткоин кэш (Bitcoin Cash), Ethereum, Ethereum Classic, Litecoin и XRP.", "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.", "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.", - "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services" + "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services", + "coinberry": "Coinberry is the most trusted crypto platform in Canada with better-than-bank security, best-in-class user interface and No Fee funding & withdraw. Pre-register to get early access to our platform if you are not a Canadian citizen.", + "btcDirect": "Buy and sell with the greatest of ease at Europe's leading cryptocurrency broker. Sign up for free and receive your coins within minutes! Our users rate us with an 8,7 on Trustpilot" }, "genuinecheck": { "modal": { @@ -916,4 +918,4 @@ "description": "Please contact Ledger Support" } } -} +} \ No newline at end of file From 05ce70165c3ba39c08a59e5e2dbd3dc0460db0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Mon, 28 Jan 2019 12:19:30 +0100 Subject: [PATCH 18/18] Also use warning color in modals --- src/components/CurrencyDownStatusAlert.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/CurrencyDownStatusAlert.js b/src/components/CurrencyDownStatusAlert.js index 8271e96c..6301c8e1 100644 --- a/src/components/CurrencyDownStatusAlert.js +++ b/src/components/CurrencyDownStatusAlert.js @@ -28,7 +28,7 @@ const CurrencyDownBox = styled(Box).attrs({ py: 2, mb: 4, })` - background-color: ${p => p.theme.colors.alertRed}; + background-color: ${p => (p.warning ? p.theme.colors.orange : p.theme.colors.alertRed)}; ` const Link = styled.span` @@ -48,7 +48,7 @@ class CurrencyDownStatusAlert extends PureComponent { const { status, t } = this.props if (!status) return null return ( - +