Skip to content

Commit

Permalink
[#23]: Initial search screen shows an error message
Browse files Browse the repository at this point in the history
  • Loading branch information
@alwx
alwx committed Oct 4, 2018
1 parent 3039461 commit ffa2590
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 50 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -42,3 +42,4 @@ package-lock.json
.vs/
bin/
.idea/
*.iml
117 changes: 67 additions & 50 deletions app/components/ens/nameLookup.js
View file
Expand Up @@ -33,12 +33,12 @@ import { nullAddress, getResolver } from './utils/domain';

const normalizer = new IDNANormalizer();
const invalidSuffix = '0000000000000000000000000000000000000000'
const validAddress = address => address != nullAddress;
const validAddress = address => address !== nullAddress;
const validStatusAddress = address => !address.includes(invalidSuffix);
const formatName = domainName => domainName.includes('.') ? normalizer.normalize(domainName) : normalizer.normalize(`${domainName}.stateofus.eth`);
const getDomain = fullDomain => formatName(fullDomain).split('.').slice(1).join('.');
const hashedDomain = domainName => hash(getDomain(domainName));
const registryIsOwner = address => address == UsernameRegistrar._address;
const registryIsOwner = address => address === UsernameRegistrar._address;
const { soliditySha3, fromWei } = web3.utils;


Expand Down Expand Up @@ -77,7 +77,7 @@ const DisplayBox = ({ displayType, pubKey }) => (

const MobileAddressDisplay = ({ domainName, address, statusAccount, expirationTime, defaultAccount, isOwner, edit, onSubmit, handleChange, values, handleSubmit }) => (
<Fragment>
<LookupForm {...{ handleSubmit, values, handleChange }} justSearch />
<LookupForm {...{ handleSubmit, values, handleChange }} isWarningDisplayed={false} />
<Info background={isOwner ? '#44D058' : '#000000'} style={{ margin: '0.4em', boxShadow: '0px 6px 10px rgba(0, 0, 0, 0.2)' }}>
<Typography variant="title" style={
{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'space-evenly', height: '4em', color: '#ffffff', textAlign: 'center', margin: '10%' }
Expand Down Expand Up @@ -116,17 +116,17 @@ class RenderAddresses extends PureComponent {
state = { copied: false, editMenu: false, editAction: false }

render() {
const { domainName, address, statusAccount, expirationTime, defaultAccount, ownerAddress, setStatus, registryOwnsDomain } = this.props
const { domainName, address, statusAccount, expirationTime, defaultAccount, ownerAddress, setStatus, registryOwnsDomain } = this.props;
const { copied, editMenu, editAction, submitted } = this.state
const markCopied = (v) => { this.setState({ copied: v }) }
const isCopied = address => address == copied;
const isCopied = address => address === copied;
const renderCopied = address => isCopied(address) && <span style={{ color: theme.positive }}><IconCheck/>Copied!</span>;
const onClose = value => { this.setState({ editAction: value, editMenu: false }) }
const onClickEdit = () => { validAddress(address) ? this.setState({ editMenu: true }) : this.setState({ editAction: 'edit' }) }
const isOwner = defaultAccount === ownerAddress;
const closeReleaseAlert = value => {
if (!isNil(value)) {
this.setState({ submitted: true })
this.setState({ submitted: true });
release(
soliditySha3(domainName)
)
Expand Down Expand Up @@ -192,7 +192,7 @@ const RegisterInfoCard = ({ formattedDomain, domainPrice, registryOwnsDomain })
</Typography>
</Hidden>
</Fragment>
)
);

const TransactionComplete = ({ type, setStatus }) => (
<div style={{ textAlign: 'center', margin: '40% 15 10' }}>
Expand Down Expand Up @@ -275,7 +275,7 @@ const DisplayAddress = connect(mapStateToProps)((props) => (
</Fragment>
))

const LookupForm = ({ handleSubmit, values, handleChange, justSearch }) => (
const LookupForm = ({ handleSubmit, values, handleChange, isWarningDisplayed }) => (
<Fragment>
<form onSubmit={handleSubmit} onBlur={handleSubmit} >
<Hidden mdDown>
Expand All @@ -297,7 +297,7 @@ const LookupForm = ({ handleSubmit, values, handleChange, justSearch }) => (
onChange={handleChange}
required
wide />
{!justSearch && <Warning>Names are made with<br/>letters and numbers only</Warning>}
{isWarningDisplayed && <Warning>Names are made with<br/>letters and numbers only</Warning>}
</Hidden>
<Hidden mdDown>
<Button mode="strong" type="submit" style={{ marginLeft: '3%', maxWidth: '95%' }} wide>
Expand All @@ -324,55 +324,72 @@ const InnerForm = ({
<Hidden mdDown>
<span style={{ display: 'flex', justifyContent: 'space-evenly', margin: '50 0 10 0' }}>
<StatusLogo />
<img style={{ maxWidth: '150px', alignSelf: 'center' }} src={EnsLogo} alt="Ens Logo"/>
<img style={{maxWidth: '150px', alignSelf: 'center'}} src={EnsLogo} alt="Ens Logo"/>
</span>
</Hidden>
{!status
? <LookupForm {...{ handleSubmit, values, handleChange }} />
: validAddress(status.address) || defaultAccount === status.ownerAddress ?
<DisplayAddress
{...{ handleSubmit, values, handleChange }}
domainName={status.resolvedDomainName}
address={status.address}
statusAccount={status.statusAccount}
expirationTime={status.expirationTime}
ownerAddress={status.ownerAddress}
registryOwnsDomain={status.registryOwnsDomain}
setStatus={setStatus} /> :
<div>
<LookupForm {...{ handleSubmit, values, handleChange }} justSearch />
<ConnectedRegister
style={{ position: 'relative' }}
setStatus={setStatus}
registryOwnsDomain={status.registryOwnsDomain}
ownerAddress={status.ownerAddress}
domainName={status.resolvedDomainName} />
</div>
</Hidden>
{!status || !status.address ?
<LookupForm {...{handleSubmit, values, handleChange}} isWarningDisplayed={status && status.isInvalidDomain}/>
:
validAddress(status.address) || defaultAccount === status.ownerAddress ?
<DisplayAddress
{...{handleSubmit, values, handleChange}}
domainName={status.domainName}
address={status.address}
statusAccount={status.statusAccount}
expirationTime={status.expirationTime}
ownerAddress={status.ownerAddress}
registryOwnsDomain={status.registryOwnsDomain}
setStatus={setStatus}/> :
<div>
<LookupForm {...{handleSubmit, values, handleChange}} isWarningDisplayed={false}/>
<ConnectedRegister
style={{position: 'relative'}}
setStatus={setStatus}
registryOwnsDomain={status.registryOwnsDomain}
ownerAddress={status.ownerAddress}
domainName={status.domainName}/>
</div>
}
</div>
)
);

const isValidDomainName = val => /^([a-z0-9]+)$/.test(val.toLowerCase());

const NameLookup = withFormik({
mapPropsToValues: props => ({ domainName: '' }),

async handleSubmit(values, { status, setSubmitting, setStatus }) {
const { domainName } = values;
const { methods: { owner, resolver } } = ENSRegistry;
const lookupHash = hash(formatName(domainName));
const resolverContract = await getResolver(lookupHash);
const { addr, pubkey } = resolverContract.methods;
const address = addr(lookupHash).call();
const keys = pubkey(lookupHash).call();
const ownerAddress = owner(lookupHash).call();
const suffixOwner = owner(hash(getDomain(domainName))).call();
const expirationTime = getExpirationTime(lookupHash).call();
Promise.all([address, keys, ownerAddress, expirationTime, suffixOwner])
.then(([ address, keys, ownerAddress, expirationTime, suffixOwner ]) => {
const statusAccount = keyFromXY(keys[0], keys[1]);
const registryOwnsDomain = registryIsOwner(suffixOwner)
const resolvedDomainName = domainName;
setStatus({ address, statusAccount, expirationTime, ownerAddress, registryOwnsDomain, resolvedDomainName });
})

if (isValidDomainName(domainName)) {
const {methods: {owner, resolver}} = ENSRegistry;
const lookupHash = hash(formatName(domainName));
const resolverContract = await getResolver(lookupHash);
const {addr, pubkey} = resolverContract.methods;
const address = addr(lookupHash).call();
const keys = pubkey(lookupHash).call();
const ownerAddress = owner(lookupHash).call();
const suffixOwner = owner(hash(getDomain(domainName))).call();
const expirationTime = getExpirationTime(lookupHash).call();

Promise.all([address, keys, ownerAddress, expirationTime, suffixOwner])
.then(([address, keys, ownerAddress, expirationTime, suffixOwner]) => {
const statusAccount = keyFromXY(keys[0], keys[1]);
const registryOwnsDomain = registryIsOwner(suffixOwner);

setStatus({
address,
statusAccount,
expirationTime,
ownerAddress,
registryOwnsDomain,
domainName
});
});
} else {
setStatus({isInvalidDomain: true});
}
}
})(InnerForm)
})(InnerForm);

export default connect(mapStateToProps)(NameLookup);

0 comments on commit ffa2590

Please sign in to comment.