nicer auditor display on withdraw

This commit is contained in:
Florian Dold 2017-06-04 18:46:32 +02:00
parent c88bcce998
commit 8edbf426f7
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
8 changed files with 187 additions and 134 deletions

View File

@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:212
#, fuzzy, c-format #, fuzzy, c-format
msgid "Withdrawal fees:" msgid "Withdrawal fees:"
msgstr "Abheben bei %1$s" msgstr "Abheben bei %1$s"
#: src/webex/pages/confirm-create-reserve.tsx:207 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "Rounding loss:" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:219
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:220
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:221
#, fuzzy, c-format #, fuzzy, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "Abheben bei %1$s" msgstr "Abheben bei %1$s"
#: src/webex/pages/confirm-create-reserve.tsx:216 #: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:217 #: src/webex/pages/confirm-create-reserve.tsx:223
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:270 #: src/webex/pages/confirm-create-reserve.tsx:276
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:286 #: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:354 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:360 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:366 #: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:375 #: src/webex/pages/confirm-create-reserve.tsx:381
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,63 +132,63 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:389 #: src/webex/pages/confirm-create-reserve.tsx:395
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:400 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:406 #: src/webex/pages/confirm-create-reserve.tsx:412
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:418 #: src/webex/pages/confirm-create-reserve.tsx:424
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:423 #: src/webex/pages/confirm-create-reserve.tsx:429
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:479 #: src/webex/pages/confirm-create-reserve.tsx:485
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:562 #: src/webex/pages/confirm-create-reserve.tsx:568
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:573 #: src/webex/pages/confirm-create-reserve.tsx:579
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:587 #: src/webex/pages/confirm-create-reserve.tsx:593
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:594 #: src/webex/pages/confirm-create-reserve.tsx:600
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""

View File

@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:212
#, c-format #, c-format
msgid "Withdrawal fees:" msgid "Withdrawal fees:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "Rounding loss:" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:219
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:220
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:221
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216 #: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:217 #: src/webex/pages/confirm-create-reserve.tsx:223
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:270 #: src/webex/pages/confirm-create-reserve.tsx:276
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:286 #: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:354 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:360 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:366 #: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:375 #: src/webex/pages/confirm-create-reserve.tsx:381
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,63 +132,63 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:389 #: src/webex/pages/confirm-create-reserve.tsx:395
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:400 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:406 #: src/webex/pages/confirm-create-reserve.tsx:412
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:418 #: src/webex/pages/confirm-create-reserve.tsx:424
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:423 #: src/webex/pages/confirm-create-reserve.tsx:429
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:479 #: src/webex/pages/confirm-create-reserve.tsx:485
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:562 #: src/webex/pages/confirm-create-reserve.tsx:568
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:573 #: src/webex/pages/confirm-create-reserve.tsx:579
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:587 #: src/webex/pages/confirm-create-reserve.tsx:593
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:594 #: src/webex/pages/confirm-create-reserve.tsx:600
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""

View File

@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:212
#, c-format #, c-format
msgid "Withdrawal fees:" msgid "Withdrawal fees:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "Rounding loss:" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:219
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:220
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:221
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216 #: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:217 #: src/webex/pages/confirm-create-reserve.tsx:223
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:270 #: src/webex/pages/confirm-create-reserve.tsx:276
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:286 #: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:354 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:360 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:366 #: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:375 #: src/webex/pages/confirm-create-reserve.tsx:381
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,63 +132,63 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:389 #: src/webex/pages/confirm-create-reserve.tsx:395
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:400 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:406 #: src/webex/pages/confirm-create-reserve.tsx:412
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:418 #: src/webex/pages/confirm-create-reserve.tsx:424
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:423 #: src/webex/pages/confirm-create-reserve.tsx:429
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:479 #: src/webex/pages/confirm-create-reserve.tsx:485
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:562 #: src/webex/pages/confirm-create-reserve.tsx:568
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:573 #: src/webex/pages/confirm-create-reserve.tsx:579
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:587 #: src/webex/pages/confirm-create-reserve.tsx:593
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:594 #: src/webex/pages/confirm-create-reserve.tsx:600
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""

View File

