app/components/add-contributor/component.js

@@ -1,27 +1,12 @@
 import Component from '@ember/component';
 import { and, notEmpty } from '@ember/object/computed';
-import { inject as injectService } from '@ember/service';
+import { inject as service } from '@ember/service';
 
 
 export default Component.extend({
-  kredits: injectService(),
+  kredits: service(),
 
-  // Default attributes used by reset
-  attributes: {
-    account: null,
-    name: null,
-    kind: 'person',
-    url: null,
-    github_username: null,
-    github_uid: null,
-    wiki_username: null,
-    isCore: false,
-  },
-
-  didInsertElement() {
-    this._super(...arguments);
-    this.reset();
-  },
+  attributes: null,
 
   // TODO: add proper address validation
   isValidAccount: notEmpty('account'),
@@ -36,6 +21,27 @@ export default Component.extend({
     'isValidGithubUID'
   ),
 
+  init () {
+    this._super(...arguments);
+
+    // Default attributes used by reset
+    this.set('attributes', {
+      account: null,
+      name: null,
+      kind: 'person',
+      url: null,
+      github_username: null,
+      github_uid: null,
+      wiki_username: null,
+      isCore: false
+    });
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.reset();
+  },
+
   reset: function() {
     this.setProperties(this.attributes);
   },
@@ -61,4 +67,5 @@ export default Component.extend({
       });
     }
   }
+
 });

app/components/add-proposal/component.js

@@ -3,21 +3,9 @@ import { computed } from '@ember/object';
 import { and, notEmpty } from '@ember/object/computed';
 
 export default Component.extend({
-  // Default attributes used by reset
-  attributes: {
-    contributorId: null,
-    kind: 'community',
-    amount: null,
-    description: null,
-    url: null,
-  },
 
-  didInsertElement() {
-    this._super(...arguments);
-    this.reset();
-  },
-
-  contributors: [],
+  attributes: null,
+  contributors: null,
 
   isValidContributor: notEmpty('contributorId'),
   isValidAmount: computed('amount', function() {
@@ -29,6 +17,26 @@ export default Component.extend({
                'isValidAmount',
                'isValidDescription'),
 
+  init () {
+    this._super(...arguments);
+
+    // Default attributes used by reset
+    this.set('attributes', {
+      contributorId: null,
+      kind: 'community',
+      amount: null,
+      description: null,
+      url: null,
+    });
+
+    this.set('contributors', []);
+  },
+
+  didInsertElement() {
+    this._super(...arguments);
+    this.reset();
+  },
+
   reset: function() {
     this.setProperties(this.attributes);
   },
@@ -54,4 +62,5 @@ export default Component.extend({
       });
     }
   }
+
 });

app/components/chart-contributions-by-type/component.js

@@ -12,6 +12,17 @@ let categoryColors = {
 export default Component.extend({
 
   contributions: null,
+  chartOptions: null,
+
+  init () {
+    this._super(...arguments);
+
+    this.set('chartOptions', {
+      legend: {
+        display: false
+      }
+    });
+  },
 
   chartData: computed('contributions', function() {
     let kredits = this.contributions
@@ -52,12 +63,6 @@ export default Component.extend({
         'Documentation'
       ],
     }
-  }),
-
-  chartOptions: {
-    legend: {
-      display: false
-    }
-  }
+  })
 
 });

app/controllers/application.js

@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
-import { inject as injectService } from '@ember/service';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  kredits: injectService(),
+  kredits: service(),
 });

app/controllers/index.js

@@ -1,21 +1,21 @@
 import Controller from '@ember/controller';
 import { alias, filter, filterBy, sort } from '@ember/object/computed';
-import { inject as injectService } from '@ember/service';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  kredits: injectService(),
+  kredits: service(),
 
   contributors: alias('kredits.contributors'),
   contributorsWithKredits: filter('contributors', function(contributor) {
     return contributor.get('balance') !== 0;
   }),
-  contributorsSorting: ['balance:desc'],
+  contributorsSorting: Object.freeze(['balance:desc']),
   contributorsSorted: sort('contributorsWithKredits', 'contributorsSorting'),
 
   proposals: alias('kredits.proposals'),
   proposalsOpen: filterBy('proposals', 'isExecuted', false),
   proposalsClosed: filterBy('proposals', 'isExecuted', true),
-  proposalsSorting: ['id:desc'],
+  proposalsSorting: Object.freeze(['id:desc']),
   proposalsClosedSorted: sort('proposalsClosed', 'proposalsSorting'),
   proposalsOpenSorted: sort('proposalsOpen', 'proposalsSorting'),
 

app/controllers/proposals/new.js

@@ -1,9 +1,9 @@
 import Controller from '@ember/controller';
 import { alias, filterBy } from '@ember/object/computed';
-import { inject as injectService } from '@ember/service';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
-  kredits: injectService(),
+  kredits: service(),
 
   contributors: alias('kredits.contributors'),
   minedContributors: filterBy('contributors', 'id'),

app/models/proposal.js

@@ -3,6 +3,7 @@ import { alias } from '@ember/object/computed';
 import bignumber from 'kredits-web/utils/cps/bignumber';
 
 export default EmberObject.extend({
+
   // Contract
   id: bignumber('idRaw', 'toString'),
   creatorAccount: null,
@@ -19,7 +20,13 @@ export default EmberObject.extend({
   // IPFS
   kind: null,
   description: null,
-  details: {},
+  details: null,
   url: null,
   ipfsData: '',
+
+  init () {
+    this._super(...arguments);
+    this.set('details', {});
+  }
+
 });

app/routes/application.js

@@ -1,8 +1,8 @@
-import { inject as injectService } from '@ember/service';
+import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 
 export default Route.extend({
-  kredits: injectService(),
+  kredits: service(),
 
   beforeModel(transition) {
     const kredits = this.kredits;

app/services/kredits.js

@@ -16,6 +16,8 @@ export default Service.extend({
 
   currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
   currentUser: null,
+  contributors: null,
+  proposals: null,
   currentUserIsContributor: notEmpty('currentUser'),
   currentUserIsCore: alias('currentUser.isCore'),
   hasAccounts: notEmpty('currentUserAccounts'),
@@ -23,6 +25,12 @@ export default Service.extend({
     return this.currentUserAccounts && isEmpty(this.currentUserAccounts);
   }),
 
+  init () {
+    this._super(...arguments);
+    this.set('contributors', []);
+    this.set('proposals', []);
+  },
+
   // this is called in the routes beforeModel().  So it is initialized before everything else
   // and we can rely on the ethProvider and the potential currentUserAccounts to be available
   getEthProvider: function() {
@@ -84,9 +92,6 @@ export default Service.extend({
     return this.kredits.Token.functions.totalSupply();
   }),
 
-  contributors: [],
-  proposals: [],
-
   loadContributorsAndProposals() {
     return this.getContributors()
                .then(contributors => this.contributors.pushObjects(contributors))