fix taler URI classification bug

11 files changed, 146 insertions, 555 deletions

diff --git a/manifest.json b/manifest.json
index 826f52419..80247782e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,8 +4,8 @@
   "name": "GNU Taler Wallet (git)",
   "description": "Privacy preserving and transparent payments",
   "author": "GNU Taler Developers",
-  "version": "0.6.71",
-  "version_name": "0.6.0pre4",
+  "version": "0.6.72",
+  "version_name": "0.6.0pre7",
 
   "minimum_chrome_version": "51",
   "minimum_opera_version": "36",
diff --git a/src/i18n/de.po b/src/i18n/de.po
index e559cc07a..bcc3dcdb4 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -117,71 +117,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, fuzzy, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
-
-#: src/webex/pages/popup.tsx:341
-#, fuzzy, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-
-#: src/webex/pages/popup.tsx:350
-#, fuzzy, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr ""
-"%1$s\n"
-"               möchte einen Vertrag über %2$s\n"
-"               mit Ihnen abschließen."
-
-#: src/webex/pages/popup.tsx:363
-#, fuzzy, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-
-#: src/webex/pages/popup.tsx:378
-#, fuzzy, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-
-#: src/webex/pages/popup.tsx:388
-#, fuzzy, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr ""
-"%1$s\n"
-"               möchte einen Vertrag über %2$s\n"
-"               mit Ihnen abschließen."
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, fuzzy, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr ""
-"%1$s\n"
-"               möchte einen Vertrag über %2$s\n"
-"               mit Ihnen abschließen."
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
@@ -203,7 +149,7 @@ msgstr "Saldo"
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -213,54 +159,54 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, fuzzy, c-format
 msgid "Withdrawal fees:"
 msgstr "Abheben bei"
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
@@ -291,6 +237,43 @@ msgid "Deposit Fee"
 msgstr ""
 
 #, fuzzy, c-format
+#~ msgid "Bank requested reserve (%1$s) for %2$s."
+#~ msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
+
+#, fuzzy, c-format
+#~ msgid "Started to withdraw %1$s from %2$s (%3$s)."
+#~ msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s offered contract %2$s."
+#~ msgstr ""
+#~ "%1$s\n"
+#~ "               möchte einen Vertrag über %2$s\n"
+#~ "               mit Ihnen abschließen."
+
+#, fuzzy, c-format
+#~ msgid "Withdrew %1$s from %2$s ( %3$s)."
+#~ msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+
+#, fuzzy, c-format
+#~ msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
+#~ msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
+
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s gave a refund over %2$s."
+#~ msgstr ""
+#~ "%1$s\n"
+#~ "               möchte einen Vertrag über %2$s\n"
+#~ "               mit Ihnen abschließen."
+
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s gave a %2$s of %3$s."
+#~ msgstr ""
+#~ "%1$s\n"
+#~ "               möchte einen Vertrag über %2$s\n"
+#~ "               mit Ihnen abschließen."
+
+#, fuzzy, c-format
 #~ msgid "Submitting payment"
 #~ msgstr "Bezahlung bestätigen"
 
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index a490b6dce..033415818 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -117,62 +117,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:341
-#, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:350
-#, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:363
-#, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:378
-#, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:388
-#, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
@@ -194,7 +149,7 @@ msgstr ""
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -204,54 +159,54 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 63256d552..f1127c09e 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -117,62 +117,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:341
-#, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:350
-#, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:363
-#, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:378
-#, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:388
-#, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
@@ -194,7 +149,7 @@ msgstr ""
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -204,54 +159,54 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index 63256d552..f1127c09e 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -117,62 +117,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:341
-#, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:350
-#, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:363
-#, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:378
-#, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:388
-#, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
@@ -194,7 +149,7 @@ msgstr ""
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -204,54 +159,54 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 65a1d3f9c..3bd84bec7 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -96,42 +96,6 @@ strings['de'] = {
         null,
         ""
       ],
