paths, multi env and webpack config

10 files changed, 300 insertions, 292 deletions

diff --git a/src/crypto/emscLoader.js b/src/crypto/emscLoader.js
index eee2c8000..ed8662818 100644
--- a/src/crypto/emscLoader.js
+++ b/src/crypto/emscLoader.js
@@ -44,17 +44,26 @@ export function getLib() {
     // Assume that the code is run from the build/ directory.
     const lib = indirectRequire("../../../emscripten/taler-emscripten-lib.js");
     g.importScripts = savedImportScripts;
-    return lib;
+    if (lib) {
+      return lib;
+    }
+    // When we're running as a webpack bundle, the above require might
+    // have failed and returned 'undefined', so we try other ways to import.
   }
 
   if (typeof importScripts !== "undefined") {
-    importScripts('/src/emscripten/taler-emscripten-lib.js')
-    if (TalerEmscriptenLib) {
-      throw Error("can't import TalerEmscriptenLib");
+    self.TalerEmscriptenLib = {};
+    importScripts('/emscripten/taler-emscripten-lib.js')
+    if (!self.TalerEmscriptenLib) {
+      throw Error("can't import taler emscripten lib");
     }
-    return TalerEmscriptenLib
+    return self.TalerEmscriptenLib
   }
 
+  // Last resort, we don't have require, we're not running in a webworker.
+  // Maybe we're on a normal browser page, in this case TalerEmscriptenLib
+  // must be included in a script tag on the page.
+
   if (typeof window !== "undefined") {
     if (window.TalerEmscriptenLib) {
       return TalerEmscriptenLib;
diff --git a/src/i18n/de.po b/src/i18n/de.po
index a76705b9a..1578830b5 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -27,27 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:66
+#: src/webex/pages/confirm-contract.tsx:69
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:80
+#: src/webex/pages/confirm-contract.tsx:83
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:85
+#: src/webex/pages/confirm-contract.tsx:88
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:161
+#: src/webex/pages/confirm-contract.tsx:146
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:162
+#. tslint:disable-next-line:max-line-length
+#: src/webex/pages/confirm-contract.tsx:148
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,72 +56,67 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:197
+#: src/webex/pages/confirm-create-reserve.tsx:204
 #, fuzzy, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/pages/confirm-create-reserve.tsx:198
+#: src/webex/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:199
+#: src/webex/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:211
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:213
 #, fuzzy, c-format
 msgid "Withdraw Fee"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/pages/confirm-create-reserve.tsx:207
+#: src/webex/pages/confirm-create-reserve.tsx:214
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:208
+#: src/webex/pages/confirm-create-reserve.tsx:215
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:246
-#, fuzzy, c-format
-msgid "Withdraw fees:"
-msgstr "Abheben bei %1$s"
-
-#: src/webex/pages/confirm-create-reserve.tsx:289
+#: src/webex/pages/confirm-create-reserve.tsx:268
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:305
+#: src/webex/pages/confirm-create-reserve.tsx:284
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:352
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:379
+#: src/webex/pages/confirm-create-reserve.tsx:358
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:385
+#: src/webex/pages/confirm-create-reserve.tsx:364
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -128,7 +124,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:394
+#: src/webex/pages/confirm-create-reserve.tsx:373
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -136,63 +132,63 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
+#: src/webex/pages/confirm-create-reserve.tsx:387
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:419
+#: src/webex/pages/confirm-create-reserve.tsx:398
 #, c-format
 msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:425
+#: src/webex/pages/confirm-create-reserve.tsx:404
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:437
+#: src/webex/pages/confirm-create-reserve.tsx:416
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:442
+#: src/webex/pages/confirm-create-reserve.tsx:421
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:498
+#: src/webex/pages/confirm-create-reserve.tsx:477
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:581
+#: src/webex/pages/confirm-create-reserve.tsx:560
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:571
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:606
+#: src/webex/pages/confirm-create-reserve.tsx:585
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:614
+#: src/webex/pages/confirm-create-reserve.tsx:592
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:634
+#: src/webex/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -212,76 +208,80 @@ msgstr "Verlauf"
 msgid "Debug"
 msgstr "Debug"
 
-#: src/webex/pages/popup.tsx:241
+#: src/webex/pages/popup.tsx:245
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:246
+#: src/webex/pages/popup.tsx:250
 #, fuzzy, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr "Sie haben kein Digitalgeld. Wollen Sie %1$s? abheben?"
 
-#: src/webex/pages/popup.tsx:263
+#: src/webex/pages/popup.tsx:267
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:276
+#: src/webex/pages/popup.tsx:280
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:302
+#: src/webex/pages/popup.tsx:306
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:345
 #, fuzzy, c-format
-msgid "Bank requested reserve (%1$s) for%2$s.\n"
+msgid ""
+"Bank requested reserve (%1$s) for\n"
+" %2$s.\n"
 msgstr "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
 
-#: src/webex/pages/popup.tsx:352
+#: src/webex/pages/popup.tsx:356
 #, fuzzy, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:366
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:376
 #, fuzzy, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:386
 #, fuzzy, c-format
-msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgid ""
+"Paid%1$sto merchant%2$s.\n"
+" (%3$s)\n"
 msgstr "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
 
-#: src/webex/pages/popup.tsx:391
+#: src/webex/pages/popup.tsx:395
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:434
+#: src/webex/pages/popup.tsx:438
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:468
+#: src/webex/pages/popup.tsx:472
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr "Ihre Geldbörse verzeichnet keine Vorkommnisse."
 
-#: src/webex/renderHtml.tsx:51
+#: src/webex/renderHtml.tsx:49
 #, fuzzy, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
@@ -289,11 +289,15 @@ msgstr ""
 "               möchte einen Vertrag über %2$s\n"
 "               mit Ihnen abschließen."
 
-#: src/webex/renderHtml.tsx:56
+#: src/webex/renderHtml.tsx:54
 #, fuzzy, c-format
 msgid "You are about to purchase:"
 msgstr "Sie sind dabei, Folgendes zu kaufen:"
 
+#, fuzzy
+#~ msgid "Withdraw fees:"
+#~ msgstr "Abheben bei %1$s"
+
 #~ msgid "Confirm Payment"
 #~ msgstr "Bezahlung bestätigen"
 
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index 86ca8ccca..f7faad5fd 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -27,27 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:66
+#: src/webex/pages/confirm-contract.tsx:69
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:80
+#: src/webex/pages/confirm-contract.tsx:83
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:85
+#: src/webex/pages/confirm-contract.tsx:88
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:161
+#: src/webex/pages/confirm-contract.tsx:146
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:162
+#. tslint:disable-next-line:max-line-length
+#: src/webex/pages/confirm-contract.tsx:148
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,72 +56,67 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:197
+#: src/webex/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:198
+#: src/webex/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:199
+#: src/webex/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:211
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:213
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:207
+#: src/webex/pages/confirm-create-reserve.tsx:214
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:208
+#: src/webex/pages/confirm-create-reserve.tsx:215
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:246
-#, c-format
-msgid "Withdraw fees:"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:289
+#: src/webex/pages/confirm-create-reserve.tsx:268
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:305
+#: src/webex/pages/confirm-create-reserve.tsx:284
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:352
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:379
+#: src/webex/pages/confirm-create-reserve.tsx:358
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:385
+#: src/webex/pages/confirm-create-reserve.tsx:364
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -128,7 +124,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:394
+#: src/webex/pages/confirm-create-reserve.tsx:373
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -136,63 +132,63 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
+#: src/webex/pages/confirm-create-reserve.tsx:387
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:419
+#: src/webex/pages/confirm-create-reserve.tsx:398
 #, c-format
 msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:425
+#: src/webex/pages/confirm-create-reserve.tsx:404
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:437
+#: src/webex/pages/confirm-create-reserve.tsx:416
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:442
+#: src/webex/pages/confirm-create-reserve.tsx:421
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:498
+#: src/webex/pages/confirm-create-reserve.tsx:477
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:581
+#: src/webex/pages/confirm-create-reserve.tsx:560
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:571
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:606
+#: src/webex/pages/confirm-create-reserve.tsx:585
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:614
+#: src/webex/pages/confirm-create-reserve.tsx:592
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:634
+#: src/webex/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -212,81 +208,85 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:241
+#: src/webex/pages/popup.tsx:245
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:246
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:263
+#: src/webex/pages/popup.tsx:267
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:276
+#: src/webex/pages/popup.tsx:280
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:302
+#: src/webex/pages/popup.tsx:306
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:345
 #, c-format
-msgid "Bank requested reserve (%1$s) for%2$s.\n"
+msgid ""
+"Bank requested reserve (%1$s) for\n"
+" %2$s.\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:352
+#: src/webex/pages/popup.tsx:356
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:366
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:376
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:386
 #, c-format
-msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgid ""
+"Paid%1$sto merchant%2$s.\n"
+" (%3$s)\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:391
+#: src/webex/pages/popup.tsx:395
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:434
+#: src/webex/pages/popup.tsx:438
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:468
+#: src/webex/pages/popup.tsx:472
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
+#: src/webex/renderHtml.tsx:49
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:56
+#: src/webex/renderHtml.tsx:54
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index 71e273b23..2011e1bb8 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -27,27 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:66
+#: src/webex/pages/confirm-contract.tsx:69
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:80
+#: src/webex/pages/confirm-contract.tsx:83
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:85
+#: src/webex/pages/confirm-contract.tsx:88
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:161
+#: src/webex/pages/confirm-contract.tsx:146
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:162
+#. tslint:disable-next-line:max-line-length
+#: src/webex/pages/confirm-contract.tsx:148
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,72 +56,67 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:197
+#: src/webex/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:198
+#: src/webex/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:199
+#: src/webex/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:211
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:213
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:207
+#: src/webex/pages/confirm-create-reserve.tsx:214
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:208
+#: src/webex/pages/confirm-create-reserve.tsx:215
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:246
-#, c-format
-msgid "Withdraw fees:"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:289
+#: src/webex/pages/confirm-create-reserve.tsx:268
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:305
+#: src/webex/pages/confirm-create-reserve.tsx:284
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:352
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:379
+#: src/webex/pages/confirm-create-reserve.tsx:358
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:385
+#: src/webex/pages/confirm-create-reserve.tsx:364
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -128,7 +124,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:394
+#: src/webex/pages/confirm-create-reserve.tsx:373
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -136,63 +132,63 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
+#: src/webex/pages/confirm-create-reserve.tsx:387
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:419
+#: src/webex/pages/confirm-create-reserve.tsx:398
 #, c-format
 msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:425
+#: src/webex/pages/confirm-create-reserve.tsx:404
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:437
+#: src/webex/pages/confirm-create-reserve.tsx:416
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:442
+#: src/webex/pages/confirm-create-reserve.tsx:421
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:498
+#: src/webex/pages/confirm-create-reserve.tsx:477
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:581
+#: src/webex/pages/confirm-create-reserve.tsx:560
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:571
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:606
+#: src/webex/pages/confirm-create-reserve.tsx:585
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:614
+#: src/webex/pages/confirm-create-reserve.tsx:592
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:634
+#: src/webex/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -212,81 +208,85 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:241
+#: src/webex/pages/popup.tsx:245
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:246
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:263
+#: src/webex/pages/popup.tsx:267
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:276
+#: src/webex/pages/popup.tsx:280
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:302
+#: src/webex/pages/popup.tsx:306
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:345
 #, c-format
-msgid "Bank requested reserve (%1$s) for%2$s.\n"
+msgid ""
+"Bank requested reserve (%1$s) for\n"
+" %2$s.\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:352
+#: src/webex/pages/popup.tsx:356
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:366
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:376
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:386
 #, c-format
-msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgid ""
+"Paid%1$sto merchant%2$s.\n"
+" (%3$s)\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:391
+#: src/webex/pages/popup.tsx:395
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:434
+#: src/webex/pages/popup.tsx:438
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:468
+#: src/webex/pages/popup.tsx:472
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
+#: src/webex/renderHtml.tsx:49
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:56
+#: src/webex/renderHtml.tsx:54
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/it.po b/src/i18n/it.po
index 71e273b23..2011e1bb8 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -27,27 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:66
+#: src/webex/pages/confirm-contract.tsx:69
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:80
+#: src/webex/pages/confirm-contract.tsx:83
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:85
+#: src/webex/pages/confirm-contract.tsx:88
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:161
+#: src/webex/pages/confirm-contract.tsx:146
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:162
+#. tslint:disable-next-line:max-line-length
+#: src/webex/pages/confirm-contract.tsx:148
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,72 +56,67 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:197
+#: src/webex/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:198
+#: src/webex/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:199
+#: src/webex/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:211
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:213
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:207
+#: src/webex/pages/confirm-create-reserve.tsx:214
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:208
+#: src/webex/pages/confirm-create-reserve.tsx:215
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:246
-#, c-format
-msgid "Withdraw fees:"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:289
+#: src/webex/pages/confirm-create-reserve.tsx:268
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:305
+#: src/webex/pages/confirm-create-reserve.tsx:284
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:352
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:379
+#: src/webex/pages/confirm-create-reserve.tsx:358
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:385
+#: src/webex/pages/confirm-create-reserve.tsx:364
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -128,7 +124,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:394
+#: src/webex/pages/confirm-create-reserve.tsx:373
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -136,63 +132,63 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
+#: src/webex/pages/confirm-create-reserve.tsx:387
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:419
+#: src/webex/pages/confirm-create-reserve.tsx:398
 #, c-format
 msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:425
+#: src/webex/pages/confirm-create-reserve.tsx:404
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:437
+#: src/webex/pages/confirm-create-reserve.tsx:416
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:442
+#: src/webex/pages/confirm-create-reserve.tsx:421
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:498
+#: src/webex/pages/confirm-create-reserve.tsx:477
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:581
+#: src/webex/pages/confirm-create-reserve.tsx:560
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:571
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:606
+#: src/webex/pages/confirm-create-reserve.tsx:585
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:614
+#: src/webex/pages/confirm-create-reserve.tsx:592
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:634
+#: src/webex/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -212,81 +208,85 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:241
+#: src/webex/pages/popup.tsx:245
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:246
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:263
+#: src/webex/pages/popup.tsx:267
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:276
+#: src/webex/pages/popup.tsx:280
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:302
+#: src/webex/pages/popup.tsx:306
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:345
 #, c-format
-msgid "Bank requested reserve (%1$s) for%2$s.\n"
+msgid ""
+"Bank requested reserve (%1$s) for\n"
+" %2$s.\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:352
+#: src/webex/pages/popup.tsx:356
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:366
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:376
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:386
 #, c-format
-msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgid ""
+"Paid%1$sto merchant%2$s.\n"
+" (%3$s)\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:391
+#: src/webex/pages/popup.tsx:395
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:434
+#: src/webex/pages/popup.tsx:438
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:468
+#: src/webex/pages/popup.tsx:472
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
+#: src/webex/renderHtml.tsx:49
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:56
+#: src/webex/renderHtml.tsx:54
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 806989369..f21122542 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -63,9 +63,6 @@ strings['de'] = {
       "Deposit Fee": [
         ""
       ],
-      "Withdraw fees:": [
-        "Abheben bei %1$s"
-      ],
       "Select": [
         ""
       ],
@@ -141,7 +138,7 @@ strings['de'] = {
       "Error: could not retrieve balance information.": [
         ""
       ],
-      "Bank requested reserve (%1$s) for%2$s.\n": [
+      "Bank requested reserve (%1$s) for\n %2$s.\n": [
         "Bank bestätig anlegen der Reserve (%1$s) bei %2$s"
       ],
       "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
@@ -153,7 +150,7 @@ strings['de'] = {
       "Withdrew%1$sfrom%2$s(%3$s).\n": [
         "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
       ],
-      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+      "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
         "Reserve (%1$s) mit %2$s bei %3$s erzeugt"
       ],
       "Unknown event (%1$s)": [
@@ -222,9 +219,6 @@ strings['en-US'] = {
       "Deposit Fee": [
         ""
       ],
-      "Withdraw fees:": [
-        ""
-      ],
       "Select": [
         ""
       ],
@@ -300,7 +294,7 @@ strings['en-US'] = {
       "Error: could not retrieve balance information.": [
         ""
       ],
-      "Bank requested reserve (%1$s) for%2$s.\n": [
+      "Bank requested reserve (%1$s) for\n %2$s.\n": [
         ""
       ],
       "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
@@ -312,7 +306,7 @@ strings['en-US'] = {
       "Withdrew%1$sfrom%2$s(%3$s).\n": [
         ""
       ],
-      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+      "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
         ""
       ],
       "Unknown event (%1$s)": [
@@ -381,9 +375,6 @@ strings['fr'] = {
       "Deposit Fee": [
         ""
       ],
-      "Withdraw fees:": [
-        ""
-      ],
       "Select": [
         ""
       ],
@@ -459,7 +450,7 @@ strings['fr'] = {
       "Error: could not retrieve balance information.": [
         ""
       ],
-      "Bank requested reserve (%1$s) for%2$s.\n": [
+      "Bank requested reserve (%1$s) for\n %2$s.\n": [
         ""
       ],
       "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
@@ -471,7 +462,7 @@ strings['fr'] = {
       "Withdrew%1$sfrom%2$s(%3$s).\n": [
         ""
       ],
-      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+      "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
         ""
       ],
       "Unknown event (%1$s)": [
@@ -540,9 +531,6 @@ strings['it'] = {
       "Deposit Fee": [
         ""
       ],
-      "Withdraw fees:": [
-        ""
-      ],
       "Select": [
         ""
       ],
@@ -618,7 +606,7 @@ strings['it'] = {
       "Error: could not retrieve balance information.": [
         ""
       ],
-      "Bank requested reserve (%1$s) for%2$s.\n": [
+      "Bank requested reserve (%1$s) for\n %2$s.\n": [
         ""
       ],
       "Started to withdraw\n %1$s from%2$s(%3$s).\n": [
@@ -630,7 +618,7 @@ strings['it'] = {
       "Withdrew%1$sfrom%2$s(%3$s).\n": [
         ""
       ],
-      "Paid%1$sto merchant%2$s.  (%3$s)\n": [
+      "Paid%1$sto merchant%2$s.\n (%3$s)\n": [
         ""
       ],
       "Unknown event (%1$s)": [
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index 71e273b23..2011e1bb8 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -27,27 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:66
+#: src/webex/pages/confirm-contract.tsx:69
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:80
+#: src/webex/pages/confirm-contract.tsx:83
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:85
+#: src/webex/pages/confirm-contract.tsx:88
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:161
+#: src/webex/pages/confirm-contract.tsx:146
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:162
+#. tslint:disable-next-line:max-line-length
+#: src/webex/pages/confirm-contract.tsx:148
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -55,72 +56,67 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:197
+#: src/webex/pages/confirm-create-reserve.tsx:204
 #, c-format
 msgid "Withdrawal fees: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:198
+#: src/webex/pages/confirm-create-reserve.tsx:205
 #, c-format
 msgid "Rounding loss: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:199
+#: src/webex/pages/confirm-create-reserve.tsx:206
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:204
+#: src/webex/pages/confirm-create-reserve.tsx:211
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:205
+#: src/webex/pages/confirm-create-reserve.tsx:212
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:206
+#: src/webex/pages/confirm-create-reserve.tsx:213
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:207
+#: src/webex/pages/confirm-create-reserve.tsx:214
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:208
+#: src/webex/pages/confirm-create-reserve.tsx:215
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:246
-#, c-format
-msgid "Withdraw fees:"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:289
+#: src/webex/pages/confirm-create-reserve.tsx:268
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:305
+#: src/webex/pages/confirm-create-reserve.tsx:284
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:373
+#: src/webex/pages/confirm-create-reserve.tsx:352
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:379
+#: src/webex/pages/confirm-create-reserve.tsx:358
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:385
+#: src/webex/pages/confirm-create-reserve.tsx:364
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -128,7 +124,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:394
+#: src/webex/pages/confirm-create-reserve.tsx:373
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -136,63 +132,63 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
+#: src/webex/pages/confirm-create-reserve.tsx:387
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:419
+#: src/webex/pages/confirm-create-reserve.tsx:398
 #, c-format
 msgid "A problem occured, see below. %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:425
+#: src/webex/pages/confirm-create-reserve.tsx:404
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:437
+#: src/webex/pages/confirm-create-reserve.tsx:416
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:442
+#: src/webex/pages/confirm-create-reserve.tsx:421
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:498
+#: src/webex/pages/confirm-create-reserve.tsx:477
 #, c-format
 msgid "You are about to withdraw %1$s from your bank account into your wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:581
+#: src/webex/pages/confirm-create-reserve.tsx:560
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:592
+#: src/webex/pages/confirm-create-reserve.tsx:571
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:606
+#: src/webex/pages/confirm-create-reserve.tsx:585
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:614
+#: src/webex/pages/confirm-create-reserve.tsx:592
 #, c-format
 msgid "Can't parse wire_types: %1$s"
 msgstr ""
 
 #. TODO:generic error reporting function or component.
-#: src/webex/pages/confirm-create-reserve.tsx:634
+#: src/webex/pages/confirm-create-reserve.tsx:612
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -212,81 +208,85 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:241
+#: src/webex/pages/popup.tsx:245
 #, c-format
 msgid "help"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:246
+#: src/webex/pages/popup.tsx:250
 #, c-format
 msgid ""
 "You have no balance to show. Need some\n"
 " %1$s getting started?\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:263
+#: src/webex/pages/popup.tsx:267
 #, c-format
 msgid "%1$s incoming\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:276
+#: src/webex/pages/popup.tsx:280
 #, c-format
 msgid "%1$s being spent\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:302
+#: src/webex/pages/popup.tsx:306
 #, c-format
 msgid "Error: could not retrieve balance information."
 msgstr ""
 
-#: src/webex/pages/popup.tsx:343
+#: src/webex/pages/popup.tsx:345
 #, c-format
-msgid "Bank requested reserve (%1$s) for%2$s.\n"
+msgid ""
+"Bank requested reserve (%1$s) for\n"
+" %2$s.\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:352
+#: src/webex/pages/popup.tsx:356
 #, c-format
 msgid ""
 "Started to withdraw\n"
 " %1$s from%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:364
+#: src/webex/pages/popup.tsx:366
 #, c-format
 msgid "Merchant%1$soffered contract%2$s;\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:374
+#: src/webex/pages/popup.tsx:376
 #, c-format
 msgid "Withdrew%1$sfrom%2$s(%3$s).\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:384
+#: src/webex/pages/popup.tsx:386
 #, c-format
-msgid "Paid%1$sto merchant%2$s.  (%3$s)\n"
+msgid ""
+"Paid%1$sto merchant%2$s.\n"
+" (%3$s)\n"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:391
+#: src/webex/pages/popup.tsx:395
 #, c-format
 msgid "Unknown event (%1$s)"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:434
+#: src/webex/pages/popup.tsx:438
 #, c-format
 msgid "Error: could not retrieve event history"
 msgstr ""
 
-#: src/webex/pages/popup.tsx:468
+#: src/webex/pages/popup.tsx:472
 #, c-format
 msgid "Your wallet has no events recorded."
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
+#: src/webex/renderHtml.tsx:49
 #, c-format
 msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:56
+#: src/webex/renderHtml.tsx:54
 #, c-format
 msgid "You are about to purchase:"
 msgstr ""
diff --git a/src/timer.ts b/src/timer.ts
index 2fc2ade04..dd67dbd29 100644
--- a/src/timer.ts
+++ b/src/timer.ts
@@ -50,7 +50,7 @@ class TimeoutHandle {
  * Get a performance counter in milliseconds.
  */
 export let performanceNow = (() => {
-  if (typeof "process" !== "undefined") {
+  if (typeof process !== "undefined" && process.hrtime) {
     return () => {
       const t = process.hrtime();
       return t[0] * 1e9 + t[1];
diff --git a/webpack.config.js b/webpack.config.js
index d86379d57..cc17ad4de 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,6 +3,14 @@ const webpack = require('webpack');
 const merge = require('webpack-merge');
 
 
+function externalsCb(context, request, callback) {
+  if (/.*taler-emscripten-lib.*/.test(request)) {
+    callback(null, "undefined");
+    return;
+  }
+  callback();
+}
+
 module.exports = function (env) {
   env = env || {};
   const base = {
@@ -28,7 +36,10 @@ module.exports = function (env) {
     },
     plugins: [],
     devtool: "source-map",
-    externals: ["fs", "path", "child_process", /.*taler-emscripten-lib.*/],
+    externals: [
+      externalsCb,
+      "child_process",
+    ],
   }
   if (env.prod) {
     base.plugins.push(new webpack.optimize.UglifyJsPlugin());
diff --git a/yarn.lock b/yarn.lock
index cae8e7341..5bd122cb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4297,11 +4297,7 @@ resolve-from@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
 
-resolve@^1.1.6, resolve@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
-resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies: