Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ledger Affiliate and documentation link [ch126] #368

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/components/wallet/hwConnect/ledger/AboutDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -135,7 +135,7 @@ export default class AboutDialog extends Component<Props> {
<ProgressStepBlock progressInfo={progressInfo} />
{introBlock}
{middleBlock}
{/* <HelpLinkBlock progressInfo={progressInfo} /> */}
<HelpLinkBlock progressInfo={progressInfo} />
<HWErrorBlock progressInfo={progressInfo} error={error} />
</Dialog>);
}
Expand Down
4 changes: 2 additions & 2 deletions app/components/wallet/hwConnect/ledger/ConnectDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -116,7 +116,7 @@ export default class ConnectDialog extends Component<Props> {
<ProgressStepBlock progressInfo={progressInfo} />
{introBlock}
{middleBlock}
{/* <HelpLinkBlock progressInfo={progressInfo} /> */}
<HelpLinkBlock progressInfo={progressInfo} />
<HWErrorBlock progressInfo={progressInfo} error={error} />
</Dialog>);
}
Expand Down
6 changes: 3 additions & 3 deletions app/components/wallet/hwConnect/ledger/HelpLinkBlock.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -35,8 +35,8 @@ export default class HelpLinkBlock extends Component<Props> {

return (
<div className={styles.linkBlock}>
<a target="_blank" rel="noopener noreferrer" href={intl.formatMessage(messages.helpLinkYoroiWithTrezor)}>
{intl.formatMessage(messages.helpLinkYoroiWithTrezorText)}
<a target="_blank" rel="noopener noreferrer" href={intl.formatMessage(messages.helpLinkYoroiWithLedger)}>
{intl.formatMessage(messages.helpLinkYoroiWithLedgerText)}
<SvgInline svg={externalLinkSVG} />
</a>
</div>);
Expand Down
4 changes: 2 additions & 2 deletions app/components/wallet/hwConnect/ledger/SaveDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -150,7 +150,7 @@ export default class SaveDialog extends Component<Props> {
<ProgressStepBlock progressInfo={progressInfo} />
{walletNameBlock}
{middleBlock}
{/* <HelpLinkBlock progressInfo={progressInfo} /> */}
<HelpLinkBlock progressInfo={progressInfo} />
<HWErrorBlock progressInfo={progressInfo} error={error} />
</Dialog>);
}
Expand Down
52 changes: 29 additions & 23 deletions app/containers/footer/AddWalletFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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.',
Expand All @@ -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 {
Expand All @@ -48,22 +50,10 @@ export default class AddWalletFooter extends Component {
message={messages.buyTrezorHardwareWallet}
/>
<FooterItem
url="https://medium.com/@emurgo_io/whats-a-hardware-wallet-b3605a026008"
svg={whatIsHardwareWalletSvg}
message={messages.whatIsHardwareWallet}
/>
{/* Temporarily disable, re-enable when Ledger is ready to enable */}
{/* <FooterItem
url="https://yoroi-wallet.com/get-ledger"
svg={buyTrezorSvg}
message={messages.buyLedgerHardwareWallet}
/> */}
{/* It should be enable in the future with a video on how to connect Ledger */}
{/* <FooterItem
url="https://youtu.be/Dp0wXwtToX0"
svg={howConnetTrezorSvg}
message={messages.howToConnectTrezor}
/> */}
/>
<FooterItem
url="https://youtu.be/9jg8lsreIQ8?t=56"
svg={howCreateWalletSvg}
Expand All @@ -74,6 +64,22 @@ export default class AddWalletFooter extends Component {
svg={howRestoreWalletSvg}
message={messages.howToRestoreWallet}
/>
{
/* 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 */
}
{/* <FooterItem
url="https://medium.com/@emurgo_io/whats-a-hardware-wallet-b3605a026008"
svg={whatIsHardwareWalletSvg}
message={messages.whatIsHardwareWallet}
/> */}
{/* <FooterItem
url="https://youtu.be/Dp0wXwtToX0"
svg={howConnetTrezorSvg}
message={messages.howToConnectTrezor}
/> */}
</HorizontalFlexContainer>
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/Indonesian.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/id-ID.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/i18n/locales/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down