-      "Bank requested reserve (%1$s) for %2$s.": [
-        null,
-        "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
-      ],
-      "Started to withdraw %1$s from %2$s (%3$s).": [
-        null,
-        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-      ],
-      "Merchant %1$s offered contract %2$s.": [
-        null,
-        "%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."
-      ],
-      "Withdrew %1$s from %2$s ( %3$s).": [
-        null,
-        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-      ],
-      "Paid %1$s to merchant %2$s.%3$s( %4$s)": [
-        null,
-        "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
-      ],
-      "Merchant %1$s gave a refund over %2$s.": [
-        null,
-        "%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."
-      ],
-      "tip": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a %2$s of %3$s.": [
-        null,
-        "%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."
-      ],
-      "You did not accept the tip yet.": [
-        null,
-        ""
-      ],
       "Unknown event (%1$s)": [
         null,
         ""
@@ -308,42 +272,6 @@ strings['en-US'] = {
         null,
         ""
       ],
-      "Bank requested reserve (%1$s) for %2$s.": [
-        null,
-        ""
-      ],
-      "Started to withdraw %1$s from %2$s (%3$s).": [
-        null,
-        ""
-      ],
-      "Merchant %1$s offered contract %2$s.": [
-        null,
-        ""
-      ],
-      "Withdrew %1$s from %2$s ( %3$s).": [
-        null,
-        ""
-      ],
-      "Paid %1$s to merchant %2$s.%3$s( %4$s)": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a refund over %2$s.": [
-        null,
-        ""
-      ],
-      "tip": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a %2$s of %3$s.": [
-        null,
-        ""
-      ],
-      "You did not accept the tip yet.": [
-        null,
-        ""
-      ],
       "Unknown event (%1$s)": [
         null,
         ""
@@ -520,42 +448,6 @@ strings['fr'] = {
         null,
         ""
       ],
-      "Bank requested reserve (%1$s) for %2$s.": [
-        null,
-        ""
-      ],
-      "Started to withdraw %1$s from %2$s (%3$s).": [
-        null,
-        ""
-      ],
-      "Merchant %1$s offered contract %2$s.": [
-        null,
-        ""
-      ],
-      "Withdrew %1$s from %2$s ( %3$s).": [
-        null,
-        ""
-      ],
-      "Paid %1$s to merchant %2$s.%3$s( %4$s)": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a refund over %2$s.": [
-        null,
-        ""
-      ],
-      "tip": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a %2$s of %3$s.": [
-        null,
-        ""
-      ],
-      "You did not accept the tip yet.": [
-        null,
-        ""
-      ],
       "Unknown event (%1$s)": [
         null,
         ""
@@ -732,42 +624,6 @@ strings['it'] = {
         null,
         ""
       ],
-      "Bank requested reserve (%1$s) for %2$s.": [
-        null,
-        ""
-      ],
-      "Started to withdraw %1$s from %2$s (%3$s).": [
-        null,
-        ""
-      ],
-      "Merchant %1$s offered contract %2$s.": [
-        null,
-        ""
-      ],
-      "Withdrew %1$s from %2$s ( %3$s).": [
-        null,
-        ""
-      ],
-      "Paid %1$s to merchant %2$s.%3$s( %4$s)": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a refund over %2$s.": [
-        null,
-        ""
-      ],
-      "tip": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a %2$s of %3$s.": [
-        null,
-        ""
-      ],
-      "You did not accept the tip yet.": [
-        null,
-        ""
-      ],
       "Unknown event (%1$s)": [
         null,
         ""
@@ -944,42 +800,6 @@ strings['sv'] = {
         null,
         ""
       ],
-      "Bank requested reserve (%1$s) for %2$s.": [
-        null,
-        ""
-      ],
-      "Started to withdraw %1$s from %2$s (%3$s).": [
-        null,
-        ""
-      ],
-      "Merchant %1$s offered contract %2$s.": [
-        null,
-        "Säljaren %1$s erbjöd kontrakt %2$s.\n"
-      ],
-      "Withdrew %1$s from %2$s ( %3$s).": [
-        null,
-        ""
-      ],
-      "Paid %1$s to merchant %2$s.%3$s( %4$s)": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a refund over %2$s.": [
-        null,
-        "Säljaren %1$sgav en återbetalning på %2$s.\n"
-      ],
-      "tip": [
-        null,
-        ""
-      ],
-      "Merchant %1$s gave a %2$s of %3$s.": [
-        null,
-        "Säljaren %1$sgav en återbetalning på %2$s.\n"
-      ],
-      "You did not accept the tip yet.": [
-        null,
-        ""
-      ],
       "Unknown event (%1$s)": [
         null,
         ""
diff --git a/src/i18n/sv.po b/src/i18n/sv.po
index 03eab67f0..7a95799e0 100644
--- a/src/i18n/sv.po
+++ b/src/i18n/sv.po
@@ -119,62 +119,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:341
-#, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:350
-#, fuzzy, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr "Säljaren %1$s erbjöd kontrakt %2$s.\n"
-
-#: src/webex/pages/popup.tsx:363
-#, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:378
-#, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:388
-#, fuzzy, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n"
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, fuzzy, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n"
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "plånboken"
@@ -196,7 +151,7 @@ msgstr "Avbryt"
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -206,56 +161,56 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, fuzzy, c-format
 msgid "Chose different exchange provider"
 msgstr "Ändra tjänsteleverantörer"
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, fuzzy, c-format
 msgid "Select %1$s"
 msgstr "Välj %1$s"
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, fuzzy, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 "Du är på väg att ta ut\n"
 " %1$s från ditt bankkonto till din plånbok.\n"
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr "Acceptera avgifter och utbetala"
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, c-format
 msgid "Withdrawal fees:"
 msgstr "Utbetalnings avgifter:"
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
@@ -285,6 +240,18 @@ msgstr "Återhämtnings avgift"
 msgid "Deposit Fee"
 msgstr "Depostitions avgift"
 
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s offered contract %2$s."
+#~ msgstr "Säljaren %1$s erbjöd kontrakt %2$s.\n"
+
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s gave a refund over %2$s."
+#~ msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n"
+
+#, fuzzy, c-format
+#~ msgid "Merchant %1$s gave a %2$s of %3$s."
+#~ msgstr "Säljaren %1$sgav en återbetalning på %2$s.\n"
+
 #, c-format
 #~ msgid "help"
 #~ msgstr "hjälp"
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index 63256d552..f1127c09e 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -117,62 +117,17 @@ msgstr ""
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:332
-#, c-format
-msgid "Bank requested reserve (%1$s) for %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:341
-#, c-format
-msgid "Started to withdraw %1$s from %2$s (%3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:350
-#, c-format
-msgid "Merchant %1$s offered contract %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:363
-#, c-format
-msgid "Withdrew %1$s from %2$s ( %3$s)."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:378
-#, c-format
-msgid "Paid %1$s to merchant %2$s.%3$s( %4$s)"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:388
-#, c-format
-msgid "Merchant %1$s gave a refund over %2$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:400
-#, c-format
-msgid "tip"
-msgstr ""
-
-#: src/webex/pages/popup.tsx:404
-#, c-format
-msgid "Merchant %1$s gave a %2$s of %3$s."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:410
-#, c-format
-msgid "You did not accept the tip yet."
-msgstr ""
-
-#: src/webex/pages/popup.tsx:418
+#: src/webex/pages/popup.tsx:420
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:460
+#: src/webex/pages/popup.tsx:462
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:485
+#: src/webex/pages/popup.tsx:487
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
@@ -194,7 +149,7 @@ msgstr ""
 
 #. #-#-#-#-#  - (PACKAGE VERSION)  #-#-#-#-#
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:214
+#: src/webex/pages/tip.tsx:116 src/webex/pages/withdraw.tsx:215
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -204,54 +159,54 @@ msgstr ""
 msgid "Could not get details for withdraw operation:"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:178
+#: src/webex/pages/withdraw.tsx:88 src/webex/pages/withdraw.tsx:179
 #, c-format
 msgid "Chose different exchange provider"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:107
+#: src/webex/pages/withdraw.tsx:108
 #, c-format
 msgid ""
 "Please select an exchange.  You can review the details before after your "
 "selection."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:119
+#: src/webex/pages/withdraw.tsx:120
 #, c-format
 msgid "Select %1$s"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:141
+#: src/webex/pages/withdraw.tsx:142
 #, c-format
 msgid "Select custom exchange"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:158
+#: src/webex/pages/withdraw.tsx:159
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:169
+#: src/webex/pages/withdraw.tsx:170
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/withdraw.tsx:187
+#: src/webex/pages/withdraw.tsx:188
 #, c-format
 msgid "Cancel withdraw operation"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:237
+#: src/webex/renderHtml.tsx:238
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:240
+#: src/webex/renderHtml.tsx:241
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:242
+#: src/webex/renderHtml.tsx:243
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
diff --git a/src/operations/withdraw.ts b/src/operations/withdraw.ts
index 27156015d..950d3c007 100644
--- a/src/operations/withdraw.ts
+++ b/src/operations/withdraw.ts
@@ -110,7 +110,7 @@ export async function getBankWithdrawalInfo(
 ): Promise<BankWithdrawDetails> {
   const uriResult = parseWithdrawUri(talerWithdrawUri);
   if (!uriResult) {
-    throw Error("can't parse URL");
+    throw Error(`can't parse URL ${talerWithdrawUri}`);
   }
   const resp = await ws.http.get(uriResult.statusUrl);
   if (resp.status !== 200) {
diff --git a/src/util/taleruri.ts b/src/util/taleruri.ts
index f34b82a59..1b4e4352b 100644
--- a/src/util/taleruri.ts
+++ b/src/util/taleruri.ts
@@ -92,7 +92,7 @@ export function classifyTalerUri(s: string): TalerUriType {
     return TalerUriType.TalerWithdraw;
   }
   if (sl.startsWith("taler://notify-reserve/")) {
-    return TalerUriType.TalerWithdraw;
+    return TalerUriType.TalerNotifyReserve;
   }
   return TalerUriType.Unknown;
 
diff --git a/src/webex/pages/withdraw.tsx b/src/webex/pages/withdraw.tsx
index 9d84ff3a6..c123e2a6f 100644
--- a/src/webex/pages/withdraw.tsx
+++ b/src/webex/pages/withdraw.tsx
@@ -21,12 +21,9 @@
  * @author Florian Dold
  */
 
-
 import * as i18n from "../i18n";
 
-import {
-  WithdrawDetails,
-} from "../../types/walletTypes";
+import { WithdrawDetails } from "../../types/walletTypes";
 
 import { WithdrawDetailView, renderAmount } from "../renderHtml";
 
@@ -52,7 +49,10 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
       try {
         d = await getWithdrawDetails(talerWithdrawUri, selectedExchange);
       } catch (e) {
-        console.error("error getting withdraw details", e);
+        console.error(
+          `error getting withdraw details for uri ${talerWithdrawUri}, exchange ${selectedExchange}`,
+          e,
+        );
         setErrMsg(e.message);
         return;
       }
@@ -101,7 +101,8 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
   }
 
   if (selecting) {
-    const bankSuggestion = details && details.bankWithdrawDetails.suggestedExchange;
+    const bankSuggestion =
+      details && details.bankWithdrawDetails.suggestedExchange;
     return (
       <div>
         {i18n.str`Please select an exchange.  You can review the details before after your selection.`}
@@ -157,8 +158,8 @@ function NewExchangeSelection(props: { talerWithdrawUri: string }) {
     <div>
       <i18n.Translate wrap="p">
         You are about to withdraw{" "}
-        <strong>{renderAmount(details.bankWithdrawDetails.amount)}</strong> from your
-        bank account into your wallet.
+        <strong>{renderAmount(details.bankWithdrawDetails.amount)}</strong> from
+        your bank account into your wallet.
       </i18n.Translate>
       <div>
         <button