2.0.0-beta.2

Add type to button element
Merge pull request #209 from 67P/feature/veto_reimbursements
2023-01-11 12:44:32 +08:00 · 2023-01-11 12:42:15 +08:00 · 2023-01-09 11:34:37 +08:00 · 2023-01-09 11:31:31 +08:00 · 2022-12-31 15:07:02 +07:00 · 2022-12-31 15:05:36 +07:00
111 changed files with 54809 additions and 37121 deletions
@@ -2,13 +2,21 @@

 module.exports = {
  root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
  parserOptions: {
-    ecmaVersion: 2018,
+    requireConfigFile: false,
+    ecmaVersion: 2020,
    sourceType: 'module',
    ecmaFeatures: {
      legacyDecorators: true
-    }
+    },
+    babelOptions: {
+      babelrc: false,
+      configFile: false,
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { legacy: true }],
+      ],
+    },
  },
  globals: {
    console: true
@@ -28,7 +36,13 @@ module.exports = {
    'no-console': 'off',
    'ember/no-jquery': 'error',
    'ember/require-computed-property-dependencies': 'warn',
-    'ember/no-observers': 'warn'
+    'ember/no-computed-properties-in-native-classes': 'warn',
+    'ember/no-observers': 'warn',
+    'ember/no-classic-classes': 'warn',
+    'ember/no-classic-components': 'warn',
+    'ember/no-controller-access-in-routes': 'warn',
+    'ember/no-actions-hash': 'warn',
+    'ember/require-tagless-components': 'warn'
  },
  overrides: [
    // node files
@@ -5,7 +5,8 @@ module.exports = {

  rules: {
    'simple-unless': false,
-    'no-nested-interactive': false
+    'no-nested-interactive': false,
+    'no-html-comments': false
  },

  ignore: [
@@ -1,27 +1,21 @@
 ---
 language: node_js
 node_js:
-  - "10"
+  - "14"
+  - "16"

 sudo: false
-dist: xenial
+dist: precise

 notifications:
-  email:
-    on_success: never
-    on_failure: always
+  email: false

 addons:
  chrome: stable

-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
+cache:
+  npm: false

 branches:
  only:
    - master
-
-script:
-  - npm test
@@ -5,23 +5,24 @@
 This README outlines the details of collaborating on this Ember application.
 A short introduction of this app could easily go here.

-## Prerequisites
+## Development
+
+### Prerequisites

 You will need the following things properly installed on your computer.

 * [Git](https://git-scm.com/)
 * [Node.js](https://nodejs.org/) (with npm)
 * [Ember CLI](https://ember-cli.com/)
-* [Google Chrome](https://google.com/chrome/)
+* [Google Chrome](https://google.com/chrome/) (only for running tests)

-## Installation
+### Installation

 * `git clone git@github.com:67P/kredits-web.git` this repository
 * `cd kredits-web`
 * `npm install`

-## Running / Development
-
+### Building/running for development

 * `ember serve` - by default kredits-web connects to the Ethreum Kovan network
 * Visit your app at [http://localhost:4200](http://localhost:4200).
@@ -29,11 +30,11 @@ You will need the following things properly installed on your computer.

 See [working with locally deployed contracts](https://github.com/67P/kredits-web#working-with-locally-deployed-contracts) for details on how to develop with locally deployed contracts.

-### Code Generators
+### Code generators

 Make use of the many generators for code, try `ember help generate` for more details

-### Running Tests
+### Running tests

 * `ember test`
 * `ember test --server`
@@ -55,17 +56,15 @@ _(You need collaborator permissions on the 5apps Deploy project.)_

 `npm run deploy`

-## Working with locally deployed contracts
+### Working with locally deployed contracts

 The smart contracts and their JavaScript wrapper library are developed in the
 [kredits-contracts](https://github.com/67P/kredits-contracts) repo/package.

-You can run `kredits-web` on your machine, against a local, simulated Ethereum
-network, provided e.g. by [ganache](http://truffleframework.com/ganache/).
-
-[kredits-contracts](https://github.com/67P/kredits-contracts) holds all the tools
-to start and set up such a simulated network, as well as to deploy smart
-contracts to it.
+You can run `kredits-web` on your machine, against a local, simulated
+blockchain. [kredits-contracts](https://github.com/67P/kredits-contracts)
+contains all the tools to start and set up such a simulated network, as well as
+to deploy the Kredits smart contracts to it.

 These are the basic steps to get up and running:

@@ -78,37 +77,33 @@ Run a local IPFS deamon.

 #### 2. kredits-contracts

-Get your local Ethereum development node running. (See [kredits-contracts README](https://github.com/67P/kredits-contracts)
-for details.
+Run a local devchain with test data. (See [kredits-contracts
+README](https://github.com/67P/kredits-contracts) for details.

  * Clone [kredits-contracts](https://github.com/67P/kredits-contracts)
  * `npm install`
  * `npm run devchain` - runs a local development chain
-  * `npm run bootstrap` - bootstrap runs deploys all the contracts
-  * `npm link` - make the `kredits-contracts` module linkable as `kredits-contracts` on your machine (currently broken :( )
+  * `npm run bootstrap` - deploys all contracts and seeds test data
+  * `npm link` - makes the `kredits-contracts` module linkable as `kredits-contracts` on your machine

 #### 3. kredits-web

-With IPFS and Ethereum/ganache running, you can now start this Ember app.
+With IPFS and the local devchain running, you can now link the contracts and
+start the Ember app:

-  * `npm link kredits-contracts` - link the local `kredits-contracts` package
-  * `npm run start:local` - WEB3_PROVIDER_URL=http://localhost:7545 must be set for local settings
-
-If you restart the devchain your network ID changes. So kredits-contracts does not find the correct DAO address.
-If that is the case the DAO address must be provided as `KREDITS_DAO_ADDRESS` environment variable.
-
-  * `npm run dao:address` in the kredits-contracts repo to find your address
-  * `KREDITS_DAO_ADDRESS=<0xYOURADDRESS> npm run start:local`
+  * `npm link kredits-contracts` - links the local `kredits-contracts` package (has to be done again after every `npm install`)
+  * `npm run start:local` - runs the Ember app with WEB3_PROVIDER_URL=http://localhost:8545 set

 #### 4. Metamask network

-Switch the network in Metamask to "Custom RPC" with the RPC URL `http://localhost:7545`.
+If you want to interact with the local contracts via a Web3 wallet, switch the
+network to a "Custom RPC" one, with the RPC URL `http://localhost:8545`.

 #### IPFS

-Install IPFS with your favorite package manager and run
+If you haven't configured your IPFS node for CORS yet, you can do so by running
+the following commands:

-    ipfs init (on initial installation)
    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["localhost:4200"]'
    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT", "GET", "POST"]'
    ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials '["true"]'
@@ -3,11 +3,21 @@ import { computed } from '@ember/object';
 import { and, notEmpty } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import moment from 'moment';
+import { inject as service } from '@ember/service';

 export default Component.extend({
+  kredits: service(),

  attributes: null,
-  contributors: Object.freeze([]),
+
+  contributors: computed('kredits.contributorsSorted.[]', function() {
+    return this.kredits.contributorsSorted.map(c => {
+      return {
+        id: c.id.toString(),
+        name: c.name
+      }
+    })
+  }),

  isValidContributor: notEmpty('contributorId'),
  isValidKind: notEmpty('kind'),
@@ -55,6 +65,8 @@ export default Component.extend({

      const attributes = this.getProperties(Object.keys(this.attributes));

+      attributes.contributorId = parseInt(this.contributorId);
+
      let dateInput = (attributes.date instanceof Array) ?
        attributes.date[0] : attributes.date;

@@ -72,7 +84,5 @@ export default Component.extend({
        })
        .finally(() => this.set('inProgress', false));
    }
-
  }
-
 });
@@ -4,7 +4,7 @@
    <p>
      <select required onchange={{action (mut this.contributorId) value="target.value"}}>
        <option value="" selected disabled hidden></option>
-        {{#each @contributors as |contributor|}}
+        {{#each this.contributors as |contributor|}}
          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
        {{/each}}
      </select>
@@ -0,0 +1,91 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { action } from '@ember/object';
+import moment from 'moment';
+import isValidAmount from 'kredits-web/utils/is-valid-amount';
+import { isPresent } from '@ember/utils';
+
+export default class AddExpenseItemComponent extends Component {
+  @tracked amount = '0';
+  @tracked currency = 'EUR';
+  @tracked date = moment().startOf('hour').toDate();
+  @tracked title = '';
+  @tracked description = '';
+  @tracked url = '';
+  @tracked tags = '';
+
+  defaultDate = moment().startOf('hour').toDate();
+
+  currencies = [
+    { code: 'EUR' },
+    { code: 'USD' }
+  ];
+
+  get isValidAmount () {
+    return isValidAmount(this.amount);
+  }
+
+  get amountInputClass () {
+    return this.isValidTotal ? 'valid' : '';
+  }
+
+  validateForm () {
+    const formEl = document.querySelector('form#add-expense-item');
+    const inputFields = formEl.querySelectorAll('input');
+    inputFields.forEach(i => i.classList.remove('invalid'));
+    let validity = true;
+
+    if (!this.isValidAmount) {
+      document.querySelector('input[name=expense-amount]').classList.add('invalid');
+      validity = false;
+    }
+
+    if (!formEl.checkValidity()) {
+      inputFields.forEach(i => {
+        if (!i.validity.valid) {
+          i.classList.add('invalid');
+          validity = false;
+        }
+      })
+    }
+
+    return validity;
+  }
+
+  @action
+  updateCurrency(event) {
+    this.currency = event.target.value;
+  }
+
+  @action
+  submit (e) {
+    e.preventDefault();
+
+    let dateInput = (this.date instanceof Array) ?
+      this.date[0] : this.date;
+
+    const [ date ] = moment(dateInput).utcOffset(0, true)
+                                      .toISOString()
+                                      .split('T');
+
+    const isValid = this.validateForm();
+    if (!isValid) return false;
+
+    const expense = {
+      amount: parseFloat(this.amount),
+      currency: this.currency,
+      date: date,
+      title: this.title,
+      description: isPresent(this.description) ? this.description : undefined,
+      url: isPresent(this.url) ? this.url : undefined,
+    }
+
+    if (isPresent(this.tags)) {
+      expense.tags = this.tags.split(',')
+                              .map(t => t.trim())
+                              .filter(t => t.length > 0);
+    }
+
+    this.args.addExpenseItem(expense);
+  }
+}
@@ -0,0 +1,69 @@
+<form id="add-expense-item" {{on "submit" this.submit}} novalidate>
+  <fieldset class="horizontal">
+    <label>
+      <p class="label">Amount:</p>
+      <p>
+        <Input @name="expense-amount"
+               @type="text"
+               @placeholder="10"
+               @value={{this.amount}}
+               @required={{true}}
+               @pattern="([0-9]*[.])?[0-9]+"
+               @class={{this.amountInputClass}} />
+      </p>
+    </label>
+    <label>
+      <p class="label">Currency:</p>
+      <p>
+        <select required name="expense-currency" {{on "change" this.updateCurrency}}>
+          <option value="" selected disabled hidden></option>
+          {{#each this.currencies as |currency|}}
+          <option value={{currency.code}} selected={{eq this.currency currency.code}}>{{currency.code}}</option>
+          {{/each}}
+        </select>
+      </p>
+    </label>
+  </fieldset>
+  <label>
+    <p class="label">Date:</p>
+    <p>
+      <EmberFlatpickr @date={{this.date}}
+                      @defaultDate={{this.defaultDate}}
+                      @maxDate={{this.defaultDate}}
+                      @enableTime={{false}}
+                      @onChange={{fn (mut this.date)}} />
+    </p>
+  </label>
+  <label>
+    <p class="label">Title:</p>
+    <p>
+      <Input @name="expense-title"
+             @type="text"
+             @value={{this.title}}
+             @required={{true}} />
+    </p>
+  </label>
+  <label>
+    <p class="label">Description (optional):</p>
+    <p>
+      <Input @name="expense-description" @type="text" @value={{this.description}} />
+    </p>
+  </label>
+  <label>
+    <p class="label">URL (optional):</p>
+    <p>
+      <Input @name="expense-url" @type="url" @value={{this.url}} />
+    </p>
+  </label>
+  <label>
+    <p class="label">Tags (comma-separated, optional):</p>
+    <p>
+      <Input @name="expense-tags" @type="text" @value={{this.tags}} />
+    </p>
+  </label>
+
+  <p class="actions">
+    <Input @type="submit" @value="Add" @class="green"
+           @title="Add item to reimbursement" />
+  </p>
+</form>
@@ -0,0 +1,165 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { A } from '@ember/array';
+import { scheduleOnce } from '@ember/runloop';
+import isValidAmount from 'kredits-web/utils/is-valid-amount';
+import readFileContent from 'kredits-web/utils/read-file-content';
+import config from 'kredits-web/config/environment';
+
+export default class AddReimbursementComponent extends Component {
+  @service router;
+  @service kredits;
+  @service exchangeRates;
+
+  @alias('kredits.contributorsSorted') contributors;
+
+  @tracked recipientId = null;
+  @tracked title = '';
+  @tracked total = '0';
+  @tracked expenses = A([]);
+  @tracked expenseFormVisible = true;
+
+  constructor() {
+    super(...arguments);
+    this.exchangeRates.fetchRates();
+  }
+
+  get isValidTotal () {
+    return isValidAmount(this.total);
+  }
+
+  get totalInputClass () {
+    return this.isValidTotal ? 'valid' : '';
+  }
+
+  get totalEUR () {
+    const expenses = this.expenses.filterBy('currency', 'EUR');
+    if (expenses.length > 0) {
+      return expenses.mapBy('amount')
+                     .reduce((summation, current) => summation + current);
+    } else {
+      return 0;
+    }
+  }
+
+  get totalUSD () {
+    const expenses = this.expenses.filterBy('currency', 'USD');
+    if (expenses.length > 0) {
+      return expenses.mapBy('amount')
+                     .reduce((summation, current) => summation + current);
+    } else {
+      return 0;
+    }
+  }
+
+  get submitButtonEnabled () {
+    return this.isValidTotal &&
+           (this.expenses.length > 0);
+  }
+
+  get submitButtonDisabled () {
+    return !this.submitButtonEnabled;
+  }
+
+  scrollToExpenseItemForm () {
+    const anchor = document.getElementById('new-expense-item');
+    anchor.scrollIntoView();
+  }
+
+  updateTotalAmountFromFiat() {
+    let btcAmount = parseFloat(this.total);
+
+    if (this.exchangeRates.btceur > 0 && this.totalEUR > 0) {
+      btcAmount += (this.totalEUR / this.exchangeRates.btceur);
+    }
+    if (this.exchangeRates.btcusd > 0 && this.totalUSD > 0) {
+      btcAmount += (this.totalUSD / this.exchangeRates.btcusd);
+    }
+    if (this.totalUSD === 0 && this.totalEUR === 0) {
+      btcAmount = 0;
+    }
+
+    this.total = btcAmount.toFixed(8);
+  }
+
+  // TODO use ember-concurrency here
+  // https://github.com/67P/kredits-web/pull/209#discussion_r1064234421
+  @action
+  async addExpensesFromFile (evt) {
+    const content = await readFileContent(evt.target.files[0]);
+    const expenses = JSON.parse(content);
+
+    if (expenses instanceof Array) {
+      for (const item of expenses) {
+        this.addExpenseItem(item);
+      }
+    } else {
+      console.warn("Expenses in file must be a list of items:");
+      console.debug(content);
+    }
+  }
+
+  @action
+  updateContributor (event) {
+    this.recipientId = event.target.value;
+  }
+
+  @action
+  showExpenseForm () {
+    this.expenseFormVisible = true;
+    scheduleOnce('afterRender', this, this.scrollToExpenseItemForm);
+  }
+
+  @action
+  addExpenseItem (expenseItem) {
+    this.expenses.pushObject(expenseItem);
+    this.updateTotalAmountFromFiat();
+    this.expenseFormVisible = false;
+  }
+
+  @action
+  removeExpenseItem (expenseItem) {
+    this.expenses.removeObject(expenseItem);
+    this.updateTotalAmountFromFiat();
+
+    if (this.expenses.length === 0) {
+      this.expenseFormVisible = true;
+    }
+  }
+
+  @action
+  submit (e) {
+    e.preventDefault();
+    if (!this.kredits.currentUser) { window.alert('You need to connect your RSK account first.'); return false }
+    if (!this.kredits.currentUserIsCore) { window.alert('Only core contributors can submit reimbursements.'); return false }
+
+    const contributor = this.contributors.findBy('id', parseInt(this.recipientId));
+
+    const attributes = {
+      amount: parseInt(parseFloat(this.total) * 100000000), // convert to sats
+      token: config.tokens['BTC'],
+      recipientId: parseInt(this.recipientId),
+      title: `Expenses covered by ${contributor.name}`,
+      description: this.description,
+      url: this.url,
+      expenses: JSON.parse(JSON.stringify((this.expenses)))
+    }
+
+    this.inProgress = true;
+
+    this.kredits.addReimbursement(attributes)
+      .then((/* reimbursement */) => {
+        this.router.transitionTo('budget');
+      })
+      .catch(e => {
+        console.error('Could not add reimbursement:', e);
+        window.alert('Something went wrong. Please check the browser console.')
+      })
+      .finally(() => {
+        this.inProgress = false;
+      });
+  }
+}
@@ -0,0 +1,95 @@
+<form {{on "submit" this.submit}} novalidate>
+  <label>
+    <p class="label">Contributor:</p>
+    <p>
+      <select required {{on "change" this.updateContributor}}>
+        <option value="" selected disabled hidden></option>
+        {{#each this.contributors as |contributor|}}
+          <option value={{contributor.id}} selected={{eq this.contributorId contributor.id}}>{{contributor.name}}</option>
+        {{/each}}
+      </select>
+    </p>
+  </label>
+  <fieldset class="horizontal thirds total-amounts">
+    <label>
+      <p class="label">Total amount (BTC):</p>
+      <p>
+        <Input @type="text"
+               @placeholder="0.0015"
+               @value={{this.total}}
+               @required={{true}}
+               @pattern="([0-9]*[.])?[0-9]+"
+               @class={{this.totalInputClass}} />
+      </p>
+    </label>
+    <label>
+      <p class="label">EUR total</p>
+      <p>
+        <Input @type="text"
+               @name="total-eur"
+               @value={{this.totalEUR}}
+               @disabled={{true}} />
+      </p>
+    </label>
+    <label>
+      <p class="label">USD total</p>
+      <p>
+        <Input @type="text"
+               @name="total-usd"
+               @value={{this.totalUSD}}
+               @disabled={{true}} />
+      </p>
+    </label>
+  </fieldset>
+
+  <h3>Expense items</h3>
+  {{#if this.expenses}}
+    <ul class="expense-list">
+      {{#each this.expenses as |expense|}}
+        <li>
+          <div class="description" rowspan="2">
+            <h4>
+              <span class="date">{{expense.date}}:</span>
+              <span class="title">{{expense.title}}</span>
+            </h4>
+            <p class="description">{{expense.description}}</p>
+          </div>
+          <div class="amount">
+            {{fmt-fiat-currency expense.amount expense.currency}}
+          </div>
+          <div class="actions">
+            <button {{on "click" (fn this.removeExpenseItem expense)}}
+              class="danger small" type="button">delete</button>
+          </div>
+        </li>
+      {{/each}}
+    </ul>
+    <p class="actions">
+      <button {{on "click" this.showExpenseForm}}
+        class="green small" type="button">+ Add another item</button>
+    </p>
+  {{else}}
+    <p>No line items yet.</p>
+  {{/if}}
+
+  <p class="actions">
+    {{#if this.inProgress}}
+      <Input @type="submit" @value="Submitting..." @disabled={{true}}
+             @title="Submit/propose this reimbursement" />
+    {{else}}
+      <Input @type="submit" @value="Submit" @disabled={{this.submitButtonDisabled}}
+             @title="Submit/propose this reimbursement" />
+    {{/if}}
+  </p>
+
+  {{#if this.expenseFormVisible}}
+    <h3 id="new-expense-item">New expense item</h3>
+    <AddExpenseItem @addExpenseItem={{fn this.addExpenseItem}} />
+  {{/if}}
+</form>
+<form id="add-expenses-from-file">
+  <h3>Add expense items from file</h3>
+  <input type="file" multiple="false"
+         onchange={{fn this.addExpensesFromFile}}
+         accept="application/json" />
+</form>
@@ -0,0 +1,12 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
+
+export default class BudgetBalancesComponent extends Component {
+  @service communityFunds;
+  @alias('communityFunds.balances') balances;
+
+  get loading () {
+    return !this.communityFunds.balancesLoaded;
+  }
+}
@@ -0,0 +1,18 @@
+<table class="token-balances {{if this.loading 'loading'}}">
+  <thead>
+    <tr>
+      <th>Token</th>
+      <th>Amount</th>
+      <th>Fiat value</th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#each this.balances as |balance|}}
+      <tr>
+        <th>{{balance.token.symbol}}</th>
+        <td class="amount">{{balance.confirmed_balance}}</td>
+        <td class="fiat-amount">~{{balance.balanceUSD}} USD</td>
+      </tr>
+    {{/each}}
+  </tbody>
+</table>
@@ -24,10 +24,9 @@ export default Component.extend({
  contributors: sort('kredits.contributors', 'contributorsSorting'),

  contributorsActive: computed('contributors.[]', 'contributions', function() {
-    const activeIds = new Set(this.contributions.mapBy('contributorId')
-                                                .map(id => id.toString()));
+    const activeIds = new Set(this.contributions.mapBy('contributorId'));

-    return this.contributors.filter(c => activeIds.has(c.id.toString()));
+    return this.contributors.filter(c => activeIds.has(c.id));
  }),

  contributionKinds: computed('contributions.[]', function() {
@@ -42,7 +41,7 @@ export default Component.extend({
          c.amount <= 500) { included = false; }

      if (isPresent(this.contributorId) &&
-          c.contributorId.toString() !== this.contributorId.toString()) { included = false; }
+          c.contributorId !== parseInt(this.contributorId)) { included = false; }

      if (isPresent(this.contributionKind) &&
          c.kind !== this.contributionKind) { included = false; }
@@ -29,11 +29,11 @@
  </div>
 {{/if}}

-<ul class="contribution-list {{if @loading 'loading'}}">
+<ul class="item-list contribution-list {{if @loading 'loading'}}">
  {{#each this.contributionsFiltered as |contribution|}}
    <li role="button" data-contribution-id={{contribution.id}}
        {{action "openContributionDetails" contribution}}
-        class="{{contribution-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">
+        class="{{item-status contribution}}{{if (eq contribution.id @selectedContributionId) " selected"}}">
      <p class="meta">
        <span class="recipient"><UserAvatar @contributor={{contribution.contributor}} /></span>
        <span class="category {{contribution.kind}}">({{contribution.kind}})</span>
@@ -0,0 +1,23 @@
+import Component from '@glimmer/component';
+import { sort } from '@ember/object/computed';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
+import config from 'kredits-web/config/environment';
+
+export default class ReimbursementListComponent extends Component {
+  @service kredits;
+
+  itemSorting = Object.freeze(['pendingStatus:asc', 'id:desc']);
+  @sort('args.items', 'itemSorting') itemsSorted;
+
+  get ipfsGatewayUrl () {
+    return config.ipfs.gatewayUrl;
+  }
+
+  @action
+  veto (id) {
+    this.kredits.vetoReimbursement(id).then(transaction => {
+      console.debug('[controllers:budget] Veto submitted to chain: '+transaction.hash);
+    });
+  }
+}
@@ -0,0 +1,46 @@
+<ul class="item-list spaced reimbursement-list {{if @loading 'loading'}}">
+  {{#each this.itemsSorted as |reimbursement|}}
+    <li data-reimbursement-id={{reimbursement.id}}
+        class="{{item-status reimbursement}}">
+      <p class="meta">
+        <span class="title">
+          Expenses covered by {{reimbursement.contributor.name}}
+        </span>
+        <span class="recipient">
+          <UserAvatar @contributor={{reimbursement.contributor}} />
+        </span>
+      </p>
+      <p class="token-amount">
+        <span class="amount">
+          {{sats-to-btc reimbursement.amount}}</span>&#8239;<span class="symbol">BTC</span>
+      </p>
+      <ul class="expense-list">
+        {{#each reimbursement.expenses as |expense|}}
+          <li>
+            <div class="description" rowspan="2">
+              <h4>
+                <span class="date">{{expense.date}}:</span>
+                <span class="title">{{expense.title}}</span>
+              </h4>
+              <p class="description">{{expense.description}}</p>
+            </div>
+            <div class="amount">
+              {{fmt-fiat-currency expense.amount expense.currency}}
+            </div>
+          </li>
+        {{/each}}
+      </ul>
+      {{#if this.kredits.currentUserIsCore}}
+        <p>
+          <a href="{{this.ipfsGatewayUrl}}/{{reimbursement.ipfsHash}}"
+             class="button small" target="_blank" rel="noopener noreferrer">
+            Inspect IPFS data
+          </a>
+          <button {{on "click" (fn this.veto reimbursement.id)}}
+                  disabled={{reimbursement.vetoed}}
+                  class="button small danger" type="button">veto</button>
+        </p>
+      {{/if}}
+    </li>
+  {{/each}}
+</ul>
@@ -34,7 +34,6 @@ export default Component.extend({
        this.set('setupInProgress', true);
        await this.kredits.setup();
        this.set('setupInProgress', false);
-        this.router.transitionTo('dashboard');
      } catch (error) {
        this.set('setupInProgress', false);
        console.log('Opening Ethereum wallet failed:', error);
@@ -0,0 +1,10 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
+
+export default class BudgetController extends Controller {
+  @service kredits;
+
+  @alias('kredits.reimbursementsUnconfirmed') reimbursementsUnconfirmed;
+  @alias('kredits.reimbursementsConfirmed') reimbursementsConfirmed;
+}
@@ -41,7 +41,7 @@ export default Controller.extend({

    vetoContribution (contributionId) {
      this.kredits.veto(contributionId).then(transaction => {
-        console.debug('[controllers:index] Veto submitted to Ethereum blockhain: '+transaction.hash);
+        console.debug('[controllers:index] Veto submitted to chain: '+transaction.hash);
      });
    },

@@ -1,56 +0,0 @@
-import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
-import { alias } from '@ember/object/computed';
-import { once } from '@ember/runloop';
-
-export default Helper.extend({
-
-  kredits: service(),
-  currentBlock: alias('kredits.currentBlock'),
-
-  compute([contribution]) {
-    this.setupRecompute(contribution);
-
-    let status = [];
-
-    if (contribution.vetoed) {
-      status.push('vetoed');
-    } else if (contribution.confirmedAt > this.currentBlock) {
-      status.push('unconfirmed');
-    } else {
-      status.push('confirmed');
-    }
-
-    if (contribution.hasPendingChanges) {
-      status.push('pending');
-    }
-
-    return status.join(' ');
-  },
-
-  destroy () {
-    if (this.teardown) this.teardown();
-    this._super(...arguments);
-  },
-
-  setupRecompute (contribution) {
-    if (this.teardown) this.teardown();
-
-    contribution.addObserver('vetoed' , this, this.triggerRecompute);
-    contribution.addObserver('confirmedAt' , this, this.triggerRecompute);
-    contribution.addObserver('currentBlock' , this, this.triggerRecompute);
-    contribution.addObserver('hasPendingChanges' , this, this.triggerRecompute);
-
-    this.teardown = () => {
-      contribution.removeObserver('vetoed', this, this.triggerRecompute);
-      contribution.removeObserver('confirmedAt', this, this.triggerRecompute);
-      contribution.removeObserver('currentBlock', this, this.triggerRecompute);
-      contribution.removeObserver('hasPendingChanges', this, this.triggerRecompute);
-    };
-  },
-
-  triggerRecompute () {
-    once(this, this.recompute);
-  }
-
-});
@@ -0,0 +1,18 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function fmtCryptoCurrency(params/*, hash*/) {
+  let fmtAmount;
+  const amount = params[0];
+  const code = params[1];
+
+  switch(code) {
+    case 'RBTC':
+      fmtAmount = amount / 1000000000000000000;
+      break;
+    case 'BTC':
+      fmtAmount = amount / 100000000;
+      break;
+  }
+
+  return fmtAmount;
+});
@@ -0,0 +1,11 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function fmtFiatCurrency(params) {
+  const lang = navigator.language || navigator.userLanguage;
+  const formatter = new Intl.NumberFormat(lang, {
+    style: 'currency',
+    currency: params[1] || 'EUR',
+    currencyDisplay: 'code'
+  })
+  return formatter.format(params[0]);
+});
@@ -0,0 +1,56 @@
+import Helper from '@ember/component/helper';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
+import { once } from '@ember/runloop';
+
+export default Helper.extend({
+
+  kredits: service(),
+  currentBlock: alias('kredits.currentBlock'),
+
+  compute([item]) {
+    this.setupRecompute(item);
+
+    let status = [];
+
+    if (item.vetoed) {
+      status.push('vetoed');
+    } else if (item.confirmedAt > this.currentBlock) {
+      status.push('unconfirmed');
+    } else {
+      status.push('confirmed');
+    }
+
+    if (item.hasPendingChanges) {
+      status.push('pending');
+    }
+
+    return status.join(' ');
+  },
+
+  destroy () {
+    if (this.teardown) this.teardown();
+    this._super(...arguments);
+  },
+
+  setupRecompute (item) {
+    if (this.teardown) this.teardown();
+
+    item.addObserver('vetoed' , this, this.triggerRecompute);
+    item.addObserver('confirmedAt' , this, this.triggerRecompute);
+    item.addObserver('currentBlock' , this, this.triggerRecompute);
+    item.addObserver('hasPendingChanges' , this, this.triggerRecompute);
+
+    this.teardown = () => {
+      item.removeObserver('vetoed', this, this.triggerRecompute);
+      item.removeObserver('confirmedAt', this, this.triggerRecompute);
+      item.removeObserver('currentBlock', this, this.triggerRecompute);
+      item.removeObserver('hasPendingChanges', this, this.triggerRecompute);
+    };
+  },
+
+  triggerRecompute () {
+    once(this, this.recompute);
+  }
+
+});
@@ -0,0 +1,5 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function satsToBtc(amount/*, hash*/) {
+  return amount / 100000000;
+});
@@ -3,7 +3,6 @@ import { isEmpty, isPresent } from '@ember/utils';
 import moment from 'moment';

 export default EmberObject.extend({
-
  // Contract
  id: null,
  contributorId: null,
@@ -48,5 +47,4 @@ export default EmberObject.extend({
  serialize () {
    return JSON.stringify(this);
  }
-
 });
@@ -22,5 +22,4 @@ export default EmberObject.extend({
  serialize () {
    return JSON.stringify(this);
  }
-
 });
@@ -0,0 +1,47 @@
+import EmberObject, { computed } from '@ember/object';
+import moment from 'moment';
+import { isPresent } from '@ember/utils';
+
+export default EmberObject.extend({
+
+  // Contract
+  id: null,
+  recipientId: null,
+  token: null,
+  amount: null,
+  confirmedAt: null,
+  vetoed: null,
+  ipfsHash: null,
+
+  // contributor model instance
+  recipient: null,
+
+  // TODO contributor who submitted the reimbursement
+  // recordedBy: null,
+
+  // IPFS
+  expenses: null, // Array of expense objects
+
+  pendingTx: null,
+
+  iso8601Date: computed('date', 'time', function() {
+    return this.time ? `${this.date}T${this.time}` : this.date;
+  }),
+
+  jsDate: computed('iso8601Date', function() {
+    return moment(this.iso8601Date).toDate();
+  }),
+
+  hasPendingChanges: computed('pendingTx', function() {
+    return isPresent(this.pendingTx);
+  }),
+
+  pendingStatus: computed('pendingTx', function() {
+    return isPresent(this.pendingTx) ? 'isPending' : 'notPending';
+  }),
+
+  serialize () {
+    return JSON.stringify(this);
+  }
+
+});
@@ -29,4 +29,13 @@ Router.map(function() {
    this.route('eth-account');
    this.route('complete');
  });
+  this.route('budget', function() {
+    this.route('expenses');
+
+    this.route('reimbursements', function() {});
+  });
+
+  this.route('reimbursements', function() {
+    this.route('new');
+  });
 });
@@ -1,39 +1,35 @@
-import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 import { schedule } from '@ember/runloop';

-export default Route.extend({
-  kredits: service(),
+export default class ApplicationRoute extends Route {
+  @service kredits;
+  @service communityFunds;

  beforeModel(/* transition */) {
-    const kredits = this.kredits;
-
-    return kredits.setup().then(() => {
-      kredits.get('kredits').preflightChecks().catch((error) => {
+    return this.kredits.setup().then(() => {
+      this.kredits.kredits.preflightChecks().catch(error => {
        console.error('Kredits preflight check failed!');
        console.error(error);
      });
-    }).catch((error) => {
+    }).catch(error => {
      console.log('Error initializing Kredits', error);
    });
-  },
+  }
+
+  model() {
+    return this.kredits.loadInitialData().then(() => {
+      this.kredits.addContractEventHandlers()
+    });
+  }

  afterModel() {
-    return this.kredits.loadInitialData()
-      .then(() => {
-        this.kredits.addContractEventHandlers();
-      })
-      .then(() => {
-        if (this.kredits.contributorsNeedSync) {
-          schedule('afterRender', this.kredits.syncContributors,
-                   this.kredits.syncContributors.perform);
-        }
-        if (this.kredits.contributionsNeedSync) {
-          schedule('afterRender', this.kredits.syncContributions,
-                   this.kredits.syncContributions.perform);
-        }
-        schedule('afterRender', this.kredits.fetchMissingContributions,
-                 this.kredits.fetchMissingContributions.perform);
-      });
+    if (this.kredits.contributorsNeedSync) {
+      schedule('afterRender', this.kredits.syncContributors,
+        this.kredits.syncContributors.perform);
+    }
+
+    schedule('afterRender', this.communityFunds.fetchBalances,
+      this.communityFunds.fetchBalances.perform);
  }
-});
+}
@@ -0,0 +1,34 @@
+import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
+import { isEmpty, isPresent } from '@ember/utils';
+import { schedule } from '@ember/runloop';
+
+export default class BudgetRoute extends Route {
+  @service browserCache;
+  @service kredits;
+
+  async model () {
+    if (isPresent(this.kredits.reimbursements) &&
+        isEmpty(this.kredits.reimbursementsPending)) {
+      console.debug('[route:budget] Reimbursements loaded before, no need to sync or load');
+      return;
+    } else {
+      const numCachedReimbursements = await this.browserCache.reimbursements.length();
+      if (numCachedReimbursements > 0) {
+        await this.kredits.loadObjectsFromCache('Reimbursement');
+        this.kredits.set('reimbursementsNeedSync', true);
+      } else {
+        await this.kredits.fetchObjects('Reimbursement', { page: { size: 10 } });
+      }
+    }
+  }
+
+  afterModel() {
+    if (this.kredits.reimbursementsNeedSync) {
+      schedule('afterRender', this.kredits.syncReimbursements,
+        this.kredits.syncReimbursements.perform);
+    }
+    schedule('afterRender', this.kredits.fetchMissingReimbursements,
+      this.kredits.fetchMissingReimbursements.perform);
+  }
+}
@@ -0,0 +1,4 @@
+import Route from '@ember/routing/route';
+
+export default class BudgetExpensesRoute extends Route {
+}
@@ -1,9 +1,9 @@
 import Route from '@ember/routing/route';

-export default Route.extend({
+export default class ContributionsNewRoute extends Route {

  model (params) {
    return { params };
  }

-});
+}
@@ -6,19 +6,15 @@ export default Route.extend({
  kredits: service(),

  model(params) {
-    const contribution = this.kredits.contributions.findBy('id', parseInt(params.id));
-    contribution.contributorId = contribution.contributorId.toString();
-
-    return contribution;
+    return this.kredits.contributions.findBy('id', parseInt(params.id));
  },

  setupController (controller, model) {
    this._super(controller, model);

    controller.set('attributes', model.getProperties([
-      'kind', 'amount', 'description', 'url', 'details'
+      'contributorId', 'kind', 'amount', 'description', 'url', 'details'
    ]));
-    controller.set('attributes.contributorId', model.contributorId.toString());
    controller.set('attributes.date', model.jsDate);
  }

@@ -0,0 +1,18 @@
+import Route from '@ember/routing/route';
+import { schedule } from '@ember/runloop';
+import { inject as service } from '@ember/service';
+
+export default class DashboardRoute extends Route {
+
+  @service kredits;
+
+  afterModel() {
+    if (this.kredits.contributionsNeedSync) {
+      schedule('afterRender', this.kredits.syncContributions,
+        this.kredits.syncContributions.perform);
+    }
+    schedule('afterRender', this.kredits.fetchMissingContributions,
+      this.kredits.fetchMissingContributions.perform);
+  }
+
+}
@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+
+export default class ReimbursementsNewRoute extends Route {
+
+  model (params) {
+    return { params };
+  }
+
+}
@@ -3,7 +3,12 @@ import * as localforage from 'localforage';
 import config from 'kredits-web/config/environment';

 function createStore(name) {
-  const networkName = config.web3RequiredNetwork || 'custom';
+  let networkName;
+  if (config.web3RequiredNetworkName) {
+    networkName = config.web3RequiredNetworkName.toLocaleLowerCase().replace(' ', '-');
+  } else {
+    networkName = 'custom';
+  }
  return localforage.createInstance({ name: `kredits:${networkName}:${name}` });
 }

@@ -13,7 +18,8 @@ export default class BrowserCacheService extends Service {
    super(...arguments);
    this.stores = {
      contributors:  createStore('contributors'),
-      contributions: createStore('contributions')
+      contributions: createStore('contributions'),
+      reimbursements: createStore('reimbursements')
    }
  }

@@ -24,4 +30,8 @@ export default class BrowserCacheService extends Service {
  get contributions() {
    return this.stores.contributions;
  }
+
+  get reimbursements() {
+    return this.stores.reimbursements;
+  }
 }
@@ -0,0 +1,39 @@
+import Service, { inject as service } from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import { A } from '@ember/array';
+import { task } from 'ember-concurrency-decorators';
+import config from 'kredits-web/config/environment';
+
+export default class CommunityFundsService extends Service {
+  @service exchangeRates;
+
+  @tracked balancesLoaded = false;
+  @tracked balances = A([]);
+
+  @task
+  *fetchBalances () {
+    yield fetch(config.btcBalanceAPI).then(res => res.json())
+      .then(res => {
+        return this.processBalances(res);
+      })
+      .catch(err => {
+        console.log(`[community-funds] Fetching balances failed:`);
+        console.error(err);
+      });
+  }
+
+  async processBalances (res) {
+    await this.exchangeRates.fetchRates();
+    // Format and round the approximate USD value
+    const lang = navigator.language || navigator.userLanguage;
+    const balanceUSD = res.confirmed_balance * this.exchangeRates.btcusd;
+    res.balanceUSD = Math.round(balanceUSD).toLocaleString(lang);
+
+    this.balances.pushObject({
+      ...res,
+      ...{ token: { name: 'BTC', symbol: 'BTC'} }
+    });
+
+    this.balancesLoaded = true;
+  }
+}
@@ -0,0 +1,29 @@
+import Service from '@ember/service';
+import { tracked } from '@glimmer/tracking';
+import config from 'kredits-web/config/environment';
+
+// Need to go through proxy for CORS headers
+const bitstampBaseUrl = `${config.corsProxy}https://www.bitstamp.net/api/v2`;
+
+async function fetchFromBitstamp(currencyPair) {
+  try {
+    const res = await fetch(`${bitstampBaseUrl}/ticker/${currencyPair}/`).then(r => r.json());
+    return parseFloat(res.vwap); // Last 24 hours volume weighted average price
+  } catch(e) {
+    console.error('Could not fetch exchange rate from Bitstamp:', e);
+    return 0;
+  }
+}
+
+export default class ExchangeRatesService extends Service {
+  @tracked btceur = 0;
+  @tracked btcusd = 0;
+
+  async fetchRates (source='bitstamp') {
+    switch(source) {
+      case 'bitstamp':
+        this.btceur = await fetchFromBitstamp('btceur');
+        this.btcusd = await fetchFromBitstamp('btcusd');
+    }
+  }
+}
@@ -1,10 +1,10 @@
 import ethers from 'ethers';
-import Kredits from 'kredits-contracts';
+import Kredits from '@kredits/contracts';

 import Service from '@ember/service';
 import EmberObject from '@ember/object';
 import { computed } from '@ember/object';
-import { alias, notEmpty } from '@ember/object/computed';
+import { alias, filterBy, notEmpty, sort } from '@ember/object/computed';
 import { isEmpty, isPresent } from '@ember/utils';
 import { inject as service } from '@ember/service';

@@ -13,11 +13,15 @@ import { task, taskGroup } from 'ember-concurrency';
 import groupBy from 'kredits-web/utils/group-by';
 import processContributorData from 'kredits-web/utils/process-contributor-data';
 import processContributionData from 'kredits-web/utils/process-contribution-data';
+import processReimbursementData from 'kredits-web/utils/process-reimbursement-data';
 import formatKredits from 'kredits-web/utils/format-kredits';

 import config from 'kredits-web/config/environment';
-import Contributor from 'kredits-web/models/contributor'
-import Contribution from 'kredits-web/models/contribution'
+import Contributor from 'kredits-web/models/contributor';
+import Contribution from 'kredits-web/models/contribution';
+import Reimbursement from 'kredits-web/models/reimbursement';
+// Lets us access the model classes dynamically
+const models = { Contributor, Contribution, Reimbursement };

 export default Service.extend({

@@ -28,64 +32,27 @@ export default Service.extend({
  currentUser: null,
  contributors: null,
  contributions: null,
+  reimbursements: null,
  githubAccessToken: null,

  currentUserIsContributor: notEmpty('currentUser'),
  currentUserIsCore: alias('currentUser.isCore'),
  hasAccounts: notEmpty('currentUserAccounts'),

+  contributorsMined: filterBy('contributors', 'id'),
+  contributorsSorting: Object.freeze(['name:asc']),
+  contributorsSorted: sort('contributorsMined', 'contributorsSorting'),
+
  // When data was loaded from cache, we need to fetch updates from the network
  contributorsNeedSync: false,
  contributionsNeedSync: false,
-
-  contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions.filter(contribution => {
-      return contribution.confirmedAt > this.currentBlock;
-    });
-  }),
-
-  contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
-    return this.contributions
-               .filterBy('vetoed', false)
-               .filter(contribution => {
-                 return contribution.confirmedAt <= this.currentBlock;
-               });
-  }),
-
-  kreditsByContributor: computed('contributionsUnconfirmed.@each.vetoed', 'contributors.[]', function() {
-    const contributionsUnconfirmed = this.contributionsUnconfirmed.filterBy('vetoed', false);
-    const contributionsGrouped = groupBy(contributionsUnconfirmed, 'contributorId');
-    const contributorsWithUnconfirmed = contributionsGrouped.map(c => c.value.toString());
-    const contributorsWithOnlyConfirmed = this.contributors.reject(c => contributorsWithUnconfirmed.includes(c.id))
-
-    const kreditsByContributor = contributionsGrouped.map(c => {
-      const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b);
-      const contributor = this.contributors.findBy('id', c.value.toString());
-
-      return EmberObject.create({
-        contributor: contributor,
-        amountUnconfirmed: amountUnconfirmed,
-        amountConfirmed: contributor.totalKreditsEarned,
-        amountTotal: contributor.totalKreditsEarned + amountUnconfirmed
-      })
-    });
-
-    contributorsWithOnlyConfirmed.forEach(c => {
-      kreditsByContributor.push(EmberObject.create({
-        contributor: c,
-        amountUnconfirmed: 0,
-        amountConfirmed: c.totalKreditsEarned,
-        amountTotal: c.totalKreditsEarned
-      }));
-    })
-
-    return kreditsByContributor;
-  }),
+  reimbursementsNeedSync: false,

  init () {
    this._super(...arguments);
    this.set('contributors', []);
    this.set('contributions', []);
+    this.set('reimbursements', []);
  },

  // This is called in the application route's beforeModel(). So it is
@@ -106,13 +73,12 @@ export default Service.extend({
      }

      async function instantiateWithAccount (web3Provider, context) {
-        console.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
+        console.debug('[kredits] Using user-provided Web3 instance, e.g. from Metamask');
        ethProvider = new ethers.providers.Web3Provider(web3Provider);

        const network = await ethProvider.getNetwork();
-        if (isPresent(config.web3RequiredNetwork) &&
-            network.name !== config.web3RequiredNetwork) {
-          window.alert(`Please switch your Ethereum wallet to the "${config.web3RequiredNetwork}" network before connecting your account.`);
+        if (isPresent(config.web3RequiredChainId) &&
+            network.chainId !== config.web3RequiredChainId) {
          return instantiateWithoutAccount();
        }

@@ -144,30 +110,43 @@ export default Service.extend({
    });
  },

-  setup () {
-    return this.getEthProvider().then((providerAndSigner) => {
-      let kredits = new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
-        addresses: { Kernel: config.kreditsKernelAddress },
-        apm: config.kreditsApmDomain,
+  async setup () {
+    const kredits = await this.getEthProvider().then(providerAndSigner => {
+      return new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
        ipfsConfig: config.ipfs
      });
-      return kredits
-        .init()
-        .then(async (kredits) => {
-          this.set('kredits', kredits);
-          this.set('currentBlock', await kredits.provider.getBlockNumber());
-
-          if (this.currentUserAccounts && this.currentUserAccounts.length > 0) {
-            this.getCurrentUser.then((contributorData) => {
-              this.set('currentUser', contributorData);
-            });
-          }
-
-          return kredits;
-        });
    });
+
+    await kredits.init();
+
+    this.set('kredits', kredits);
+    this.set('currentBlock', await kredits.provider.getBlockNumber());
+
+    if (this.currentUserAccounts && this.currentUserAccounts.length > 0) {
+      this.getCurrentUser.then(contributorData => {
+        this.set('currentUser', contributorData);
+      });
+    }
+
+    return kredits;
  },

+  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
+    if (isEmpty(this.currentUserAccounts)) {
+      return Promise.resolve();
+    }
+    return this.kredits.Contributor
+      .functions.getContributorIdByAddress(this.currentUserAccounts.firstObject)
+      .then((id) => {
+        // check if the user is a contributor or not
+        if (id === 0) {
+          return Promise.resolve();
+        } else {
+          return this.kredits.Contributor.getById(id);
+        }
+      });
+  }),
+
  totalSupply: computed(function() {
    return this.kredits.Token.functions.totalSupply().then(total => {
      return formatKredits(total);
@@ -175,14 +154,69 @@ export default Service.extend({
  }),

  totalKreditsEarned: computed(function() {
-    return this.kredits.Contribution.functions.totalKreditsEarned(true)
-      .then(total => total.toNumber());
+    return this.kredits.Contribution.functions.totalKreditsEarned(true);
+  }),
+
+  kreditsByContributor: computed('contributionsUnconfirmed.@each.vetoed', 'contributors.[]', function() {
+    const contributionsUnconfirmed = this.contributionsUnconfirmed.filterBy('vetoed', false);
+    const contributionsGrouped = groupBy(contributionsUnconfirmed, 'contributorId');
+    const contributorsWithUnconfirmed = contributionsGrouped.map(c => c.value);
+    const contributorsWithOnlyConfirmed = this.contributors.reject(c => contributorsWithUnconfirmed.includes(c.id))
+
+    const kreditsByContributor = contributionsGrouped.map(c => {
+      const amountUnconfirmed = c.items.mapBy('amount').reduce((a, b) => a + b);
+      const contributor = this.contributors.findBy('id', c.value);
+
+      return EmberObject.create({
+        contributor: contributor,
+        amountUnconfirmed: amountUnconfirmed,
+        amountConfirmed: contributor.totalKreditsEarned,
+        amountTotal: contributor.totalKreditsEarned + amountUnconfirmed
+      })
+    });
+
+    contributorsWithOnlyConfirmed.forEach(c => {
+      kreditsByContributor.push(EmberObject.create({
+        contributor: c,
+        amountUnconfirmed: 0,
+        amountConfirmed: c.totalKreditsEarned,
+        amountTotal: c.totalKreditsEarned
+      }));
+    })
+
+    return kreditsByContributor;
+  }),
+
+  contributionsUnconfirmed: computed('contributions.[]', 'currentBlock', function() {
+    return this.contributions
+               .filter(c => c.confirmedAt > this.currentBlock);
+  }),
+
+  contributionsConfirmed: computed('contributions.[]', 'currentBlock', function() {
+    return this.contributions
+               .filterBy('vetoed', false)
+               .filter(c => c.confirmedAt <= this.currentBlock);
+  }),
+
+  reimbursementsUnconfirmed: computed('reimbursements.[]', 'currentBlock', function() {
+    return this.reimbursements
+               .filter(r => r.confirmedAt > this.currentBlock);
+  }),
+
+  reimbursementsConfirmed: computed('reimbursements.[]', 'currentBlock', function() {
+    return this.reimbursements
+               .filterBy('vetoed', false)
+               .filter(r => r.confirmedAt <= this.currentBlock);
+  }),
+
+  reimbursementsPending: computed('reimbursements.[]', 'pendingTx', function() {
+    return this.reimbursements.filter(r => !r.id);
  }),

  async loadInitialData () {
    const numCachedContributors = await this.browserCache.contributors.length();
    if (numCachedContributors > 0) {
-      await this.loadContributorsFromCache();
+      await this.loadObjectsFromCache('Contributor');
      this.set('contributorsNeedSync', true);
    } else {
      await this.fetchContributors();
@@ -190,7 +224,7 @@ export default Service.extend({

    const numCachedContributions = await this.browserCache.contributions.length();
    if (numCachedContributions > 0) {
-      await this.loadContributionsFromCache();
+      await this.loadObjectsFromCache('Contribution');
      this.set('contributionsNeedSync', true);
    } else {
      await this.fetchContributions({ page: { size: 30 } });
@@ -241,7 +275,7 @@ export default Service.extend({
      });
  },

-  loadContributorFromData(data) {
+  loadContributorFromData (data) {
    const contributor = Contributor.create(processContributorData(data));
    const loadedContributor = this.contributors.findBy('id', contributor.id);
    if (loadedContributor) { this.contributors.removeObject(loadedContributor); }
@@ -251,7 +285,7 @@ export default Service.extend({

  async cacheLoadedContributors () {
    for (const c of this.contributors) {
-      await this.browserCache.contributors.setItem(c.id, c.serialize());
+      await this.browserCache.contributors.setItem(c.id.toString(), c.serialize());
    }
    console.debug(`[kredits] Cached ${this.contributors.length} contributors in browser storage`);
    return Promise.resolve();
@@ -267,18 +301,19 @@ export default Service.extend({

  syncContributors: task(function * () {
    yield this.fetchContributors();
+    this.set('contributorsNeedSync', false);
  }),

  addContribution (attributes) {
-    console.debug('[kredits] add contribution', attributes);
+    console.debug('[kredits] Adding contribution', attributes);

-    return this.kredits.Contribution.addContribution(attributes, { gasLimit: 300000 })
+    return this.kredits.Contribution.add(attributes, { gasLimit: 300000 })
      .then(data => {
-        console.debug('[kredits] add contribution response', data);
+        console.debug('[kredits] Contribution.add response', data);
        attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
        const contribution = Contribution.create(attributes);
        contribution.set('pendingTx', data);
-        contribution.set('confirmedAtBlock', data.blockNumber + 40320);
+        contribution.set('confirmedAtBlock', this.currentBlock + 40320);
        this.contributions.pushObject(contribution);
        return contribution;
      });
@@ -305,7 +340,7 @@ export default Service.extend({

  loadContributionFromData(data) {
    const contribution = Contribution.create(processContributionData(data));
-    contribution.set('contributor', this.contributors.findBy('id', data.contributorId.toString()));
+    contribution.set('contributor', this.contributors.findBy('id', data.contributorId));
    const loadedContribution = this.contributions.findBy('id', contribution.id);
    if (loadedContribution) { this.contributions.removeObject(loadedContribution); }
    this.contributions.pushObject(contribution);
@@ -314,7 +349,7 @@ export default Service.extend({

  async cacheLoadedContributions () {
    for (const c of this.contributions) {
-      await this.browserCache.contributions.setItem(c.id, c.serialize());
+      await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
    }
    console.debug(`[kredits] Cached ${this.contributions.length} contributions in browser storage`);
    return Promise.resolve();
@@ -333,6 +368,7 @@ export default Service.extend({
  syncContributions: task(function * () {
    yield this.fetchNewContributions.perform();
    yield this.syncUnconfirmedContributions.perform();
+    this.set('contributionsNeedSync', false);
  }).group('contributionTasks'),

  fetchNewContributions: task(function * () {
@@ -406,23 +442,197 @@ export default Service.extend({
      });
  },

-  getCurrentUser: computed('kredits.provider', 'currentUserAccounts.[]', function() {
-    if (isEmpty(this.currentUserAccounts)) {
-      return Promise.resolve();
-    }
-    return this.kredits.Contributor
-      .functions.getContributorIdByAddress(this.currentUserAccounts.firstObject)
-      .then((id) => {
-        // check if the user is a contributor or not
-        if (id === 0) {
-          return Promise.resolve();
-        } else {
-          return this.kredits.Contributor.getById(id);
-        }
+  //
+  // Generic data handling (for objects that can be vetoed)
+  //
+
+  fetchObjects(objectClass, options = { page: { size: 200 } }) {
+    const objectClassLowerCase = objectClass.toLowerCase();
+    console.debug(`[kredits] Fetching ${objectClassLowerCase}s from the network`);
+    return this.kredits[objectClass].all(options)
+      .then(objects => {
+        return objects.map(data => {
+          const classInstance = this[`load${objectClass}FromData`](data);
+          return classInstance;
+        });
+      })
+      .then(objects => {
+        const cacheWrites = objects.map(o => {
+          return this.browserCache[objectClassLowerCase+'s']
+                     .setItem(o.id.toString(), o.serialize());
+        });
+        return Promise.all(cacheWrites).then(() => {
+          console.debug(`[kredits] Cached ${objects.length} ${objectClassLowerCase+'s'} in browser storage`);
+        });
      });
+  },
+
+  removeObjectFromCollectionIfLoaded (collection, objectId) {
+    const loadedObj = this[collection].findBy('id', objectId);
+    if (loadedObj) { this[collection].removeObject(loadedObj); }
+  },
+
+  async cacheLoadedObjects (collection) {
+    for (const o of this[collection]) {
+      await this.browserCache[collection].setItem(o.id, o.serialize());
+    }
+    console.debug(`[kredits] Cached ${this[collection].length} ${collection} in browser storage`);
+  },
+
+  async loadObjectsFromCache (objectClass) {
+    const collection = objectClass.toLowerCase()+'s';
+    return this.browserCache[collection].iterate((value/*, key , iterationNumber */) => {
+      const obj = models[objectClass].create(JSON.parse(value));
+      this.removeObjectFromCollectionIfLoaded(collection, obj.id)
+      this[collection].pushObject(obj);
+    }).then((/* result */) => {
+      console.debug(`[kredits] Loaded ${this[collection].length} ${collection} from cache`);
+    });
+  },
+
+  syncTaskGroup: taskGroup().enqueue(),
+
+  fetchNewObjects: task(function * (objectClass) {
+    const collection = objectClass.toLowerCase()+'s';
+    const count = yield this.kredits[objectClass].functions[`${collection}Count`]();
+    const lastKnownObjectId = Math.max.apply(null, this[collection].mapBy('id'));
+    const toFetch = count - lastKnownObjectId;
+
+    if (toFetch > 0) {
+      console.debug(`[kredits] Fetching ${toFetch} new ${collection}`);
+      for (let id = lastKnownObjectId; id <= count; id++) {
+        const data = yield this.kredits[objectClass].getById(id);
+        const o = this[`load${objectClass}FromData`](data);
+        yield this.browserCache[collection].setItem(o.id.toString(), o.serialize());
+      }
+    } else {
+      console.debug(`[kredits] No new ${collection} to fetch`);
+    }
  }),

+  fetchMissingObjects: task(function * (objectClass) {
+    const collection = objectClass.toLowerCase()+'s';
+    const count = yield this.kredits[objectClass].functions[`${collection}Count`]();
+    const allIds = [...Array(count+1).keys()];
+    allIds.shift(); // remove first item, which is 0
+    const loadedObjects = new Set(this[collection].mapBy('id'));
+    const toFetch = allIds.filter(id => !loadedObjects.has(id));
+    if (toFetch.length === 0) {
+      console.debug(`[kredits] No ${collection} left to fetch`);
+      return;
+    }
+    console.debug(`[kredits] Fetching ${toFetch.length} past ${collection}`);
+    let countFetched = 0;
+
+    for (let id = count; id > 0; id--) {
+      if (loadedObjects.has(id)) {
+        continue;
+      } else {
+        const data = yield this.kredits[objectClass].getById(id);
+        const o = this[`load${objectClass}FromData`](data);
+        yield this.browserCache[collection].setItem(o.id.toString(), o.serialize());
+        countFetched++;
+        if (countFetched % 20 === 0) {
+          console.debug(`[kredits] Fetched ${countFetched} more ${collection}`);
+        }
+      }
+    }
+    console.debug(`[kredits] Cached ${countFetched} past ${collection}`);
+  }),
+
+  syncUnconfirmedObjects: task(function * (objectClass) {
+    const collection = objectClass.toLowerCase()+'s';
+    if (this.get(`${collection}Unconfirmed`).length > 0) {
+      console.debug(`[kredits] Syncing unconfirmed ${collection}`);
+      for (const o of this[`${collection}Unconfirmed`]) {
+        if (isEmpty(o.id)) return;
+        const data = yield this.kredits[objectClass].getById(o.id);
+        const object = this[`load${objectClass}FromData`](data);
+        yield this.browserCache[collection]
+                  .setItem(o.id.toString(), object.serialize());
+      }
+    } else {
+      console.debug(`[kredits] No unconfirmed ${collection} to sync`);
+    }
+  }),
+
+  vetoAgainstObject (objectClass, objectId) {
+    console.debug(`[kredits] veto against ${objectClass.toLowerCase()}`, objectId);
+    const collection = objectClass.toLowerCase()+'s';
+    const object = this[collection].findBy('id', objectId);
+
+    return this.kredits[objectClass].functions.veto(objectId, { gasLimit: 300000 })
+      .then(data => {
+        console.debug('[kredits] veto response', data);
+        object.set('pendingTx', data);
+        return data;
+      });
+  },
+
+  //
+  // Reimbursements
+  //
+
+  loadReimbursementFromData(data) {
+    const obj = Reimbursement.create(processReimbursementData(data));
+    obj.set('contributor', this.contributors.findBy('id', data.recipientId));
+    this.removeObjectFromCollectionIfLoaded('reimbursements', obj.id);
+    this.reimbursements.pushObject(obj);
+    return obj;
+  },
+
+  addReimbursement (attributes) {
+    console.debug('[kredits] add reimbursement', attributes);
+
+    return this.kredits.Reimbursement.add(attributes, { gasLimit: 300000 })
+      .then(data => {
+        console.debug('[kredits] add reimbursement response', data);
+        const reimbursement = Reimbursement.create(attributes);
+        reimbursement.setProperties({
+          contributor: this.contributors.findBy('id', attributes.recipientId),
+          pendingTx: data,
+          confirmedAt: this.currentBlock + 40320
+        });
+        this.reimbursements.pushObject(reimbursement);
+
+        // Listen to tx mining/execution status
+        data.wait()
+            .then(d => console.debug('[kredits] tx successful', d))
+            .catch(e => {
+              window.alert('The transaction failed to execute. Please check the browser console.');
+              console.log('[kredits] tx error', e);
+            });
+
+        return reimbursement;
+      });
+  },
+
+  syncReimbursements: task(function * () {
+    yield this.fetchNewObjects.perform('Reimbursement');
+    yield this.syncUnconfirmedObjects.perform('Reimbursement');
+    this.set('reimbursementsNeedSync', false);
+  }).group('syncTaskGroup'),
+
+  fetchMissingReimbursements: task(function * () {
+    yield this.fetchMissingObjects.perform('Reimbursement');
+  }).group('syncTaskGroup'),
+
+  vetoReimbursement (id) {
+    console.debug('[kredits] veto against reimbursement', id);
+    const reimbursement = this.reimbursements.findBy('id', id);
+
+    return this.kredits.Reimbursement.functions.veto(id, { gasLimit: 300000 })
+      .then(data => {
+        console.debug('[kredits] veto response', data);
+        reimbursement.set('pendingTx', data);
+        return data;
+      });
+  },
+
+  //
  // Contract events
+  //
+
  addContractEventHandlers () {
    this.kredits.Contributor
      .on('ContributorProfileUpdated', this.handleContributorChange.bind(this))
@@ -433,6 +643,10 @@ export default Service.extend({
      .on('ContributionAdded', this.handleContributionAdded.bind(this))
      .on('ContributionVetoed', this.handleContributionVetoed.bind(this))

+    this.kredits.Reimbursement
+      .on('ReimbursementAdded', this.handleReimbursementAdded.bind(this))
+      .on('ReimbursementVetoed', this.handleReimbursementVetoed.bind(this))
+
    this.kredits.Token
      .on('Transfer', this.handleTransfer.bind(this));
  },
@@ -443,13 +657,15 @@ export default Service.extend({
    const contributorData = await this.kredits.Contributor.getById(contributorId);
    const newContributor = Contributor.create(contributorData);

-    const oldContributor = this.contributors.findBy('id', contributorId.toString());
+    // TODO check for actual differences in the contributor data first
+
+    const oldContributor = this.contributors.findBy('id', contributorId);
    if (oldContributor) {
-      console.debug('[kredits] old contributor', oldContributor);
+      // console.debug('[kredits] cached contributor', oldContributor);
      this.contributors.removeObject(oldContributor);
    }

-    console.debug('[kredits] new contributor', newContributor);
+    // console.debug('[kredits] incoming contributor data', newContributor);
    this.contributors.pushObject(newContributor);
  },

@@ -458,27 +674,57 @@ export default Service.extend({

    const pendingContribution = this.contributions.find(c => {
      return (c.id === null) &&
-             (c.contributorId.toString() === contributorId.toString()) &&
+             (c.contributorId === contributorId) &&
             (c.amount.toString() === amount.toString());
    });

    if (pendingContribution) {
-      const attributes = await this.kredits.Contribution.getById(id);
-      attributes.contributor = this.contributors.findBy('id', attributes.contributorId.toString());
-      const newContribution = Contribution.create(attributes);
-      this.contributions.addObject(newContribution);
      this.contributions.removeObject(pendingContribution);
    }
+
+    const data = await this.kredits.Contribution.getById(id);
+    const c = this.loadContributionFromData(data);
+    await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+  },
+
+  async handleContributionVetoed (contributionId) {
+    console.debug('[kredits] ContributionVetoed event received for #', contributionId);
+    const c = this.contributions.findBy('id', contributionId);
+
+    if (c) {
+      console.debug('[kredits] Updating contribution', c);
+      c.set('vetoed', true);
+      c.set('pendingTx', null);
+      await this.browserCache.contributions.setItem(c.id.toString(), c.serialize());
+    }
  },

-  handleContributionVetoed (contributionId) {
-    console.debug('[kredits] ContributionVetoed event received for ', contributionId);
-    const contribution = this.contributions.findBy('id', contributionId);
-    console.debug('[kredits] contribution', contribution);
+  async handleReimbursementAdded (id, addedByAccount, amount) {
+    console.debug('[kredits] ReimbursementAdded event received', { id, addedByAccount, amount });

-    if (contribution) {
-      contribution.set('vetoed', true);
-      contribution.set('pendingTx', null);
+    const pendingReimbursement = this.reimbursementsPending.find(r => {
+      return r.amount.toString() === amount.toString();
+    });
+
+    if (pendingReimbursement) {
+      console.debug('[kredits] Found a pending reimbursement matching the event. Replacing it with the final record...');
+      this.reimbursements.removeObject(pendingReimbursement);
+    }
+
+    const data = await this.kredits.Reimbursement.getById(id);
+    const r = this.loadReimbursementFromData(data);
+    this.browserCache.reimbursements.setItem(r.id.toString(), r.serialize());
+  },
+
+  async handleReimbursementVetoed (id) {
+    console.debug(`[kredits] ReimbursementVetoed received for #${id}`);
+    const r = this.reimbursements.findBy('id', id);
+    console.debug('[kredits] reimbursement', r);
+
+    if (r) {
+      r.set('vetoed', true);
+      r.set('pendingTx', null);
+      this.browserCache.reimbursements.setItem(r.id.toString(), r.serialize());
    }
  },

@@ -20,7 +20,7 @@ button, input[type=submit], .button {
    background-color: rgba(22, 21, 40, 0.8);
  }

-  &:active, &.active {
+  &:focus, &:active, &.active {
    border-color: $primary-color;
  }

@@ -41,7 +41,7 @@ button, input[type=submit], .button {
    &:hover {
      background-color: rgba(40, 21, 21, 0.8);
    }
-    &:active, &.active {
+    &:focus, &:active, &.active {
      border-color: $red;
    }
  }
@@ -54,7 +54,7 @@ button, input[type=submit], .button {
    &:hover {
      background-color: rgba(21, 40, 21, 0.8);
    }
-    &:active, &.active {
+    &:focus, &:active, &.active {
      border-color: $green;
    }
  }
@@ -8,3 +8,7 @@ $red: #fb6868;
 $primary-color: $blue;

 $body-text-color: #fff;
+
+$item-background-color: rgba(255,255,255,0.1);
+$item-highlighted-background-color: rgba(255,255,255,0.2);
+$item-border-color: rgba(255,255,255,0.2);
@@ -1,21 +1,31 @@
 section#add-contributor,
 section#add-contribution,
+section#add-contribution,
+section#add-item, // TODO use for all forms for adding data
 section#signup {
-
  form {
+    h3 {
+      font-size: 1.5rem;
+      font-weight: normal;
+      margin-top: 2em;
+      margin-bottom: 1em;
+    }

    p {
-      margin-bottom: 1.5rem;
+      font-size: 1.2rem;

      &.mg-bottom-md {
        margin-bottom: 2rem;
      }

      &.label {
+        margin-bottom: 1.5rem;
+        font-size: 1rem;
        margin-bottom: .5rem;
      }

      &.actions {
+        margin-bottom: 1.5rem;
        padding-top: 1.5rem;
        text-align: center;
        a {
@@ -29,9 +39,34 @@ section#signup {
      display: block;
      margin-bottom: 0.5rem;
      opacity: 0.7;
+
+      > p {
+        margin-bottom: 1.5rem;
+      }
    }

-    input[type=text], select {
+    fieldset {
+      border: none;
+
+      &.horizontal {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        grid-gap: 2rem;
+
+        &.thirds {
+          grid-template-columns: 1fr 1fr 1fr;
+        }
+
+        &.total-amounts {
+          grid-template-columns: 2fr 1fr 1fr;
+        }
+
+        label {
+        }
+      }
+    }
+
+    input[type=text], input[type=url], select {
      width: 100%;
      padding: 1rem;
      border: none;
@@ -39,17 +74,24 @@ section#signup {
      background-color: rgba(22, 21, 40, 0.3);
      color: #fff;
      font-size: 1.2rem;
+      font-weight: normal;
      transition: border-color 0.1s linear;

      &:focus, &.valid {
        background-color: rgba(22, 21, 40, 0.6);
      }
-      &:focus {
+      &:focus :not(:invalid) {
        border-color: $blue;
      }
      &::placeholder {
        color: rgba(238, 238, 238, 0.5);
      }
+      &.invalid {
+        border-color: $red;
+      }
+      &:disabled {
+        color: rgba(255, 255, 255, 0.6);
+      }
    }

    select {
@@ -109,7 +151,5 @@ section#signup {
        color: #fff;
      }
    }
-
  }
-
 }
@@ -0,0 +1,35 @@
+ul.item-list {
+  list-style: none;
+
+  > li {
+    padding: 0.8rem 1.2rem;
+    font-size: 1.2rem;
+    background-color: $item-background-color;
+    border-bottom: 1px solid $item-border-color;
+
+    &:first-of-type {
+      border-top: 1px solid $item-border-color;
+    }
+
+    &.selected {
+      background-color: $item-highlighted-background-color;
+    }
+  }
+
+  &.loading {
+    @include loading-border-top;
+
+    > li {
+      &:first-of-type {
+        border-top: none;
+      }
+    }
+  }
+
+  &.spaced {
+    > li {
+      border-top: 1px solid $item-border-color;
+      margin-bottom: 2rem;
+    }
+  }
+}
@@ -14,6 +14,15 @@ main {
      "contributions";
  }

+  &#budget {
+    width: 100%;
+    display: grid;
+    grid-row-gap: 2rem;
+    grid-template-areas:
+      "aside"
+      "content";
+  }
+
  &.center-column {
    display: flex;
    flex-direction: column;
@@ -29,6 +38,16 @@ main {
    }
  }

+  div#content {
+    section {
+      &:first-of-type {
+        @include media-max(small) {
+          margin-top: 0;
+        }
+      }
+    }
+  }
+
  section {
    .content {
      a {
@@ -68,7 +87,7 @@ main {

  @include media-max(small) {
    padding: 2rem 1rem;
-    font-size: 1.4rem;
+    font-size: 1.5rem;
  }

  h2 {
@@ -111,6 +130,13 @@ main {
          "stats contributions details";
      }
    }
+
+    &#budget {
+      grid-column-gap: 3rem;
+      grid-template-columns: 2fr 4fr 2fr;
+      grid-template-areas:
+        "aside content empty";
+    }
  }
 }

@@ -47,7 +47,7 @@ a {

 section {
  h2 {
-    font-size: 1.4rem;
+    font-size: 1.5rem;
    color: $primary-color;
  }

@@ -89,13 +89,17 @@ section {
@import "buttons";
@import "forms";
@import "sugar";
+@import "item-list";

-@import "components/contribution-list";
+@import "components/budget-balances";
@import "components/contribution-details";
+@import "components/contribution-list";
@import "components/contributor-list";
@import "components/contributor-profile";
+@import "components/expense-list";
@import "components/external-account-link";
@import "components/loading-spinner";
+@import "components/reimbursement-list";
@import "components/topbar";
@import "components/topbar-account-panel";
@import "components/user-avatar";
@@ -0,0 +1,42 @@
+section#funds {
+  @include media-max(small) {
+    margin-bottom: 2rem;
+  }
+
+  table.token-balances {
+    opacity: 1;
+    transition: opacity 0.3s linear;
+
+    &.loading {
+      opacity: 0;
+    }
+
+    thead {
+      display: none;
+    }
+
+    th, td {
+      font-size: 1.2rem;
+      vertical-align: text-bottom;
+    }
+
+    th {
+      font-size: 1.5rem;
+      text-align: left;
+      padding-right: 1rem;
+    }
+
+    td {
+      text-align: right;
+
+      &.amount {
+        font-size: 2rem;
+        padding-right: 1.2rem;
+      }
+
+      &.fiat-amount {
+        color: rgba(255,255,255,0.8);
+      }
+    }
+  }
+}
@@ -16,9 +16,9 @@ section#contribution-details {
    margin: 0 0 1.5rem;
    padding: 2rem 2rem;

-    border-top: 1px solid rgba(255,255,255,0.2);
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-    background-color: rgba(255,255,255,0.1);
+    border-top: 1px solid $item-border-color;
+    border-bottom: 1px solid $item-border-color;
+    background-color: $item-background-color;

    h3 {
      font-size: 1.5rem;
@@ -67,7 +67,7 @@ section#contribution-details {
    overflow: auto;
    margin-top: 2rem;
    padding-top: 2rem;
-    border-top: 1px solid rgba(255,255,255,0.2);
+    border-top: 1px solid $item-border-color;
    font-size: 1.2rem;

    .icon {
@@ -24,22 +24,13 @@ main section {
 ul.contribution-list {
  clear: both;
  width: 100%;
-  list-style: none;

  li {
    display: grid;
    grid-template-columns: auto 5rem 5rem;
    grid-row-gap: 0.5rem;
-    padding: 0.8rem 1.2rem;
-    background-color: rgba(255,255,255,0.1);
-    font-size: 1.2rem;
-    border-bottom: 1px solid rgba(255,255,255,0.2);
    cursor: pointer;

-    &:first-of-type {
-      border-top: 1px solid rgba(255,255,255,0.2);
-    }
-
    &.confirmed {
      grid-template-columns: auto 5rem;
    }
@@ -50,10 +41,6 @@ ul.contribution-list {
      opacity: 0.6;
    }

-    &.selected {
-      background-color: rgba(255,255,255,0.2);
-    }
-
    p {
      align-self: center;
      margin: 0;
@@ -113,14 +100,4 @@ ul.contribution-list {
      margin-right: 0.5rem;
    }
  }
-
-  &.loading {
-    @include loading-border-top;
-
-    li {
-      &:first-of-type {
-        border-top: none;
-      }
-    }
-  }
 }
@@ -5,16 +5,16 @@ table.contributor-list {
  margin-bottom: 1.5rem;

  tr {
-    background-color: rgba(255,255,255,0.1);
-    border-bottom: 1px solid rgba(255,255,255,0.2);
+    background-color: $item-background-color;
+    border-bottom: 1px solid $item-border-color;
    cursor: pointer;

    &:first-of-type {
-      border-top: 1px solid rgba(255,255,255,0.2);
+      border-top: 1px solid $item-border-color;
    }

    &.selected {
-      background-color: rgba(255,255,255,0.2);
+      background-color: $item-highlighted-background-color;
    }

    &.current-user {
@@ -8,7 +8,7 @@ section#contributor-profile {

    img {
      margin: 0 auto;
-      border: 3px solid rgba(255,255,255,0.2);
+      border: 3px solid $item-border-color;
    }
  }

@@ -18,9 +18,9 @@ section#contributor-profile {
    margin: -7.2rem 0 1.5rem;
    padding: 6rem 1.2rem 2rem;

-    border-top: 1px solid rgba(255,255,255,0.2);
-    border-bottom: 1px solid rgba(255,255,255,0.2);
-    background-color: rgba(255,255,255,0.1);
+    border-top: 1px solid $item-border-color;
+    border-bottom: 1px solid $item-border-color;
+    background-color: $item-background-color;

    h2 {
      text-align: center;
@@ -0,0 +1,48 @@
+ul.expense-list {
+  grid-column-start: span 2;
+  width: 100%;
+  margin-top: 0.8rem;
+  border-collapse: collapse;
+
+  li {
+    display: grid;
+    grid-template-columns: auto 10rem;
+    grid-row-gap: 0.5rem;
+    padding-top: 1.2rem;
+    border-top: 1px solid $item-border-color;
+    font-size: 1.2rem;
+
+    &:not(:last-child) {
+      padding-bottom: 1.2rem;
+    }
+  }
+
+  .description {
+    grid-row-start: 1;
+    grid-row-end: 3;
+  }
+
+  .amount {
+    justify-self: end;
+    // font-weight: normal;
+  }
+
+  .actions {
+    justify-self: end;
+  }
+
+  h4 {
+    font-size: 1.2rem;
+    font-weight: normal;
+    line-height: 2rem;
+  }
+
+  p {
+    line-height: 2rem;
+
+    &.description {
+      font-size: 1rem;
+      opacity: 0.7;
+    }
+  }
+}
@@ -10,7 +10,7 @@
 .loading-spinner {
  margin-top: 12rem;
  text-align: center;
-  font-size: 1.4rem;
+  font-size: 1.5rem;
  color: $primary-color;

  @include media-max(small) {
@@ -0,0 +1,34 @@
+ul.reimbursement-list {
+  width: 100%;
+
+  > li {
+    display: grid;
+    grid-template-columns: auto 12rem;
+    grid-row-gap: 0.5rem;
+    padding-top: 1.6rem;
+
+    &.vetoed {
+      text-decoration: line-through;
+      opacity: 0.6;
+    }
+
+    .token-amount {
+      text-align: right;
+
+      img {
+        height: 1em;
+        vertical-align: middle;
+        margin-top: -2px;
+      }
+
+      .amount {
+        font-size: 1.5rem;
+      }
+
+      .symbol {
+        font-size: 1rem;
+        padding-left: 0.2rem;
+      }
+    }
+  }
+}
@@ -0,0 +1,63 @@
+<main id="budget">
+
+  <div id="aside">
+    <!-- <section id="main&#45;nav"> -->
+    <!--   <header> -->
+    <!--     <h2>Budget</h2> -->
+    <!--   </header> -->
+    <!--   <div class="content"> -->
+    <!--     <ul> -->
+    <!--       <li> -->
+    <!--         <LinkTo @route="budget.expenses">Expenses</LinkTo> -->
+    <!--       </li> -->
+    <!--       <li> -->
+    <!--         <a href="#">Rewards</a> -->
+    <!--       </li> -->
+    <!--     </ul> -->
+    <!--   </div> -->
+    <!-- </section> -->
+
+    <section id="funds">
+      <header>
+        <h2>Community funds</h2>
+      </header>
+      <div class="content">
+        <BudgetBalances />
+      </div>
+    </section>
+  </div>
+
+  <div id="content">
+    {{#if this.reimbursementsUnconfirmed}}
+      <section id="expenses-unconfirmed">
+        <header class="with-nav">
+          <h2>Proposed Reimbursements</h2>
+          <nav>
+            <LinkTo @route="reimbursements.new" @title="Submit a reimbursement" class="button small green">add</LinkTo>
+          </nav>
+        </header>
+        <div class="content">
+          <ReimbursementList @items={{this.reimbursementsUnconfirmed}} />
+        </div>
+      </section>
+    {{/if}}
+
+    {{#if this.reimbursementsConfirmed}}
+      <section id="expenses-confirmed">
+        <header class="with-nav">
+          <h2>Confirmed Expenses</h2>
+          <nav>
+            <LinkTo @route="reimbursements.new" @title="Submit a reimbursement" class="button small green">add</LinkTo>
+          </nav>
+        </header>
+        <div class="content">
+          <ReimbursementList @items={{this.reimbursementsConfirmed}} />
+        </div>
+      </section>
+    {{/if}}
+  </div>
+
+  <div id="empty">
+  </div>
+
+</main>
@@ -0,0 +1 @@
+{{outlet}}
@@ -6,8 +6,7 @@
    </header>

    <div class="content">
-      <AddContribution @contributors={{this.sortedContributors}}
-                       @attributes={{this.model.params}}
+      <AddContribution @attributes={{this.model.params}}
                       @save={{action "save"}} />
    </div>
  </section>
@@ -19,7 +19,7 @@
    <h3>{{this.model.description}}</h3>
    <p>
      Kind: {{this.model.kind}}
-      <br>Status: {{contribution-status this.model}}
+      <br>Status: {{item-status this.model}}
    </p>
    {{#if this.model.url}}
      <p>
@@ -0,0 +1,13 @@
+<main class="center-column">
+
+  <section id="add-item">
+    <header>
+      <h2>Submit a Reimbursement</h2>
+    </header>
+
+    <div class="content">
+      <AddReimbursement @attributes={{this.model.params}} />
+    </div>
+  </section>
+
+</main>
@@ -2,7 +2,6 @@
 // Code from https://github.com/HeroicEric/ember-group-by (MIT licensed)
 //
 import { A } from '@ember/array';
-import { get } from '@ember/object';
 import { isPresent } from '@ember/utils';

 export default function groupBy (collection, property) {
@@ -11,11 +10,11 @@ export default function groupBy (collection, property) {

  if (items) {
    items.forEach(function(item) {
-      let value = get(item, property);
+      let value = item[property];
      let group = groups.findBy('value', value);

      if (isPresent(group)) {
-        get(group, 'items').push(item);
+        group.items.push(item);
      } else {
        group = { property: property, value: value, items: [item] };
        groups.push(group);
@@ -0,0 +1,8 @@
+export default function isValidAmount(inputAmount) {
+  const amount = parseFloat(inputAmount);
+  if (Number.isNaN(amount)) {
+    return false;
+  } else {
+    return amount > 0;
+  }
+}
@@ -1,4 +1,4 @@
-export default function processContributionData(data) {
+export default function processContributionData(data, options={}) {
  const processed = {}

  if (data.confirmedAtBlock && (typeof data.confirmedAtBlock.toNumber === 'function')) {
@@ -8,14 +8,17 @@ export default function processContributionData(data) {
  }

  const otherProperties = [
-    'id', 'contributorId', 'amount', 'vetoed',
-    'ipfsHash', 'kind', 'description', 'details',
-    'url', 'date', 'time', 'pendingTx'
+    'id', 'contributorId', 'amount', 'vetoed', 'ipfsHash', 'kind',
+    'description', 'url', 'date', 'time', 'pendingTx'
  ];

  otherProperties.forEach(prop => {
    processed[prop] = data[prop];
  });

+  if (options.includeDetails) {
+    processed.details = data.details;
+  }
+
  return processed;
 }
@@ -1,13 +1,12 @@
 export default function processContributorData(data) {
  const processed = {
-    id: data.id.toString(),
    balance: data.balanceInt,
    totalKreditsEarned: data.totalKreditsEarned,
    contributionsCount: data.contributionsCount?.toNumber()
  }

  const otherProperties = [
-    'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
+    'id', 'account', 'accounts', 'ipfsHash', 'isCore', 'kind', 'name', 'url',
    'github_username', 'github_uid', 'wiki_username', 'zoom_display_name'
  ];

@@ -0,0 +1,22 @@
+export default function processReimbursementData(data) {
+  const processed = {
+    amount: data.amount.toNumber()
+  }
+
+  if (data.confirmedAtBlock && (typeof data.confirmedAtBlock.toNumber === 'function')) {
+    processed.confirmedAt = data.confirmedAtBlock.toNumber();
+  } else if (data.confirmedAt !== 'undefined') {
+    processed.confirmedAt = data.confirmedAt;
+  }
+
+  const otherProperties = [
+    'id', 'recipientId', 'token', 'vetoed', 'ipfsHash',
+    'expenses', 'pendingTx'
+  ];
+
+  otherProperties.forEach(prop => {
+    processed[prop] = data[prop];
+  });
+
+  return processed;
+}
@@ -0,0 +1,8 @@
+export default function (file) {
+  const reader = new FileReader();
+  return new Promise((resolve, reject) => {
+    reader.onload = event => resolve(event.target.result)
+    reader.onerror = error => reject(error)
+    reader.readAsText(file)
+  })
+}
@@ -25,18 +25,9 @@ module.exports = function(environment) {
      // when it is created
    },

-    browserify: {
-      tests: true,
-      transform: [
-        ["babelify", {
-          presets: ["es2015"],
-          global: true
-        }]
-      ]
-    },
-
-    web3ProviderUrl: 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9',
-    web3RequiredNetwork: 'rinkeby',
+    web3ProviderUrl: 'https://rsk-testnet.kosmos.org',
+    web3RequiredChainId: 31,
+    web3RequiredNetworkName: 'RSK Testnet',

    githubConnectUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/connect/github',
    githubSignupUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/github',
@@ -46,7 +37,17 @@ module.exports = function(environment) {
      port: '5444',
      protocol: 'https',
      gatewayUrl: 'https://ipfs.kosmos.org/ipfs'
-    }
+    },
+
+    tokens: {
+      // TODO this is still the WBTC address, since contracts currently
+      // requires a token address for reimbursements
+      'BTC': '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599'
+    },
+
+    btcBalanceAPI: 'https://api.kosmos.org/kredits/onchain_btc_balance',
+
+    corsProxy: 'https://cors.5apps.com/?uri='
  };

  if (environment === 'development') {
@@ -55,7 +56,6 @@ module.exports = function(environment) {
    // ENV.APP.LOG_TRANSITIONS = true;
    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
    // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.web3ProviderUrl = 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9';

    ENV.githubConnectUrl = 'http://localhost:8888/kredits/signup/connect/github';
    ENV.githubSignupUrl = 'http://localhost:8888/kredits/signup/github';
@@ -82,13 +82,7 @@ module.exports = function(environment) {

  if (process.env.WEB3_PROVIDER_URL) {
    ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
-    ENV.web3RequiredNetwork = null;
-  }
-  if (process.env.KREDITS_DAO_ADDRESS) {
-    ENV.kreditsKernelAddress = process.env.KREDITS_DAO_ADDRESS;
-  }
-  if (process.env.KREDITS_APM_DOMAIN) {
-    ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN;
+    ENV.web3RequiredChainId = null;
  }

  return ENV;
@@ -17,12 +17,12 @@ module.exports = function(defaults) {
      webpack: {
        module: {
          rules: [
-            {
-              // inline json files instead of using fs.readFileSync
-              enforce: 'post',
-              test: /kosmos-schemas\/index\.js$/,
-              loader: 'transform-loader?brfs'
-            }
+            // {
+            //   // inline json files instead of using fs.readFileSync
+            //   enforce: 'post',
+            //   test: /kosmos-schemas\/index\.js$/,
+            //   loader: 'transform-loader?brfs'
+            // }
          ]
        },
        node: {
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true
+  }
+}
@@ -1,6 +1,6 @@
 {
  "name": "kredits-web",
-  "version": "1.17.0",
+  "version": "2.0.0-beta.2",
  "private": true,
  "description": "Contribution dashboard of the Kosmos project",
  "repository": "https://github.com/67P/kredits-web",
@@ -17,7 +17,7 @@
    "start": "ember serve",
    "test": "npm-run-all lint:* test:*",
    "test:ember": "ember test",
-    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember serve",
+    "start:local": "WEB3_PROVIDER_URL=http://localhost:8545 ember serve",
    "build": "ember build --environment=production",
    "build-prod": "rm -rf release/* && ember build -prod --output-path release",
    "preversion": "npm test",
@@ -26,16 +26,15 @@
    "deploy": "git push 5apps master"
  },
  "devDependencies": {
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/plugin-proposal-decorators": "^7.19.3",
    "@ember/optional-features": "^1.3.0",
    "@glimmer/component": "^1.0.0",
    "@glimmer/tracking": "^1.0.0",
-    "@kosmos/schemas": "^2.2.1",
-    "babel-eslint": "^10.1.0",
+    "@kredits/contracts": "^7.0.1",
    "babel-preset-es2015": "^6.22.0",
-    "babelify": "^7.3.0",
-    "brfs": "^2.0.2",
    "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.5.3",
+    "ember-auto-import": "^1.12.1",
    "ember-awesome-macros": "0.41.0",
    "ember-cli": "~3.18.0",
    "ember-cli-app-version": "^3.2.0",
@@ -49,6 +48,7 @@
    "ember-cli-sri": "^2.1.1",
    "ember-cli-uglify": "^3.0.0",
    "ember-concurrency": "^1.1.7",
+    "ember-concurrency-decorators": "^2.0.1",
    "ember-export-application-global": "^2.0.1",
    "ember-fetch": "^8.0.1",
    "ember-flatpickr": "^2.16.2",
@@ -61,12 +61,12 @@
    "ember-resolver": "^8.0.0",
    "ember-source": "~3.18.0",
    "ember-template-lint": "^2.8.0",
-    "ember-truth-helpers": "github:jmurphyau/ember-truth-helpers#31a14373a31f1f82c77537720549b47a95c28e5f",
-    "eslint": "^7.1.0",
-    "eslint-plugin-ember": "^8.5.2",
+    "ember-truth-helpers": "^3.0.0",
+    "eslint": "^8.14.0",
+    "eslint-plugin-ember": "^11.0.6",
    "eslint-plugin-node": "^11.1.0",
-    "ethers": "^4.0.47",
-    "kredits-contracts": "^5.5.0",
+    "ethers": "^5.4.7",
+    "fetch-mock": "^9.10.7",
    "loader.js": "^4.7.0",
    "localforage": "^1.7.3",
    "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3",
@@ -75,10 +75,10 @@
    "sass": "^1.26.7",
    "transform-loader": "^0.2.4",
    "tv4": "^1.3.0",
-    "web3-utils": "^1.2.8"
+    "web3-utils": "^1.7.3"
  },
  "engines": {
-    "node": "10.* || >= 12"
+    "node": ">= 14"
  },
  "ember": {
    "edition": "octane"
@@ -0,0 +1,7 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(0.00630876,-0.00301984)">
+<path fill="#f7931a" d="m63.033,39.744c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z"/>
+<path fill="#FFF" d="m46.103,27.444c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z"/>
+</g>
+</svg>
@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"auto-import-fastboot.js"}
@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=auto-import-fastboot-81f919f3d82c38703c7b0de8c4c4a874.map
@@ -0,0 +1,7 @@
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<g transform="translate(0.00630876,-0.00301984)">
+<path fill="#f7931a" d="m63.033,39.744c-4.274,17.143-21.637,27.576-38.782,23.301-17.138-4.274-27.571-21.638-23.295-38.78,4.272-17.145,21.635-27.579,38.775-23.305,17.144,4.274,27.576,21.64,23.302,38.784z"/>
+<path fill="#FFF" d="m46.103,27.444c0.637-4.258-2.605-6.547-7.038-8.074l1.438-5.768-3.511-0.875-1.4,5.616c-0.923-0.23-1.871-0.447-2.813-0.662l1.41-5.653-3.509-0.875-1.439,5.766c-0.764-0.174-1.514-0.346-2.242-0.527l0.004-0.018-4.842-1.209-0.934,3.75s2.605,0.597,2.55,0.634c1.422,0.355,1.679,1.296,1.636,2.042l-1.638,6.571c0.098,0.025,0.225,0.061,0.365,0.117-0.117-0.029-0.242-0.061-0.371-0.092l-2.296,9.205c-0.174,0.432-0.615,1.08-1.609,0.834,0.035,0.051-2.552-0.637-2.552-0.637l-1.743,4.019,4.569,1.139c0.85,0.213,1.683,0.436,2.503,0.646l-1.453,5.834,3.507,0.875,1.439-5.772c0.958,0.26,1.888,0.5,2.798,0.726l-1.434,5.745,3.511,0.875,1.453-5.823c5.987,1.133,10.489,0.676,12.384-4.739,1.527-4.36-0.076-6.875-3.226-8.515,2.294-0.529,4.022-2.038,4.483-5.155zm-8.022,11.249c-1.085,4.36-8.426,2.003-10.806,1.412l1.928-7.729c2.38,0.594,10.012,1.77,8.878,6.317zm1.086-11.312c-0.99,3.966-7.1,1.951-9.082,1.457l1.748-7.01c1.982,0.494,8.365,1.416,7.334,5.553z"/>
+</g>
+</svg>
@@ -8,10 +8,10 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

    
-<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%221.17.0%2B733e5e36%22%7D%2C%22browserify%22%3A%7B%22tests%22%3Atrue%2C%22transform%22%3A%5B%5B%22babelify%22%2C%7B%22presets%22%3A%5B%22es2015%22%5D%2C%22global%22%3Atrue%7D%5D%5D%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frinkeby.infura.io%2Fv3%2Fd4f788b7a6584f7db2fc3c268d4d09e9%22%2C%22web3RequiredNetwork%22%3A%22rinkeby%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<meta name="kredits-web/config/environment" content="%7B%22modulePrefix%22%3A%22kredits-web%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_DEFAULT_ASYNC_OBSERVERS%22%3Atrue%2C%22_JQUERY_INTEGRATION%22%3Afalse%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22name%22%3A%22kredits-web%22%2C%22version%22%3A%222.0.0-beta.2%2B62b618b6%22%7D%2C%22web3ProviderUrl%22%3A%22https%3A%2F%2Frsk-testnet.kosmos.org%22%2C%22web3RequiredChainId%22%3A31%2C%22web3RequiredNetworkName%22%3A%22RSK%20Testnet%22%2C%22githubConnectUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fconnect%2Fgithub%22%2C%22githubSignupUrl%22%3A%22https%3A%2F%2Fhal8000.chat.kosmos.org%2Fkredits%2Fsignup%2Fgithub%22%2C%22ipfs%22%3A%7B%22host%22%3A%22ipfs.kosmos.org%22%2C%22port%22%3A%225444%22%2C%22protocol%22%3A%22https%22%2C%22gatewayUrl%22%3A%22https%3A%2F%2Fipfs.kosmos.org%2Fipfs%22%7D%2C%22tokens%22%3A%7B%22BTC%22%3A%220x2260fac5e5542a773aa44fbcfedf7c193bc2c599%22%7D%2C%22btcBalanceAPI%22%3A%22https%3A%2F%2Fapi.kosmos.org%2Fkredits%2Fonchain_btc_balance%22%2C%22corsProxy%22%3A%22https%3A%2F%2Fcors.5apps.com%2F%3Furi%3D%22%2C%22exportApplicationGlobal%22%3Afalse%7D" />

    <link integrity="" rel="stylesheet" href="/assets/vendor-ca96b2e19fc9f356e3dbad90c9f3f323.css">
-    <link integrity="" rel="stylesheet" href="/assets/kredits-web-f225d49328a14feac0888a2126087423.css">
+    <link integrity="" rel="stylesheet" href="/assets/kredits-web-429511daa3257050f23812f202a534ee.css">

    

@@ -24,8 +24,8 @@
  <body>
    

-    <script src="/assets/vendor-c96bc8b15817400d8cb58a32671bab0c.js" integrity="sha256-vRS2UvkDzerqXqzdCMPtGtxCDFflTcDv9xfi/8NLKJw= sha512-GWfVwFu8LhNRJyijvRuow7f38ARQGGCU0uKzB7HwiX+pQF6Vw5zSfZHtlfZiucFImmb2uyxSexiXkh16ulShEw==" ></script>
-    <script src="/assets/kredits-web-b7d7786c26ec2d9d78fc58c35d4e9c59.js" integrity="sha256-IUbTJl1JYq98BlScoUafRjtznFRb4LOaGC0weMP0ycU= sha512-kzcGqMHh8+3DLnSeTwK3Mw6Nr+JZw0EEjfMGx+c/D1OkAVvuKXYmUKq1b5XgFw+lQ7cDkGLiAb4ud6O4DpT3Jg==" ></script>
+    <script src="/assets/vendor-4ee536ded971436a83d35253df25f2cb.js" integrity="sha256-yb+pC9iuZ8WcQwk9VuDNhSlWguL7BEABsEOEhBpwUC0= sha512-50LApx5XqeKHu/FMaljzqhAMPgkqSiy2rDhUcViYBcXWBBYmilFirup/iWvLiNCdfr5ct9wk7+tU9iShdSgDww==" ></script>
+    <script src="/assets/kredits-web-0a433c90d05ea3903308867e0d178f7f.js" integrity="sha256-kU8qbqT24o1tZj4xdYJzarfPFSfEmZr3JLu0g8pAmqk= sha512-gD6YmV3xDnwHJ2WU6yXNkUEiPScjdfM2S5eYwCrsfcsI4iJUG81z7IjUbwzstuZocKkCS5zt8Y84Hh84SdhSuw==" ></script>

    
  </body>
@@ -18,7 +18,7 @@ const data = [

 data.forEach(attrs => {
  const c = Model.create(processContributionData(attrs));
-  c.set('contributor', contributors.findBy('id', attrs.contributorId.toString()));
+  c.set('contributor', contributors.findBy('id', attrs.contributorId));
  items.push(c);
 });

@@ -4,9 +4,9 @@ import processContributorData from 'kredits-web/utils/process-contributor-data';
 const contributors = [];

 const data = [
-  { id: '1', name: 'Bumi', totalKreditsEarned: 11500, github_uid: 318 },
-  { id: '2', name: 'Râu Cao', totalKreditsEarned: 3000, github_uid: 842 },
-  { id: '3', name: 'Manuel', totalKreditsEarned: 0, github_uid: 54812 }
+  { id: 1, name: 'Bumi', totalKreditsEarned: 11500, github_uid: 318 },
+  { id: 2, name: 'Râu Cao', totalKreditsEarned: 3000, github_uid: 842 },
+  { id: 3, name: 'Manuel', totalKreditsEarned: 0, github_uid: 54812 }
 ];

 data.forEach(attrs => {
@@ -0,0 +1,8 @@
+import { getContext } from '@ember/test-helpers';
+
+export default function createComponent(lookupPath, named = {}) {
+  let { owner } = getContext();
+  let componentManager = owner.lookup('component-manager:glimmer');
+  let { class: componentClass } = owner.factoryFor(lookupPath);
+  return componentManager.createComponent(componentClass, { named });
+}
@@ -0,0 +1,15 @@
+// import { module, test } from 'qunit';
+// import { setupRenderingTest } from 'ember-qunit';
+// import { render } from '@ember/test-helpers';
+// import { hbs } from 'ember-cli-htmlbars';
+//
+// module('Integration | Component | add-expense-item', function(hooks) {
+//   setupRenderingTest(hooks);
+//
+//   test('it renders', async function(assert) {
+//     Set any properties with this.set('myProperty', 'value');
+//     Handle any actions with this.set('myAction', function(val) { ... });
+//     await render(hbs`<AddExpenseItem />`);
+//     assert.equal(this.element.textContent.trim(), '');
+//   });
+// });
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | add-reimbursement', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it works', async function(assert) {
+    await render(hbs`<AddReimbursement />`);
+    assert.ok(true);
+  });
+});
@@ -0,0 +1,13 @@
+// import { module, test } from 'qunit';
+// import { setupRenderingTest } from 'ember-qunit';
+// import { render } from '@ember/test-helpers';
+// import { hbs } from 'ember-cli-htmlbars';
+//
+// module('Integration | Component | budget-balances', function(hooks) {
+//   setupRenderingTest(hooks);
+//
+//   test('it renders', async function(assert) {
+//     await render(hbs`<BudgetBalances />`);
+//     assert.equal(this.element.textContent.trim(), '');
+//   });
+// });
@@ -16,8 +16,8 @@ module('Integration | Component | contribution-list', function(hooks) {
  });

  test('it renders filtered contributions', async function(assert) {
-    let service = this.owner.lookup('service:kredits');
-    service.set('contributors', contributors);
+    let kredits = this.owner.lookup('service:kredits');
+    kredits.set('contributors', contributors);

    this.set('fixtures', contributions);
    await render(hbs`{{contribution-list contributions=fixtures showQuickFilter=true}}`);
@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | reimbursement-list', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function(assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<ReimbursementList />`);
+
+    assert.equal(this.element.textContent.trim(), '');
+  });
+});
@@ -8,14 +8,14 @@ module('Integration | Component | user-avatar', function(hooks) {
  setupRenderingTest(hooks);

  test('it renders', async function(assert) {
-    this.set('bumi', contributors.findBy('id', '1'));
+    this.set('bumi', contributors.findBy('id', 1));
    await render(hbs`{{user-avatar contributor=bumi}}`);

    assert.dom(this.element).hasText('');
  });

  test('default image source URL', async function(assert) {
-    this.set('bumi', contributors.findBy('id', '1'));
+    this.set('bumi', contributors.findBy('id', 1));
    await render(hbs`{{user-avatar contributor=bumi}}`);

    assert.equal(this.element.querySelector('img').src,
@@ -23,7 +23,7 @@ module('Integration | Component | user-avatar', function(hooks) {
  });

  test('size-specific image source URLs', async function(assert) {
-    this.set('bumi', contributors.findBy('id', '1'));
+    this.set('bumi', contributors.findBy('id', 1));
    this.set('size', 'medium');

    await render(hbs`{{user-avatar contributor=bumi size=size}}`);
@@ -0,0 +1,20 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Helper | fmt-crypto-currency', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it converts Wei to RBTC', async function(assert) {
+    this.set('balanceRBTC', '500000000000000000');
+    await render(hbs`{{fmt-crypto-currency balanceRBTC "RBTC"}}`);
+    assert.equal(this.element.textContent.trim(), '0.5');
+  });
+
+  test('it converts Satoshis to BTC', async function(assert) {
+    this.set('balanceBTC', '117214976');
+    await render(hbs`{{fmt-crypto-currency balanceBTC "BTC"}}`);
+    assert.equal(this.element.textContent.trim(), '1.17214976');
+  });
+});
@@ -0,0 +1,22 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Helper | fmt-fiat-currency', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it returns the number formatted as currency', async function(assert) {
+    this.set('amount', 13.9);
+
+    await render(hbs`{{fmt-fiat-currency this.amount}}`);
+    assert.ok(this.element.textContent.trim().match(/13.90/),
+              'formats the number with two decimals');
+    assert.ok(this.element.textContent.trim().match(/EUR/),
+              'using EUR by default');
+
+    await render(hbs`{{fmt-fiat-currency this.amount 'USD'}}`);
+    assert.ok(this.element.textContent.trim().match(/USD/),
+              'using defined currency when given');
+  });
+});
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Helper | sats-to-btc', function(hooks) {
+  setupRenderingTest(hooks);
+
+  test('it converts satoshis to full BTC amounts', async function(assert) {
+    this.set('amount', '166800');
+
+    await render(hbs`{{sats-to-btc this.amount}}`);
+
+    assert.equal(this.element.textContent.trim(), '0.001668');
+  });
+});
@@ -2,6 +2,19 @@ import Application from '../app';
 import config from '../config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
+import fetchMock from 'fetch-mock';
+
+fetchMock.get(`${config.corsProxy}https://www.bitstamp.net/api/v2/ticker/btceur/`, {
+  "high": "9258.43", "last": "9165.14", "timestamp": "1601455909", "bid":
+  "9159.93", "vwap": "9167.57", "volume": "1542.54764854", "low": "9080.20",
+  "ask": "9165.14", "open": "9240.84"
+});
+
+fetchMock.get(`${config.corsProxy}https://www.bitstamp.net/api/v2/ticker/btcusd/`, {
+  "high": "10865.00", "last": "10714.62", "timestamp": "1601455914", "bid":
+  "10711.31", "vwap": "10749.70", "volume": "4460.32091975", "low": "10636.66",
+  "ask": "10715.99", "open": "10840.00"
+});

 setApplication(Application.create(config.APP));

@@ -0,0 +1,50 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+import createComponent from 'kredits-web/tests/helpers/create-component';
+
+const expenses = [
+  {
+    title: "Server rent",
+    description: "Dedicated server: andromeda.kosmos.org, April 2020",
+    currency: "EUR",
+    amount: 39.00,
+    date: "2020-05-06",
+    url: "https://wiki.kosmos.org/Infrastructure#Hetzner",
+    tags: ["infrastructure", "server", "hetzner"]
+  },
+  {
+    title: "Server rent",
+    description: "Dedicated server: centaurus.kosmos.org, April 2020",
+    currency: "EUR",
+    amount: 32.00,
+    date: "2020-05-06",
+    url: "https://wiki.kosmos.org/Infrastructure#Hetzner",
+    tags: ["infrastructure", "server", "hetzner"]
+  },
+  {
+    title: "Domain name kosmos.org",
+    currency: "USD",
+    amount: 59.00,
+    date: "2020-05-07",
+    tags: ["domain"]
+  }
+];
+
+module('Unit | Component | add-reimbursement', function(hooks) {
+  setupTest(hooks);
+
+  test('total sums of expenses in EUR and USD', function(assert) {
+    let component = createComponent('component:add-reimbursement');
+    component.expenses = expenses;
+    assert.equal(component.totalEUR, '71');
+    assert.equal(component.totalUSD, '59');
+  });
+
+  test('#updateTotalAmountFromFiat', async function(assert) {
+    let component = createComponent('component:add-reimbursement');
+    component.expenses = expenses;
+    await component.exchangeRates.fetchRates();
+    component.updateTotalAmountFromFiat();
+    assert.equal(component.total, '0.01323322', 'converts EUR and USD totals to BTC and rounds to 8 decimals');
+  });
+});
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | budget', function(hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function(assert) {
+    let controller = this.owner.lookup('controller:budget');
+    assert.ok(controller);
+  });
+});
@@ -2,11 +2,11 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import Contribution from 'kredits-web/models/contribution';

-module('Unit | Helper | contribution-status', function (hooks) {
+module('Unit | Helper | item-status', function (hooks) {
  setupTest(hooks);

  test('returns the appropriate status', function (assert) {
-    const contributionStatus = this.owner.factoryFor('helper:contribution-status').create();
+    const contributionStatus = this.owner.factoryFor('helper:item-status').create();
    const kredits = this.owner.lookup('service:kredits');

    kredits.set('currentBlock', 23000);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Râu Cao	ee664c06c1	2.0.0-beta.2	2023-01-11 12:44:32 +08:00
Râu Cao	62b618b657	Add type to button element	2023-01-11 12:42:15 +08:00
Râu Cao	348dc03429	Merge pull request #209 from 67P/feature/veto_reimbursements Finish Reimbursement UI (MVP)	2023-01-09 11:34:37 +08:00
Râu Cao	d159fca816	Add todo note to async action	2023-01-09 11:31:31 +08:00
Râu Cao	a582f41fde	Cache reimbursement data on incoming events	2022-12-31 15:07:02 +07:00
Râu Cao	2082b51c5b	Add expenses from file Allow to upload a JSON file containing a list of expense items	2022-12-31 15:05:36 +07:00
Râu Cao	e543708b42	Add IPFS inspect button to reimbursements	2022-12-31 12:20:59 +07:00
Râu Cao	0b0dea095f	Reject empty tag strings	2022-12-31 12:20:27 +07:00
Râu Cao	c7eb81450c	Allow to veto reimbursements	2022-12-30 22:26:32 +07:00
Râu Cao	ca1ccf6d93	Formatting	2022-12-30 22:25:50 +07:00
Râu Cao	0b79d48be9	Merge pull request #208 from 67P/bugfix/204-reimbursement_form Fix timezone issue in expense item form	2022-12-30 22:24:43 +07:00
Râu Cao	f8cc453d7e	Fix timezone issue in expense item form Dates being added with 00:00 time still carry the timezone set for the OS/browser, and thus get changed to the previous day when in a positive offset zone. This change removes the timezone offset entirely when adding the line item, so that the chosen date is always assumed to be in UTC time. fixes #204	2022-12-30 22:20:16 +07:00
Râu Cao	08bedda288	2.0.0-beta.1	2022-11-14 15:56:57 +01:00
Râu Cao	7c8ca45b27	Merge pull request #205 from 67P/feature/improve_caching Improve caching, fix Firefox private mode usage	2022-11-14 15:48:33 +01:00
Râu Cao	ff3fe49dd0	Wording	2022-11-11 21:11:17 +01:00
Râu Cao	92056517a6	Cache contribution vetos Fixes potentially not marking contributions as vetoed if there's no incoming event after loading the app. Also improves performance either way.	2022-11-11 21:11:17 +01:00
Râu Cao	11f19c8344	Refactor adding new contributions from events Fixes contributions not being added when not already in memory (from creation). Simplifies the entire function.	2022-11-11 21:11:13 +01:00
Râu Cao	0f8d7d84ca	Don't cache contribution details in browser storage	2022-11-11 17:02:45 +01:00
Râu Cao	e1780109aa	Merge pull request #203 from 67P/feature/rsk-testnet Migrate/switch to RSK testnet	2022-11-11 17:01:36 +01:00
Râu Cao	8c2f6aa38b	Update Travis CI config	2022-11-11 16:57:51 +01:00
Râu Cao	afbce03a4a	Adapt test for rsk storage namespace	2022-11-11 16:38:39 +01:00
Râu Cao	1f2dd9d198	Use new @kredits/contracts	2022-11-03 16:57:55 +01:00
Râu Cao	e4814923f9	Update contracts module branch	2022-10-31 12:48:49 +01:00
Râu Cao	ad015f1cee	Use required chain ID and network name Use the chain ID when loading the web3 wallet/provider, and use the network name for the localstorage namespace.	2022-10-24 16:45:02 +02:00
Râu Cao	0c5aebf7b4	WIP Migrate to RSK testnet	2022-10-24 16:30:38 +02:00
Râu Cao	52f7e86fc9	Merge pull request #202 from 67P/chore/fix_js_linting Fix ESLint setup	2022-10-06 16:29:52 +02:00
Râu Cao	fb66bd4f0d	Fix some linter errors and warnings	2022-10-06 12:29:57 +02:00
Râu Cao	19553b9777	Fix eslint setup babel-eslint isn't working with node 16 anymore In addition to the new packages, also turn the remaining Ember errors into warnings, so we can fix them without `npm test` failing in the meantime.	2022-10-06 12:29:03 +02:00
Râu Cao	441dc21894	Merge pull request #201 from 67P/update-for-new-amounts Fix for new Contribution#totalKreditsEarned type	2022-10-06 12:26:09 +02:00
bumi	0732911e13	Cleanup	2022-10-06 11:03:50 +02:00
bumi	57934ae7a3	Fix for new Contribution#totalKreditsEarned type totalKreditsEarned is no longer a Big number but now already a number. I think this is due to the change of the denomination.	2022-10-06 10:52:22 +02:00
basti	1e240b6539	Merge pull request #199 from 67P/chore/rename_recipient_for_reimbursements Rename contributorId to recipientId	2022-06-12 07:17:47 +02:00
basti	2c773c147a	Merge pull request #200 from 67P/feature/wbtc_to_btc Switch from ETH/WBTC to BTC	2022-06-12 07:17:17 +02:00
basti	e05449a7ff	Show wallet balance for BTC instead of Gnosis Safe	2022-05-24 16:19:26 +02:00
basti	44b631c688	Switch from ETH/WBTC to RBTC/BTC	2022-05-22 17:04:28 +02:00
basti	6cd62d3764	Fix looking up contributor by ID string	2022-05-22 17:03:31 +02:00
basti	4c749bca35	Use integer for contributor ID everywhere closes #145	2022-05-21 18:16:26 +02:00
basti	466354cff7	Update/improve README Especially the local-contracts part.	2022-05-01 14:19:45 +02:00
basti	721c330f3c	WIP Rename contributorId to recipientId	2022-04-27 18:17:33 +02:00
basti	d07963ad6b	Merge pull request #198 from 67P/chore/dependencies Upgrade dependencies, fix contracts linking	2022-04-27 18:17:20 +02:00
basti	eef9fa1aba	Refactor kredits setup code a bit	2022-04-27 18:15:12 +02:00
basti	77dbde8bb4	Update dependencies, build configs	2022-04-27 18:14:56 +02:00
basti	64bd2477c7	Merge pull request #195 from 67P/feature/expenses Introduce budget, reimbursements for expenses	2021-06-03 16:23:45 +02:00
basti	aed29ff982	Remove obsolete property from class and template Co-authored-by: Garret Alfert <alfert@wevelop.de>	2020-11-17 13:40:44 +01:00
basti	f3f158ff26	Update app/services/kredits.js Co-authored-by: Garret Alfert <alfert@wevelop.de>	2020-11-17 13:38:47 +01:00
basti	2a8fd3b001	Update app/components/topbar-account-panel/component.js Co-authored-by: Garret Alfert <alfert@wevelop.de>	2020-11-17 12:47:43 +01:00
basti	087cb706d2	Fix JS linting errors	2020-10-31 13:30:44 +01:00
basti	b58870a03c	Octanify add-reimbursement syntax Fixes linter errors	2020-10-31 13:05:40 +01:00
basti	ccda6ec354	Reset BTC amount to 0 when last expense item removed Fix a logical bug that prevented setting the amount to 0 upon removing the last item from the list/form.	2020-10-31 12:58:03 +01:00
basti	2045b94951	Allow HTML comments, remove obsolete comment	2020-10-31 12:49:29 +01:00
basti	be16a57043	Octanify add-expense-item syntax Fixes linter errors	2020-10-31 12:49:03 +01:00
basti	ae06385039	Improve mobile layout of budget view a bit	2020-10-31 12:21:31 +01:00
basti	7b1c3c813c	Finish reimbursement loading and sync	2020-10-30 15:26:32 +01:00
basti	ec50e7deef	Fix small layout issue with token amounts Wasn't enough space for longer amounts	2020-10-30 15:03:54 +01:00
basti	c3b1bd2f4c	Make font sizes more consistent	2020-10-30 15:03:45 +01:00
basti	93e2a23ac7	WIP reimbursement sync	2020-10-09 15:40:46 +02:00
basti	a41d1b1dbd	Handle incoming and vetoed reimbursements	2020-10-09 15:09:35 +02:00
basti	c0ccf83061	Don't allow form submission unless connected and core	2020-10-09 14:41:10 +02:00
basti	4ab5c3c372	Listen to tx status of submitted reimbursements	2020-10-09 14:29:53 +02:00
basti	5d4fb1c423	Fix reimbursement handling after creation	2020-10-01 17:23:22 +02:00
basti	361ccb103d	Remove commented code	2020-10-01 12:58:07 +02:00
basti	2bf590886c	Fix newly created contributions not showing It's trying to use a non-existing block number to calculate confirmedAtBlock, which then fails the filter to be shown.	2020-10-01 12:50:18 +02:00
basti	c7b6f9e3e7	Submit reimbursements	2020-10-01 12:48:01 +02:00
basti	c1eb93c596	Mark input fields as valid when re-submitting form	2020-09-30 16:57:10 +02:00
basti	d85235ff88	Remove obsolete template code	2020-09-30 16:51:22 +02:00
basti	63675a1e13	Convert fiat totals to BTC and add to total amount	2020-09-30 16:46:35 +02:00
basti	87bc8f5cb5	Visualize disabled input fields by greying out text	2020-09-30 16:06:57 +02:00
basti	4abc1593cb	Add total sums of EUR/USD expenses	2020-09-30 16:04:53 +02:00
basti	25b2a8b0e5	Create exchange rate service , use CORS proxy for requests	2020-09-30 15:03:55 +02:00
basti	b5700092a8	Add util for fetching bitcoin exchange rate	2020-09-30 12:10:21 +02:00
basti	7288d75237	Don't load more reimbursements when already loaded	2020-09-30 10:32:36 +02:00
basti	444ec62a66	Validate expense/reimbursement forms Adds some general helpers and styles for minimalistic form validation.	2020-09-29 19:31:58 +02:00
basti	326d46b1a1	Validate total amount	2020-09-29 18:09:48 +02:00
basti	083c873631	Scroll to current item; remove some obsolete code	2020-09-29 17:59:00 +02:00
basti	37dc91da57	Clearly highlight focused buttons	2020-09-29 17:59:00 +02:00
basti	7c86edcaaa	Remove expense item from list	2020-09-29 17:59:00 +02:00
basti	e4d2fdfce4	WIP Reimbursements/expenses	2020-09-29 17:58:38 +02:00
basti	4722064337	WIP expense items	2020-09-28 11:46:55 +02:00
basti	9f35add07f	WIP Reimbursement UI	2020-09-10 16:28:01 +02:00
basti	e86541574d	Format and round the USD value of balances	2020-08-13 16:30:39 +02:00
basti	5f90bc23bc	Dynamically load all balances from Safe	2020-08-13 16:13:50 +02:00
basti	1dd63b2c7a	Basic styles for budget balances	2020-08-13 15:43:51 +02:00
basti	f1bd20a6f4	Add helper for formatting cryptocurrencies	2020-08-13 15:19:17 +02:00
basti	ec6b72008d	Add whitespace between reimbursement items in list They're a bit difficult to scan otherwise.	2020-08-13 14:58:49 +02:00
basti	dec71c6f4f	Load community funds balances from mainnet Gnosis Safe	2020-08-13 00:27:40 +02:00
basti	52172ea065	add-reimbursement component	2020-08-12 22:53:08 +02:00
basti	f63d14d7b4	Move sorted contributors to kredits service	2020-08-12 22:51:52 +02:00
basti	ef0fc11edf	Add reimbursement form route and component	2020-07-25 18:24:16 +02:00
basti	083334ed18	Don't redirect to dashboard after connecting web3 account	2020-07-25 18:23:55 +02:00
basti	69a6c850bf	Convert route to class	2020-07-25 18:22:02 +02:00
basti	8074d2d0e3	Hide empty sections in budget	2020-07-10 13:01:06 +02:00
basti	11c3078b55	Style reimbursement list items	2020-07-09 23:53:06 +02:00
basti	fb267813fb	Introduce item-list CSS, move item colors to variables	2020-07-09 22:41:11 +02:00
basti	a96cca879d	Use browser's locale for currency format	2020-07-09 22:15:25 +02:00
basti	4849a755dc	Render currencies etc.	2020-07-09 17:07:05 +02:00
basti	eaac245f4e	WIP Basic reimbursement lists	2020-07-09 15:46:20 +02:00
basti	95743330e4	WIP Generic data handling and caching Add basic support for reimbursements via new, generic data handling functions.	2020-06-27 16:35:45 +02:00
basti	4a9dd5ff09	Re-organize functions of kredits service	2020-06-27 14:01:05 +02:00
basti	3b127b0e81	WIP Budget route and basic layout	2020-06-27 13:36:28 +02:00
basti	769317777c	Refactor routes * Add specific dashboard route * Port application route to Octane * Fetch/sync contributors in application route, but only sync contributions in dashboard route for now	2020-06-27 13:36:02 +02:00
				`@@ -1 +0,0 @@`
				`{"version":3,"sources":[],"names":[],"mappings":"","file":"auto-import-fastboot.js"}`
				`@@ -1,2 +0,0 @@`

				`//# sourceMappingURL=auto-import-fastboot-81f919f3d82c38703c7b0de8c4c4a874.map`