[GNUnet-SVN] [taler-wallet-webex] branch master updated: accept exchange URL suggestion from bank

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-webex.

The following commit(s) were added to refs/heads/master by this push:
     new 04aad59  accept exchange URL suggestion from bank
04aad59 is described below

commit 04aad590fb9e6141982a3d0a5aec7c29356e9c76
Author: Florian Dold <address@hidden>
AuthorDate: Sun Feb 12 04:40:28 2017 +0100

    accept exchange URL suggestion from bank
---
 src/content_scripts/notify.ts        | 1 +
 src/pages/confirm-create-reserve.tsx | 6 +++++-
 src/wxBackend.ts                     | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/content_scripts/notify.ts b/src/content_scripts/notify.ts
index 022eada..ef3a3ed 100644
--- a/src/content_scripts/notify.ts
+++ b/src/content_scripts/notify.ts
@@ -209,6 +209,7 @@ namespace TalerNotify {
           .absoluteTo(document.location.href),
         bank_url: document.location.href,
         wt_types: JSON.stringify(msg.wt_types),
+        suggested_exchange_url: msg.suggested_exchange_url,
       };
       let uri = 
URI(chrome.extension.getURL("/src/pages/confirm-create-reserve.html"));
       let redirectUrl = uri.query(params).href();
diff --git a/src/pages/confirm-create-reserve.tsx 
b/src/pages/confirm-create-reserve.tsx
index da86729..44dd60d 100644
--- a/src/pages/confirm-create-reserve.tsx
+++ b/src/pages/confirm-create-reserve.tsx
@@ -396,7 +396,11 @@ export async function main() {
       throw Error(i18n.str`Can't parse wire_types: ${e.message}`);
     }
 
-    const suggestedExchangeUrl = await getSuggestedExchange(amount.currency);
+    let suggestedExchangeUrl = await getSuggestedExchange(amount.currency);
+    if (!suggestedExchangeUrl && query.suggested_exchange_url) {
+      suggestedExchangeUrl = query.suggested_exchange_url;
+    }
+
     let args = {
       wt_types,
       suggestedExchangeUrl,
diff --git a/src/wxBackend.ts b/src/wxBackend.ts
index b519cd3..6bcedaf 100644
--- a/src/wxBackend.ts
+++ b/src/wxBackend.ts
@@ -90,6 +90,7 @@ function makeHandlers(db: IDBDatabase,
       const d = {
         exchange: detail.exchange,
         amount: detail.amount,
+        suggested_exchange_url: detail.suggested_exchange_url
       };
       const req = CreateReserveRequest.checked(d);
       return wallet.createReserve(req);
@@ -403,6 +404,7 @@ function handleBankRequest(wallet: Wallet, headerList: 
chrome.webRequest.HttpHea
         .absoluteTo(url),
       bank_url: url,
       wt_types: wtTypes,
+      suggested_exchange_url: headers["x-taler-suggested-exchange"],
     };
     let uri = 
URI(chrome.extension.getURL("/src/pages/confirm-create-reserve.html"));
     let redirectUrl = uri.query(params).href();

-- 
To stop receiving notification emails like this one, please contact
address@hidden