compute full fees for refresh and spending

6 files changed, 230 insertions, 259 deletions

diff --git a/src/i18n/de.po b/src/i18n/de.po
index cb57219c5..38ce00c45 100644
--- a/src/i18n/de.po
+++ b/src/i18n/de.po
@@ -27,28 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:69
+#: src/webex/pages/confirm-contract.tsx:70
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:83
+#: src/webex/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:89
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:154
+#: src/webex/pages/confirm-contract.tsx:156
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
 #. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:156
+#: src/webex/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,77 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-contract.tsx:214
+#, c-format
+msgid "The merchant%1$s offers you to purchase:\n"
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:232
+#, fuzzy, c-format
+msgid "Confirm payment"
+msgstr "Bezahlung bestätigen"
+
+#: src/webex/pages/confirm-create-reserve.tsx:179
 #, fuzzy, c-format
 msgid "Withdrawal fees:"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:180
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:181
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:220
+#: src/webex/pages/confirm-create-reserve.tsx:186
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:221
+#: src/webex/pages/confirm-create-reserve.tsx:187
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:222
+#: src/webex/pages/confirm-create-reserve.tsx:188
 #, fuzzy, c-format
 msgid "Withdraw Fee"
 msgstr "Abheben bei %1$s"
 
-#: src/webex/pages/confirm-create-reserve.tsx:223
+#: src/webex/pages/confirm-create-reserve.tsx:189
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:224
+#: src/webex/pages/confirm-create-reserve.tsx:190
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:278
+#: src/webex/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:294
+#: src/webex/pages/confirm-create-reserve.tsx:260
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:362
+#: src/webex/pages/confirm-create-reserve.tsx:328
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:368
+#: src/webex/pages/confirm-create-reserve.tsx:334
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:374
+#: src/webex/pages/confirm-create-reserve.tsx:340
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +134,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:383
+#: src/webex/pages/confirm-create-reserve.tsx:349
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -132,63 +142,58 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:397
+#: src/webex/pages/confirm-create-reserve.tsx:363
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
-#, c-format
-msgid "A problem occured, see below. %1$s"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:414
+#: src/webex/pages/confirm-create-reserve.tsx:380
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:457
+#: src/webex/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:462
+#: src/webex/pages/confirm-create-reserve.tsx:428
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:519
+#: src/webex/pages/confirm-create-reserve.tsx:485
 #, 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:607
+#: src/webex/pages/confirm-create-reserve.tsx:570
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:616
+#: src/webex/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:630
+#: src/webex/pages/confirm-create-reserve.tsx:593
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:637
+#: src/webex/pages/confirm-create-reserve.tsx:600
 #, 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:663
+#: src/webex/pages/confirm-create-reserve.tsx:626
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -311,19 +316,6 @@ msgstr "Bezahlung bestätigen"
 msgid "Cancel"
 msgstr "Saldo"
 
-#: src/webex/renderHtml.tsx:51
-#, fuzzy, c-format
-msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
-msgstr ""
-"%1$s\n"
-"               möchte einen Vertrag über %2$s\n"
-"               mit Ihnen abschließen."
-
-#: src/webex/renderHtml.tsx:56
-#, fuzzy, c-format
-msgid "You are about to purchase:"
-msgstr "Sie sind dabei, Folgendes zu kaufen:"
-
 #: src/wire.ts:38
 #, c-format
 msgid "Invalid Wire"
@@ -345,6 +337,17 @@ msgid "Unknown Wire Detail"
 msgstr ""
 
 #, fuzzy
+#~ msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
+#~ msgstr ""
+#~ "%1$s\n"
+#~ "               möchte einen Vertrag über %2$s\n"
+#~ "               mit Ihnen abschließen."
+
+#, fuzzy
+#~ msgid "You are about to purchase:"
+#~ msgstr "Sie sind dabei, Folgendes zu kaufen:"
+
+#, fuzzy
 #~ msgid "Withdrawal fees: %1$s"
 #~ msgstr "Abheben bei %1$s"
 
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
index a39c8331a..66d4bd118 100644
--- a/src/i18n/en-US.po
+++ b/src/i18n/en-US.po
@@ -27,28 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:69
+#: src/webex/pages/confirm-contract.tsx:70
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:83
+#: src/webex/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:89
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:154
+#: src/webex/pages/confirm-contract.tsx:156
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
 #. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:156
