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

Fixs race condition (#341) 

Fixs typo
This commit is contained in:
Agustin Pane 2019-12-13 09:55:09 -03:00 committed by Mikhail Mikheev
parent 3a86378d63
commit 1e1592f957
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/safe/container/index.jsx
View File

@ -37,10 +37,11 @@ class SafeView extends React.Component<Props, State> {
fetchSafe, activeTokens, safeUrl, fetchTokenBalances, fetchTokens, fetchTransactions, fetchSafe, activeTokens, safeUrl, fetchTokenBalances, fetchTokens, fetchTransactions,
} = this.props } = this.props
fetchSafe(safeUrl) fetchSafe(safeUrl).then(() => {
// The safe needs to be loaded before fetching the transactions
fetchTransactions(safeUrl)
})
fetchTokenBalances(safeUrl, activeTokens) fetchTokenBalances(safeUrl, activeTokens)
fetchTransactions(safeUrl)
// fetch tokens there to get symbols for tokens in TXs list // fetch tokens there to get symbols for tokens in TXs list
fetchTokens() fetchTokens()

2
src/routes/safe/container/selector.js
View File

@ -119,7 +119,7 @@ const extendedTransactionsSelector: Selector<GlobalState, RouterProps, List<Tran
const extendedTransactions = transactions.map((tx: Transaction) => { const extendedTransactions = transactions.map((tx: Transaction) => {
let extendedTx = tx let extendedTx = tx
// If transactions is not executed, but there's a transaction with the same nonce submitted later // If transactions are not executed, but there's a transaction with the same nonce submitted 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
let replacementTransaction let replacementTransaction
if (!tx.isExecuted) { if (!tx.isExecuted) {