diff --git a/app/components/contributor-list/component.js b/app/components/contributor-list/component.js index 4055ab0..851ef26 100644 --- a/app/components/contributor-list/component.js +++ b/app/components/contributor-list/component.js @@ -9,10 +9,10 @@ export default Component.extend({ actions: { toggleContributorInfo(contributor) { - if (contributor.get('showMetadata')) { + if (contributor.showMetadata) { contributor.set('showMetadata', false); } else { - this.contributors.setEach('showMetadata', false); + this.contributorList.setEach('showMetadata', false); contributor.set('showMetadata', true); } } diff --git a/app/components/contributor-list/template.hbs b/app/components/contributor-list/template.hbs index 611b46c..765ebd9 100644 --- a/app/components/contributor-list/template.hbs +++ b/app/components/contributor-list/template.hbs @@ -1,6 +1,6 @@ {{#each contributorList as |c|}} - + {{user-avatar contributor=c.contributor}} {{c.contributor.name}} @@ -18,12 +18,16 @@ - {{#if c.contributor.showMetadata}} + {{#if c.showMetadata}}
{{c.contributor.ipfsData}}
{{/if}} diff --git a/app/services/kredits.js b/app/services/kredits.js index 7062625..39e62af 100644 --- a/app/services/kredits.js +++ b/app/services/kredits.js @@ -3,6 +3,7 @@ import Kredits from 'npm:kredits-contracts'; import RSVP from 'rsvp'; import Service from '@ember/service'; +import EmberObject from '@ember/object'; import { computed } from '@ember/object'; import { alias, notEmpty } from '@ember/object/computed'; import { isEmpty } from '@ember/utils'; @@ -50,12 +51,12 @@ export default Service.extend({ return contributionsGrouped.map(c => { const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b); const contributor = this.contributors.findBy('id', c.value.toString()); - return { + return EmberObject.create({ contributor: contributor, amountUnconfirmed: amountUnconfirmed, amountConfirmed: contributor.totalKreditsEarned, amountTotal: contributor.totalKreditsEarned + amountUnconfirmed - } + }) }) }),