Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
Merge pull request #201 from ethereum/hex-checksum
Browse files Browse the repository at this point in the history
Adds support for Hex checksum
  • Loading branch information
frozeman committed Feb 29, 2016
2 parents b1f3e6e + 070d40e commit 4e5baf8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions interface/client/templates/popupWindows/onboardingScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions interface/i18n/mist.en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var ipcPath = getIpcPath();
global.appName = 'Mist';

global.production = false;
global.mode = 'mist';
global.mode = 'wallet';

global.mainWindow = null;
global.windows = {};
Expand Down

0 comments on commit 4e5baf8

Please sign in to comment.