@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:212
#, c-format #, c-format
msgid "Withdrawal fees:" msgid "Withdrawal fees:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "Rounding loss:" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:219
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:220
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:221
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216 #: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:217 #: src/webex/pages/confirm-create-reserve.tsx:223
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:270 #: src/webex/pages/confirm-create-reserve.tsx:276
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:286 #: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:354 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:360 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:366 #: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:375 #: src/webex/pages/confirm-create-reserve.tsx:381
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,63 +132,63 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:389 #: src/webex/pages/confirm-create-reserve.tsx:395
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:400 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:406 #: src/webex/pages/confirm-create-reserve.tsx:412
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:418 #: src/webex/pages/confirm-create-reserve.tsx:424
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:423 #: src/webex/pages/confirm-create-reserve.tsx:429
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:479 #: src/webex/pages/confirm-create-reserve.tsx:485
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:562 #: src/webex/pages/confirm-create-reserve.tsx:568
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:573 #: src/webex/pages/confirm-create-reserve.tsx:579
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:587 #: src/webex/pages/confirm-create-reserve.tsx:593
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:594 #: src/webex/pages/confirm-create-reserve.tsx:600
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""

View File

@ -56,67 +56,67 @@ msgid ""
"wallet." "wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:206 #: src/webex/pages/confirm-create-reserve.tsx:212
#, c-format #, c-format
msgid "Withdrawal fees:" msgid "Withdrawal fees:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:207 #: src/webex/pages/confirm-create-reserve.tsx:213
#, c-format #, c-format
msgid "Rounding loss:" msgid "Rounding loss:"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:208 #: src/webex/pages/confirm-create-reserve.tsx:214
#, c-format #, c-format
msgid "Earliest expiration (for deposit): %1$s" msgid "Earliest expiration (for deposit): %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:213 #: src/webex/pages/confirm-create-reserve.tsx:219
#, c-format #, c-format
msgid "# Coins" msgid "# Coins"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:214 #: src/webex/pages/confirm-create-reserve.tsx:220
#, c-format #, c-format
msgid "Value" msgid "Value"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:215 #: src/webex/pages/confirm-create-reserve.tsx:221
#, c-format #, c-format
msgid "Withdraw Fee" msgid "Withdraw Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:216 #: src/webex/pages/confirm-create-reserve.tsx:222
#, c-format #, c-format
msgid "Refresh Fee" msgid "Refresh Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:217 #: src/webex/pages/confirm-create-reserve.tsx:223
#, c-format #, c-format
msgid "Deposit Fee" msgid "Deposit Fee"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:270 #: src/webex/pages/confirm-create-reserve.tsx:276
#, c-format #, c-format
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:286 #: src/webex/pages/confirm-create-reserve.tsx:292
#, c-format #, c-format
msgid "Error: URL may not be relative" msgid "Error: URL may not be relative"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:354 #: src/webex/pages/confirm-create-reserve.tsx:360
#, c-format #, c-format
msgid "The exchange is trusted by the wallet.\n" msgid "The exchange is trusted by the wallet.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:360 #: src/webex/pages/confirm-create-reserve.tsx:366
#, c-format #, c-format
msgid "The exchange is audited by a trusted auditor.\n" msgid "The exchange is audited by a trusted auditor.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:366 #: src/webex/pages/confirm-create-reserve.tsx:372
#, c-format #, c-format
msgid "" msgid ""
"Warning: The exchange is neither directly trusted nor audited by a trusted " "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" "If you withdraw from this exchange, it will be trusted in the future.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:375 #: src/webex/pages/confirm-create-reserve.tsx:381
#, c-format #, c-format
msgid "" msgid ""
"Using exchange provider%1$s.\n" "Using exchange provider%1$s.\n"
@ -132,63 +132,63 @@ msgid ""
" %2$s in fees.\n" " %2$s in fees.\n"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:389 #: src/webex/pages/confirm-create-reserve.tsx:395
#, c-format #, c-format
msgid "" msgid ""
"Waiting for a response from\n" "Waiting for a response from\n"
" %1$s" " %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:400 #: src/webex/pages/confirm-create-reserve.tsx:406
#, c-format #, c-format
msgid "A problem occured, see below. %1$s" msgid "A problem occured, see below. %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:406 #: src/webex/pages/confirm-create-reserve.tsx:412
#, c-format #, c-format
msgid "" msgid ""
"Information about fees will be available when an exchange provider is " "Information about fees will be available when an exchange provider is "
"selected." "selected."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:418 #: src/webex/pages/confirm-create-reserve.tsx:424
#, c-format #, c-format
msgid "Accept fees and withdraw" msgid "Accept fees and withdraw"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:423 #: src/webex/pages/confirm-create-reserve.tsx:429
#, c-format #, c-format
msgid "Change Exchange Provider" msgid "Change Exchange Provider"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:479 #: src/webex/pages/confirm-create-reserve.tsx:485
#, c-format #, c-format
msgid "You are about to withdraw %1$s from your bank account into your wallet." msgid "You are about to withdraw %1$s from your bank account into your wallet."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:562 #: src/webex/pages/confirm-create-reserve.tsx:568
#, c-format #, c-format
msgid "" msgid ""
"Oops, something went wrong. The wallet responded with error status (%1$s)." "Oops, something went wrong. The wallet responded with error status (%1$s)."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:573 #: src/webex/pages/confirm-create-reserve.tsx:579
#, c-format #, c-format
msgid "Checking URL, please wait ..." msgid "Checking URL, please wait ..."
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:587 #: src/webex/pages/confirm-create-reserve.tsx:593
#, c-format #, c-format
msgid "Can't parse amount: %1$s" msgid "Can't parse amount: %1$s"
msgstr "" msgstr ""
#: src/webex/pages/confirm-create-reserve.tsx:594 #: src/webex/pages/confirm-create-reserve.tsx:600
#, c-format #, c-format
msgid "Can't parse wire_types: %1$s" msgid "Can't parse wire_types: %1$s"
msgstr "" msgstr ""
#. TODO:generic error reporting function or component. #. 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 #, c-format
msgid "Fatal error: \"%1$s\"." msgid "Fatal error: \"%1$s\"."
msgstr "" msgstr ""

