From 3839eb2be4e382b9aa2064e631ff178edd23dac3 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Sun, 15 Apr 2018 21:33:37 +0200
Subject: [PATCH] Fixes and cleanup

---
 app/services/kredits.js | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/app/services/kredits.js b/app/services/kredits.js
index 470c1ff..91cfa3f 100644
--- a/app/services/kredits.js
+++ b/app/services/kredits.js
@@ -86,31 +86,11 @@ export default Service.extend({
       contributors: this.getContributors(),
       proposals: this.getProposals(),
     }).then(({ contributors, proposals }) => {
-      this.set('contributors', contributors);
-      this.set('proposals', proposals);
+      this.get('contributors').pushObjects(contributors);
+      this.get('proposals').pushObjects(proposals);
     });
   },
 
-  addContractEventHandlers() {
-    // Operator events
-    this.get('kredits').Operator
-      .on('ProposalCreated', (proposalId) => {
-        this.handleProposalCreated(proposalId);
-      })
-      .on('ProposalVoted', (proposalId, voter, totalVotes) => {
-        this.handleProposalVoted(proposalId, totalVotes);
-      })
-      .on('ProposalExecuted', (proposalId, contributorId, amount) => {
-        this.handleProposalExecuted(proposalId, contributorId, amount);
-      });
-
-    // Token events
-    this.get('kredits').Token
-      .on('Transfer', (from, to, value) => {
-        this.handleTransfer(from, to, value);
-      });
-  },
-
   // TODO: Only assign valid attributes
   buildModel(name, attributes) {
     debug('[kredits] build', name, attributes);
@@ -191,6 +171,18 @@ export default Service.extend({
   },
 
   // Contract events
+  addContractEventHandlers() {
+    // Operator events
+    this.get('kredits').Operator
+      .on('ProposalCreated', this.handleProposalCreated.bind(this))
+      .on('ProposalVoted', this.handleProposalVoted.bind(this))
+      .on('ProposalExecuted', this.handleProposalExecuted.bind(this));
+
+    // Token events
+    this.get('kredits').Token
+      .on('Transfer', this.handleTransfer.bind(this));
+  },
+
   handleProposalCreated(proposalId) {
     let proposal = this.findProposalById(proposalId);
 
@@ -201,12 +193,13 @@ export default Service.extend({
 
     this.get('kredits').Operator.getById(proposalId)
       .then((proposal) => {
+        proposal = this.buildModel('proposal', proposal);
         this.get('proposals').pushObject(proposal);
       });
   },
 
   // TODO: We may want to reload that proposal to show the voter as voted
-  handleProposalVoted(proposalId, totalVotes) {
+  handleProposalVoted(proposalId, voterId, totalVotes) {
     let proposal = this.findProposalById(proposalId);
 
     if (proposal) {
@@ -226,7 +219,7 @@ export default Service.extend({
 
     this.get('contributors')
         .findBy('id', contributorId.toString())
-        .incrementProperty('balance', amount);
+        .incrementProperty('balance', amount.toNumber());
   },
 
   handleTransfer(from, to, value) {