aboutsummaryrefslogtreecommitdiff
path: root/extension/pages
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-01-24 03:30:54 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-01-24 03:30:54 +0100
commit53654b3622de38c6cca5d29f9969eb9a67caf8a0 (patch)
tree0f34658f03ef8489d10d5bcddc11c9b7a258895c /extension/pages
parentb8627813be56e04c18baf38885f3a3dc0fb7496c (diff)
downloadwallet-core-53654b3622de38c6cca5d29f9969eb9a67caf8a0.tar.xz
Redirect to bank page on reserve creation success
Fixes #4084.
Diffstat (limited to 'extension/pages')
-rw-r--r--extension/pages/confirm-create-reserve.js8
-rw-r--r--extension/pages/confirm-create-reserve.tsx15
-rw-r--r--extension/pages/reserve-success.html29
3 files changed, 6 insertions, 46 deletions
diff --git a/extension/pages/confirm-create-reserve.js b/extension/pages/confirm-create-reserve.js
index 8b0fdc536..193f496a6 100644
--- a/extension/pages/confirm-create-reserve.js
+++ b/extension/pages/confirm-create-reserve.js
@@ -28,14 +28,10 @@ var ConfirmCreateReserve;
}
showAmount.textContent = s;
}
- function clone(obj) {
- // This is faster than it looks ...
- return JSON.parse(JSON.stringify(obj));
- }
document.addEventListener("DOMContentLoaded", function (e) {
updateAmount();
document.getElementById("confirm").addEventListener("click", function (e) {
- var d = clone(query);
+ var d = Object.assign({}, query);
d.mint = document.getElementById('mint-url').value;
chrome.runtime.sendMessage({ type: 'confirm-reserve', detail: d }, function (resp) {
if (resp.success === true) {
@@ -43,7 +39,7 @@ var ConfirmCreateReserve;
}
else {
document.body.innerHTML =
- "\n Oops, something went wrong.\n The bank responded with HTTP status code " + resp.status + ".\n Here is some more info:\n <pre>" + resp.text + "</pre>\n </div>";
+ "Oops, something went wrong. It looks like the bank could not\n transfer funds to the mint. Please go back to your bank's website\n to check what happened.";
}
});
});
diff --git a/extension/pages/confirm-create-reserve.tsx b/extension/pages/confirm-create-reserve.tsx
index 325f3849c..38776ee6b 100644
--- a/extension/pages/confirm-create-reserve.tsx
+++ b/extension/pages/confirm-create-reserve.tsx
@@ -32,16 +32,12 @@ namespace ConfirmCreateReserve {
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);
+ let d = Object.assign({}, query);
d.mint = (document.getElementById('mint-url') as HTMLInputElement).value;
chrome.runtime.sendMessage({type:'confirm-reserve', detail: d},
(resp) => {
@@ -49,12 +45,9 @@ namespace ConfirmCreateReserve {
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>
- </div>`;
+ `Oops, something went wrong. It looks like the bank could not
+ transfer funds to the mint. Please go back to your bank's website
+ to check what happened.`;
}
});
diff --git a/extension/pages/reserve-success.html b/extension/pages/reserve-success.html
deleted file mode 100644
index 8d5c6aeb4..000000000
--- a/extension/pages/reserve-success.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-
-<html>
- <head>
- <title>Taler Wallet: Withdraw operation initiated</title>
- <link rel="stylesheet" type="text/css" href="../style/wallet.css">
- </head>
- <body>
-
- <header>
- <div id="logo"></div>
- <h1>Withdraw operation initiated</h1>
- </header>
-
- <aside class="sidebar" id="left">
- </aside>
-
- <section id="main">
-
- <article>
- <h1>Success!</h1>
-
- <p>We have started the process of withdrawing electronic coins. This process may take a bit, but will happen in the background. So you can now continue to browse.</p>
- <p>You can click on the Taler logo in your navigation bar to check on the progress of the withdrawal operation and your current balance.</p>
- </article>
-
- </section>
- </body>
-</html>