3 files changed, 10 insertions, 31 deletions
diff --git a/extension/lib/wallet/wallet.ts b/extension/lib/wallet/wallet.ts
index f5db93c91..788d3f6c6 100644
--- a/extension/lib/wallet/wallet.ts
+++ b/extension/lib/wallet/wallet.ts
@@ -554,16 +554,19 @@ export class Wallet {
    * but do not send them yet.
    */
   confirmPay(offer: Offer): Promise<any> {
+    console.log("executing confirmPay");
     return Promise.resolve().then(() => {
       return this.getPossibleMintCoins(offer.contract.amount,
                                        offer.contract.max_fee,
                                        offer.contract.mints)
     }).then((mcs) => {
       if (Object.keys(mcs).length == 0) {
+        console.log("not confirming payment, insufficient coins");
         return {
           error: "coins-insufficient",
         };
       }
+      console.log("about to record ...");
       let mintUrl = Object.keys(mcs)[0];
       let ds = Wallet.signDeposit(offer, mcs[mintUrl]);
       return this.recordConfirmPay(offer, ds, mintUrl)
@@ -738,27 +741,6 @@ export class Wallet {
       });
   }
 
-
-  updateBadge() {
-    function countNonEmpty(c, n) {
-      if (c.currentAmount.fraction != 0 || c.currentAmount.value != 0) {
-        return n + 1;
-      }
-      return n;
-    }
-
-    function doBadge(n) {
-      this.badge.setText(n.toString());
-      this.badge.setColor("#0F0");
-    }
-
-    Query(this.db)
-      .iter("coins")
-      .reduce(countNonEmpty, 0)
-      .then(doBadge.bind(this));
-  }
-
-
   storeCoin(coin: Coin): Promise<void> {
     let historyEntry = {
       type: "withdraw",
@@ -771,10 +753,7 @@ export class Wallet {
       .delete("precoins", coin.coinPub)
       .add("coins", coin)
       .add("history", historyEntry)
-      .finish()
-      .then(() => {
-        this.updateBadge();
-      });
+      .finish();
   }
 
 
diff --git a/extension/lib/wallet/wxmessaging.js b/extension/lib/wallet/wxmessaging.js
index 8c74dab4e..c70bfb5a0 100644
--- a/extension/lib/wallet/wxmessaging.js
+++ b/extension/lib/wallet/wxmessaging.js
@@ -86,10 +86,11 @@ System.register(["./wallet", "./db", "./http"], function(exports_1, context_1) {
                 return true;
             },
             _a["confirm-pay"] = function (db, detail, sendResponse) {
+                console.log("in confirm-pay handler");
                 var offer = wallet_1.Offer.checked(detail.offer);
                 wallet.confirmPay(offer)
-                    .then(function () {
-                    sendResponse({});
+                    .then(function (r) {
+                    sendResponse(r);
                 })
                     .catch(function (e) {
                     console.error("exception during 'confirm-pay'");
@@ -138,7 +139,6 @@ System.register(["./wallet", "./db", "./http"], function(exports_1, context_1) {
             var badge = new ChromeBadge();
             var wallet = new wallet_1.Wallet(db, http, badge);
             var handlers = makeHandlers(wallet);
-            wallet.updateBadge();
             chrome.runtime.onMessage.addListener(function (req, sender, onresponse) {
                 if (req.type in handlers) {
                     return handlers[req.type](db, req.detail, onresponse);
diff --git a/extension/lib/wallet/wxmessaging.ts b/extension/lib/wallet/wxmessaging.ts
index b3bc5005d..ac2594500 100644
--- a/extension/lib/wallet/wxmessaging.ts
+++ b/extension/lib/wallet/wxmessaging.ts
@@ -92,10 +92,11 @@ function makeHandlers(wallet: Wallet) {
       return true;
     },
     ["confirm-pay"]: function(db, detail, sendResponse) {
+      console.log("in confirm-pay handler");
       const offer = Offer.checked(detail.offer);
       wallet.confirmPay(offer)
-            .then(() => {
-              sendResponse({})
+            .then((r) => {
+              sendResponse(r)
             })
             .catch((e) => {
               console.error("exception during 'confirm-pay'");
@@ -156,7 +157,6 @@ export function wxMain() {
       let badge = new ChromeBadge();
       let wallet = new Wallet(db, http, badge);
       let handlers = makeHandlers(wallet);
-      wallet.updateBadge();
       chrome.runtime.onMessage.addListener(
         function(req, sender, onresponse) {
           if (req.type in handlers) {