Merge pull request #650 from ETCDEVTeam/fix/tokens

Fix/tokens
emeraldpay · Jun 22, 2018 · 24c8e8f · 24c8e8f
2 parents ff9a32e + 055ed8a
commit 24c8e8f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/src/components/tokens/AddToken/add.js b/src/components/tokens/AddToken/add.js
@@ -119,6 +119,7 @@ function mapDispatchToProps(dispatch, ownProps) {
           .then(dispatch(reset('addToken')))
           .then(dispatch(tokens.actions.loadTokenBalances(data)));
       }
+
       return dispatch(tokens.actions.fetchTokenDetails(data.address))
         .then((result) => {
           return dispatch(change('addToken', 'token', result));

diff --git a/src/components/tokens/TokensList/list.js b/src/components/tokens/TokensList/list.js
@@ -5,6 +5,7 @@ import Immutable from 'immutable';
 import { IconButton } from 'material-ui';
 import { Trash as DeleteIcon } from 'emerald-js-ui/lib/icons3';
 import { Input } from 'emerald-js-ui';
+import tokensStore from '../../../store/vault/tokens';
 
 import styles from './list.scss';
 
@@ -34,7 +35,7 @@ const Token = (props) => {
         />
       </div>
       <div>
-        <IconButton iconStyle={ deleteIconStyle }>
+        <IconButton onClick={ () => props.onDelete(token) } iconStyle={ deleteIconStyle }>
           <DeleteIcon/>
         </IconButton>
       </div>
@@ -46,11 +47,11 @@ Token.propTypes = {
   token: PropTypes.object.isRequired,
 };
 
-const TokensList = ({ tokens }) => {
+const TokensList = ({ tokens, onDelete }) => {
   return (
     <div>
       { tokens.map((token) =>
-        <Token key={ token.get('address') } token={ token }/>)}
+        <Token {...{onDelete}} key={ token.get('address') } {...{token}}/>)}
     </div>
   );
 };
@@ -61,8 +62,13 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  onDelete: (token) => {
+    dispatch(tokensStore.actions.removeToken(token.get('address')));
+  },
+});
+
 export default connect(
   mapStateToProps,
-  null
+  mapDispatchToProps
 )(TokensList);
-
diff --git a/src/store/vault/tokens/actionTypes.js b/src/store/vault/tokens/actionTypes.js
@@ -4,6 +4,7 @@ const ActionTypes = {
   RESET_BALANCES: 'TOKEN/RESET_BALANCES',
   SET_INFO: 'TOKEN/SET_INFO',
   ADD_TOKEN: 'TOKEN/ADD_TOKEN',
+  REMOVE_TOKEN: 'TOKEN/REMOVE_TOKEN',
   SET_LIST: 'TOKEN/SET_LIST',
   LOADING: 'TOKEN/LOADING',
 };

diff --git a/src/store/vault/tokens/tokenActions.js b/src/store/vault/tokens/tokenActions.js
@@ -97,10 +97,12 @@ export function loadTokenDetails(tokenAddress: string): () => Promise<any> {
 
 export function fetchTokenDetails(tokenAddress: string): () => Promise<any> {
   return (dispatch, getState, api) => {
+    const contractCallBase = {to: tokenAddress};
+
     return Promise.all([
-      api.geth.eth.call(tokenAddress, tokenContract.functionToData('totalSupply')),
-      api.geth.eth.call(tokenAddress, tokenContract.functionToData('decimals')),
-      api.geth.eth.call(tokenAddress, tokenContract.functionToData('symbol')),
+      api.geth.eth.call({ ...contractCallBase, data: tokenContract.functionToData('totalSupply') }),
+      api.geth.eth.call({ ...contractCallBase, data: tokenContract.functionToData('decimals') }),
+      api.geth.eth.call({ ...contractCallBase, data: tokenContract.functionToData('symbol') }),
     ]).then((results) => {
       return {
         address: tokenAddress,
@@ -189,6 +191,10 @@ export function addToken(token: TokenInfo) {
   };
 }
 
+export function removeToken(address: string) {
+  return (dispatch, getState, api) => dispatch({ type: ActionTypes.REMOVE_TOKEN, address });
+}
+
 // FIXME: deprecated
 export function traceCall(from: string, to: string, gas: string, gasPrice: string, value: string, data: string) {
   return (dispatch, getState, api) => {

diff --git a/src/store/vault/tokens/tokenReducers.js b/src/store/vault/tokens/tokenReducers.js
@@ -26,7 +26,6 @@ const initialToken = Map({
 });
 
 // ----- UTILITY FUNCTIONS
-
 function addToken(state, address, name) {
   return state.update('tokens', (tokens) => {
     const pos = tokens.findKey((tok) => tok.get('address') === address);
@@ -69,6 +68,16 @@ function updateToken(state, id, f) {
 
 // ----- REDUCERS
 
+function onRemoveToken(state, action) {
+  if (action.type === ActionTypes.REMOVE_TOKEN) {
+    return state.set(
+      'tokens',
+      state.get('tokens').filterNot((token) => token.get('address') === action.address)
+    );
+  }
+  return state;
+}
+
 function onLoading(state, action) {
   switch (action.type) {
     case ActionTypes.LOADING:
@@ -169,5 +178,6 @@ export default function tokenReducers(state, action) {
   state = onSetTokenBalance(state, action);
   state = onSetTokensBalances(state, action);
   state = onResetBalances(state, action);
+  state = onRemoveToken(state, action);
   return state;
 }