From c2f37d46e7cf84baeaa101840ec50f57083d9406 Mon Sep 17 00:00:00 2001 From: SARVESHWAR SINGH Date: Wed, 27 Mar 2019 12:46:44 +0900 Subject: [PATCH] Add Ledger Affiliate and documentation link [ch126] --- .../wallet/hwConnect/ledger/AboutDialog.js | 4 +- .../wallet/hwConnect/ledger/ConnectDialog.js | 4 +- .../wallet/hwConnect/ledger/HelpLinkBlock.js | 6 +-- .../wallet/hwConnect/ledger/SaveDialog.js | 4 +- app/containers/footer/AddWalletFooter.js | 52 +++++++++++-------- app/i18n/locales/Indonesian.json | 2 +- app/i18n/locales/de-DE.json | 2 +- app/i18n/locales/en-US.json | 2 +- app/i18n/locales/fr-FR.json | 2 +- app/i18n/locales/id-ID.json | 2 +- app/i18n/locales/ja-JP.json | 2 +- app/i18n/locales/ko-KR.json | 2 +- app/i18n/locales/ru-RU.json | 2 +- app/i18n/locales/zh-Hans.json | 2 +- app/i18n/locales/zh-Hant.json | 2 +- 15 files changed, 48 insertions(+), 42 deletions(-) diff --git a/app/components/wallet/hwConnect/ledger/AboutDialog.js b/app/components/wallet/hwConnect/ledger/AboutDialog.js index 9ffcdf0d8d..eea3dd2303 100644 --- a/app/components/wallet/hwConnect/ledger/AboutDialog.js +++ b/app/components/wallet/hwConnect/ledger/AboutDialog.js @@ -12,7 +12,7 @@ import Dialog from '../../../widgets/Dialog'; import DialogCloseButton from '../../../widgets/DialogCloseButton'; import ProgressStepBlock from '../common/ProgressStepBlock'; -// import HelpLinkBlock from './HelpLinkBlock'; +import HelpLinkBlock from './HelpLinkBlock'; import HWErrorBlock from '../common/HWErrorBlock'; import externalLinkSVG from '../../../../assets/images/link-external.inline.svg'; @@ -135,7 +135,7 @@ export default class AboutDialog extends Component { {introBlock} {middleBlock} - {/* */} + ); } diff --git a/app/components/wallet/hwConnect/ledger/ConnectDialog.js b/app/components/wallet/hwConnect/ledger/ConnectDialog.js index c18dc9baf0..13d9109805 100644 --- a/app/components/wallet/hwConnect/ledger/ConnectDialog.js +++ b/app/components/wallet/hwConnect/ledger/ConnectDialog.js @@ -13,7 +13,7 @@ import DialogBackButton from '../../../widgets/DialogBackButton'; import DialogCloseButton from '../../../widgets/DialogCloseButton'; import ProgressStepBlock from '../common/ProgressStepBlock'; -// import HelpLinkBlock from './HelpLinkBlock'; +import HelpLinkBlock from './HelpLinkBlock'; import HWErrorBlock from '../common/HWErrorBlock'; import connectLoadGIF from '../../../../assets/images/hardware-wallet/ledger/connect-load.gif'; @@ -116,7 +116,7 @@ export default class ConnectDialog extends Component { {introBlock} {middleBlock} - {/* */} + ); } diff --git a/app/components/wallet/hwConnect/ledger/HelpLinkBlock.js b/app/components/wallet/hwConnect/ledger/HelpLinkBlock.js index f01bc0b80b..5e0533432f 100644 --- a/app/components/wallet/hwConnect/ledger/HelpLinkBlock.js +++ b/app/components/wallet/hwConnect/ledger/HelpLinkBlock.js @@ -11,7 +11,7 @@ import styles from '../common/HelpLinkBlock.scss'; const messages = defineMessages({ helpLinkYoroiWithLedger: { id: 'wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger', - defaultMessage: '!!!https://yoroi-wallet.com/', + defaultMessage: '!!!https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano', }, helpLinkYoroiWithLedgerText: { id: 'wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text', @@ -35,8 +35,8 @@ export default class HelpLinkBlock extends Component { return ( ); diff --git a/app/components/wallet/hwConnect/ledger/SaveDialog.js b/app/components/wallet/hwConnect/ledger/SaveDialog.js index 408e510a9a..cdf93bbb52 100644 --- a/app/components/wallet/hwConnect/ledger/SaveDialog.js +++ b/app/components/wallet/hwConnect/ledger/SaveDialog.js @@ -14,7 +14,7 @@ import Dialog from '../../../widgets/Dialog'; import DialogCloseButton from '../../../widgets/DialogCloseButton'; import ProgressStepBlock from '../common/ProgressStepBlock'; -// import HelpLinkBlock from './HelpLinkBlock'; +import HelpLinkBlock from './HelpLinkBlock'; import HWErrorBlock from '../common/HWErrorBlock'; import saveLoadSVG from '../../../../assets/images/hardware-wallet/ledger/save-load.inline.svg'; @@ -150,7 +150,7 @@ export default class SaveDialog extends Component { {walletNameBlock} {middleBlock} - {/* */} + ); } diff --git a/app/containers/footer/AddWalletFooter.js b/app/containers/footer/AddWalletFooter.js index 5be8761b51..834c4e89ad 100644 --- a/app/containers/footer/AddWalletFooter.js +++ b/app/containers/footer/AddWalletFooter.js @@ -3,9 +3,7 @@ import FooterItem from '../../components/footer/FooterItem'; import HorizontalFlexContainer from '../../components/layout/HorizontalFlexContainer'; import buyTrezorSvg from '../../assets/images/footer/buy-trezor.inline.svg'; -import whatIsHardwareWalletSvg from '../../assets/images/footer/what-is-hardware-wallet.inline.svg'; import howCreateWalletSvg from '../../assets/images/footer/how-to-create-wallet.inline.svg'; -import howConnetTrezorSvg from '../../assets/images/footer/how-to-connect-trezor.inline.svg'; import howRestoreWalletSvg from '../../assets/images/footer/how-to-restore-wallet.inline.svg'; import { defineMessages } from 'react-intl'; @@ -15,18 +13,10 @@ const messages = defineMessages({ id: 'wallet.footer.buyTrezorHardwareWallet.text', defaultMessage: '!!!Buy a Trezor hardware wallet.', }, - whatIsHardwareWallet: { - id: 'wallet.footer.whatIsHardwareWallet.text', - defaultMessage: '!!!What is a hardware wallet', - }, buyLedgerHardwareWallet: { id: 'wallet.footer.buyLedgerHardwareWallet.text', defaultMessage: '!!!Buy a Ledger hardware wallet.', }, - howToConnectTrezor: { - id: 'wallet.footer.howToConnectTrezor.text', - defaultMessage: '!!!How to connect a Trezor.', - }, howToCreateWallet: { id: 'wallet.footer.howToCreateWallet.text', defaultMessage: '!!!How to create a wallet.', @@ -35,6 +25,18 @@ const messages = defineMessages({ id: 'wallet.footer.howToRestoreWallet.text', defaultMessage: '!!!How to restore a wallet.', }, + /* Temporarily disable + * re-enable when new design is ready and if it's still needed + * if it's not needed in new design, + * then delete this as well as it's assets and translations */ + // whatIsHardwareWallet: { + // id: 'wallet.footer.whatIsHardwareWallet.text', + // defaultMessage: '!!!What is a hardware wallet', + // }, + // howToConnectTrezor: { + // id: 'wallet.footer.howToConnectTrezor.text', + // defaultMessage: '!!!How to connect a Trezor.', + // }, }); export default class AddWalletFooter extends Component { @@ -48,22 +50,10 @@ export default class AddWalletFooter extends Component { message={messages.buyTrezorHardwareWallet} /> - {/* Temporarily disable, re-enable when Ledger is ready to enable */} - {/* */} - {/* It should be enable in the future with a video on how to connect Ledger */} - {/* */} + /> + { + /* Temporarily disable + * re-enable when new design is ready and if it's still needed + * if it's not needed in new design, + * then delete this as well as it's assets and translations */ + } + {/* */} + {/* */} ); } diff --git a/app/i18n/locales/Indonesian.json b/app/i18n/locales/Indonesian.json index 93990c6497..6aae47ab0c 100644 --- a/app/i18n/locales/Indonesian.json +++ b/app/i18n/locales/Indonesian.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "SIMPAN", "wallet.connect.hw.dialog.step.save.walletName.hint": "Masukkan nama wallet", "wallet.connect.hw.dialog.step.save.walletName.label": "NAMA WALLET", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Only Supports ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/de-DE.json b/app/i18n/locales/de-DE.json index 2dd58f1963..f1aa0dd468 100644 --- a/app/i18n/locales/de-DE.json +++ b/app/i18n/locales/de-DE.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "SPEICHERN", "wallet.connect.hw.dialog.step.save.walletName.hint": "Wallet-Namen eingeben", "wallet.connect.hw.dialog.step.save.walletName.label": "WALLET-NAME", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Klicke hier, um mehr über die Verwendung von Yoroi zusammen mit Ledger zu erfahren", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Unterstützt nur ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/en-US.json b/app/i18n/locales/en-US.json index e317f5cdf0..5886a09f7d 100644 --- a/app/i18n/locales/en-US.json +++ b/app/i18n/locales/en-US.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "SAVE", "wallet.connect.hw.dialog.step.save.walletName.hint": "Enter wallet name", "wallet.connect.hw.dialog.step.save.walletName.label": "WALLET NAME", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Only Supports ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/fr-FR.json b/app/i18n/locales/fr-FR.json index 0e7abae64b..5378793e70 100644 --- a/app/i18n/locales/fr-FR.json +++ b/app/i18n/locales/fr-FR.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "Sauvegarder", "wallet.connect.hw.dialog.step.save.walletName.hint": "Veuillez entrer le nom du wallet", "wallet.connect.hw.dialog.step.save.walletName.label": "Nom du wallet", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Only Supports ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/id-ID.json b/app/i18n/locales/id-ID.json index 0445ad5165..4ef23ea427 100644 --- a/app/i18n/locales/id-ID.json +++ b/app/i18n/locales/id-ID.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "SIMPAN", "wallet.connect.hw.dialog.step.save.walletName.hint": "Masukkan nama wallet", "wallet.connect.hw.dialog.step.save.walletName.label": "NAMA WALLET", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Only Supports ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/ja-JP.json b/app/i18n/locales/ja-JP.json index a313aa3993..2841a9dfc5 100644 --- a/app/i18n/locales/ja-JP.json +++ b/app/i18n/locales/ja-JP.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "保存", "wallet.connect.hw.dialog.step.save.walletName.hint": "ウォレット名を入力", "wallet.connect.hw.dialog.step.save.walletName.label": "ウォレット名", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/ja/blog/how-to-use-ledger-nano-s-with-yoroi-cardano-jp", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Ledger連携のヨロイの使用方法はこちら", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": " ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/ko-KR.json b/app/i18n/locales/ko-KR.json index 398d166c1a..c69b279d65 100644 --- a/app/i18n/locales/ko-KR.json +++ b/app/i18n/locales/ko-KR.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "저장", "wallet.connect.hw.dialog.step.save.walletName.hint": "지갑명을 입력해 주십시오.", "wallet.connect.hw.dialog.step.save.walletName.label": "지갑명", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Only Supports ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/ru-RU.json b/app/i18n/locales/ru-RU.json index 1cda61432c..d23adf5e7a 100644 --- a/app/i18n/locales/ru-RU.json +++ b/app/i18n/locales/ru-RU.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "СОХРАНИТЬ", "wallet.connect.hw.dialog.step.save.walletName.hint": "Ввести имя кошелька", "wallet.connect.hw.dialog.step.save.walletName.label": "ИМЯ КОШЕЛЬКА", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Нажмите здесь, чтобы узнать больше об использовании Yoroi с Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "Поддерживает только ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/zh-Hans.json b/app/i18n/locales/zh-Hans.json index a69a144f12..1b25e2c441 100644 --- a/app/i18n/locales/zh-Hans.json +++ b/app/i18n/locales/zh-Hans.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "保存", "wallet.connect.hw.dialog.step.save.walletName.hint": "输入钱包名称", "wallet.connect.hw.dialog.step.save.walletName.label": "钱包名称", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "点击这里了解更多关于使用 Yoroi 与 Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "仅支援 ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s", diff --git a/app/i18n/locales/zh-Hant.json b/app/i18n/locales/zh-Hant.json index 045630a8d8..b31340418e 100644 --- a/app/i18n/locales/zh-Hant.json +++ b/app/i18n/locales/zh-Hant.json @@ -188,7 +188,7 @@ "wallet.connect.hw.dialog.step.save.label": "保存", "wallet.connect.hw.dialog.step.save.walletName.hint": "輸入錢包名稱", "wallet.connect.hw.dialog.step.save.walletName.label": "錢包名稱", - "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://youtu.be/Dp0wXwtToX0", + "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger": "https://emurgo.io/#/en/blog/how-to-use-ledger-nano-s-with-yoroi-cardano", "wallet.connect.ledger.dialog.common.step.link.helpYoroiWithLedger.text": "Click here to learn more about using Yoroi with Ledger", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part1": "僅支援 ", "wallet.connect.ledger.dialog.step.about.prerequisite.1.part2.link": "https://www.ledger.com/products/ledger-nano-s",