Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
do not count a transaction-in-progress as a transaction...
Browse files Browse the repository at this point in the history
Fixes #5371

Fixes #5441 (i can’t
reproduce it — neither could @ayumi — but i cleaned up a little bit of
logic to make it easier to follow.
  • Loading branch information
mrose17 committed Nov 17, 2016
1 parent 3e284ac commit 9653daf
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions app/ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,8 @@ var getStateInfo = (state) => {
transaction = state.transactions[i]
if (transaction.stamp < then) break

if ((!transaction.ballots) || (transaction.ballots.length < transaction.count)) continue

ballots = underscore.clone(transaction.ballots || {})
state.ballots.forEach((ballot) => {
if (ballot.viewingId !== transaction.viewingId) return
Expand Down Expand Up @@ -1462,10 +1464,9 @@ var pathName = (name) => {
*/

const showNotifications = () => {
if (getSetting(settings.PAYMENTS_ENABLED) &&
getSetting(settings.PAYMENTS_NOTIFICATIONS)) {
showEnabledNotifications()
} else if (!getSetting(settings.PAYMENTS_ENABLED)) {
if (getSetting(settings.PAYMENTS_ENABLED)) {
if (getSetting(settings.PAYMENTS_NOTIFICATIONS)) showEnabledNotifications()
} else {
showDisabledNotifications()
}
}
Expand Down

0 comments on commit 9653daf

Please sign in to comment.