+#: src/webex/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,77 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-contract.tsx:214
+#, c-format
+msgid "The merchant%1$s offers you to purchase:\n"
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:232
+#, c-format
+msgid "Confirm payment"
+msgstr ""
+
+#: src/webex/pages/confirm-create-reserve.tsx:179
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:180
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:181
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:220
+#: src/webex/pages/confirm-create-reserve.tsx:186
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:221
+#: src/webex/pages/confirm-create-reserve.tsx:187
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:222
+#: src/webex/pages/confirm-create-reserve.tsx:188
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:223
+#: src/webex/pages/confirm-create-reserve.tsx:189
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:224
+#: src/webex/pages/confirm-create-reserve.tsx:190
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:278
+#: src/webex/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:294
+#: src/webex/pages/confirm-create-reserve.tsx:260
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:362
+#: src/webex/pages/confirm-create-reserve.tsx:328
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:368
+#: src/webex/pages/confirm-create-reserve.tsx:334
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:374
+#: src/webex/pages/confirm-create-reserve.tsx:340
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +134,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:383
+#: src/webex/pages/confirm-create-reserve.tsx:349
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -132,63 +142,58 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:397
+#: src/webex/pages/confirm-create-reserve.tsx:363
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
-#, c-format
-msgid "A problem occured, see below. %1$s"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:414
+#: src/webex/pages/confirm-create-reserve.tsx:380
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:457
+#: src/webex/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:462
+#: src/webex/pages/confirm-create-reserve.tsx:428
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:519
+#: src/webex/pages/confirm-create-reserve.tsx:485
 #, 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:607
+#: src/webex/pages/confirm-create-reserve.tsx:570
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:616
+#: src/webex/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:630
+#: src/webex/pages/confirm-create-reserve.tsx:593
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:637
+#: src/webex/pages/confirm-create-reserve.tsx:600
 #, 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:663
+#: src/webex/pages/confirm-create-reserve.tsx:626
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -311,16 +316,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
-#, c-format
-msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
-msgstr ""
-
-#: src/webex/renderHtml.tsx:56
-#, c-format
-msgid "You are about to purchase:"
-msgstr ""
-
 #: src/wire.ts:38
 #, c-format
 msgid "Invalid Wire"
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
index dc271a749..d804bd204 100644
--- a/src/i18n/fr.po
+++ b/src/i18n/fr.po
@@ -27,28 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:69
+#: src/webex/pages/confirm-contract.tsx:70
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:83
+#: src/webex/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:89
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:154
+#: src/webex/pages/confirm-contract.tsx:156
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
 #. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:156
+#: src/webex/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,77 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-contract.tsx:214
+#, c-format
+msgid "The merchant%1$s offers you to purchase:\n"
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:232
+#, c-format
+msgid "Confirm payment"
+msgstr ""
+
+#: src/webex/pages/confirm-create-reserve.tsx:179
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:180
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:181
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:220
+#: src/webex/pages/confirm-create-reserve.tsx:186
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:221
+#: src/webex/pages/confirm-create-reserve.tsx:187
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:222
+#: src/webex/pages/confirm-create-reserve.tsx:188
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:223
+#: src/webex/pages/confirm-create-reserve.tsx:189
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:224
+#: src/webex/pages/confirm-create-reserve.tsx:190
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:278
+#: src/webex/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:294
+#: src/webex/pages/confirm-create-reserve.tsx:260
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:362
+#: src/webex/pages/confirm-create-reserve.tsx:328
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:368
+#: src/webex/pages/confirm-create-reserve.tsx:334
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:374
+#: src/webex/pages/confirm-create-reserve.tsx:340
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +134,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:383
+#: src/webex/pages/confirm-create-reserve.tsx:349
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -132,63 +142,58 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:397
+#: src/webex/pages/confirm-create-reserve.tsx:363
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
-#, c-format
-msgid "A problem occured, see below. %1$s"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:414
+#: src/webex/pages/confirm-create-reserve.tsx:380
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:457
+#: src/webex/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:462
+#: src/webex/pages/confirm-create-reserve.tsx:428
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:519
+#: src/webex/pages/confirm-create-reserve.tsx:485
 #, 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:607
+#: src/webex/pages/confirm-create-reserve.tsx:570
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:616
+#: src/webex/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:630
+#: src/webex/pages/confirm-create-reserve.tsx:593
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:637
+#: src/webex/pages/confirm-create-reserve.tsx:600
 #, 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:663
