merge master

This commit is contained in:
2018-04-15 19:08:26 +02:00
9 changed files with 37 additions and 14 deletions
+3 -2
View File
@@ -40,6 +40,7 @@ export default Controller.extend({
proposalsOpenSorted: sort('proposalsOpen', 'proposalsSorting'),
_handleProposalCreated(proposalId) {
// TODO: check if proposalId is already a string
let proposal = this.get('proposals')
.findBy('id', proposalId.toString());
if (proposal) {
@@ -78,10 +79,10 @@ export default Controller.extend({
_handleTransfer(from, to, value) {
value = value.toNumber();
this.get('contributors')
.findBy('account', from)
.findBy('address', from)
.decrementProperty('balance', value);
this.get('contributors')
.findBy('account', to)
.findBy('address', to)
.incrementProperty('balance', value);
},