diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /ui/app/components/send_/send-content/send-to-row/send-to-row.component.js | |
parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip |
fix merge conflicts
Diffstat (limited to 'ui/app/components/send_/send-content/send-to-row/send-to-row.component.js')
-rw-r--r-- | ui/app/components/send_/send-content/send-to-row/send-to-row.component.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js index 0a83186a5..1c2ecdf9c 100644 --- a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js +++ b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js @@ -19,9 +19,9 @@ export default class SendToRow extends Component { updateSendToError: PropTypes.func, }; - handleToChange (to, nickname = '') { + handleToChange (to, nickname = '', toError) { const { updateSendTo, updateSendToError, updateGas } = this.props - const toErrorObject = getToErrorObject(to) + const toErrorObject = getToErrorObject(to, toError) updateSendTo(to, nickname) updateSendToError(toErrorObject) if (toErrorObject.to === null) { @@ -53,7 +53,7 @@ export default class SendToRow extends Component { inError={inError} name={'address'} network={network} - onChange={(newTo, newNickname) => this.handleToChange(newTo, newNickname)} + onChange={({ toAddress, nickname, toError }) => this.handleToChange(toAddress, nickname, toError)} openDropdown={() => openToDropdown()} placeholder={this.context.t('recipientAddress')} to={to} |