diff --git a/ui/app/pages/send/send-content/add-recipient/add-recipient.component.js b/ui/app/pages/send/send-content/add-recipient/add-recipient.component.js index a13a4a666..82ccfa1d4 100644 --- a/ui/app/pages/send/send-content/add-recipient/add-recipient.component.js +++ b/ui/app/pages/send/send-content/add-recipient/add-recipient.component.js @@ -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} ); - } - - if (toError && toError !== 'required' && !ensResolution) { + } else if (toError && toError !== 'required' && !ensResolution) { return ( {t(toError)} ); + } else if (toWarning) { + return ( + + {t(toWarning)} + + ); } return null; diff --git a/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-component.test.js b/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-component.test.js index 7736969e9..55f193590 100644 --- a/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-component.test.js +++ b/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-component.test.js @@ -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); - }); }); }); diff --git a/ui/app/pages/send/send.component.js b/ui/app/pages/send/send.component.js index 3fbd7ecd8..98c3b6600 100644 --- a/ui/app/pages/send/send.component.js +++ b/ui/app/pages/send/send.component.js @@ -341,7 +341,7 @@ export default class SendTransactionScreen extends Component { } renderAddRecipient() { - const { toError } = this.state; + const { toError, toWarning } = this.state; return ( @@ -349,6 +349,7 @@ export default class SendTransactionScreen extends Component { } query={this.state.query} toError={toError} + toWarning={toWarning} setInternalSearch={(internalSearch) => this.setInternalSearch(internalSearch) }