mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Restore display of all unconfirmed transactions.
This commit is contained in:
parent
baebf64afd
commit
a4fd4f013f
@ -389,7 +389,7 @@ function reduceApp (state, action) {
|
||||
return extend(appState, {
|
||||
currentView: {
|
||||
name: 'confTx',
|
||||
context: action.id ? indexForPending(state, action.id) : indexForLastPending(state),
|
||||
context: action.id ? indexForPending(state, action.id) : 0,
|
||||
},
|
||||
transForward: action.transForward,
|
||||
warning: null,
|
||||
@ -409,21 +409,21 @@ function reduceApp (state, action) {
|
||||
|
||||
case actions.COMPLETED_TX:
|
||||
log.debug('reducing COMPLETED_TX for tx ' + action.value)
|
||||
// const otherUnconfActions = getUnconfActionList(state)
|
||||
// .filter(tx => tx.id !== action.value)
|
||||
// const hasOtherUnconfActions = otherUnconfActions.length > 0
|
||||
const otherUnconfActions = getUnconfActionList(state)
|
||||
.filter(tx => tx.id !== action.value)
|
||||
const hasOtherUnconfActions = otherUnconfActions.length > 0
|
||||
|
||||
// if (hasOtherUnconfActions) {
|
||||
// log.debug('reducer detected txs - rendering confTx view')
|
||||
// return extend(appState, {
|
||||
// transForward: false,
|
||||
// currentView: {
|
||||
// name: 'confTx',
|
||||
// context: 0,
|
||||
// },
|
||||
// warning: null,
|
||||
// })
|
||||
// } else {
|
||||
if (hasOtherUnconfActions) {
|
||||
log.debug('reducer detected txs - rendering confTx view')
|
||||
return extend(appState, {
|
||||
transForward: false,
|
||||
currentView: {
|
||||
name: 'confTx',
|
||||
context: 0,
|
||||
},
|
||||
warning: null,
|
||||
})
|
||||
} else {
|
||||
log.debug('attempting to close popup')
|
||||
return extend(appState, {
|
||||
// indicate notification should close
|
||||
@ -438,7 +438,7 @@ function reduceApp (state, action) {
|
||||
subview: 'transactions',
|
||||
},
|
||||
})
|
||||
// }
|
||||
}
|
||||
|
||||
case actions.NEXT_TX:
|
||||
return extend(appState, {
|
||||
@ -679,6 +679,6 @@ function indexForPending (state, txId) {
|
||||
return index
|
||||
}
|
||||
|
||||
function indexForLastPending (state) {
|
||||
return getUnconfActionList(state).length
|
||||
}
|
||||
// function indexForLastPending (state) {
|
||||
// return getUnconfActionList(state).length
|
||||
// }
|
||||
|
Loading…
Reference in New Issue
Block a user