diff --git a/app/components/confirmed-in/component.js b/app/components/confirmed-in/component.js index e14c639..4ed1426 100644 --- a/app/components/confirmed-in/component.js +++ b/app/components/confirmed-in/component.js @@ -1,20 +1,12 @@ import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; import { inject as service } from '@ember/service'; import moment from 'moment'; export default class ConfirmedInComponent extends Component { @service kredits; - @tracked confirmedAtBlock = null; - - constructor(confirmedAtBlock) { - super(...arguments); - this.confirmedAtBlock = confirmedAtBlock; - } - get confirmedInBlocks () { - return this.confirmedAtBlock - this.kredits.currentBlock; + return this.args.confirmedAtBlock - this.kredits.currentBlock; } get confirmedInSeconds () { diff --git a/app/components/confirmed-in/template.hbs b/app/components/confirmed-in/template.hbs new file mode 100644 index 0000000..1529053 --- /dev/null +++ b/app/components/confirmed-in/template.hbs @@ -0,0 +1 @@ +Confirming in {{this.confirmedInBlocks}} blocks (~ {{this.confirmedInHumanTime}}) diff --git a/app/components/reimbursement-list/template.hbs b/app/components/reimbursement-list/template.hbs index b904207..2a3a187 100644 --- a/app/components/reimbursement-list/template.hbs +++ b/app/components/reimbursement-list/template.hbs @@ -3,12 +3,12 @@
  • - - Expenses covered by {{reimbursement.contributor.name}} - + + Expenses covered by {{reimbursement.contributor.name}} +

    @@ -30,17 +30,22 @@

  • {{/each}} - {{#if this.kredits.currentUserIsCore}} -

    +

    +

    + +

    +

    Inspect IPFS data - + {{#if this.kredits.currentUserIsCore}} + + {{/if}}

    - {{/if}} +
    {{/each}} \ No newline at end of file diff --git a/app/styles/components/_reimbursement-list.scss b/app/styles/components/_reimbursement-list.scss index dfbb5d8..556f69a 100644 --- a/app/styles/components/_reimbursement-list.scss +++ b/app/styles/components/_reimbursement-list.scss @@ -31,4 +31,24 @@ ul.reimbursement-list { } } } + + div.meta { + grid-column-start: 1; + grid-column-end: 3; + margin-top: 0.6rem; + border-top: 1px solid $item-border-color; + display: flex; + + p { + flex: 1; + padding: 1.6rem 0 1rem 0; + + &.confirmation-eta { + } + + &.actions { + text-align: right; + } + } + } }