+#: src/webex/pages/confirm-create-reserve.tsx:626
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -311,16 +316,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
-#, c-format
-msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
-msgstr ""
-
-#: src/webex/renderHtml.tsx:56
-#, c-format
-msgid "You are about to purchase:"
-msgstr ""
-
 #: src/wire.ts:38
 #, c-format
 msgid "Invalid Wire"
diff --git a/src/i18n/it.po b/src/i18n/it.po
index dc271a749..d804bd204 100644
--- a/src/i18n/it.po
+++ b/src/i18n/it.po
@@ -27,28 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:69
+#: src/webex/pages/confirm-contract.tsx:70
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:83
+#: src/webex/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:89
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:154
+#: src/webex/pages/confirm-contract.tsx:156
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
 #. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:156
+#: src/webex/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,77 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-contract.tsx:214
+#, c-format
+msgid "The merchant%1$s offers you to purchase:\n"
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:232
+#, c-format
+msgid "Confirm payment"
+msgstr ""
+
+#: src/webex/pages/confirm-create-reserve.tsx:179
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:180
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:181
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:220
+#: src/webex/pages/confirm-create-reserve.tsx:186
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:221
+#: src/webex/pages/confirm-create-reserve.tsx:187
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:222
+#: src/webex/pages/confirm-create-reserve.tsx:188
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:223
+#: src/webex/pages/confirm-create-reserve.tsx:189
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:224
+#: src/webex/pages/confirm-create-reserve.tsx:190
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:278
+#: src/webex/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:294
+#: src/webex/pages/confirm-create-reserve.tsx:260
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:362
+#: src/webex/pages/confirm-create-reserve.tsx:328
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:368
+#: src/webex/pages/confirm-create-reserve.tsx:334
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:374
+#: src/webex/pages/confirm-create-reserve.tsx:340
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +134,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:383
+#: src/webex/pages/confirm-create-reserve.tsx:349
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -132,63 +142,58 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:397
+#: src/webex/pages/confirm-create-reserve.tsx:363
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
-#, c-format
-msgid "A problem occured, see below. %1$s"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:414
+#: src/webex/pages/confirm-create-reserve.tsx:380
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:457
+#: src/webex/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:462
+#: src/webex/pages/confirm-create-reserve.tsx:428
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:519
+#: src/webex/pages/confirm-create-reserve.tsx:485
 #, 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:607
+#: src/webex/pages/confirm-create-reserve.tsx:570
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:616
+#: src/webex/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:630
+#: src/webex/pages/confirm-create-reserve.tsx:593
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:637
+#: src/webex/pages/confirm-create-reserve.tsx:600
 #, 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:663
+#: src/webex/pages/confirm-create-reserve.tsx:626
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -311,16 +316,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
-#, c-format
-msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
-msgstr ""
-
-#: src/webex/renderHtml.tsx:56
-#, c-format
-msgid "You are about to purchase:"
-msgstr ""
-
 #: src/wire.ts:38
 #, c-format
 msgid "Invalid Wire"
