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

[Transaction List v2] Pending status only if user signs the tx (#1890) 

* prevent setting a tx to _pending_ if user didn't signed the tx
This commit is contained in:
Fernando 2021-02-15 05:56:12 -03:00 committed by GitHub
parent 9800ce78ef
commit 49cdd2874e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/logic/safe/store/reducer/gatewayTransactions.ts
View File

@ -326,6 +326,11 @@ export const gatewayTransactions = handleActions<AppReduxState['gatewayTransacti
} }
case 'queued.next': { case 'queued.next': {
queued.next[nonce] = queued.next[nonce].map((txToUpdate) => { queued.next[nonce] = queued.next[nonce].map((txToUpdate) => {
// prevent setting `PENDING_FAILED` status, if previous status wasn't `PENDING`
if (txStatus === 'PENDING_FAILED' && txToUpdate.txStatus !== 'PENDING') {
return txToUpdate
}
if (typeof id !== 'undefined') { if (typeof id !== 'undefined') {
if (sameString(txToUpdate.id, id)) { if (sameString(txToUpdate.id, id)) {
txToUpdate.txStatus = txStatus txToUpdate.txStatus = txStatus
@ -339,6 +344,11 @@ export const gatewayTransactions = handleActions<AppReduxState['gatewayTransacti
} }
case 'queued.queued': { case 'queued.queued': {
queued.queued[nonce] = queued.queued[nonce].map((txToUpdate) => { queued.queued[nonce] = queued.queued[nonce].map((txToUpdate) => {
// prevent setting `PENDING_FAILED` status, if previous status wasn't `PENDING`
if (txStatus === 'PENDING_FAILED' && txToUpdate.txStatus !== 'PENDING') {
return txToUpdate
}
if (typeof id !== 'undefined') { if (typeof id !== 'undefined') {
if (sameString(txToUpdate.id, id)) { if (sameString(txToUpdate.id, id)) {
txToUpdate.txStatus = txStatus txToUpdate.txStatus = txStatus