m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Show warnings on Add Recipient page of Send flow (#10530)

Browse Source 
Warnings were not shown on the Add Recipient page of the send flow. Now
any send warnings will be shown. This can be tested using an ENS name
with a confusable character in it (the confusable character warning
will be shown).

A condition was also removed that prevented any warnings or errors from
rendering when the user had non-zero contacts or recent addresses. I
have no idea why you'd want to hide warnings or errors if the user had
no contacts or recent addresses. None of these errors even pertain to
contacts or recent addresses.
This commit is contained in:
Mark Stacey 2021-03-01 09:47:22 -03:30 committed by GitHub
parent b04120dd0f
commit 0f7e2dbf20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/app/pages/send/send-content/add-recipient/add-recipient.component.js
View File

@ -19,6 +19,7 @@ export default class AddRecipient extends Component {
updateSendTo: PropTypes.func,
ensResolution: PropTypes.string,
toError: PropTypes.string,
toWarning: PropTypes.string,
ensResolutionError: PropTypes.string,
addressBookEntryName: PropTypes.string,
contacts: PropTypes.array,
@ -212,14 +213,13 @@ export default class AddRecipient extends Component {
}
renderDialogs() {
const { toError, ensResolutionError, ensResolution } = this.props;
const {
toError,
toWarning,
ensResolutionError,
ensResolution,
} = this.props;
const { t } = this.context;
const contacts = this.searchForContacts();
const recents = this.searchForRecents();
if (contacts.length || recents.length) {
return null;
}
if (ensResolutionError) {
return (
@ -227,14 +227,18 @@ export default class AddRecipient extends Component {
{ensResolutionError}
</Dialog>
);
}
if (toError && toError !== 'required' && !ensResolution) {
} else if (toError && toError !== 'required' && !ensResolution) {
return (
<Dialog type="error" className="send__error-dialog">
{t(toError)}
</Dialog>
);
} else if (toWarning) {
return (
<Dialog type="warning" className="send__error-dialog">
{t(toWarning)}
</Dialog>
);
}
return null;

15
ui/app/pages/send/send-content/add-recipient/tests/add-recipient-component.test.js
View File

@ -210,20 +210,5 @@ describe('AddRecipient Component', function () {
assert.strictEqual(dialog.length, 0);
});
it('should not render error when query has results', function () {
wrapper.setProps({
addressBook: [
{ address: '0x125', name: 'alice' },
{ address: '0x126', name: 'alex' },
{ address: '0x127', name: 'catherine' },
],
toError: 'bad',
});
const dialog = wrapper.find(Dialog);
assert.strictEqual(dialog.length, 0);
});
});
});

3
ui/app/pages/send/send.component.js
View File

@ -341,7 +341,7 @@ export default class SendTransactionScreen extends Component {
}
renderAddRecipient() {
const { toError } = this.state;
const { toError, toWarning } = this.state;
return (
<AddRecipient
updateGas={({ to, amount, data } = {}) =>
@ -349,6 +349,7 @@ export default class SendTransactionScreen extends Component {
}
query={this.state.query}
toError={toError}
toWarning={toWarning}
setInternalSearch={(internalSearch) =>
this.setInternalSearch(internalSearch)
}