diff --git a/src/i18n/strings.ts b/src/i18n/strings.ts
index 75672cbd3..41c8d72a2 100644
--- a/src/i18n/strings.ts
+++ b/src/i18n/strings.ts
@@ -39,6 +39,12 @@ strings['de'] = {
       "You do not have any funds from an exchange that is accepted by this merchant. None of the exchanges accepted by the merchant is known to your wallet.": [
         ""
       ],
+      "The merchant%1$s offers you to purchase:\n": [
+        ""
+      ],
+      "Confirm payment": [
+        "Bezahlung bestätigen"
+      ],
       "Withdrawal fees:": [
         "Abheben bei %1$s"
       ],
@@ -84,9 +90,6 @@ strings['de'] = {
       "Waiting for a response from\n %1$s": [
         ""
       ],
-      "A problem occured, see below. %1$s": [
-        ""
-      ],
       "Information about fees will be available when an exchange provider is selected.": [
         ""
       ],
@@ -180,12 +183,6 @@ strings['de'] = {
       "Cancel": [
         "Saldo"
       ],
-      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
-        "%1$s\n               möchte einen Vertrag über %2$s\n               mit Ihnen abschließen."
-      ],
-      "You are about to purchase:": [
-        "Sie sind dabei, Folgendes zu kaufen:"
-      ],
       "Invalid Wire": [
         ""
       ],
@@ -225,6 +222,12 @@ strings['en-US'] = {
       "You do not have any funds from an exchange that is accepted by this merchant. None of the exchanges accepted by the merchant is known to your wallet.": [
         ""
       ],
+      "The merchant%1$s offers you to purchase:\n": [
+        ""
+      ],
+      "Confirm payment": [
+        ""
+      ],
       "Withdrawal fees:": [
         ""
       ],
@@ -270,9 +273,6 @@ strings['en-US'] = {
       "Waiting for a response from\n %1$s": [
         ""
       ],
-      "A problem occured, see below. %1$s": [
-        ""
-      ],
       "Information about fees will be available when an exchange provider is selected.": [
         ""
       ],
@@ -366,12 +366,6 @@ strings['en-US'] = {
       "Cancel": [
         ""
       ],
-      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
-        ""
-      ],
-      "You are about to purchase:": [
-        ""
-      ],
       "Invalid Wire": [
         ""
       ],
@@ -411,6 +405,12 @@ strings['fr'] = {
       "You do not have any funds from an exchange that is accepted by this merchant. None of the exchanges accepted by the merchant is known to your wallet.": [
         ""
       ],
+      "The merchant%1$s offers you to purchase:\n": [
+        ""
+      ],
+      "Confirm payment": [
+        ""
+      ],
       "Withdrawal fees:": [
         ""
       ],
@@ -456,9 +456,6 @@ strings['fr'] = {
       "Waiting for a response from\n %1$s": [
         ""
       ],
-      "A problem occured, see below. %1$s": [
-        ""
-      ],
       "Information about fees will be available when an exchange provider is selected.": [
         ""
       ],
@@ -552,12 +549,6 @@ strings['fr'] = {
       "Cancel": [
         ""
       ],
-      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
-        ""
-      ],
-      "You are about to purchase:": [
-        ""
-      ],
       "Invalid Wire": [
         ""
       ],
@@ -597,6 +588,12 @@ strings['it'] = {
       "You do not have any funds from an exchange that is accepted by this merchant. None of the exchanges accepted by the merchant is known to your wallet.": [
         ""
       ],
+      "The merchant%1$s offers you to purchase:\n": [
+        ""
+      ],
+      "Confirm payment": [
+        ""
+      ],
       "Withdrawal fees:": [
         ""
       ],
@@ -642,9 +639,6 @@ strings['it'] = {
       "Waiting for a response from\n %1$s": [
         ""
       ],
-      "A problem occured, see below. %1$s": [
-        ""
-      ],
       "Information about fees will be available when an exchange provider is selected.": [
         ""
       ],
@@ -738,12 +732,6 @@ strings['it'] = {
       "Cancel": [
         ""
       ],
-      "The merchant%1$swants to enter a contract over%2$s with you.\n": [
-        ""
-      ],
-      "You are about to purchase:": [
-        ""
-      ],
       "Invalid Wire": [
         ""
       ],
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
index dc271a749..d804bd204 100644
--- a/src/i18n/taler-wallet-webex.pot
+++ b/src/i18n/taler-wallet-webex.pot
@@ -27,28 +27,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/webex/pages/confirm-contract.tsx:69
+#: src/webex/pages/confirm-contract.tsx:70
 #, c-format
 msgid "show more details\n"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:83
+#: src/webex/pages/confirm-contract.tsx:84
 #, c-format
 msgid "Accepted exchanges:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:88
+#: src/webex/pages/confirm-contract.tsx:89
 #, c-format
 msgid "Exchanges in the wallet:"
 msgstr ""
 
-#: src/webex/pages/confirm-contract.tsx:154
+#: src/webex/pages/confirm-contract.tsx:156
 #, c-format
 msgid "You have insufficient funds of the requested currency in your wallet."
 msgstr ""
 
 #. tslint:disable-next-line:max-line-length
-#: src/webex/pages/confirm-contract.tsx:156
+#: src/webex/pages/confirm-contract.tsx:158
 #, c-format
 msgid ""
 "You do not have any funds from an exchange that is accepted by this "
@@ -56,67 +56,77 @@ msgid ""
 "wallet."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:213
+#: src/webex/pages/confirm-contract.tsx:214
+#, c-format
+msgid "The merchant%1$s offers you to purchase:\n"
+msgstr ""
+
+#: src/webex/pages/confirm-contract.tsx:232
+#, c-format
+msgid "Confirm payment"
+msgstr ""
+
+#: src/webex/pages/confirm-create-reserve.tsx:179
 #, c-format
 msgid "Withdrawal fees:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:214
+#: src/webex/pages/confirm-create-reserve.tsx:180
 #, c-format
 msgid "Rounding loss:"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:215
+#: src/webex/pages/confirm-create-reserve.tsx:181
 #, c-format
 msgid "Earliest expiration (for deposit): %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:220
+#: src/webex/pages/confirm-create-reserve.tsx:186
 #, c-format
 msgid "# Coins"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:221
+#: src/webex/pages/confirm-create-reserve.tsx:187
 #, c-format
 msgid "Value"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:222
+#: src/webex/pages/confirm-create-reserve.tsx:188
 #, c-format
 msgid "Withdraw Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:223
+#: src/webex/pages/confirm-create-reserve.tsx:189
 #, c-format
 msgid "Refresh Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:224
+#: src/webex/pages/confirm-create-reserve.tsx:190
 #, c-format
 msgid "Deposit Fee"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:278
+#: src/webex/pages/confirm-create-reserve.tsx:244
 #, c-format
 msgid "Select"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:294
+#: src/webex/pages/confirm-create-reserve.tsx:260
 #, c-format
 msgid "Error: URL may not be relative"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:362
+#: src/webex/pages/confirm-create-reserve.tsx:328
 #, c-format
 msgid "The exchange is trusted by the wallet.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:368
+#: src/webex/pages/confirm-create-reserve.tsx:334
 #, c-format
 msgid "The exchange is audited by a trusted auditor.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:374
+#: src/webex/pages/confirm-create-reserve.tsx:340
 #, c-format
 msgid ""
 "Warning:  The exchange is neither directly trusted nor audited by a trusted "
@@ -124,7 +134,7 @@ msgid ""
 "If you withdraw from this exchange, it will be trusted in the future.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:383
+#: src/webex/pages/confirm-create-reserve.tsx:349
 #, c-format
 msgid ""
 "Using exchange provider%1$s.\n"
@@ -132,63 +142,58 @@ msgid ""
 " %2$s in fees.\n"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:397
+#: src/webex/pages/confirm-create-reserve.tsx:363
 #, c-format
 msgid ""
 "Waiting for a response from\n"
 " %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:408
-#, c-format
-msgid "A problem occured, see below. %1$s"
-msgstr ""
-
-#: src/webex/pages/confirm-create-reserve.tsx:414
+#: src/webex/pages/confirm-create-reserve.tsx:380
 #, c-format
 msgid ""
 "Information about fees will be available when an exchange provider is "
 "selected."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:457
+#: src/webex/pages/confirm-create-reserve.tsx:423
 #, c-format
 msgid "Accept fees and withdraw"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:462
+#: src/webex/pages/confirm-create-reserve.tsx:428
 #, c-format
 msgid "Change Exchange Provider"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:519
+#: src/webex/pages/confirm-create-reserve.tsx:485
 #, 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:607
+#: src/webex/pages/confirm-create-reserve.tsx:570
 #, c-format
 msgid ""
 "Oops, something went wrong. The wallet responded with error status (%1$s)."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:616
+#: src/webex/pages/confirm-create-reserve.tsx:579
 #, c-format
 msgid "Checking URL, please wait ..."
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:630
+#: src/webex/pages/confirm-create-reserve.tsx:593
 #, c-format
 msgid "Can't parse amount: %1$s"
 msgstr ""
 
-#: src/webex/pages/confirm-create-reserve.tsx:637
+#: src/webex/pages/confirm-create-reserve.tsx:600
 #, 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:663
+#: src/webex/pages/confirm-create-reserve.tsx:626
 #, c-format
 msgid "Fatal error: \"%1$s\"."
 msgstr ""
@@ -311,16 +316,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/webex/renderHtml.tsx:51
-#, c-format
-msgid "The merchant%1$swants to enter a contract over%2$s with you.\n"
-msgstr ""
-
-#: src/webex/renderHtml.tsx:56
-#, c-format
-msgid "You are about to purchase:"
-msgstr ""
-
 #: src/wire.ts:38
 #, c-format
 msgid "Invalid Wire"