From 18904a4a6d7b59f7baaddbe36f68288987a346b2 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 2 Mar 2016 05:23:16 +0100
Subject: [PATCH] type error

---
 lib/wallet/wallet.ts | 5 +++--
 manifest.json        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts
index 0dc232bb0..8291f653a 100644
--- a/lib/wallet/wallet.ts
+++ b/lib/wallet/wallet.ts
@@ -862,15 +862,16 @@ export class Wallet {
   /**
    * Retrive the full event history for this wallet.
    */
-  getHistory(): Promise<any[]> {
+  getHistory(): Promise<any> {
     function collect(x, acc) {
       acc.push(x);
-      return {history: acc};
+      return acc;
     }
 
     return Query(this.db)
       .iter("history", {indexName: "timestamp"})
       .reduce(collect, [])
+      .then(acc => ({history: acc}));
   }
 
   checkRepurchase(contract: Contract): Promise<CheckRepurchaseResult> {
diff --git a/manifest.json b/manifest.json
index 03b15bcdb..54a5585ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "description": "Privacy preserving and transparent payments",
   "manifest_version": 2,
   "name": "GNU Taler Wallet (git)",
-  "version": "0.5.12",
+  "version": "0.5.14",
 
   "applications": {
     "gecko": {