Skip to content

Commit

Permalink
Adapted about page and send transaction form
Browse files Browse the repository at this point in the history
  • Loading branch information
RonaldEAM committed May 15, 2018
1 parent 35843c1 commit 7b54a10
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 25 deletions.
10 changes: 5 additions & 5 deletions src/components/tx/SendTx/CreateTx/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ const CreateTx = connect(
dispatch(change('createTx', 'value', value));
}
},
onChangeGasLimit: (event, value) => {
if (value) {
dispatch(change('createTx', 'gas', value));
}
},
// onChangeGasLimit: (event, value) => {
// if (value) {
// dispatch(change('createTx', 'gas', value));
// }
// },
onChangeToken: (event, value, prev) => {
// if switching from WEB to token, change default gas
if (prev.length < 1 && !(address(value))) {
Expand Down
13 changes: 9 additions & 4 deletions src/components/tx/SendTx/CreateTx/createTxForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,12 @@ export const CreateTxForm = (props) => {
validate={[required, number]}
value={parseFloat(value)}
/>
<Field
<div style={styles.right}>
<div style={styles.fieldName}>
WEB
</div>
</div>
{/* <Field
name="token"
style={{ marginLeft: '19px', maxWidth: '125px' }}
component={SelectField}
Expand All @@ -187,7 +192,7 @@ export const CreateTxForm = (props) => {
primaryText={it.get('symbol')}
/>
)}
</Field>
</Field> */}

{/* {isToken &&*/}
{/* <Field name="isTransfer"*/}
Expand Down Expand Up @@ -220,7 +225,7 @@ export const CreateTxForm = (props) => {
</div>
</Row>

<Row>
{/* <Row>
<div style={styles.left}>
<div style={styles.fieldName}>
Gas Limit
Expand All @@ -236,7 +241,7 @@ export const CreateTxForm = (props) => {
validate={[required, number, positive]}
/>
</div>
</Row>
</Row> */}
<Row>
<div style={styles.left}>
<div style={styles.fieldName}>Transaction Fee</div>
Expand Down
20 changes: 11 additions & 9 deletions src/containers/About/About.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import muiThemeable from 'material-ui/styles/muiThemeable';
import { Logo as EtcLogo } from 'emerald-js-ui/lib/icons';
import LogoIcon from '../../elements/Icons/logoIcon';
import { Button } from 'emerald-js-ui';
import version from '../../version';

Expand All @@ -16,21 +16,23 @@ class AboutClass extends React.Component {
};
return (
<div style={{ padding: '30px', position: 'relative' }}>
<div style={{ position: 'absolute', top: '-100px', right: '-175px' }}>
<EtcLogo height="350px" width="350px" />
<div style={{ position: 'absolute', top: '25px', right: '25px' }}>
<LogoIcon height="150px" width="150px" />
</div>
<h2 style={{ color: muiTheme.palette.primary1Color, fontWeight: '200', paddingBottom: '0px', marginBottom: '5px' }}>Emerald Wallet</h2>
<h2 style={{ color: muiTheme.palette.primary1Color, fontWeight: '200', paddingBottom: '0px', marginBottom: '5px' }}>Webchain Wallet</h2>
<div style={{ marginBottom: '20px' }}>{version}</div>
<div style={{ color: muiTheme.palette.secondaryTextColor, fontWeight: '100', lineHeight: '26px', maxWidth: '580px' }}>ETCDEVTEAM: Igor Artamonov, Isaac Ardis, Constantine Kryvomaz, Yury Gagarin, Tomasz Zdybal, Shane Jonas, Richard Schumann, Darcy Reno</div>
{/* <div style={{ color: muiTheme.palette.secondaryTextColor, fontWeight: '100', lineHeight: '26px', maxWidth: '580px' }}>ETCDEVTEAM: Igor Artamonov, Isaac Ardis, Constantine Kryvomaz, Yury Gagarin, Tomasz Zdybal, Shane Jonas, Richard Schumann, Darcy Reno</div> */}
<div style={{ paddingTop: '60px', marginBottom: '60px' }}>
<Button onClick={onButtonClick} primary label='Buy us a Pizza' />
<a href="https://webchain.network/">
<Button primary label="Visit project page" />
</a>
</div>
<div style={{ fontSize: '14px' }}>
<div style={{ paddingBottom: '5px' }}>Copyright &copy; 2017-{year} ETCDEVTeam</div>
<div style={{ paddingBottom: '5px' }}>Copyright &copy; {year} Webchain Network</div>
<div> Licensed under <a onClick={onLicenseClick} style={styles.links} href="#">Apache License 2.0</a>
<span style={{ float: 'right', textAlign: 'right' }}>
{/* <span style={{ float: 'right', textAlign: 'right' }}>
<a onClick={onHelpClick} style={styles.links} href="#">Help & Support</a>
</span>
</span> */}
</div>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions src/lib/deployedTokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
*
*/
const Tokens = {};
Tokens[61] = [
{
address: '0x085fb4f24031eaedbc2b611aa528f22343eb52db',
symbol: 'BEC',
decimals: '0x08',
},
];
// Tokens[61] = [
// {
// address: '0x085fb4f24031eaedbc2b611aa528f22343eb52db',
// symbol: 'BEC',
// decimals: '0x08',
// },
// ];

export default Tokens;

0 comments on commit 7b54a10

Please sign in to comment.