4 files changed, 17 insertions, 11 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 f5dd725f7..5464f637c 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 98acfebfc..5c35121e3 100644
--- a/extension/pages/confirm-create-reserve.js
+++ b/extension/pages/confirm-create-reserve.js
@@ -8,7 +8,7 @@ function updateAmount() {
   console.log("Query is " + JSON.stringify(query));
   let s = query.amount_str;
   if (!s) {
-    document.getElementById('main').innerHTML = "Oops, something went wrong.";
+    document.body.innerHTML = "Oops, something went wrong.";
     return;
   }
   showAmount.textContent = s;
@@ -29,7 +29,7 @@ document.addEventListener("DOMContentLoaded", (e) => {
       if (resp.success === true) {
         document.location.href = resp.backlink;
       } else {
-        document.getElementById('main').innerHTML =
+        document.body.innerHTML =
           `Oops, something went wrong.
            The bank responded with HTTP status code ${resp.status}.
            Here is some more info:
@@ -39,3 +39,5 @@ document.addEventListener("DOMContentLoaded", (e) => {
 
   });
 });
+
+