1e6a2cb378
* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
114 lines
3.4 KiB
JavaScript
114 lines
3.4 KiB
JavaScript
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import React, { Component, PropTypes } from 'react';
|
|
import { Checkbox, MenuItem } from 'material-ui';
|
|
|
|
import { Form, Input, Select } from '../../../ui';
|
|
|
|
import Price from '../Price';
|
|
|
|
import styles from './optionsStep.css';
|
|
|
|
export default class OptionsStep extends Component {
|
|
static propTypes = {
|
|
refundAddress: PropTypes.string.isRequired,
|
|
coinSymbol: PropTypes.string.isRequired,
|
|
coins: PropTypes.array.isRequired,
|
|
price: PropTypes.object,
|
|
hasAccepted: PropTypes.bool.isRequired,
|
|
onChangeSymbol: PropTypes.func.isRequired,
|
|
onChangeRefund: PropTypes.func.isRequired,
|
|
onToggleAccept: PropTypes.func.isRequired
|
|
};
|
|
|
|
render () {
|
|
const { coinSymbol, coins, refundAddress, hasAccepted, onToggleAccept } = this.props;
|
|
const label = `(optional) ${coinSymbol} return address`;
|
|
|
|
if (!coins.length) {
|
|
return (
|
|
<div className={ styles.empty }>
|
|
There are currently no exchange pairs/coins available to fund with.
|
|
</div>
|
|
);
|
|
}
|
|
|
|
const items = coins.map(this.renderCoinSelectItem);
|
|
|
|
return (
|
|
<div className={ styles.body }>
|
|
<Form>
|
|
<Select
|
|
className={ styles.coinselector }
|
|
label='fund account from'
|
|
hint='the type of crypto conversion to do'
|
|
value={ coinSymbol }
|
|
onChange={ this.onSelectCoin }>
|
|
{ items }
|
|
</Select>
|
|
<Input
|
|
label={ label }
|
|
hint='the return address for send failures'
|
|
value={ refundAddress }
|
|
onSubmit={ this.onChangeRefund } />
|
|
<Checkbox
|
|
className={ styles.accept }
|
|
label='I understand that ShapeShift.io is a 3rd-party service and by using the service any transfer of information and/or funds is completely out of the control of Parity'
|
|
checked={ hasAccepted }
|
|
onCheck={ onToggleAccept } />
|
|
</Form>
|
|
<Price { ...this.props } />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
renderCoinSelectItem = (coin) => {
|
|
const { image, name, symbol } = coin;
|
|
|
|
const item = (
|
|
<div className={ styles.coinselect }>
|
|
<img className={ styles.coinimage } src={ image } />
|
|
<div className={ styles.coindetails }>
|
|
<div className={ styles.coinsymbol }>
|
|
{ symbol }
|
|
</div>
|
|
<div className={ styles.coinname }>
|
|
{ name }
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<MenuItem
|
|
key={ symbol }
|
|
value={ symbol }
|
|
label={ item }>
|
|
{ item }
|
|
</MenuItem>
|
|
);
|
|
}
|
|
|
|
onSelectCoin = (event, idx, value) => {
|
|
this.props.onChangeSymbol(event, value);
|
|
}
|
|
|
|
onChangeAddress = (event, value) => {
|
|
this.props.onChangeRefund(value);
|
|
}
|
|
}
|