Skip to content

Commit

Permalink
Sync with ww
Browse files Browse the repository at this point in the history
  • Loading branch information
@stephenandrews
stephenandrews committed Oct 18, 2019
1 parent dea84ae commit 2a6ca23
Show file tree
Hide file tree
Showing 10 changed files with 717 additions and 245 deletions.
479 changes: 323 additions & 156 deletions app/app/controllers.js
View file

Large diffs are not rendered by default.

47 changes: 32 additions & 15 deletions app/app/services/lang.js
View file
Expand Up @@ -51,18 +51,19 @@ app.service('Lang', ["$sce", function($sce) {
"create_tezbox" : "Create TezBox",
"restore" : "Restore",
"link" : "Link your TezBox",
"link_hardware_wallet" : "Do you want to link a Hardware Wallet?",
"link_hardware_wallet" : "Hardware Wallet users (new and existing):",
"recommend_hardware" : "Get yours today!",
"i_accept" : "I Accept",
"i_accept_terms_conditions" : "I have Accepted the <a href=\"https://tezbox.com/terms.html\" target=\"_blank\">Terms</a> and <a href=\"https://tezbox.com/privacy.html\" target=\"_blank\">Privacy Policy</a>",
"create_your_tezbox" : "Create your TezBox",
"create_your_tezbox" : "Create your Account",
"new_mnemonic" : "New Mnemonic",
"continue" : "Continue",
"cancel" : "Cancel",
"validate_your_tezbox" : "Validate your TezBox",
"validate_your_tezbox" : "Validate your Account",
"secure_your_tezbox" : "Secure Your TezBox",
"encrypt_wallet" : "Encrypt Wallet",
"link_your_tezbox" : "Link your TezBox",
"link_tezbox" : "Link Tezbox",
"encrypt_wallet" : "Encrypt TezBox",
"link_your_tezbox" : "Link your Account",
"connect_tezbox" : "Connect Account",
"unlock_wallet" : "Unlock Wallet",
"clear_tezbox" : "Clear TezBox",
"back" : "Back",
Expand All @@ -89,12 +90,12 @@ app.service('Lang', ["$sce", function($sce) {
"create_info" : "Please write your seed words below and store them in a secure place. These can be used to restore your wallet. If you choose to use a Passphrase, this will need to be noted down and stored as well",
"validate_info" : "Please re-enter your seed words and passphrase in full from the previous step. This is to confirm that you have correctly recorded these down.",
"secure_your_tezbox_info" : "Please enter a password to encrypt your private data. This password is only used to unlock your wallet (not required to restore it).",
"ledger_info" : "Currently only the Ledger Nano S is supported - please also ensure the Tezos Wallet app has been setup on your Ledger and is currently open.",
"trezor_info" : "Currently only the Trezor T is supported - please also ensure the firmware one your Trezor T has been updated to at least 2.0.8, and is plugged in and unlocked.",
"ledger_info" : "Currently only the Ledger Nano S is supported - please also ensure the Tezos Wallet app has been setup on your Ledger, is updated and is currently open.",
"trezor_info" : "Currently only the Trezor T is supported - please also ensure the firmware one your Trezor T has been updated to the latest version, and is plugged in and unlocked.",
"hd_derivation_path_info" : "Advanced option to access different addresses - leave as it is to use the default key",
"offline_signer_info" : "This method is effectively a view-only wallet. You can use an offline signing tool (an official TezBox tool is currently being developed).",
"tezbox_settings_info" : "Please be careful with changing or interacting with these settings.",
"export_private_key_info" : "Please be careful with this option, as anyone viewing your screen will see the private key below",
"export_private_key_info" : "Please be careful with this option, as anyone viewing your screen will see the private key below. NOTE: this will only export the private key for this manager account!",
"rpc_address_info" : "When running your own node, you can use your IP/domain here to connect to it by default. This needs to be available via SSL (HTTPS) to work with this wallet.",
"tezbox_settings" : "TezBox Settings",
"restore_your_tezbox" : "Restore your TezBox",
Expand All @@ -116,7 +117,7 @@ app.service('Lang', ["$sce", function($sce) {
"private_key_tooltip" : "Your private key can be exported from the Tezos Client or other wallets, and will start with edesk or edsk",
"encryption_password" : "Encryption Password",
"encryption_password_tooltip" : "This is the password used in the Tezos Client to encrypt your private key",
"restore_tezbox" : "Restore TezBox",
"restore_tezbox" : "Restore Account",
"activation_successful" : "Activation was successful - please keep in mind that it may take a few minutes for your balance to show!",
"activation_unsuccessful" : "Activation was unsuccessful - please ensure the code is right, or leave it blank if you have already activated your account!",
"restoring" : "Restoring...",
Expand All @@ -134,13 +135,13 @@ app.service('Lang', ["$sce", function($sce) {
"incorrect_password" : "Incorrect password",
"clear_tezbox_warning" : "You are about to clear you TezBox - note, unless you've backed up your seed words or private key you'll no longer have access to your accounts",
"yes_clear_it" : "Yes, clear it!",
"my_accounts" : "My Accounts",
"add_account" : "Add Account",
"level" : "level",
"my_accounts" : "My Contracts",
"add_account" : "Add Contract",
"level" : "Level",
"disclaimer" : "Disclaimer",
"terms" : "Terms",
"privacy" : "Privacy",
"view_on_tzscan" : "View on TzScan",
"view_on_tezosid" : "View on Tezos.ID",
"account_notadded" : "This account has not been added to the blockchain yet - please wait for a baker to include this in a block before you can use this account. This error may also show if your device can't connect to the Tezos Network.",
"transactions" : "Transactions",
"send" : "Send",
Expand Down Expand Up @@ -179,6 +180,7 @@ app.service('Lang', ["$sce", function($sce) {
"ensure_delegate" : "Please ensure the delegate you are entering has been registered to participate in the baking protocol.",
"endorse_delegate" : "TezBox doesn't endorse any of the listed delegation services listed below - please ensure you are doing your own research into each one.",
"disabled_delegate" : "Delegation from this address is not allowed (lowercase tz addresses) - these are referred to as implicit addresses and the protocol doesn't allow them to delegate to another key. Please create an account (KT address) to use for delegation.",
"comingsoon_delegate" : "Delegation has changed with the Babylon upgrade - you can now delegate directly from your tz* address. If you want to change your delegate, please transfer your funds to your tz* address and delegate from there. We will re-add delegation for KT1 addresses in the future.",
"delegate_options" : "Delegate Options",
"delegate_options_tooltip" : "Delegate your account to participate in the baking process. Select a pre-set baker, or enter your own",
"custom_delegate" : "Custom Delegate",
Expand All @@ -190,9 +192,11 @@ app.service('Lang', ["$sce", function($sce) {
"import_kt1_account_msg" : "You can use this to import KT1 addresses that have been originated else where (or after you have restored your account). You can view all of your originated KT1 addresses on",
"import" : "Import",
"remove_account" : "Remove Account",
"remove_account_warning" : "You are about to remove this account from your wallet! (You can always restore this account in future)",
"remove_conract" : "Remove Contract",
"connected_to" : "Connected to",
"not_connected" : "Not Connected",
"remove_account_warning" : "You are about to remove this account from your wallet! (You can always restore this account in future by going to Options > Import)",
"remove_conract_warning" : "You are about to remove this contract from your wallet! (You can always restore this account in future by going to Options > Import)",
"yes_remove_it" : "Yes, remove it!",
"originate_warning" : "Creating a new account incurs a fee of 0.26ꜩ. Do you want to continue?)",
"yes_continue" : "Yes, continue!",
Expand All @@ -214,6 +218,19 @@ app.service('Lang', ["$sce", function($sce) {
"transaction_confirm_info" : "You are about to send $$ꜩ to $$ - this transaction is irreversible",
"transaction_confirm_lowtz" : "You are sending to an empty implicit (tz) account - this will incur an additional fee of 0.257ꜩ. Do you want to continue?",
"extra_fee" : "Additional fees!",
"create_manager" : "Create Account",
"restore_manager" : "Restore Account",
"connect_hardware" : "Connect Ledger/Trezor",
"sub_accounts" : "Accounts",
"settings" : "Settings",
"lock_wallet" : "Lock Wallet",
"last_account_error" : "You can't remove this account as you must have at least one manager account! You can log out then click Clear TezBox if you want to complete delete your TezBox data.",
"error_baby_originate" : "The new Babylon upgrade means you can delegate directly from your tz* address, and contract origination is now reserved for more complex purposes. We are working on smart contract support currently.",
"link_tezbox" : "Use Ledger/Trezor",
"restore_tezbox2" : "Restore Existing Account",
"create_tezbox" : "Create New Account",
"hd_path" : "Hardware Wallet HD Path",
"hd_path_info" : "Your HD path is the unique identifier to access your account on your Hardware Wallet - this is not the same as the private seed/key, which is also needed and should be kept somewhere secure.",
}

},
Expand Down
9 changes: 8 additions & 1 deletion app/app/views/link.html
View file
Expand Up @@ -11,6 +11,13 @@
</div>
<div class="med-container">
<h2 class="med-title">{{translate('link_your_tezbox')}}</h2>
<div class="row text-center">
<div class="col-md-6 col-md-offset-3">
<p class="alert alert-info"><i class="leftIcon fas fa-link"></i>
<strong>Don't have a hardware wallet?<br /><a target="_blank" href="https://tezbox.com/buy-hardware-wallet.html" class="">Get yours today and support TezBox!</a><br /></strong>
</p>
</div>
</div>
<div class="row">
<div class="col-md-10 col-md-offset-1">
<div class="row text-center tabChoices">
Expand Down Expand Up @@ -65,7 +72,7 @@ <h2 class="med-title">{{translate('link_your_tezbox')}}</h2>
</div>
<div ng-show="type == 'ledger' || type == 'trezor'" class="row text-center mt-20">
<div class="col-md-6">
<a ng-click="link()" class="btn btn-primary btn-block">{{translate('link_tezbox')}}</a>
<a ng-click="link()" class="btn btn-primary btn-block">{{translate('connect_tezbox')}}</a>
</div>
<div class="col-md-6">
<a ng-click="cancel()" class="btn btn-secondary btn-block">{{translate('cancel')}}</a>
Expand Down

0 comments on commit 2a6ca23

Please sign in to comment.