Skip to content

Commit

Permalink
Merge branch 'guide'
Browse files Browse the repository at this point in the history
  • Loading branch information
benma committed Jul 7, 2020
2 parents 8ac37e1 + 4e1b584 commit 24963ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions frontends/web/src/locales/en/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,10 @@
"text": "As soon as you transact, a new address is automatically added to the list so there are always 20 addresses available which have never received any coins.",
"title": "When do the addresses change?"
},
"addressFormats": {
"text": "A compatible address is standard segwit whereas the modern address is native segwit (bech32). By default the BitBox02 uses the modern address. If you are having issues sending to this address, click \"change to compatible address\".",
"title": "What is the difference between compatible address and modern address?"
},
"howVerify": {
"text": "For the BitBox01, click on the BitBox icon in the sidebar on the left and see the Pairing section. The guide will update and you can continue following the instructions from there.\nFor the BitBox02, you can verify addresses directly on the device during the send/receive process.",
"title": "How can I verify an address securely?"
Expand Down
1 change: 1 addition & 0 deletions frontends/web/src/routes/account/receive/receive.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ class Receive extends Component<Props, State> {
{currentAddresses.length > 1 && <Entry key="guide.receive.whyMany" entry={t('guide.receive.whyMany')} />}
{currentAddresses.length > 1 && <Entry key="guide.receive.why20" entry={t('guide.receive.why20')} />}
{currentAddresses.length > 1 && <Entry key="guide.receive.addressChange" entry={t('guide.receive.addressChange')} />}
{receiveAddresses.length > 1 && currentAddresses.length > 1 && <Entry key="guide.receive.addressFormats" entry={t('guide.receive.addressFormats')} />}
</Guide>
</div>
);
Expand Down

0 comments on commit 24963ca

Please sign in to comment.