diff --git a/app/components/ens/nameLookup.js b/app/components/ens/nameLookup.js index e80372c..2413b3c 100644 --- a/app/components/ens/nameLookup.js +++ b/app/components/ens/nameLookup.js @@ -1,7 +1,7 @@ import React, { Fragment, PureComponent } from 'react'; import web3 from 'web3'; import { connect } from 'react-redux'; -import { actions as accountActions } from '../../reducers/accounts'; +import { actions as accountActions, getDefaultAccount } from '../../reducers/accounts'; import Hidden from '@material-ui/core/Hidden'; import Typography from '@material-ui/core/Typography'; import ENSSubdomainRegistry from 'Embark/contracts/ENSSubdomainRegistry'; @@ -59,11 +59,33 @@ const DisplayBox = ({ displayType, pubKey }) => ( ); +const MobileAddressDisplay = ({ domainName, address, statusAccount, expirationTime, defaultAccount }) => ( + + + + + {formatName(domainName).toUpperCase()} +
+ {expirationTime && Expires {generatePrettyDate(expirationTime)}} +
+
+
+ Name is unavailable + It is pointed to the following addresses + + {validStatusAddress(statusAccount) && } +
+) + class RenderAddresses extends PureComponent { state = { copied: false } render() { - const { domainName, address, statusAccount, expirationTime } = this.props + const { domainName, address, statusAccount, expirationTime, defaultAccount } = this.props + // TODO ADD CONDITIONAL RENDER TO MobileAddressDisplay + console.log(defaultAccount) const { copied } = this.state const markCopied = (v) => { this.setState({ copied: v }) } const isCopied = address => address == copied; @@ -84,21 +106,7 @@ class RenderAddresses extends PureComponent { - - - - {formatName(domainName).toUpperCase()} -
- {expirationTime && Expires {generatePrettyDate(expirationTime)}} -
-
-
- Name is unavailable - It is pointed to the following addresses - - {validStatusAddress(statusAccount) && } +
) @@ -179,9 +187,13 @@ const mapDispatchToProps = dispatch => ({ }, }); -const ConnectedRegister = connect(null, mapDispatchToProps)(Register); +const mapStateToProps = state => ({ + defaultAccount: getDefaultAccount(state) +}) -const DisplayAddress = (props) => ( +const ConnectedRegister = connect(mapStateToProps, mapDispatchToProps)(Register); + +const DisplayAddress = connect(mapStateToProps)((props) => ( {validAddress(props.address) ? @@ -194,7 +206,7 @@ const DisplayAddress = (props) => ( }
props.setStatus(null)}>←
-) +)) const LookupForm = ({ handleSubmit, values, handleChange, justSearch }) => (