From 7348b0ca41a5eb7c70c736480f77d086907c63ea Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 29 Dec 2015 10:46:50 +0100 Subject: [PATCH] Chrome Webstore Link --- extension/background/wallet.js | 7 --- extension/background/wallet.ts | 10 +--- extension/popup/transactions.html | 98 +++++++++++++++++-------------- 3 files changed, 55 insertions(+), 60 deletions(-) diff --git a/extension/background/wallet.js b/extension/background/wallet.js index 9f62c29f5..fc84fdfb0 100644 --- a/extension/background/wallet.js +++ b/extension/background/wallet.js @@ -201,13 +201,6 @@ function executePay(db, offer, payCoinInfo, merchantBaseUrl, chosenMint) { }); } function confirmPay(db, detail, sendResponse) { - console.log("confirmPay", JSON.stringify(detail)); - let tx = db.transaction(['transactions'], 'readwrite'); - let trans = { - contractHash: detail.offer.H_contract, - contract: detail.offer.contract, - sig: detail.offer - }; let offer = detail.offer; getPossibleMintCoins(db, offer.contract.amount, offer.contract.max_fee, offer.contract.mints) .then((mcs) => { diff --git a/extension/background/wallet.ts b/extension/background/wallet.ts index f8f75b16f..1abd09fd8 100644 --- a/extension/background/wallet.ts +++ b/extension/background/wallet.ts @@ -21,7 +21,7 @@ interface AmountJson { value: number; - fraction: number; + fraction: number currency: string; } @@ -304,14 +304,6 @@ function executePay(db, function confirmPay(db, detail: ConfirmPayRequest, sendResponse) { - console.log("confirmPay", JSON.stringify(detail)); - let tx = db.transaction(['transactions'], 'readwrite'); - let trans = { - contractHash: detail.offer.H_contract, - contract: detail.offer.contract, - sig: detail.offer - }; - let offer: Offer = detail.offer; getPossibleMintCoins(db, offer.contract.amount, diff --git a/extension/popup/transactions.html b/extension/popup/transactions.html index 87e3ec445..e575f0227 100644 --- a/extension/popup/transactions.html +++ b/extension/popup/transactions.html @@ -1,52 +1,62 @@ - - - - - - + + + + + - - + -
- - - - - - - - - - - - - + -

- There are no transactions to show. -

-
+ + - +
+ + + + + + + + + + + + + + +

+ There are no transactions to show. +

+
+ +