From 8c4d58aa4508e3d54c3f69847347e78d09c63b97 Mon Sep 17 00:00:00 2001 From: Bruno Date: Sun, 10 Jun 2018 03:52:32 -0400 Subject: initial trezor support --- app/_locales/en/messages.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 457c3c3b1..339dd8da2 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -119,6 +119,12 @@ "confirmTransaction": { "message": "Confirm Transaction" }, + "connectHardware": { + "message": "Connect Hardware" + }, + "connect": { + "message": "Connect" + }, "continue": { "message": "Continue" }, @@ -930,6 +936,9 @@ "unknownNetworkId": { "message": "Unknown network ID" }, + "unlock": { + "message": "Unlock" + }, "unlockMessage": { "message": "The decentralized web awaits" }, -- cgit From f19ffaf08d49f33c395a25faf3eeb6b08d5285a4 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 2 Jul 2018 15:16:05 -0400 Subject: move hardcoded strings to localization file --- app/_locales/en/messages.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 37189ab7f..f10ba01f3 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -11,6 +11,9 @@ "accountName": { "message": "Account Name" }, + "accountSelectionRequired": { + "message": "You need to select an account!" + }, "address": { "message": "Address" }, @@ -125,6 +128,12 @@ "connect": { "message": "Connect" }, + "connecting": { + "message": "Connecting..." + }, + "connectToTrezor": { + "message": "Connect to Trezor" + }, "continue": { "message": "Continue" }, @@ -618,6 +627,9 @@ "popularTokens": { "message": "Popular Tokens" }, + "prev": { + "message": "Prev" + }, "privacyMsg": { "message": "Privacy Policy" }, @@ -793,6 +805,9 @@ "searchTokens": { "message": "Search Tokens" }, + "selectAnAddress": { + "message": "Select an Address" + }, "sendTokensAnywhere": { "message": "Send Tokens to anyone with an Ethereum account" }, -- cgit From ba5cde0995f956fb22825d604fe7d664677abaaa Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 5 Jul 2018 17:04:36 -0400 Subject: move strings to localization file --- app/_locales/en/messages.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index f10ba01f3..9c3e43803 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -80,6 +80,9 @@ "borrowDharma": { "message": "Borrow With Dharma (Beta)" }, + "browserNotSupported": { + "message": "Bummer! Your Browser is not supported..." + }, "builtInCalifornia": { "message": "MetaMask is designed and built in California." }, @@ -107,6 +110,9 @@ "close": { "message": "Close" }, + "chromeRequiredForTrezor":{ + "message": "You need to use Metamask on Google Chrome in order to connect to your TREZOR device." + }, "confirm": { "message": "Confirm" }, @@ -259,6 +265,9 @@ "done": { "message": "Done" }, + "downloadGoogleChrome": { + "message": "Download Google Chrome" + }, "downloadStateLogs": { "message": "Download State Logs" }, -- cgit From dddbb4250b30b7263eb97ddc2e23791166bcc98e Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 6 Jul 2018 20:04:20 -0400 Subject: update connect harwdware screen --- app/_locales/en/messages.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index e1f321c68..658a77e77 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -140,6 +140,12 @@ "connectToTrezor": { "message": "Connect to Trezor" }, + "connectToTrezorHelp": { + "message": "Metamask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked." + }, + "connectToTrezorTrouble": { + "message": "If you are having trouble, make sure you are using the latest version of the TREZOR firmware." + }, "continue": { "message": "Continue" }, @@ -944,6 +950,9 @@ "transfers": { "message": "Transfers" }, + "trezorHardwareWallet": { + "message": "TREZOR Hardware Wallet" + }, "troubleTokenBalances": { "message": "We had trouble loading your token balances. You can view them ", "description": "Followed by a link (here) to view token balances" -- cgit From 512760154528c47213cc8ff75475c21e3e674a23 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 6 Jul 2018 20:37:08 -0400 Subject: copy updated --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 658a77e77..4598d14a5 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -144,7 +144,7 @@ "message": "Metamask is able to access your TREZOR ethereum accounts. First make sure your device is connected and unlocked." }, "connectToTrezorTrouble": { - "message": "If you are having trouble, make sure you are using the latest version of the TREZOR firmware." + "message": "If you are having trouble, please make sure you are using the latest version of the TREZOR firmware." }, "continue": { "message": "Continue" -- cgit From 9b81180ab10cf8ca59666104e862c0331e953591 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 10 Jul 2018 00:20:00 -0400 Subject: added ui to remove accounts --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 4598d14a5..303a612f1 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -393,6 +393,9 @@ "message": "must be greater than or equal to $1.", "description": "helper for inputting hex as decimal input" }, + "hardware": { + "message": "hardware" + }, "here": { "message": "here", "description": "as in -click here- for more information (goes with troubleTokenBalances)" -- cgit From b9c2994d24e688305d63aaefd7fac88d88773ad9 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 10 Jul 2018 19:19:29 -0400 Subject: finish warning modal UI --- app/_locales/en/messages.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 303a612f1..c4f78d121 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -733,6 +733,15 @@ "revert": { "message": "Revert" }, + "remove": { + "message": "remove" + }, + "removeAccount": { + "message": "Remove account?" + }, + "removeAccountDescription": { + "message": "This account will be removed from your wallet. Please make sure you have the original seed phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. " + }, "rinkeby": { "message": "Rinkeby Test Network" }, -- cgit From 80e875308b4447ed38d7e0f677570d73956dd9de Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Wed, 11 Jul 2018 21:21:36 -0400 Subject: forget device and autiload account features added --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index c4f78d121..8e119d3e4 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -339,6 +339,9 @@ "followTwitter": { "message": "Follow us on Twitter" }, + "forgetDevice": { + "message": "Forget this device" + }, "from": { "message": "From" }, -- cgit From 2a0a7853249284cb27831890f3b62847ea27eb83 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 12 Jul 2018 00:23:08 -0400 Subject: added tooltip --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8e119d3e4..14d2f923a 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -740,7 +740,7 @@ "message": "remove" }, "removeAccount": { - "message": "Remove account?" + "message": "Remove account" }, "removeAccountDescription": { "message": "This account will be removed from your wallet. Please make sure you have the original seed phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. " -- cgit From 53995463883c062157a3d725e7cb8fe54486badb Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 13 Jul 2018 13:49:20 -0400 Subject: added affiliate link to trezor --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index c40a8c3b6..b8b9d9c1c 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -407,6 +407,9 @@ "message": "Get Ether from a faucet for the $1", "description": "Displays network name for Ether faucet" }, + "getYourTrezor": { + "message": "Don't have a TREZOR hardware wallet? Order yours now!" + }, "greaterThanMin": { "message": "must be greater than or equal to $1.", "description": "helper for inputting hex as decimal input" -- cgit From 3ae5b4e77261035b7cfcec25c9186f6743b66026 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 13 Jul 2018 19:47:45 -0400 Subject: update label --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index b8b9d9c1c..2b212a522 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -135,7 +135,7 @@ "message": "Confirm Transaction" }, "connectHardware": { - "message": "Connect Hardware" + "message": "Connect Hardware Wallet" }, "connect": { "message": "Connect" -- cgit From cb97517b26a7732cbb7c4a9f30f85b5fa596e608 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 17 Jul 2018 18:53:37 -0400 Subject: updated account list based on new designs --- app/_locales/en/messages.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 564c12f86..f0927af9c 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -877,6 +877,12 @@ "selectAnAddress": { "message": "Select an Address" }, + "selectAnAccount": { + "message": "Select an Account" + }, + "selectAnAccountHelp": { + "message": "These are the accounts available in your hardware wallet. Select the one you’d like to use in MetaMask." + }, "sendTokensAnywhere": { "message": "Send Tokens to anyone with an Ethereum account" }, -- cgit From cbb14f1d5e50c10865838a98452ecfb4b6cb8d6a Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 17 Jul 2018 21:57:19 -0400 Subject: fix browser not supported screen --- app/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8619d6716..069db400d 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -84,7 +84,7 @@ "message": "Borrow With Dharma (Beta)" }, "browserNotSupported": { - "message": "Bummer! Your Browser is not supported..." + "message": "Your Browser is not supported..." }, "builtInCalifornia": { "message": "MetaMask is designed and built in California." -- cgit From 49d1bdea8a47139cc814d3c49aa97bf2d542d3d5 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Wed, 18 Jul 2018 22:57:47 -0400 Subject: design done --- app/_locales/en/messages.json | 44 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 069db400d..f9f01f040 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -134,7 +134,7 @@ "confirmTransaction": { "message": "Confirm Transaction" }, - "connectHardware": { + "connectHardwareWallet": { "message": "Connect Hardware Wallet" }, "connect": { @@ -286,6 +286,9 @@ "downloadStateLogs": { "message": "Download State Logs" }, + "dontHaveATrezorWallet": { + "message": "Don't have a TREZOR hardware wallet?" + }, "dropped": { "message": "Dropped" }, @@ -407,8 +410,8 @@ "message": "Get Ether from a faucet for the $1", "description": "Displays network name for Ether faucet" }, - "getYourTrezor": { - "message": "Don't have a TREZOR hardware wallet? Order yours now!" + "getHelp": { + "message": "Get Help." }, "greaterThanMin": { "message": "must be greater than or equal to $1.", @@ -417,6 +420,15 @@ "hardware": { "message": "hardware" }, + "hardwareSupport": { + "message": "Hardware Support" + }, + "hardwareSupportMsg": { + "message": "You can now view your Hardware accounts in MetaMask! Scroll down and read how it works." + }, + "havingTroubleConnecting": { + "message": "Having trouble connecting?" + }, "here": { "message": "here", "description": "as in -click here- for more information (goes with troubleTokenBalances)" @@ -515,7 +527,7 @@ "message": "Max" }, "learnMore": { - "message": "Learn more." + "message": "Learn more" }, "lessThanMax": { "message": "must be less than or equal to $1.", @@ -778,6 +790,9 @@ "removeAccountDescription": { "message": "This account will be removed from your wallet. Please make sure you have the original seed phrase or private key for this imported account before continuing. You can import or create accounts again from the account drop-down. " }, + "readyToConnect": { + "message": "Ready to Connect?" + }, "rinkeby": { "message": "Rinkeby Test Network" }, @@ -874,6 +889,9 @@ "message": "Only send $1 to an Ethereum account address.", "description": "displays token symbol" }, + "orderOneHere": { + "message": "Order one here." + }, "searchTokens": { "message": "Search Tokens" }, @@ -892,6 +910,24 @@ "settings": { "message": "Settings" }, + "step1HardwareWallet": { + "message": "1. Connect Hardware Wallet" + }, + "step1HardwareWalletMsg": { + "message": "Connect your hardware wallet directly to your computer." + }, + "step2HardwareWallet": { + "message": "2. Select an Account" + }, + "step2HardwareWalletMsg": { + "message": "Select the account you want to view. You can only choose one at a time." + }, + "step3HardwareWallet": { + "message": "3. Start using dApps and more!" + }, + "step3HardwareWalletMsg": { + "message": "Use your hardware account like you would with any Ethereum account. Log in to dApps, send Eth, buy and store ERC20 tokens and Non-Fungible tokens like CryptoKitties." + }, "info": { "message": "Info" }, -- cgit From df19163bf9611d75aaf8ea6da52651dbba9a5e00 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 19 Jul 2018 02:31:13 -0400 Subject: last css fixes --- app/_locales/en/messages.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/_locales/en/messages.json') diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index f9f01f040..08d1d33ae 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -420,6 +420,9 @@ "hardware": { "message": "hardware" }, + "hardwareWalletConnected": { + "message": "Hardware wallet connected" + }, "hardwareSupport": { "message": "Hardware Support" }, -- cgit