From 8edbf426f7cf468c041cf0f87a44a68d1f6acd46 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 4 Jun 2017 18:46:32 +0200 Subject: [PATCH] nicer auditor display on withdraw --- src/i18n/de.po | 50 +++++++++++----------- src/i18n/en-US.po | 50 +++++++++++----------- src/i18n/fr.po | 50 +++++++++++----------- src/i18n/it.po | 50 +++++++++++----------- src/i18n/taler-wallet-webex.pot | 50 +++++++++++----------- src/types.ts | 40 ++++++++++++++--- src/wallet.ts | 23 ++++++++-- src/webex/pages/confirm-create-reserve.tsx | 8 +++- 8 files changed, 187 insertions(+), 134 deletions(-) diff --git a/src/i18n/de.po b/src/i18n/de.po index 6fa2e657f..171e8b058 100644 --- a/src/i18n/de.po +++ b/src/i18n/de.po @@ -56,67 +56,67 @@ msgid "" "wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:206 +#: src/webex/pages/confirm-create-reserve.tsx:212 #, fuzzy, c-format msgid "Withdrawal fees:" msgstr "Abheben bei %1$s" -#: src/webex/pages/confirm-create-reserve.tsx:207 +#: src/webex/pages/confirm-create-reserve.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:208 +#: src/webex/pages/confirm-create-reserve.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:213 +#: src/webex/pages/confirm-create-reserve.tsx:219 #, c-format msgid "# Coins" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:214 +#: src/webex/pages/confirm-create-reserve.tsx:220 #, c-format msgid "Value" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:215 +#: src/webex/pages/confirm-create-reserve.tsx:221 #, fuzzy, c-format msgid "Withdraw Fee" msgstr "Abheben bei %1$s" -#: src/webex/pages/confirm-create-reserve.tsx:216 +#: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:217 +#: src/webex/pages/confirm-create-reserve.tsx:223 #, c-format msgid "Deposit Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:270 +#: src/webex/pages/confirm-create-reserve.tsx:276 #, c-format msgid "Select" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:286 +#: src/webex/pages/confirm-create-reserve.tsx:292 #, c-format msgid "Error: URL may not be relative" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:354 +#: src/webex/pages/confirm-create-reserve.tsx:360 #, c-format msgid "The exchange is trusted by the wallet.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:360 +#: src/webex/pages/confirm-create-reserve.tsx:366 #, c-format msgid "The exchange is audited by a trusted auditor.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:366 +#: src/webex/pages/confirm-create-reserve.tsx:372 #, c-format msgid "" "Warning: The exchange is neither directly trusted nor audited by a trusted " @@ -124,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:375 +#: src/webex/pages/confirm-create-reserve.tsx:381 #, c-format msgid "" "Using exchange provider%1$s.\n" @@ -132,63 +132,63 @@ msgid "" " %2$s in fees.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:389 +#: src/webex/pages/confirm-create-reserve.tsx:395 #, c-format msgid "" "Waiting for a response from\n" " %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:400 +#: src/webex/pages/confirm-create-reserve.tsx:406 #, c-format msgid "A problem occured, see below. %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:406 +#: src/webex/pages/confirm-create-reserve.tsx:412 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:418 +#: src/webex/pages/confirm-create-reserve.tsx:424 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:423 +#: src/webex/pages/confirm-create-reserve.tsx:429 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: 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:562 +#: src/webex/pages/confirm-create-reserve.tsx:568 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:573 +#: src/webex/pages/confirm-create-reserve.tsx:579 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:587 +#: 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:594 +#: 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:614 +#: src/webex/pages/confirm-create-reserve.tsx:620 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po index ab6e9d36d..7870ff891 100644 --- a/src/i18n/en-US.po +++ b/src/i18n/en-US.po @@ -56,67 +56,67 @@ msgid "" "wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:206 +#: src/webex/pages/confirm-create-reserve.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:207 +#: src/webex/pages/confirm-create-reserve.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:208 +#: src/webex/pages/confirm-create-reserve.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:213 +#: src/webex/pages/confirm-create-reserve.tsx:219 #, c-format msgid "# Coins" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:214 +#: src/webex/pages/confirm-create-reserve.tsx:220 #, c-format msgid "Value" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:215 +#: src/webex/pages/confirm-create-reserve.tsx:221 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:216 +#: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:217 +#: src/webex/pages/confirm-create-reserve.tsx:223 #, c-format msgid "Deposit Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:270 +#: src/webex/pages/confirm-create-reserve.tsx:276 #, c-format msgid "Select" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:286 +#: src/webex/pages/confirm-create-reserve.tsx:292 #, c-format msgid "Error: URL may not be relative" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:354 +#: src/webex/pages/confirm-create-reserve.tsx:360 #, c-format msgid "The exchange is trusted by the wallet.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:360 +#: src/webex/pages/confirm-create-reserve.tsx:366 #, c-format msgid "The exchange is audited by a trusted auditor.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:366 +#: src/webex/pages/confirm-create-reserve.tsx:372 #, c-format msgid "" "Warning: The exchange is neither directly trusted nor audited by a trusted " @@ -124,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:375 +#: src/webex/pages/confirm-create-reserve.tsx:381 #, c-format msgid "" "Using exchange provider%1$s.\n" @@ -132,63 +132,63 @@ msgid "" " %2$s in fees.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:389 +#: src/webex/pages/confirm-create-reserve.tsx:395 #, c-format msgid "" "Waiting for a response from\n" " %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:400 +#: src/webex/pages/confirm-create-reserve.tsx:406 #, c-format msgid "A problem occured, see below. %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:406 +#: src/webex/pages/confirm-create-reserve.tsx:412 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:418 +#: src/webex/pages/confirm-create-reserve.tsx:424 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:423 +#: src/webex/pages/confirm-create-reserve.tsx:429 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: 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:562 +#: src/webex/pages/confirm-create-reserve.tsx:568 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:573 +#: src/webex/pages/confirm-create-reserve.tsx:579 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:587 +#: 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:594 +#: 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:614 +#: src/webex/pages/confirm-create-reserve.tsx:620 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" diff --git a/src/i18n/fr.po b/src/i18n/fr.po index b08b98b83..ccd36aecc 100644 --- a/src/i18n/fr.po +++ b/src/i18n/fr.po @@ -56,67 +56,67 @@ msgid "" "wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:206 +#: src/webex/pages/confirm-create-reserve.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:207 +#: src/webex/pages/confirm-create-reserve.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:208 +#: src/webex/pages/confirm-create-reserve.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:213 +#: src/webex/pages/confirm-create-reserve.tsx:219 #, c-format msgid "# Coins" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:214 +#: src/webex/pages/confirm-create-reserve.tsx:220 #, c-format msgid "Value" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:215 +#: src/webex/pages/confirm-create-reserve.tsx:221 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:216 +#: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:217 +#: src/webex/pages/confirm-create-reserve.tsx:223 #, c-format msgid "Deposit Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:270 +#: src/webex/pages/confirm-create-reserve.tsx:276 #, c-format msgid "Select" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:286 +#: src/webex/pages/confirm-create-reserve.tsx:292 #, c-format msgid "Error: URL may not be relative" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:354 +#: src/webex/pages/confirm-create-reserve.tsx:360 #, c-format msgid "The exchange is trusted by the wallet.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:360 +#: src/webex/pages/confirm-create-reserve.tsx:366 #, c-format msgid "The exchange is audited by a trusted auditor.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:366 +#: src/webex/pages/confirm-create-reserve.tsx:372 #, c-format msgid "" "Warning: The exchange is neither directly trusted nor audited by a trusted " @@ -124,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:375 +#: src/webex/pages/confirm-create-reserve.tsx:381 #, c-format msgid "" "Using exchange provider%1$s.\n" @@ -132,63 +132,63 @@ msgid "" " %2$s in fees.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:389 +#: src/webex/pages/confirm-create-reserve.tsx:395 #, c-format msgid "" "Waiting for a response from\n" " %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:400 +#: src/webex/pages/confirm-create-reserve.tsx:406 #, c-format msgid "A problem occured, see below. %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:406 +#: src/webex/pages/confirm-create-reserve.tsx:412 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:418 +#: src/webex/pages/confirm-create-reserve.tsx:424 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:423 +#: src/webex/pages/confirm-create-reserve.tsx:429 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: 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:562 +#: src/webex/pages/confirm-create-reserve.tsx:568 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:573 +#: src/webex/pages/confirm-create-reserve.tsx:579 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:587 +#: 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:594 +#: 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:614 +#: src/webex/pages/confirm-create-reserve.tsx:620 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" diff --git a/src/i18n/it.po b/src/i18n/it.po index b08b98b83..ccd36aecc 100644 --- a/src/i18n/it.po +++ b/src/i18n/it.po @@ -56,67 +56,67 @@ msgid "" "wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:206 +#: src/webex/pages/confirm-create-reserve.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:207 +#: src/webex/pages/confirm-create-reserve.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:208 +#: src/webex/pages/confirm-create-reserve.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:213 +#: src/webex/pages/confirm-create-reserve.tsx:219 #, c-format msgid "# Coins" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:214 +#: src/webex/pages/confirm-create-reserve.tsx:220 #, c-format msgid "Value" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:215 +#: src/webex/pages/confirm-create-reserve.tsx:221 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:216 +#: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:217 +#: src/webex/pages/confirm-create-reserve.tsx:223 #, c-format msgid "Deposit Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:270 +#: src/webex/pages/confirm-create-reserve.tsx:276 #, c-format msgid "Select" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:286 +#: src/webex/pages/confirm-create-reserve.tsx:292 #, c-format msgid "Error: URL may not be relative" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:354 +#: src/webex/pages/confirm-create-reserve.tsx:360 #, c-format msgid "The exchange is trusted by the wallet.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:360 +#: src/webex/pages/confirm-create-reserve.tsx:366 #, c-format msgid "The exchange is audited by a trusted auditor.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:366 +#: src/webex/pages/confirm-create-reserve.tsx:372 #, c-format msgid "" "Warning: The exchange is neither directly trusted nor audited by a trusted " @@ -124,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:375 +#: src/webex/pages/confirm-create-reserve.tsx:381 #, c-format msgid "" "Using exchange provider%1$s.\n" @@ -132,63 +132,63 @@ msgid "" " %2$s in fees.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:389 +#: src/webex/pages/confirm-create-reserve.tsx:395 #, c-format msgid "" "Waiting for a response from\n" " %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:400 +#: src/webex/pages/confirm-create-reserve.tsx:406 #, c-format msgid "A problem occured, see below. %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:406 +#: src/webex/pages/confirm-create-reserve.tsx:412 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:418 +#: src/webex/pages/confirm-create-reserve.tsx:424 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:423 +#: src/webex/pages/confirm-create-reserve.tsx:429 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: 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:562 +#: src/webex/pages/confirm-create-reserve.tsx:568 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:573 +#: src/webex/pages/confirm-create-reserve.tsx:579 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:587 +#: 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:594 +#: 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:614 +#: src/webex/pages/confirm-create-reserve.tsx:620 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot index b08b98b83..ccd36aecc 100644 --- a/src/i18n/taler-wallet-webex.pot +++ b/src/i18n/taler-wallet-webex.pot @@ -56,67 +56,67 @@ msgid "" "wallet." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:206 +#: src/webex/pages/confirm-create-reserve.tsx:212 #, c-format msgid "Withdrawal fees:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:207 +#: src/webex/pages/confirm-create-reserve.tsx:213 #, c-format msgid "Rounding loss:" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:208 +#: src/webex/pages/confirm-create-reserve.tsx:214 #, c-format msgid "Earliest expiration (for deposit): %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:213 +#: src/webex/pages/confirm-create-reserve.tsx:219 #, c-format msgid "# Coins" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:214 +#: src/webex/pages/confirm-create-reserve.tsx:220 #, c-format msgid "Value" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:215 +#: src/webex/pages/confirm-create-reserve.tsx:221 #, c-format msgid "Withdraw Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:216 +#: src/webex/pages/confirm-create-reserve.tsx:222 #, c-format msgid "Refresh Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:217 +#: src/webex/pages/confirm-create-reserve.tsx:223 #, c-format msgid "Deposit Fee" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:270 +#: src/webex/pages/confirm-create-reserve.tsx:276 #, c-format msgid "Select" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:286 +#: src/webex/pages/confirm-create-reserve.tsx:292 #, c-format msgid "Error: URL may not be relative" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:354 +#: src/webex/pages/confirm-create-reserve.tsx:360 #, c-format msgid "The exchange is trusted by the wallet.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:360 +#: src/webex/pages/confirm-create-reserve.tsx:366 #, c-format msgid "The exchange is audited by a trusted auditor.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:366 +#: src/webex/pages/confirm-create-reserve.tsx:372 #, c-format msgid "" "Warning: The exchange is neither directly trusted nor audited by a trusted " @@ -124,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:375 +#: src/webex/pages/confirm-create-reserve.tsx:381 #, c-format msgid "" "Using exchange provider%1$s.\n" @@ -132,63 +132,63 @@ msgid "" " %2$s in fees.\n" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:389 +#: src/webex/pages/confirm-create-reserve.tsx:395 #, c-format msgid "" "Waiting for a response from\n" " %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:400 +#: src/webex/pages/confirm-create-reserve.tsx:406 #, c-format msgid "A problem occured, see below. %1$s" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:406 +#: src/webex/pages/confirm-create-reserve.tsx:412 #, c-format msgid "" "Information about fees will be available when an exchange provider is " "selected." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:418 +#: src/webex/pages/confirm-create-reserve.tsx:424 #, c-format msgid "Accept fees and withdraw" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:423 +#: src/webex/pages/confirm-create-reserve.tsx:429 #, c-format msgid "Change Exchange Provider" msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:479 +#: 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:562 +#: src/webex/pages/confirm-create-reserve.tsx:568 #, c-format msgid "" "Oops, something went wrong. The wallet responded with error status (%1$s)." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:573 +#: src/webex/pages/confirm-create-reserve.tsx:579 #, c-format msgid "Checking URL, please wait ..." msgstr "" -#: src/webex/pages/confirm-create-reserve.tsx:587 +#: 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:594 +#: 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:614 +#: src/webex/pages/confirm-create-reserve.tsx:620 #, c-format msgid "Fatal error: \"%1$s\"." msgstr "" diff --git a/src/types.ts b/src/types.ts index 0f817ccb6..7120f64cc 100644 --- a/src/types.ts +++ b/src/types.ts @@ -424,23 +424,45 @@ export class Denomination { /** - * Auditor information. + * Signature by the auditor that a particular denomination key is audited. */ -export interface Auditor { +@Checkable.Class() +export class AuditorDenomSig { /** - * Official name. + * Denomination public key's hash. */ - name: string; + @Checkable.String + denom_pub_h: string; + /** + * The signature. + */ + @Checkable.String + auditor_sig: string; +} + +/** + * Auditor information as given by the exchange in /keys. + */ +@Checkable.Class() +export class Auditor { /** * Auditor's public key. */ + @Checkable.String auditor_pub: string; /** * Base URL of the auditor. */ - url: string; + @Checkable.String + auditor_url: string; + + /** + * List of signatures for denominations by the auditor. + */ + @Checkable.List(Checkable.Value(AuditorDenomSig)) + denomination_keys: AuditorDenomSig[]; } @@ -528,6 +550,14 @@ export interface ReserveCreationInfo { * The earliest deposit expiration of the selected coins. */ earliestDepositExpiration: number; + /** + * Number of currently offered denominations. + */ + numOfferedDenoms: number; + /** + * Public keys of trusted auditors for the currency we're withdrawing. + */ + trustedAuditorPubs: string[]; } diff --git a/src/wallet.ts b/src/wallet.ts index ec7eade9c..1d72489c0 100644 --- a/src/wallet.ts +++ b/src/wallet.ts @@ -129,8 +129,8 @@ export class KeysJson { /** * The list of auditors (partially) auditing the exchange. */ - @Checkable.Any - auditors: any[]; + @Checkable.List(Checkable.Value(Auditor)) + auditors: Auditor[]; /** * Timestamp when this response was issued. @@ -321,6 +321,8 @@ export interface ConfigRecord { } +const WALLET_PROTOCOL_VERSION = "0:0:0"; + const builtinCurrencies: CurrencyRecord[] = [ { auditors: [ @@ -1452,7 +1454,7 @@ export class Wallet { } for (const trustedAuditor of currencyRecord.auditors) { for (const exchangeAuditor of exchangeInfo.auditors) { - if (trustedAuditor.baseUrl === exchangeAuditor.url) { + if (trustedAuditor.baseUrl === exchangeAuditor.auditor_url) { isAudited = true; break; } @@ -1495,13 +1497,28 @@ export class Wallet { } } + const possibleDenoms = await ( + this.q().iterIndex(Stores.denominations.exchangeBaseUrlIndex, baseUrl) + .filter((d) => d.isOffered) + .toArray() + ) || []; + + const currencyRecord = await this.q().get(Stores.currencies, amount.currency); + if (!currencyRecord) { + throw Error("currency not found"); + } + + const trustedAuditorPubs = currencyRecord.auditors.map((a) => a.auditorPub); + const ret: ReserveCreationInfo = { earliestDepositExpiration, exchangeInfo, isAudited, isTrusted, + numOfferedDenoms: possibleDenoms.length, overhead: Amounts.sub(amount, actualCoinCost).amount, selectedDenoms, + trustedAuditorPubs, wireFees, wireInfo, withdrawFee: acc, diff --git a/src/webex/pages/confirm-create-reserve.tsx b/src/webex/pages/confirm-create-reserve.tsx index a695d9353..ca8517a25 100644 --- a/src/webex/pages/confirm-create-reserve.tsx +++ b/src/webex/pages/confirm-create-reserve.tsx @@ -115,6 +115,7 @@ class Collapsible extends React.Component { } function renderAuditorDetails(rci: ReserveCreationInfo|null) { + console.log("rci", rci); if (!rci) { return (

@@ -132,7 +133,12 @@ function renderAuditorDetails(rci: ReserveCreationInfo|null) { return (

{rci.exchangeInfo.auditors.map((a) => ( -

Auditor {a.url}

+
+

Auditor {a.auditor_url}

+

Public key: {a.auditor_pub}

+

Trusted: {rci.trustedAuditorPubs.indexOf(a.auditor_pub) >= 0 ? "yes" : "no"}

+

Audits {a.denomination_keys.length} of {rci.numOfferedDenoms} denominations

+
))}
);