aboutsummaryrefslogtreecommitdiff
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/background/wallet.js7
-rw-r--r--extension/background/wallet.ts10
-rw-r--r--extension/popup/transactions.html98
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 @@
<!DOCTYPE html>
<html>
- <head>
- <meta charset="utf-8">
- <link rel="stylesheet" href="popup.css" type="text/css">
- <script src="../lib/util.js" type="text/javascript"></script>
- <script src="transactions.js" type="text/javascript"></script>
- </head>
+<head>
+ <meta charset="utf-8">
+ <link rel="stylesheet" href="popup.css" type="text/css">
+ <script src="../lib/util.js" type="text/javascript"></script>
+ <script src="transactions.js" type="text/javascript"></script>
- <body>
- <div id="header" class="nav">
- <a href="balance-overview.html">Wallet</a>
- <a href="transactions.html" class="active">Transactions</a>
- <a href="reserves.html">Reserves</a>
- </div>
+ <script id="balance-template" type="text/x-handlebars-template">
+ {{#each transactions}}
+ bla
+ {{else}}
+ Looks like you didn't make any transactions. Get some
+ coins and <a>donate</a> something.
+ {{/each}}
+ </script>
- <div id="content">
- <table id="transactions-table" class="hidden">
- <thead>
- <tr>
- <th>Date</th>
- <th>Amount</th>
- <th>Status</th>
- <th></th>
- </tr>
- </thead>
- <tbody>
- <!--
- <tr>
- <td class="date">2015-12-21 13:37</td>
- <td class="amount">42 EUR</td>
- <td class="status">Completed</td>
- <td class="contract"><button>Contract</button></td>
- </tr>
- <tr>
- <td class="date">2015-12-22 10:01</td>
- <td class="amount">23 USD</td>
- <td class="status">Pending</td>
- <td class="contract"><button>Contract</button></td>
- </tr>
- -->
- </tbody>
- </table>
+</head>
- <p id="no-transactions">
- There are no transactions to show.
- </p>
- </div>
+<body>
+<div id="header" class="nav">
+ <a href="balance-overview.html">Wallet</a>
+ <a href="transactions.html" class="active">Transactions</a>
+ <a href="reserves.html">Reserves</a>
+</div>
- </body>
+<div id="content">
+ <table id="transactions-table" class="hidden">
+ <thead>
+ <tr>
+ <th>Date</th>
+ <th>Amount</th>
+ <th>Status</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ <!--
+ <tr>
+ <td class="date">2015-12-21 13:37</td>
+ <td class="amount">42 EUR</td>
+ <td class="status">Completed</td>
+ <td class="contract"><button>Contract</button></td>
+ </tr>
+ <tr>
+ <td class="date">2015-12-22 10:01</td>
+ <td class="amount">23 USD</td>
+ <td class="status">Pending</td>
+ <td class="contract"><button>Contract</button></td>
+ </tr>
+ -->
+ </tbody>
+ </table>
+
+ <p id="no-transactions">
+ There are no transactions to show.
+ </p>
+</div>
+
+</body>
</html>