poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore display of all unconfirmed transactions.

This commit is contained in:
Dan 2018-01-15 22:11:06 -03:30 committed by Chi Kei Chan
parent baebf64afd
commit a4fd4f013f
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ui/app/reducers/app.js
View File

@ -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,36 +409,36 @@ 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 {
log.debug('attempting to close popup')
return extend(appState, {
// indicate notification should close
shouldClose: true,
transForward: false,
warning: null,
currentView: {
name: 'accountDetail',
context: state.metamask.selectedAddress,
},
accountDetail: {
subview: 'transactions',
},
})
// }
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
shouldClose: true,
transForward: false,
warning: null,
currentView: {
name: 'accountDetail',
context: state.metamask.selectedAddress,
},
accountDetail: {
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
// }