diff options
Diffstat (limited to 'extension/pages')
| -rw-r--r-- | extension/pages/confirm-contract.js | 10 | ||||
| -rw-r--r-- | extension/pages/confirm-contract.tsx | 11 | ||||
| -rw-r--r-- | extension/pages/confirm-create-reserve.html | 1 | ||||
| -rw-r--r-- | extension/pages/confirm-create-reserve.js | 75 |
4 files changed, 47 insertions, 50 deletions
diff --git a/extension/pages/confirm-contract.js b/extension/pages/confirm-contract.js index 60de27e90..2c12211f6 100644 --- a/extension/pages/confirm-contract.js +++ b/extension/pages/confirm-contract.js @@ -20,8 +20,7 @@ document.addEventListener("DOMContentLoaded", (e) => { console.dir(offer); let source = $_("contract-template").innerHTML; let template = Handlebars.compile(source); - let html = template(offer.contract); - $_("render-contract").innerHTML = html; + $_("render-contract").innerHTML = template(offer.contract); document.getElementById("confirm-pay").addEventListener("click", (e) => { console.log("Query:", JSON.stringify(query)); let d = { @@ -29,13 +28,16 @@ document.addEventListener("DOMContentLoaded", (e) => { merchantPageUrl: query.merchantPageUrl }; chrome.runtime.sendMessage({ type: 'confirm-pay', detail: d }, (resp) => { - console.log("got response", resp); - if ("error" in resp) { + if (!resp.success) { let source = $_("error-template").innerHTML; let template = Handlebars.compile(source); $_("status").innerHTML = template(resp); return; } + document.location.href = URI(d.offer.exec_url) + .absoluteTo(query.merchantPageUrl) + .addQuery({ H_contract: d.offer.H_contract }) + .href(); }); }); }); diff --git a/extension/pages/confirm-contract.tsx b/extension/pages/confirm-contract.tsx index 040f13ea3..968f5af7a 100644 --- a/extension/pages/confirm-contract.tsx +++ b/extension/pages/confirm-contract.tsx @@ -29,9 +29,7 @@ document.addEventListener("DOMContentLoaded", (e) => { let source = $_("contract-template").innerHTML; let template = Handlebars.compile(source); - let html = template(offer.contract); - - $_("render-contract").innerHTML = html; + $_("render-contract").innerHTML = template(offer.contract); document.getElementById("confirm-pay").addEventListener("click", (e) => { console.log("Query:", JSON.stringify(query)); @@ -40,13 +38,16 @@ document.addEventListener("DOMContentLoaded", (e) => { merchantPageUrl: query.merchantPageUrl }; chrome.runtime.sendMessage({type:'confirm-pay', detail: d}, (resp) => { - console.log("got response", resp); - if ("error" in resp) { + if (!resp.success) { let source = $_("error-template").innerHTML; let template = Handlebars.compile(source); $_("status").innerHTML = template(resp); return; } + document.location.href = URI(d.offer.exec_url) + .absoluteTo(query.merchantPageUrl) + .addQuery({H_contract: d.offer.H_contract}) + .href(); }); }); }); diff --git a/extension/pages/confirm-create-reserve.html b/extension/pages/confirm-create-reserve.html index d89fd0b13..be718da7d 100644 --- a/extension/pages/confirm-create-reserve.html +++ b/extension/pages/confirm-create-reserve.html @@ -4,6 +4,7 @@ <head> <title>Taler Wallet: Confirm Reserve Creation</title> <script src="../lib/URI.js"></script> + <script src="../lib/polyfill-react.js"></script> <script src="confirm-create-reserve.js"></script> <link rel="stylesheet" type="text/css" href="../style/wallet.css"> </head> diff --git a/extension/pages/confirm-create-reserve.js b/extension/pages/confirm-create-reserve.js index 5c35121e3..7c3a5a572 100644 --- a/extension/pages/confirm-create-reserve.js +++ b/extension/pages/confirm-create-reserve.js @@ -1,43 +1,36 @@ "use strict"; - -let url = URI(document.location.href); -let query = URI.parseQuery(url.query()); - -function updateAmount() { - let showAmount = document.getElementById("show-amount"); - console.log("Query is " + JSON.stringify(query)); - let s = query.amount_str; - if (!s) { - document.body.innerHTML = "Oops, something went wrong."; - return; - } - showAmount.textContent = s; -} - -function clone(obj) { - // This is faster than it looks ... - return JSON.parse(JSON.stringify(obj)); -} - -document.addEventListener("DOMContentLoaded", (e) => { - updateAmount(); - - document.getElementById("confirm").addEventListener("click", (e) => { - let d = clone(query); - d.mint = document.getElementById('mint-url').value; - chrome.runtime.sendMessage({type:'confirm-reserve', detail: d}, (resp) => { - if (resp.success === true) { - document.location.href = resp.backlink; - } else { - document.body.innerHTML = - `Oops, something went wrong. - The bank responded with HTTP status code ${resp.status}. - Here is some more info: - <pre>${resp.text}</pre>`; - } +var ConfirmCreateReserve; +(function (ConfirmCreateReserve) { + let url = URI(document.location.href); + let query = URI.parseQuery(url.query()); + function updateAmount() { + let showAmount = document.getElementById("show-amount"); + console.log("Query is " + JSON.stringify(query)); + let s = query.amount_str; + if (!s) { + document.body.innerHTML = "Oops, something went wrong."; + return; + } + showAmount.textContent = s; + } + function clone(obj) { + // This is faster than it looks ... + return JSON.parse(JSON.stringify(obj)); + } + document.addEventListener("DOMContentLoaded", (e) => { + updateAmount(); + document.getElementById("confirm").addEventListener("click", (e) => { + let d = clone(query); + d.mint = document.getElementById('mint-url').value; + chrome.runtime.sendMessage({ type: 'confirm-reserve', detail: d }, (resp) => { + if (resp.success === true) { + document.location.href = resp.backlink; + } + else { + document.body.innerHTML = + React.createElement("div", null, "Oops, something went wrong." + ' ' + "The bank responded with HTTP status code $", resp.status, "." + ' ' + "Here is some more info:", React.createElement("pre", null, resp.text), "`"); + } + }); + }); }); - - }); -}); - - +})(ConfirmCreateReserve || (ConfirmCreateReserve = {})); |