Refactoring of Tokens & Balances (#5372)
* Remove ETH filter * Remove unused Blockchain reducer+actions * Simpler Token updates and fetching * Cleanup use of balances * Cleanup of balances * Cleanup of Balances * Linting * Update List Component * Separate tokens from balances * Refactoring balance fetchin and storing - Part I * Linting * Better ETH token description and use * Working Transfer with new logic * Add debugging * Querying the tokens filter on new block * Fixing the tests - PART I * Fix txCount
This commit is contained in:
committed by
Jaco Greeff
parent
fc18299869
commit
37690cfde2
@@ -47,7 +47,6 @@ export default class DetailsStep extends Component {
|
||||
abiError: PropTypes.string,
|
||||
amount: PropTypes.string,
|
||||
amountError: PropTypes.string,
|
||||
balances: PropTypes.object,
|
||||
code: PropTypes.string,
|
||||
codeError: PropTypes.string,
|
||||
description: PropTypes.string,
|
||||
@@ -87,7 +86,6 @@ export default class DetailsStep extends Component {
|
||||
render () {
|
||||
const {
|
||||
accounts,
|
||||
balances,
|
||||
readOnly,
|
||||
|
||||
fromAddress, fromAddressError,
|
||||
@@ -141,7 +139,6 @@ export default class DetailsStep extends Component {
|
||||
|
||||
<AddressSelect
|
||||
accounts={ accounts }
|
||||
balances={ balances }
|
||||
error={ fromAddressError }
|
||||
hint={
|
||||
<FormattedMessage
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import BigNumber from 'bignumber.js';
|
||||
import { pick } from 'lodash';
|
||||
import { observer } from 'mobx-react';
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
@@ -69,7 +68,6 @@ class DeployContract extends Component {
|
||||
static propTypes = {
|
||||
accounts: PropTypes.object.isRequired,
|
||||
abi: PropTypes.string,
|
||||
balances: PropTypes.object,
|
||||
code: PropTypes.string,
|
||||
gasLimit: PropTypes.object.isRequired,
|
||||
onClose: PropTypes.func.isRequired,
|
||||
@@ -282,7 +280,7 @@ class DeployContract extends Component {
|
||||
}
|
||||
|
||||
renderStep () {
|
||||
const { accounts, readOnly, balances } = this.props;
|
||||
const { accounts, readOnly } = this.props;
|
||||
const { step } = this.state;
|
||||
|
||||
switch (step) {
|
||||
@@ -291,7 +289,6 @@ class DeployContract extends Component {
|
||||
<DetailsStep
|
||||
{ ...this.state }
|
||||
accounts={ accounts }
|
||||
balances={ balances }
|
||||
onAmountChange={ this.onAmountChange }
|
||||
onExtrasChange={ this.onExtrasChange }
|
||||
onFromAddressChange={ this.onFromAddressChange }
|
||||
@@ -484,20 +481,11 @@ class DeployContract extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
function mapStateToProps (initState, initProps) {
|
||||
const { accounts } = initProps;
|
||||
function mapStateToProps (state) {
|
||||
const { gasLimit } = state.nodeStatus;
|
||||
|
||||
const fromAddresses = Object.keys(accounts);
|
||||
|
||||
return (state) => {
|
||||
const balances = pick(state.balances.balances, fromAddresses);
|
||||
const { gasLimit } = state.nodeStatus;
|
||||
|
||||
return {
|
||||
accounts,
|
||||
balances,
|
||||
gasLimit
|
||||
};
|
||||
return {
|
||||
gasLimit
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user