show symbol in txs table

src/routes/safe/components/Balances/Tokens/screens/AddCustomToken/validators.js

@@ -1,6 +1,5 @@
 // @flow
 import { List } from 'immutable'
-import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { type Token } from '~/logic/tokens/store/model/token'
 import { sameAddress } from '~/logic/wallets/ethAddresses'
 import { isAddressAToken } from '~/logic/tokens/utils/tokenHelpers'

src/routes/safe/components/TransactionsNew/TxsTable/columns.js

@@ -32,7 +32,7 @@ export const getTxTableData = (transactions: List<Transaction>): List<BalanceRow
     [TX_TABLE_NONCE_ID]: tx.nonce,
     [TX_TABLE_TYPE_ID]: 'Outgoing transfer',
     [TX_TABLE_DATE_ID]: formatDate(tx.isExecuted ? tx.executionDate : tx.submissionDate),
-    [TX_TABLE_AMOUNT_ID]: Number(tx.value) > 0 ? fromWei(toBN(tx.value), 'ether') : 'n/a',
+    [TX_TABLE_AMOUNT_ID]: Number(tx.value) > 0 ? `${fromWei(toBN(tx.value), 'ether')} ${tx.symbol}` : 'n/a',
     [TX_TABLE_STATUS_ID]: tx.isExecuted ? 'success' : 'awaiting',
   }))
 

src/routes/safe/store/actions/fetchTransactions.js

@@ -11,7 +11,8 @@ import { buildTxServiceUrl, type TxServiceType } from '~/logic/safe/transactions
 import { getOwners } from '~/logic/safe/utils'
 import { EMPTY_DATA } from '~/logic/wallets/ethTransactions'
 import { addTransactions } from './addTransactions'
-import { addressIsTokenContract } from '../../components/Balances/Tokens/screens/AddCustomToken/validators'
+import { getHumanFriendlyToken } from '~/logic/tokens/store/actions/fetchTokens'
+import { isAddressAToken } from '~/logic/tokens/utils/tokenHelpers'
 
 type ConfirmationServiceModel = {
   owner: string,
@@ -46,10 +47,18 @@ const buildTransactionFrom = async (safeAddress: string, tx: TxServiceModel, saf
       })
     }),
   )
-  const isToken = await addressIsTokenContract(tx.to)
+  const isToken = await isAddressAToken(tx.to)
-  console.log(isToken)
+
+  let symbol = 'ETH'
+  if (isToken) {
+    const tokenContract = await getHumanFriendlyToken()
+    const tokenInstance = await tokenContract.at(tx.to)
+    symbol = await tokenInstance.symbol()
+  }
+
   return makeTransaction({
     name,
+    symbol,
     nonce: tx.nonce,
     value: Number(tx.value),
     confirmations,

src/routes/safe/store/models/transaction.js

@@ -13,6 +13,7 @@ export type TransactionProps = {
   isExecuted: boolean,
   submissionDate: Date,
   executionDate: Date,
+  symbol: string,
 }
 
 export const makeTransaction: RecordFactory<TransactionProps> = Record({
@@ -25,6 +26,7 @@ export const makeTransaction: RecordFactory<TransactionProps> = Record({
   isExecuted: false,
   submissionDate: '',
   executionDate: '',
+  symbol: '',
 })
 
 export type Transaction = RecordOf<TransactionProps>