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

Revert initial fix 

Add default transaction value for safes without outgoing transactions
This commit is contained in:
Agustin Pane 2020-05-28 12:03:21 -03:00
parent afa1f92d3d
commit 7a79579238
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/logic/safe/transactions/awaitingTransactions.ts
View File

@ -6,10 +6,6 @@ export const getAwaitingTransactions = (allTransactions, cancellationTransaction
} }
const allAwaitingTransactions = allTransactions.map((safeTransactions) => { const allAwaitingTransactions = allTransactions.map((safeTransactions) => {
if (!safeTransactions) {
return []
}
const nonCancelledTransactions = safeTransactions.filter((transaction) => { const nonCancelledTransactions = safeTransactions.filter((transaction) => {
// If transactions are not executed, but there's a transaction with the same nonce EXECUTED later // If transactions are not executed, but there's a transaction with the same nonce EXECUTED later
// it means that the transaction was cancelled (Replaced) and shouldn't get executed // it means that the transaction was cancelled (Replaced) and shouldn't get executed

2
src/routes/safe/store/actions/fetchTransactions.ts
View File

@ -262,7 +262,7 @@ export const loadSafeTransactions = async (safeAddress, getState) => {
const groupedTxs = List(txsRecord).groupBy((tx) => (tx.get('cancellationTx') ? 'cancel' : 'outgoing')) const groupedTxs = List(txsRecord).groupBy((tx) => (tx.get('cancellationTx') ? 'cancel' : 'outgoing'))
return { return {
outgoing: groupedTxs.get('outgoing'), outgoing: groupedTxs.get('outgoing') || List([]),
cancel: Map().set(safeAddress, groupedTxs.get('cancel')), cancel: Map().set(safeAddress, groupedTxs.get('cancel')),
} }
} }