Merge branch 'wallet' of github.com:ethereum/mist into wallet

ethereum · Feb 29, 2016 · f2476cc · f2476cc · romellsee · Jul 3, 2019
2 parents ebc6097 + 4e5baf8
commit f2476cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/interface/client/templates/popupWindows/onboardingScreen.js b/interface/client/templates/popupWindows/onboardingScreen.js
@@ -262,7 +262,7 @@ Template['popupWindows_onboardingScreen_importAccount'].events({
 
                 // move to add account screen, when in the onboarding window
                 if($('.onboarding-start')[0]) {
-                    TemplateVar.setTo('.onboarding-account', 'newAccount', address);
+                    TemplateVar.setTo('.onboarding-account', 'newAccount', web3.toChecksumAddress(address));
                     TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account');
 
                 // otherwise simply close the window
@@ -331,9 +331,9 @@ Template['popupWindows_onboardingScreen_password'].events({
                 TemplateVar.set(template, 'creatingPassword', false);
 
                 if(!e) {
-                    TemplateVar.setTo('.onboarding-account', 'newAccount', res);
+                    TemplateVar.setTo('.onboarding-account', 'newAccount', web3.toChecksumAddress(res));
                     TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account');
-
+                    
                     // clear form
                     pw = pwRepeat = null;
 

diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json
@@ -168,5 +168,9 @@
                 }
             }
         }
+    },
+    "elements": {
+        "checksumAlert":"This address looks valid, but it doesn't have some security features that will protect you against typos, so double check you have the right one. If provided, check if the security icon matches.",
+        "identiconHelper": "This is a security icon, if there's any change on the address the resulting icon should be a completelly different one"
     }
 }