status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-01-09 17:45:38 +00:00
Code Issues Projects Releases Wiki Activity

Fix nonce 0 check (#1941)

Browse Source
This commit is contained in:
Daniel Sanchez 2021-02-23 20:06:49 +01:00 committed by GitHub
parent 9b2dd8141c
commit ac920f0361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/logic/safe/store/actions/createTransaction.ts
View File

@ -80,11 +80,7 @@ export const createTransaction = (
const safeInstance = await getGnosisSafeInstanceAt(safeAddress) const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
const lastTx = await getLastTx(safeAddress) const lastTx = await getLastTx(safeAddress)
const nextNonce = await getNewTxNonce(lastTx, safeInstance) const nextNonce = await getNewTxNonce(lastTx, safeInstance)
const nonce = txNonce !== undefined ? txNonce.toString() : nextNonce
let nonce = nextNonce
if (txNonce !== undefined) {
nonce = txNonce.toString()
}
const isExecution = await shouldExecuteTransaction(safeInstance, nonce, lastTx) const isExecution = await shouldExecuteTransaction(safeInstance, nonce, lastTx)
const safeVersion = await getCurrentSafeVersion(safeInstance) const safeVersion = await getCurrentSafeVersion(safeInstance)

3
src/routes/safe/container/hooks/useTransactionParameters.ts
View File

@ -88,11 +88,10 @@ export const useTransactionParameters = (props?: Props): TxParameters => {
} }
} }
const safeNonce = Number(props?.initialSafeNonce || 0)
if (safeNonce === undefined) { if (safeNonce === undefined) {
getSafeNonce() getSafeNonce()
} }
}, [safeAddress, props?.initialSafeNonce]) }, [safeAddress, safeNonce])
return { return {
safeNonce, safeNonce,