poanetwork
/
MyCrypto
mirror of https://github.com/poanetwork/MyCrypto.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor donation addresses map; fix hardcoded instance of address in send

This commit is contained in:
Daniel Ternyak 2017-07-03 19:16:20 -05:00
parent 8f77aedc70
commit 29be2821a3
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/components/Footer/index.jsx
View File

@ -1,6 +1,6 @@
import React, { Component } from 'react';
import translate, { getTranslators } from 'translations';
import { DONATION_ADDRESSES_MAP } from 'config/data';
import { donationAddressMap } from 'config/data';
export default class Footer extends Component {
render() {
@ -51,13 +51,13 @@ export default class Footer extends Component {
<li>
{' '}ETH:{' '}
<span className="mono wrap">
{DONATION_ADDRESSES_MAP.ETH}
{donationAddressMap.ETH}
</span>
</li>
<li>
{' '}BTC:{' '}
<span className="mono wrap">
{DONATION_ADDRESSES_MAP.BTC}
{donationAddressMap.BTC}
</span>
</li>
</ul>

2
common/config/data.js
View File

@ -1,4 +1,4 @@
export const DONATION_ADDRESSES_MAP = {
export const donationAddressMap = {
BTC: '1MEWT2SGbqtz6mPCgFcnea8XmWV5Z4Wc6',
ETH: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8',
REP: '0x7cB57B5A97eAbe94205C07890BE4c1aD31E486A8'

7
common/containers/Tabs/SendTransaction/components/DataField.jsx
View File

@ -2,6 +2,7 @@
import React from 'react';
import translate from 'translations';
import { isValidHex } from 'libs/validators';
import { donationAddressMap } from 'config/data';
export default class DataField extends React.Component {
props: {
@ -37,11 +38,7 @@ export default class DataField extends React.Component {
? 'is-valid'
: 'is-invalid'}`}
type="text"
placeholder={
readOnly
? ''
: '0x6d79657468657277616c6c65742e636f6d20697320746865206265737421'
}
placeholder={readOnly ? '' : donationAddressMap.ETH}
value={value || ''}
disabled={readOnly}
onChange={this.onChange}

4
common/containers/Tabs/Swap/components/receivingAddress.js
View File

@ -1,7 +1,7 @@
// @flow
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { DONATION_ADDRESSES_MAP } from 'config/data';
import { donationAddressMap } from 'config/data';
import { isValidBTCAddress, isValidETHAddress } from 'libs/validators';
import translate from 'translations';
@ -48,7 +48,7 @@ export default class ReceivingAddress extends Component {
type="text"
value={destinationAddress}
onChange={this.onChangeDestinationAddress}
placeholder={DONATION_ADDRESSES_MAP[destinationKind]}
placeholder={donationAddressMap[destinationKind]}
/>
</div>
</section>

10
spec/libs/validators.spec.js
View File

@ -2,24 +2,24 @@ import {
isValidBTCAddress,
isValidETHAddress
} from '../../common/libs/validators';
import { DONATION_ADDRESSES_MAP } from '../../common/config/data';
import { donationAddressMap } from '../../common/config/data';
describe('Validator', () => {
it('should validate correct BTC address as true', () => {
expect(isValidBTCAddress(DONATION_ADDRESSES_MAP.BTC)).toBeTruthy();
expect(isValidBTCAddress(donationAddressMap.BTC)).toBeTruthy();
});
it('should validate incorrect BTC address as false', () => {
expect(
isValidBTCAddress('nonsense' + DONATION_ADDRESSES_MAP.BTC + 'nonsense')
isValidBTCAddress('nonsense' + donationAddressMap.BTC + 'nonsense')
).toBeFalsy();
});
it('should validate correct ETH address as true', () => {
expect(isValidETHAddress(DONATION_ADDRESSES_MAP.ETH)).toBeTruthy();
expect(isValidETHAddress(donationAddressMap.ETH)).toBeTruthy();
});
it('should validate incorrect ETH address as false', () => {
expect(
isValidETHAddress('nonsense' + DONATION_ADDRESSES_MAP.ETH + 'nonsense')
isValidETHAddress('nonsense' + donationAddressMap.ETH + 'nonsense')
).toBeFalsy();
});
});