From d2f1cb3234cbeca88903efcfd0d7d406fbece53c Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 26 Jan 2016 17:21:17 +0100
Subject: fix #4153 and #0004154

---
 extension/lib/wallet/wxmessaging.ts | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'extension/lib/wallet/wxmessaging.ts')

diff --git a/extension/lib/wallet/wxmessaging.ts b/extension/lib/wallet/wxmessaging.ts
index eb9f165db..0ec07dfe1 100644
--- a/extension/lib/wallet/wxmessaging.ts
+++ b/extension/lib/wallet/wxmessaging.ts
@@ -98,8 +98,8 @@ function makeHandlers(wallet) {
             .then((r) => {
               sendResponse({
                              success: true,
-                             payUrl: r.payUrl,
-                             payReq: r.payReq
+                             payReq: r.payReq,
+                             contract: r.contract,
                            });
             })
             .catch((e) => {
@@ -113,14 +113,17 @@ function makeHandlers(wallet) {
     ["get-history"]: function(db, detail, sendResponse) {
       // TODO: limit history length
       wallet.getHistory()
-        .then((h) => {
-          sendResponse(h);
-        })
-        .catch((e) => {
-          console.error("exception during 'get-history'");
-          console.error(e.stack);
-        });
+            .then((h) => {
+              sendResponse(h);
+            })
+            .catch((e) => {
+              console.error("exception during 'get-history'");
+              console.error(e.stack);
+            });
       return true;
+    },
+    ["error-fatal"]: function(db, detail, sendResponse) {
+      console.log("fatal error from page", detail.url);
     }
   };
 }
-- 
cgit v1.2.3