Skip to content

Commit

Permalink
Reimplementation BEOS dialogs (#665)
Browse files Browse the repository at this point in the history
* Generic transfer tokens for blocktrades

* BEOS account validation, crosschain transfer memo, changed to single quotes

* Minor changes

* Update version, improve translation, change UI

* Fix beos memo bug

* Fix memo bug
  • Loading branch information
motrebski authored and aaroncox committed Jul 19, 2019
1 parent baf6cdc commit 9a9ac78
Show file tree
Hide file tree
Showing 41 changed files with 359 additions and 195 deletions.
10 changes: 5 additions & 5 deletions app/renderer/assets/locales/de-DE/beos_withdraw.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"disabled_for_distribution_period": "This function will be enabled after distribution period has ended.",
"withdraw_account_validation_error": "Bitshares account validation under maintenance",
"withdraw_bitshares_account_validation": "Please wait, Bitshares account is validating...",
"withdraw_confirming_bitshares_network_fee": "Fee for withdrawal is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity for this withdrawal is valid.",
"withdraw_confirming_bitshares_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity is valid.",
"withdraw_confirming_title": "Review your Transaction",
"withdraw_header_available": "available to withdraw.",
"withdraw_header_available": "available to {{type}}.",
"withdraw_label_from": "Origin Account",
"withdraw_label_quantity": "Quantity",
"withdraw_label_to": "{{type}} account",
"withdraw_label_token_and_quantity": "Token Selection + Quantity",
"withdraw_modal_title": "Withdraw tokens",
"withdraw_modal_title": "Withdraw/crosschain transfer tokens",
"withdraw_send_button_cta": "Withdraw tokens",
"withdraw_send_button_cta_2": "Withdraw from BEOS to BTS"
"withdraw_send_button_cta_2": "Withdraw/crosschain transfer from BEOS"
}
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/de-DE/crosschaintransfer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"crosschain_transfer_beos_account_validation": "Please wait, Bitshares EOS account is validating...",
"crosschain_transfer_confirming_body_quantity": "Please ensure the quantity for this transfer is valid.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for withdrawal is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_title": "Review your Transaction",
"crosschain_transfer_header_available": "available to transfer.",
"crosschain_transfer_modal_title_2": "Crosschain Transfer Tokens",
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/de-DE/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tools_blockchains_beos_crosschaintransfer_accept_body_3": "The creators of eos-voter are in no way responsible for this service, it's data usage policies, and transfers made while using this feature.",
"tools_blockchains_beos_crosschaintransfer_accept_header": "This feature utilizes 3rd party API services",
"tools_blockchains_beos_crosschaintransfer_accept_subheader": "Before proceeding, please take a moment to understand what this means.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and EOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and BEOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_header": "What is a crosschain transfer on BEOS?",
"tools_blockchains_beos_crosschaintransfer_header": "Crosschain Transfer (BEOS)",
"tools_blockchains_beos_crosschaintransfer_instructions_understood": "I understand and accept this application will use 3rd party data services for this feature.",
Expand Down
10 changes: 5 additions & 5 deletions app/renderer/assets/locales/el-GR/beos_withdraw.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"disabled_for_distribution_period": "This function will be enabled after distribution period has ended.",
"withdraw_account_validation_error": "Bitshares account validation under maintenance",
"withdraw_bitshares_account_validation": "Please wait, Bitshares account is validating...",
"withdraw_confirming_bitshares_network_fee": "Fee for withdrawal is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity for this withdrawal is valid.",
"withdraw_confirming_bitshares_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity is valid.",
"withdraw_confirming_title": "Review your Transaction",
"withdraw_header_available": "available to withdraw.",
"withdraw_header_available": "available to {{type}}.",
"withdraw_label_from": "Origin Account",
"withdraw_label_quantity": "Quantity",
"withdraw_label_to": "{{type}} account",
"withdraw_label_token_and_quantity": "Token Selection + Quantity",
"withdraw_modal_title": "Withdraw tokens",
"withdraw_modal_title": "Withdraw/crosschain transfer tokens",
"withdraw_send_button_cta": "Withdraw tokens",
"withdraw_send_button_cta_2": "Withdraw from BEOS to BTS"
"withdraw_send_button_cta_2": "Withdraw/crosschain transfer from BEOS"
}
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/el-GR/crosschaintransfer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"crosschain_transfer_beos_account_validation": "Please wait, Bitshares EOS account is validating...",
"crosschain_transfer_confirming_body_quantity": "Please ensure the quantity for this transfer is valid.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for withdrawal is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_title": "Review your Transaction",
"crosschain_transfer_header_available": "available to transfer.",
"crosschain_transfer_modal_title_2": "Crosschain Transfer Tokens",
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/el-GR/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tools_blockchains_beos_crosschaintransfer_accept_body_3": "The creators of eos-voter are in no way responsible for this service, it's data usage policies, and transfers made while using this feature.",
"tools_blockchains_beos_crosschaintransfer_accept_header": "This feature utilizes 3rd party API services",
"tools_blockchains_beos_crosschaintransfer_accept_subheader": "Before proceeding, please take a moment to understand what this means.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and EOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and BEOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_header": "What is a crosschain transfer on BEOS?",
"tools_blockchains_beos_crosschaintransfer_header": "Crosschain Transfer (BEOS)",
"tools_blockchains_beos_crosschaintransfer_instructions_understood": "I understand and accept this application will use 3rd party data services for this feature.",
Expand Down
10 changes: 5 additions & 5 deletions app/renderer/assets/locales/en-US/beos_withdraw.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"disabled_for_distribution_period": "This function will be enabled after distribution period has ended.",
"withdraw_account_validation_error": "Bitshares account validation under maintenance",
"withdraw_bitshares_account_validation": "Please wait, Bitshares account is validating...",
"withdraw_confirming_bitshares_network_fee": "Fee for withdrawal is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity for this withdrawal is valid.",
"withdraw_confirming_bitshares_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity is valid.",
"withdraw_confirming_title": "Review your Transaction",
"withdraw_header_available": "available to withdraw.",
"withdraw_header_available": "available to {{type}}.",
"withdraw_label_from": "Origin Account",
"withdraw_label_quantity": "Quantity",
"withdraw_label_to": "{{type}} account",
"withdraw_label_token_and_quantity": "Token Selection + Quantity",
"withdraw_modal_title": "Withdraw tokens",
"withdraw_modal_title": "Withdraw/crosschain transfer tokens",
"withdraw_send_button_cta": "Withdraw tokens",
"withdraw_send_button_cta_2": "Withdraw from BEOS to BTS"
"withdraw_send_button_cta_2": "Withdraw/crosschain transfer from BEOS"
}
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/en-US/crosschaintransfer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"crosschain_transfer_beos_account_validation": "Please wait, Bitshares EOS account is validating...",
"crosschain_transfer_confirming_body_quantity": "Please ensure the quantity for this transfer is valid.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for withdrawal is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_title": "Review your Transaction",
"crosschain_transfer_header_available": "available to transfer.",
"crosschain_transfer_modal_title_2": "Crosschain Transfer Tokens",
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/en-US/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tools_blockchains_beos_crosschaintransfer_accept_body_3": "The creators of eos-voter are in no way responsible for this service, it's data usage policies, and transfers made while using this feature.",
"tools_blockchains_beos_crosschaintransfer_accept_header": "This feature utilizes 3rd party API services",
"tools_blockchains_beos_crosschaintransfer_accept_subheader": "Before proceeding, please take a moment to understand what this means.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and EOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and BEOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_header": "What is a crosschain transfer on BEOS?",
"tools_blockchains_beos_crosschaintransfer_header": "Crosschain Transfer (BEOS)",
"tools_blockchains_beos_crosschaintransfer_instructions_understood": "I understand and accept this application will use 3rd party data services for this feature.",
Expand Down
10 changes: 5 additions & 5 deletions app/renderer/assets/locales/es-ES/beos_withdraw.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"disabled_for_distribution_period": "This function will be enabled after distribution period has ended.",
"withdraw_account_validation_error": "Bitshares account validation under maintenance",
"withdraw_bitshares_account_validation": "Please wait, Bitshares account is validating...",
"withdraw_confirming_bitshares_network_fee": "Fee for withdrawal is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity for this withdrawal is valid.",
"withdraw_confirming_bitshares_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity is valid.",
"withdraw_confirming_title": "Review your Transaction",
"withdraw_header_available": "available to withdraw.",
"withdraw_header_available": "available to {{type}}.",
"withdraw_label_from": "Origin Account",
"withdraw_label_quantity": "Quantity",
"withdraw_label_to": "{{type}} account",
"withdraw_label_token_and_quantity": "Token Selection + Quantity",
"withdraw_modal_title": "Withdraw tokens",
"withdraw_modal_title": "Withdraw/crosschain transfer tokens",
"withdraw_send_button_cta": "Withdraw tokens",
"withdraw_send_button_cta_2": "Withdraw from BEOS to BTS"
"withdraw_send_button_cta_2": "Withdraw/crosschain transfer from BEOS"
}
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/es-ES/crosschaintransfer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"crosschain_transfer_beos_account_validation": "Please wait, Bitshares EOS account is validating...",
"crosschain_transfer_confirming_body_quantity": "Please ensure the quantity for this transfer is valid.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for withdrawal is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_title": "Review your Transaction",
"crosschain_transfer_header_available": "available to transfer.",
"crosschain_transfer_modal_title_2": "Crosschain Transfer Tokens",
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/es-ES/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tools_blockchains_beos_crosschaintransfer_accept_body_3": "The creators of eos-voter are in no way responsible for this service, it's data usage policies, and transfers made while using this feature.",
"tools_blockchains_beos_crosschaintransfer_accept_header": "This feature utilizes 3rd party API services",
"tools_blockchains_beos_crosschaintransfer_accept_subheader": "Before proceeding, please take a moment to understand what this means.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and EOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and BEOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_header": "What is a crosschain transfer on BEOS?",
"tools_blockchains_beos_crosschaintransfer_header": "Crosschain Transfer (BEOS)",
"tools_blockchains_beos_crosschaintransfer_instructions_understood": "I understand and accept this application will use 3rd party data services for this feature.",
Expand Down
10 changes: 5 additions & 5 deletions app/renderer/assets/locales/et-EE/beos_withdraw.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"disabled_for_distribution_period": "This function will be enabled after distribution period has ended.",
"withdraw_account_validation_error": "Bitshares account validation under maintenance",
"withdraw_bitshares_account_validation": "Please wait, Bitshares account is validating...",
"withdraw_confirming_bitshares_network_fee": "Fee for withdrawal is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity for this withdrawal is valid.",
"withdraw_confirming_bitshares_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Bitshares network.",
"withdraw_confirming_body_quantity": "Please ensure the quantity is valid.",
"withdraw_confirming_title": "Review your Transaction",
"withdraw_header_available": "available to withdraw.",
"withdraw_header_available": "available to {{type}}.",
"withdraw_label_from": "Origin Account",
"withdraw_label_quantity": "Quantity",
"withdraw_label_to": "{{type}} account",
"withdraw_label_token_and_quantity": "Token Selection + Quantity",
"withdraw_modal_title": "Withdraw tokens",
"withdraw_modal_title": "Withdraw/crosschain transfer tokens",
"withdraw_send_button_cta": "Withdraw tokens",
"withdraw_send_button_cta_2": "Withdraw from BEOS to BTS"
"withdraw_send_button_cta_2": "Withdraw/crosschain transfer from BEOS"
}
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/et-EE/crosschaintransfer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"crosschain_transfer_beos_account_validation": "Please wait, Bitshares EOS account is validating...",
"crosschain_transfer_confirming_body_quantity": "Please ensure the quantity for this transfer is valid.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for withdrawal is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_eos_network_fee": "Fee for 'Bitshares' withdrawal/crosschain transfer is the same as for the transfer in the Eos network.",
"crosschain_transfer_confirming_title": "Review your Transaction",
"crosschain_transfer_header_available": "available to transfer.",
"crosschain_transfer_modal_title_2": "Crosschain Transfer Tokens",
Expand Down
2 changes: 1 addition & 1 deletion app/renderer/assets/locales/et-EE/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tools_blockchains_beos_crosschaintransfer_accept_body_3": "The creators of eos-voter are in no way responsible for this service, it's data usage policies, and transfers made while using this feature.",
"tools_blockchains_beos_crosschaintransfer_accept_header": "This feature utilizes 3rd party API services",
"tools_blockchains_beos_crosschaintransfer_accept_subheader": "Before proceeding, please take a moment to understand what this means.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and EOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_content": "This utility allows you to deposit/withdraw EOSIO based tokens from a 3rd party gateway. Currently exchanges can be made between EOS (EOS Mainnet) and BEOS (BEOS Blockchain), allowing the transition back and forth between EOS and BEOS. More exchange types will be added as BEOS functionality expands and those options will be made available here.",
"tools_blockchains_beos_crosschaintransfer_explain_header": "What is a crosschain transfer on BEOS?",
"tools_blockchains_beos_crosschaintransfer_header": "Crosschain Transfer (BEOS)",
"tools_blockchains_beos_crosschaintransfer_instructions_understood": "I understand and accept this application will use 3rd party data services for this feature.",
Expand Down

0 comments on commit 9a9ac78

Please sign in to comment.