Skip to content

Commit 2d00d07

Browse files
Tomislav Horačeknikolaglumac
andauthored
[DDW-533] Add "Fix connection Issues" link to the hardware wallet pairing dialog (#2336)
* [DDW-533] INIT connection issue link on the hw pairing dialog * [DDW-533] Apply latest designs and support links update * [DDW-533] Add Translations * [DDW-533] Updates CHANGELOG * [DDW-533] Update to fit latest design proposal Co-authored-by: Nikola Glumac <niglumac@gmail.com>
1 parent 3b45954 commit 2d00d07

File tree

7 files changed

+121
-9
lines changed

7 files changed

+121
-9
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Changelog
1414

1515
### Chores
1616

17+
- Added link to connecting issues support article on the hardware wallet "Pairing" dialog ([PR 2336](https://github.com/input-output-hk/daedalus/pull/2336))
1718
- Updated recovery phrase entry ([PR 2334](https://github.com/input-output-hk/daedalus/pull/2334))
1819
- Adjusted sorting of table values on the "Rewards" screen ([PR 2333](https://github.com/input-output-hk/daedalus/pull/2333))
1920
- Fixed error thrown when closing delegation wizard while transaction fees are being calculated ([PR 2330](https://github.com/input-output-hk/daedalus/pull/2330))

source/renderer/app/components/wallet/WalletConnectDialog.js

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
import React, { Component } from 'react';
44
import { observer } from 'mobx-react';
55
import classnames from 'classnames';
6-
import { defineMessages, intlShape, FormattedHTMLMessage } from 'react-intl';
6+
import {
7+
defineMessages,
8+
intlShape,
9+
FormattedHTMLMessage,
10+
FormattedMessage,
11+
} from 'react-intl';
712
import SVGInline from 'react-svg-inline';
13+
import { Link } from 'react-polymorph/lib/components/Link';
14+
import { LinkSkin } from 'react-polymorph/lib/skins/simple/LinkSkin';
815
import { get } from 'lodash';
916
import ledgerIcon from '../../assets/images/hardware-wallet/ledger-cropped.inline.svg';
1017
import ledgerXIcon from '../../assets/images/hardware-wallet/ledger-x-cropped.inline.svg';
@@ -52,6 +59,22 @@ const messages = defineMessages({
5259
'!!!<p><b>Daedalus currently supports only Trezor Model T hardware wallet devices.</b></p><p>If you are <b>pairing your device with Daedalus for the first time</b>, please follow the instructions below.</p><p>If you have <b>already paired your device with Daedalus</b>, you don’t need to repeat this step. Just connect your device when you need to confirm a transaction.</p>',
5360
description: 'Follow instructions label',
5461
},
62+
connectingIssueSupportLabel: {
63+
id: 'wallet.connect.dialog.connectingIssueSupportLabel',
64+
defaultMessage:
65+
'!!!If you are experiencing issues pairing your hardware wallet device, please {supportLink}',
66+
description: 'Connecting issue support description',
67+
},
68+
connectingIssueSupportLink: {
69+
id: 'wallet.connect.dialog.connectingIssueSupportLink',
70+
defaultMessage: '!!!read the instructions.',
71+
description: 'Connecting issue support link',
72+
},
73+
connectingIssueSupportLinkUrl: {
74+
id: 'wallet.connect.dialog.connectingIssueSupportLinkUrl',
75+
defaultMessage: 'https://support.ledger.com/hc/en-us/articles/115005165269',
76+
description: 'Link to support article',
77+
},
5578
});
5679

5780
type Props = {
@@ -133,6 +156,19 @@ export default class WalletConnectDialog extends Component<Props> {
133156
? messages.instructions
134157
: messages.instructionsTrezorOnly;
135158

159+
const supportLink = (
160+
<Link
161+
className={styles.externalLink}
162+
onClick={() =>
163+
onExternalLinkClick(
164+
intl.formatMessage(messages.connectingIssueSupportLinkUrl)
165+
)
166+
}
167+
label={intl.formatMessage(messages.connectingIssueSupportLink)}
168+
skin={LinkSkin}
169+
/>
170+
);
171+
136172
return (
137173
<Dialog
138174
className={dialogClasses}
@@ -174,6 +210,14 @@ export default class WalletConnectDialog extends Component<Props> {
174210
isTransactionStatus={false}
175211
/>
176212
</div>
213+
<div className={styles.hardwareWalletIssueArticleWrapper}>
214+
<p>
215+
<FormattedMessage
216+
{...messages.connectingIssueSupportLabel}
217+
values={{ supportLink }}
218+
/>
219+
</p>
220+
</div>
177221
</div>
178222
)}
179223
</div>

source/renderer/app/components/wallet/WalletConnectDialog.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,24 @@
7878
width: 100%;
7979
}
8080

81+
.hardwareWalletIssueArticleWrapper {
82+
margin-top: 20px;
83+
84+
p {
85+
color: var(--theme-hardware-wallet-message-color);
86+
font-family: var(--font-light);
87+
font-size: 16px;
88+
line-height: 22px;
89+
}
90+
91+
.externalLink {
92+
font-family: var(--font-regular);
93+
font-size: 16px;
94+
margin-right: 4px;
95+
word-break: break-word;
96+
}
97+
}
98+
8199
.error {
82100
@include error-message;
83101
margin-top: 27px;

source/renderer/app/containers/wallet/dialogs/WalletConnectDialogContainer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export default class WalletConnectDialogContainer extends Component<Props> {
2626
const { hardwareWallets, wallets, app } = stores;
2727
const { hwDeviceStatus, transportDevice } = hardwareWallets;
2828
const { createHardwareWalletRequest } = wallets;
29+
2930
return (
3031
<WalletConnectDialog
3132
isSubmitting={createHardwareWalletRequest.isExecuting}

source/renderer/app/i18n/locales/defaultMessages.json

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12770,55 +12770,97 @@
1277012770
"description": "Title \"Connect a hardware wallet device\" in the connect wallet dialog.",
1277112771
"end": {
1277212772
"column": 3,
12773-
"line": 37
12773+
"line": 44
1277412774
},
1277512775
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
1277612776
"id": "wallet.connect.dialog.title",
1277712777
"start": {
1277812778
"column": 15,
12779-
"line": 32
12779+
"line": 39
1278012780
}
1278112781
},
1278212782
{
1278312783
"defaultMessage": "!!!Cancel",
1278412784
"description": "Label for the \"Cancel\" button in the connect wallet dialog",
1278512785
"end": {
1278612786
"column": 3,
12787-
"line": 42
12787+
"line": 49
1278812788
},
1278912789
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
1279012790
"id": "wallet.connect.dialog.button.cancel",
1279112791
"start": {
1279212792
"column": 16,
12793-
"line": 38
12793+
"line": 45
1279412794
}
1279512795
},
1279612796
{
1279712797
"defaultMessage": "!!!<p>Daedalus currently supports Ledger Nano S, Ledger Nano X, and Trezor Model T hardware wallet devices.</p><p>If you are <b>pairing your device with Daedalus for the first time</b>, please follow the instructions below.</p><p>If you have <b>already paired your device with Daedalus</b>, you don’t need to repeat this step. Just connect your device when you need to confirm a transaction.</p>",
1279812798
"description": "Follow instructions label",
1279912799
"end": {
1280012800
"column": 3,
12801-
"line": 48
12801+
"line": 55
1280212802
},
1280312803
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
1280412804
"id": "wallet.connect.dialog.instructions",
1280512805
"start": {
1280612806
"column": 16,
12807-
"line": 43
12807+
"line": 50
1280812808
}
1280912809
},
1281012810
{
1281112811
"defaultMessage": "!!!<p><b>Daedalus currently supports only Trezor Model T hardware wallet devices.</b></p><p>If you are <b>pairing your device with Daedalus for the first time</b>, please follow the instructions below.</p><p>If you have <b>already paired your device with Daedalus</b>, you don’t need to repeat this step. Just connect your device when you need to confirm a transaction.</p>",
1281212812
"description": "Follow instructions label",
1281312813
"end": {
1281412814
"column": 3,
12815-
"line": 54
12815+
"line": 61
1281612816
},
1281712817
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
1281812818
"id": "wallet.connect.dialog.instructionsTrezorOnly",
1281912819
"start": {
1282012820
"column": 26,
12821-
"line": 49
12821+
"line": 56
12822+
}
12823+
},
12824+
{
12825+
"defaultMessage": "!!!If you are experiencing issues pairing your hardware wallet device, please {supportLink}",
12826+
"description": "Connecting issue support description",
12827+
"end": {
12828+
"column": 3,
12829+
"line": 67
12830+
},
12831+
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
12832+
"id": "wallet.connect.dialog.connectingIssueSupportLabel",
12833+
"start": {
12834+
"column": 31,
12835+
"line": 62
12836+
}
12837+
},
12838+
{
12839+
"defaultMessage": "!!!read the instructions.",
12840+
"description": "Connecting issue support link",
12841+
"end": {
12842+
"column": 3,
12843+
"line": 72
12844+
},
12845+
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
12846+
"id": "wallet.connect.dialog.connectingIssueSupportLink",
12847+
"start": {
12848+
"column": 30,
12849+
"line": 68
12850+
}
12851+
},
12852+
{
12853+
"defaultMessage": "https://support.ledger.com/hc/en-us/articles/115005165269",
12854+
"description": "Link to support article",
12855+
"end": {
12856+
"column": 3,
12857+
"line": 77
12858+
},
12859+
"file": "source/renderer/app/components/wallet/WalletConnectDialog.js",
12860+
"id": "wallet.connect.dialog.connectingIssueSupportLinkUrl",
12861+
"start": {
12862+
"column": 33,
12863+
"line": 73
1282212864
}
1282312865
}
1282412866
],

source/renderer/app/i18n/locales/en-US.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,9 @@
649649
"wallet.byron.notification.moveFundsDescription.line2.link.label": "brand new wallet",
650650
"wallet.byron.notification.moveFundsTitle": "Move funds from \"{activeWalletName}\"",
651651
"wallet.connect.dialog.button.cancel": "Cancel",
652+
"wallet.connect.dialog.connectingIssueSupportLabel": "If you are experiencing issues pairing your hardware wallet device, please {supportLink}.",
653+
"wallet.connect.dialog.connectingIssueSupportLink": "read the instructions",
654+
"wallet.connect.dialog.connectingIssueSupportLinkUrl": "https://iohk.zendesk.com/hc/en-us/articles/900004722083-How-to-use-Ledger-and-Trezor-HW-with-Daedalus",
652655
"wallet.connect.dialog.instructions": "<p>Daedalus supports Ledger Nano S, Ledger Nano X, and Trezor Model T hardware wallet devices.</p><p>If you are <b>pairing your device with Daedalus for the first time</b>, please follow the instructions below.</p><p>If you have <b>already paired your device with Daedalus</b>, you don’t need to repeat this step. Just connect your device when you need to confirm a transaction.</p>",
653656
"wallet.connect.dialog.instructionsTrezorOnly": "<p><b>Daedalus currently supports only Trezor Model T hardware wallet devices.</b></p><p>If you are <b>pairing your device with Daedalus for the first time</b>, please follow the instructions below.</p><p>If you have <b>already paired your device with Daedalus</b>, you don’t need to repeat this step. Just connect your device when you need to confirm a transaction.</p>",
654657
"wallet.connect.dialog.title": "Pair a hardware wallet device",

source/renderer/app/i18n/locales/ja-JP.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,9 @@
649649
"wallet.byron.notification.moveFundsDescription.line2.link.label": "ウォレットを新規作成する",
650650
"wallet.byron.notification.moveFundsTitle": "「{activeWalletName}」の資金を移してください",
651651
"wallet.connect.dialog.button.cancel": "キャンセル",
652+
"wallet.connect.dialog.connectingIssueSupportLabel": "ハードウェアウォレットデバイスのペアリングで問題が生じた場合は、{supportLink}してください。",
653+
"wallet.connect.dialog.connectingIssueSupportLink": "ガイドを参照",
654+
"wallet.connect.dialog.connectingIssueSupportLinkUrl": "https://iohk.zendesk.com/hc/ja/articles/900004722083-How-to-use-Ledger-and-Trezor-HW-with-Daedalus",
652655
"wallet.connect.dialog.instructions": "<p>DaedalusはLedger Nano S、Ledger Nano X、Trezor Model Tハードウェアウォレットデバイスをサポートしています。</p><p><b>デバイスを初めてDaedalusにペアリングする場合</b>は、以下の指示に従ってください。</p><p><b>Daedalusとペアリング済みであるデバイスの場合</b>には、この手順を繰り返す必要はありません。トランザクションを確認する必要があるときに、デバイスを接続してください。</p>",
653656
"wallet.connect.dialog.instructionsTrezorOnly": "<p><b>Daedalusが現在サポートするハードウェアウォレットデバイスはTrezor Model Tのみです。</b></p><p><b>デバイスを初めてDaedalusにペアリングする場合</b>は、以下の指示に従ってください。</p><p><b>Daedalusとペアリング済みであるデバイスの場合</b>には、この手順を繰り返す必要はありません。トランザクションを確認する必要があるときに、デバイスを接続してください。</p>",
654657
"wallet.connect.dialog.title": "ハードウェアウォレットを接続する",

0 commit comments

Comments
 (0)