Skip to content

Commit

Permalink
Change wording for sendall of primary asset (#1944)
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastienGllmt authored Mar 1, 2021
1 parent 2d790dc commit 33fbdfe
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
8 changes: 5 additions & 3 deletions app/components/wallet/send/WalletSendForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,11 @@ export default class WalletSendForm extends Component<Props> {
<div className={styles.checkbox}>
<Checkbox
label={intl.formatMessage(messages.checkboxLabel, {
currency: truncateToken(
getTokenName(this.props.selectedToken ?? this.props.defaultToken)
)
currency: this.props.selectedToken != null
? truncateToken(getTokenName(this.props.selectedToken))
// sending all of the primary asset for the chain sends all assets
// since to send all of the primary asset, you have to include all UTXO
: intl.formatMessage(globalMessages.assets)
})}
onChange={() => {
this.props.toggleSendAll();
Expand Down
4 changes: 4 additions & 0 deletions app/i18n/global-messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ const globalMessages: * = defineMessages({
id: 'global.selectAsset.labael',
defaultMessage: '!!!Select asset',
},
assets: {
id: 'global.label.assets',
defaultMessage: '!!!assets',
},
step1: {
id: 'transfer.form.instructions.step1.text',
defaultMessage: '!!!It will take about 1 minute to restore your balance. In the next step, you will be presented with a transaction that will move all of your funds. Please review the details of the transaction carefully. You will need to pay a standard transaction fee on the Cardano network to make the transaction.',
Expand Down
1 change: 1 addition & 0 deletions app/i18n/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
"global.labael.undelegate": "Undelegate",
"global.label.addToAddressbook": "Add to address book",
"global.label.allow": "Allow",
"global.label.assets": "assets",
"global.label.choose": "Choose",
"global.labels.LearnMore": "Learn more",
"global.labels.addMemo": "Add memo",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yoroi",
"version": "4.0.3",
"version": "4.0.4",
"description": "Cardano ADA wallet",
"scripts": {
"dev:build": "rimraf dev/ && babel-node scripts/build --type=debug",
Expand Down

0 comments on commit 33fbdfe

Please sign in to comment.