|
|
@ -389,7 +389,7 @@ function reduceApp (state, action) { |
|
|
|
return extend(appState, { |
|
|
|
return extend(appState, { |
|
|
|
currentView: { |
|
|
|
currentView: { |
|
|
|
name: 'confTx', |
|
|
|
name: 'confTx', |
|
|
|
context: action.id ? indexForPending(state, action.id) : indexForLastPending(state), |
|
|
|
context: action.id ? indexForPending(state, action.id) : 0, |
|
|
|
}, |
|
|
|
}, |
|
|
|
transForward: action.transForward, |
|
|
|
transForward: action.transForward, |
|
|
|
warning: null, |
|
|
|
warning: null, |
|
|
@ -409,36 +409,36 @@ function reduceApp (state, action) { |
|
|
|
|
|
|
|
|
|
|
|
case actions.COMPLETED_TX: |
|
|
|
case actions.COMPLETED_TX: |
|
|
|
log.debug('reducing COMPLETED_TX for tx ' + action.value) |
|
|
|
log.debug('reducing COMPLETED_TX for tx ' + action.value) |
|
|
|
// const otherUnconfActions = getUnconfActionList(state)
|
|
|
|
const otherUnconfActions = getUnconfActionList(state) |
|
|
|
// .filter(tx => tx.id !== action.value)
|
|
|
|
.filter(tx => tx.id !== action.value) |
|
|
|
// const hasOtherUnconfActions = otherUnconfActions.length > 0
|
|
|
|
const hasOtherUnconfActions = otherUnconfActions.length > 0 |
|
|
|
|
|
|
|
|
|
|
|
// if (hasOtherUnconfActions) {
|
|
|
|
if (hasOtherUnconfActions) { |
|
|
|
// log.debug('reducer detected txs - rendering confTx view')
|
|
|
|
log.debug('reducer detected txs - rendering confTx view') |
|
|
|
// return extend(appState, {
|
|
|
|
return extend(appState, { |
|
|
|
// transForward: false,
|
|
|
|
transForward: false, |
|
|
|
// currentView: {
|
|
|
|
currentView: { |
|
|
|
// name: 'confTx',
|
|
|
|
name: 'confTx', |
|
|
|
// context: 0,
|
|
|
|
context: 0, |
|
|
|
// },
|
|
|
|
}, |
|
|
|
// warning: null,
|
|
|
|
warning: null, |
|
|
|
// })
|
|
|
|
}) |
|
|
|
// } else {
|
|
|
|
} else { |
|
|
|
log.debug('attempting to close popup') |
|
|
|
log.debug('attempting to close popup') |
|
|
|
return extend(appState, { |
|
|
|
return extend(appState, { |
|
|
|
// indicate notification should close
|
|
|
|
// indicate notification should close
|
|
|
|
shouldClose: true, |
|
|
|
shouldClose: true, |
|
|
|
transForward: false, |
|
|
|
transForward: false, |
|
|
|
warning: null, |
|
|
|
warning: null, |
|
|
|
currentView: { |
|
|
|
currentView: { |
|
|
|
name: 'accountDetail', |
|
|
|
name: 'accountDetail', |
|
|
|
context: state.metamask.selectedAddress, |
|
|
|
context: state.metamask.selectedAddress, |
|
|
|
}, |
|
|
|
}, |
|
|
|
accountDetail: { |
|
|
|
accountDetail: { |
|
|
|
subview: 'transactions', |
|
|
|
subview: 'transactions', |
|
|
|
}, |
|
|
|
}, |
|
|
|
}) |
|
|
|
}) |
|
|
|
// }
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
case actions.NEXT_TX: |
|
|
|
case actions.NEXT_TX: |
|
|
|
return extend(appState, { |
|
|
|
return extend(appState, { |
|
|
@ -679,6 +679,6 @@ function indexForPending (state, txId) { |
|
|
|
return index |
|
|
|
return index |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function indexForLastPending (state) { |
|
|
|
// function indexForLastPending (state) {
|
|
|
|
return getUnconfActionList(state).length |
|
|
|
// return getUnconfActionList(state).length
|
|
|
|
} |
|
|
|
// }
|
|
|
|