fix in merge

This commit is contained in:
Ricardo Guilherme Schmidt 2018-09-05 00:39:25 -03:00
parent cbfdd9cc72
commit f7641dbe29
No known key found for this signature in database
GPG Key ID: 3F95A3AD0B607030
2 changed files with 1 additions and 2 deletions

View File

@ -153,7 +153,6 @@ const RegisterSubDomain = withFormik({
const { address, statusAddress } = values; const { address, statusAddress } = values;
const { subDomain, domainName, registeredCallbackFn } = props || values; const { subDomain, domainName, registeredCallbackFn } = props || values;
const { methods: { register } } = UsernameRegistrar; const { methods: { register } } = UsernameRegistrar;
const { methods: { setAddr, setPubkey } } = PublicResolver;
const subdomainHash = soliditySha3(subDomain); const subdomainHash = soliditySha3(subDomain);
const domainNameHash = hash(domainName); const domainNameHash = hash(domainName);
const resolveToAddr = address || zeroAddress; const resolveToAddr = address || zeroAddress;

View File

@ -1,4 +1,4 @@
exports.reservedNames = [ exports.ReservedUsernames = [
//Ethereum reserved words //Ethereum reserved words
'eth', 'eth',
'ether', 'ether',