View File

@ -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. * Auditor's public key.
*/ */
@Checkable.String
auditor_pub: string; auditor_pub: string;
/** /**
* Base URL of the auditor. * 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. * The earliest deposit expiration of the selected coins.
*/ */
earliestDepositExpiration: number; earliestDepositExpiration: number;
/**
* Number of currently offered denominations.
*/
numOfferedDenoms: number;
/**
* Public keys of trusted auditors for the currency we're withdrawing.
*/
trustedAuditorPubs: string[];
} }

View File

@ -129,8 +129,8 @@ export class KeysJson {
/** /**
* The list of auditors (partially) auditing the exchange. * The list of auditors (partially) auditing the exchange.
*/ */
@Checkable.Any @Checkable.List(Checkable.Value(Auditor))
auditors: any[]; auditors: Auditor[];
/** /**
* Timestamp when this response was issued. * Timestamp when this response was issued.
@ -321,6 +321,8 @@ export interface ConfigRecord {
} }
const WALLET_PROTOCOL_VERSION = "0:0:0";
const builtinCurrencies: CurrencyRecord[] = [ const builtinCurrencies: CurrencyRecord[] = [
{ {
auditors: [ auditors: [
@ -1452,7 +1454,7 @@ export class Wallet {
} }
for (const trustedAuditor of currencyRecord.auditors) { for (const trustedAuditor of currencyRecord.auditors) {
for (const exchangeAuditor of exchangeInfo.auditors) { for (const exchangeAuditor of exchangeInfo.auditors) {
if (trustedAuditor.baseUrl === exchangeAuditor.url) { if (trustedAuditor.baseUrl === exchangeAuditor.auditor_url) {
isAudited = true; isAudited = true;
break; 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<CurrencyRecord>(Stores.currencies, amount.currency);
if (!currencyRecord) {
throw Error("currency not found");
}
const trustedAuditorPubs = currencyRecord.auditors.map((a) => a.auditorPub);
const ret: ReserveCreationInfo = { const ret: ReserveCreationInfo = {
earliestDepositExpiration, earliestDepositExpiration,
exchangeInfo, exchangeInfo,
isAudited, isAudited,
isTrusted, isTrusted,
numOfferedDenoms: possibleDenoms.length,
overhead: Amounts.sub(amount, actualCoinCost).amount, overhead: Amounts.sub(amount, actualCoinCost).amount,
selectedDenoms, selectedDenoms,
trustedAuditorPubs,
wireFees, wireFees,
wireInfo, wireInfo,
withdrawFee: acc, withdrawFee: acc,

View File

@ -115,6 +115,7 @@ class Collapsible extends React.Component<CollapsibleProps, CollapsibleState> {
} }
function renderAuditorDetails(rci: ReserveCreationInfo|null) { function renderAuditorDetails(rci: ReserveCreationInfo|null) {
console.log("rci", rci);
if (!rci) { if (!rci) {
return ( return (
<p> <p>
@ -132,7 +133,12 @@ function renderAuditorDetails(rci: ReserveCreationInfo|null) {
return ( return (
<div> <div>
{rci.exchangeInfo.auditors.map((a) => ( {rci.exchangeInfo.auditors.map((a) => (
<h3>Auditor {a.url}</h3> <div>
<h3>Auditor {a.auditor_url}</h3>
<p>Public key: {a.auditor_pub}</p>
<p>Trusted: {rci.trustedAuditorPubs.indexOf(a.auditor_pub) >= 0 ? "yes" : "no"}</p>
<p>Audits {a.denomination_keys.length} of {rci.numOfferedDenoms} denominations</p>
</div>
))} ))}
</div> </div>
); );