status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incomming transactions fetching (#346)

This commit is contained in:
Germán Martínez 2019-12-13 17:35:28 +01:00 committed by GitHub
parent 63c1153772
commit 02e09cbc49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/routes/safe/store/actions/fetchTransactions.js
View File

@ -20,9 +20,6 @@ import { isTokenTransfer } from '~/logic/tokens/utils/tokenHelpers'
import { decodeParamsFromSafeMethod } from '~/logic/contracts/methodIds'
import { ALTERNATIVE_TOKEN_ABI } from '~/logic/tokens/utils/alternativeAbi'
import { ZERO_ADDRESS } from '~/logic/wallets/ethAddresses'
import enqueueSnackbar from '~/logic/notifications/store/actions/enqueueSnackbar'
import { enhanceSnackbarForAction, SUCCESS } from '~/logic/notifications'
import { getIncomingTxAmount } from '~/routes/safe/components/Transactions/TxsTable/columns'
let web3
@ -238,7 +235,7 @@ export const loadSafeTransactions = async (safeAddress: string) => {
transactions = transactions.concat(response.data.results)
}
} catch (err) {
console.error(`Requests for transactions for ${safeAddress} failed with 404`, err)
console.error(`Requests for outgoing transactions for ${safeAddress} failed with 404`, err)
}
const txsRecord = await Promise.all(
@ -249,9 +246,17 @@ export const loadSafeTransactions = async (safeAddress: string) => {
}
export const loadSafeIncomingTransactions = async (safeAddress: string) => {
const url = buildIncomingTxServiceUrl(safeAddress)
const response = await axios.get(url)
const incomingTransactions: IncomingTxServiceModel[] = response.data.results
let incomingTransactions: IncomingTxServiceModel[] = []
try {
const url = buildIncomingTxServiceUrl(safeAddress)
const response = await axios.get(url)
if (response.data.count > 0) {
incomingTransactions = response.data.results
}
} catch (err) {
console.error(`Requests for incomming transactions for ${safeAddress} failed with 404`, err)
}
const incomingTxsRecord = await Promise.all(incomingTransactions.map(buildIncomingTransactionFrom))
return Map().set(safeAddress, List(incomingTxsRecord))