remove on page load contact code request, move to displaybox click

This commit is contained in:
Barry Gitarts 2018-10-01 16:41:02 -04:00 committed by Barry G
parent 3039461191
commit e9a4f6c72b
2 changed files with 12 additions and 4 deletions

View File

@ -3,6 +3,7 @@ import web3 from 'web3';
import EmbarkJS from 'Embark/EmbarkJS'; import EmbarkJS from 'Embark/EmbarkJS';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { actions as accountActions, getDefaultAccount } from '../../reducers/accounts'; import { actions as accountActions, getDefaultAccount } from '../../reducers/accounts';
import { checkAndDispatchStatusContactCode } from '../../actions/accounts';
import { hash } from 'eth-ens-namehash'; import { hash } from 'eth-ens-namehash';
import { isNil } from 'lodash'; import { isNil } from 'lodash';
import Hidden from '@material-ui/core/Hidden'; import Hidden from '@material-ui/core/Hidden';
@ -64,8 +65,8 @@ const backButton = {
const validTimestamp = timestamp => Number(timestamp) > 99999999; const validTimestamp = timestamp => Number(timestamp) > 99999999;
const generatePrettyDate = timestamp => new Date(timestamp * 1000).toDateString(); const generatePrettyDate = timestamp => new Date(timestamp * 1000).toDateString();
const DisplayBox = ({ displayType, pubKey }) => ( const WrappedDisplayBox = ({ displayType, pubKey, getStatusContactCode }) => (
<div> <div onClick={getStatusContactCode}>
<div style={{ fontSize: '14px', color: '#939BA1', margin: '0 1em' }}>{displayType}</div> <div style={{ fontSize: '14px', color: '#939BA1', margin: '0 1em' }}>{displayType}</div>
<div style={{ border: '1px solid #EEF2F5', borderRadius: '8px', margin: '0.5 1em 1em', display: 'flex', flexDirection: 'column', justifyContent: 'space-around', minHeight: '4em' }}> <div style={{ border: '1px solid #EEF2F5', borderRadius: '8px', margin: '0.5 1em 1em', display: 'flex', flexDirection: 'column', justifyContent: 'space-around', minHeight: '4em' }}>
<div style={{ margin: '3%', wordBreak: 'break-word' }}> <div style={{ margin: '3%', wordBreak: 'break-word' }}>
@ -75,6 +76,14 @@ const DisplayBox = ({ displayType, pubKey }) => (
</div> </div>
); );
const mapDispatchToDisplayBoxProps = dispatch => ({
getStatusContactCode() {
checkAndDispatchStatusContactCode(dispatch)
}
});
const DisplayBox = connect(null, mapDispatchToDisplayBoxProps)(WrappedDisplayBox);
const MobileAddressDisplay = ({ domainName, address, statusAccount, expirationTime, defaultAccount, isOwner, edit, onSubmit, handleChange, values, handleSubmit }) => ( const MobileAddressDisplay = ({ domainName, address, statusAccount, expirationTime, defaultAccount, isOwner, edit, onSubmit, handleChange, values, handleSubmit }) => (
<Fragment> <Fragment>
<LookupForm {...{ handleSubmit, values, handleChange }} justSearch /> <LookupForm {...{ handleSubmit, values, handleChange }} justSearch />

View File

@ -1,14 +1,13 @@
import web3 from "Embark/web3" import web3 from "Embark/web3"
import EmbarkJS from 'Embark/EmbarkJS' import EmbarkJS from 'Embark/EmbarkJS'
import store from './configureStore' import store from './configureStore'
import { fetchAndDispatchSNTAllowance, fetchAndDispatchAccountsWithBalances, checkAndDispatchStatusContactCode } from '../actions/accounts' import { fetchAndDispatchSNTAllowance, fetchAndDispatchAccountsWithBalances } from '../actions/accounts'
const dispatch = action => store.dispatch(action) const dispatch = action => store.dispatch(action)
export default () => { export default () => {
EmbarkJS.onReady(async (err) => { EmbarkJS.onReady(async (err) => {
fetchAndDispatchAccountsWithBalances(web3, dispatch) fetchAndDispatchAccountsWithBalances(web3, dispatch)
checkAndDispatchStatusContactCode(dispatch)
fetchAndDispatchSNTAllowance(dispatch) fetchAndDispatchSNTAllowance(dispatch)
}) })
} }