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

Fix 9649 - Ensure QR codes work properly when adding contact

Browse Source
This commit is contained in:
David Walsh 2020-10-21 11:35:56 -05:00
parent 51187179bb
commit 4892a3e0e1
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/app/pages/send/send-content/add-recipient/ens-input.component.js
View File

@ -33,6 +33,7 @@ export default class EnsInput extends Component {
onReset: PropTypes.func,
onValidAddressTyped: PropTypes.func,
contact: PropTypes.object,
value: PropTypes.string,
}
state = {
@ -53,16 +54,22 @@ export default class EnsInput extends Component {
}
}
// If an address is sent without a nickname, meaning not from ENS or from
// the user's own accounts, a default of a one-space string is used.
componentDidUpdate (prevProps) {
const {
input,
} = this.state
const {
network,
value,
} = this.props
// Update the value in state if its prop value changes
if (input !== value) {
this.setState({ input: value })
}
// If an address is sent without a nickname, meaning not from ENS or from
// the user's own accounts, a default of a one-space string is used.
if (prevProps.network !== network) {
const provider = global.ethereumProvider
this.ens = new ENS({ provider, network })

2
ui/app/pages/settings/contact-list-tab/add-contact/add-contact.component.js
View File

@ -52,6 +52,7 @@ export default class AddContact extends PureComponent {
validate = (address) => {
const valid = isValidAddress(address)
const validEnsAddress = isValidDomainName(address)
if (valid || validEnsAddress || address === '') {
this.setState({ error: '', ethAddress: address })
} else {
@ -73,6 +74,7 @@ export default class AddContact extends PureComponent {
this.setState({ ensAddress: address, error: '', ensError: '' })
}}
updateEnsResolutionError={(message) => this.setState({ ensError: message })}
value={this.state.ethAddress || ''}
/>
)
}