Commit 1c83a87f authored by Chi Kei Chan's avatar Chi Kei Chan

Add Pending Tx to Pool functions

parent 75ea2d3d
...@@ -7,7 +7,7 @@ import CurrencyInputPanel from '../../components/CurrencyInputPanel'; ...@@ -7,7 +7,7 @@ import CurrencyInputPanel from '../../components/CurrencyInputPanel';
import OversizedPanel from '../../components/OversizedPanel'; import OversizedPanel from '../../components/OversizedPanel';
import NavigationTabs from '../../components/NavigationTabs'; import NavigationTabs from '../../components/NavigationTabs';
import Modal from '../../components/Modal'; import Modal from '../../components/Modal';
import { selectors } from '../../ducks/web3connect'; import { selectors, addPendingTx } from '../../ducks/web3connect';
import ArrowDown from '../../assets/images/plus-blue.svg'; import ArrowDown from '../../assets/images/plus-blue.svg';
import DropdownBlue from "../../assets/images/dropdown-blue.svg"; import DropdownBlue from "../../assets/images/dropdown-blue.svg";
import DropupBlue from "../../assets/images/dropup-blue.svg"; import DropupBlue from "../../assets/images/dropup-blue.svg";
...@@ -168,6 +168,7 @@ class AddLiquidity extends Component { ...@@ -168,6 +168,7 @@ class AddLiquidity extends Component {
value: ethAmount.toFixed(0) value: ethAmount.toFixed(0)
}, (err, data) => { }, (err, data) => {
this.reset(); this.reset();
this.props.addPendingTx(data);
if (data) { if (data) {
ReactGA.event({ ReactGA.event({
category: 'Pool', category: 'Pool',
...@@ -617,6 +618,7 @@ export default connect( ...@@ -617,6 +618,7 @@ export default connect(
}), }),
dispatch => ({ dispatch => ({
selectors: () => dispatch(selectors()), selectors: () => dispatch(selectors()),
addPendingTx: id => dispatch(addPendingTx(id)),
}) })
)(AddLiquidity); )(AddLiquidity);
......
...@@ -2,7 +2,7 @@ import React, { Component } from 'react'; ...@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom'; import { withRouter } from 'react-router-dom';
import {selectors} from "../../ducks/web3connect"; import {selectors, addPendingTx} from "../../ducks/web3connect";
import classnames from "classnames"; import classnames from "classnames";
import NavigationTabs from "../../components/NavigationTabs"; import NavigationTabs from "../../components/NavigationTabs";
import ModeSelector from "./ModeSelector"; import ModeSelector from "./ModeSelector";
...@@ -125,6 +125,7 @@ class CreateExchange extends Component { ...@@ -125,6 +125,7 @@ class CreateExchange extends Component {
decimals: 0, decimals: 0,
tokenAddress: '', tokenAddress: '',
}); });
this.props.addPendingTx(data);
ReactGA.event({ ReactGA.event({
category: 'Pool', category: 'Pool',
action: 'CreateExchange', action: 'CreateExchange',
...@@ -229,6 +230,7 @@ export default withRouter( ...@@ -229,6 +230,7 @@ export default withRouter(
dispatch => ({ dispatch => ({
selectors: () => dispatch(selectors()), selectors: () => dispatch(selectors()),
addExchange: opts => dispatch(addExchange(opts)), addExchange: opts => dispatch(addExchange(opts)),
addPendingTx: id => dispatch(addPendingTx(id)),
}) })
)(CreateExchange) )(CreateExchange)
); );
...@@ -6,7 +6,7 @@ import { BigNumber as BN } from 'bignumber.js'; ...@@ -6,7 +6,7 @@ import { BigNumber as BN } from 'bignumber.js';
import NavigationTabs from "../../components/NavigationTabs"; import NavigationTabs from "../../components/NavigationTabs";
import ModeSelector from "./ModeSelector"; import ModeSelector from "./ModeSelector";
import CurrencyInputPanel from "../../components/CurrencyInputPanel"; import CurrencyInputPanel from "../../components/CurrencyInputPanel";
import { selectors } from '../../ducks/web3connect'; import { selectors, addPendingTx } from '../../ducks/web3connect';
import OversizedPanel from "../../components/OversizedPanel"; import OversizedPanel from "../../components/OversizedPanel";
import ArrowPlus from "../../assets/images/arrow-down-blue.svg"; import ArrowPlus from "../../assets/images/arrow-down-blue.svg";
import EXCHANGE_ABI from "../../abi/exchange"; import EXCHANGE_ABI from "../../abi/exchange";
...@@ -115,6 +115,8 @@ class RemoveLiquidity extends Component { ...@@ -115,6 +115,8 @@ class RemoveLiquidity extends Component {
).send({ from: account }, (err, data) => { ).send({ from: account }, (err, data) => {
if (data) { if (data) {
this.reset(); this.reset();
this.props.addPendingTx(data);
ReactGA.event({ ReactGA.event({
category: 'Pool', category: 'Pool',
action: 'RemoveLiquidity', action: 'RemoveLiquidity',
...@@ -306,5 +308,6 @@ export default connect( ...@@ -306,5 +308,6 @@ export default connect(
}), }),
dispatch => ({ dispatch => ({
selectors: () => dispatch(selectors()), selectors: () => dispatch(selectors()),
addPendingTx: id => dispatch(addPendingTx(id)),
}) })
)(RemoveLiquidity); )(RemoveLiquidity);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment