From 36ca1b172bcf415585c674978ab7f72727189c54 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Tue, 16 Feb 2016 15:26:22 +0100 Subject: [PATCH 1/6] switch mode to mist --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index c284c5ace..6e194b84f 100644 --- a/main.js +++ b/main.js @@ -28,7 +28,7 @@ var ipcPath = getIpcPath(); global.appName = 'Mist'; global.production = false; -global.mode = 'wallet'; +global.mode = 'mist'; global.mainWindow = null; global.windows = {}; From 899c2ced9669277a9ea01e7c6cac4705c0c00a6b Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Fri, 19 Feb 2016 19:21:27 -0200 Subject: [PATCH 2/6] added checksummed addresses --- .../client/templates/popupWindows/onboardingScreen.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/client/templates/popupWindows/onboardingScreen.js b/interface/client/templates/popupWindows/onboardingScreen.js index fd21cd399..991f525cb 100644 --- a/interface/client/templates/popupWindows/onboardingScreen.js +++ b/interface/client/templates/popupWindows/onboardingScreen.js @@ -262,8 +262,9 @@ 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'); + console.log('web3.toChecksumAddress(address): ', web3.toChecksumAddress(address)) // otherwise simply close the window } else { @@ -331,9 +332,11 @@ 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'); + console.log('web3.toChecksumAddress(address): ', web3.toChecksumAddress(address)); + // clear form pw = pwRepeat = null; From 306738cbfb99eb3c80d522143b6f6fa6bed3e818 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Fri, 19 Feb 2016 19:23:33 -0200 Subject: [PATCH 3/6] removed console logs --- interface/client/templates/popupWindows/onboardingScreen.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/interface/client/templates/popupWindows/onboardingScreen.js b/interface/client/templates/popupWindows/onboardingScreen.js index 991f525cb..e6185d91d 100644 --- a/interface/client/templates/popupWindows/onboardingScreen.js +++ b/interface/client/templates/popupWindows/onboardingScreen.js @@ -264,7 +264,6 @@ Template['popupWindows_onboardingScreen_importAccount'].events({ if($('.onboarding-start')[0]) { TemplateVar.setTo('.onboarding-account', 'newAccount', web3.toChecksumAddress(address)); TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account'); - console.log('web3.toChecksumAddress(address): ', web3.toChecksumAddress(address)) // otherwise simply close the window } else { @@ -334,8 +333,6 @@ Template['popupWindows_onboardingScreen_password'].events({ if(!e) { TemplateVar.setTo('.onboarding-account', 'newAccount', web3.toChecksumAddress(res)); TemplateVar.setTo('.onboarding-screen', 'currentActive', 'account'); - - console.log('web3.toChecksumAddress(address): ', web3.toChecksumAddress(address)); // clear form pw = pwRepeat = null; From 9be152e7d7454dee59ceac5201a4c2d0bfbe78c1 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Thu, 25 Feb 2016 16:14:36 -0300 Subject: [PATCH 4/6] add i18n --- interface/i18n/mist.en.i18n.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index d9d2a996e..b938dd056 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -168,5 +168,8 @@ } } } - } + }, + "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" } \ No newline at end of file From a14edbf711889f7557ff7ea53d2ee7fb4141a692 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Fri, 26 Feb 2016 11:32:39 -0300 Subject: [PATCH 5/6] i18n correction --- interface/i18n/mist.en.i18n.json | 1 + main.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index b938dd056..3b16210ce 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -172,4 +172,5 @@ "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" + } } \ No newline at end of file diff --git a/main.js b/main.js index 6da580330..e3bdd7119 100644 --- a/main.js +++ b/main.js @@ -28,7 +28,7 @@ var ipcPath = getIpcPath(); global.appName = 'Mist'; global.production = false; -global.mode = 'mist'; +global.mode = 'wallet'; global.mainWindow = null; global.windows = {}; From 070d40e27dca617ca926f39ebb68458404ce4724 Mon Sep 17 00:00:00 2001 From: Alexandre Van de Sande Date: Fri, 26 Feb 2016 12:06:55 -0300 Subject: [PATCH 6/6] merge and fix wallet --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 3655001b4..3ce032d7a 100644 --- a/main.js +++ b/main.js @@ -28,7 +28,7 @@ var ipcPath = getIpcPath(); global.appName = 'Mist'; global.production = false; -global.mode = 'mist'; +global.mode = 'wallet'; global.mainWindow = null; global.windows = {};