add ens support to input fields (#398)

* add ens support

* make regex case insensitive

Author: alexvansande

app/.meteor/versions

@@ -34,7 +34,7 @@ [email protected]
 ethereum:[email protected]
 ethereum:[email protected]
 ethereum:[email protected]
-ethereum:[email protected].12
+ethereum:[email protected].14
 ethereum:[email protected]
 ethereum:[email protected]
 [email protected]

app/client/lib/helpers/helperFunctions.js

@@ -387,7 +387,8 @@ Helpers.addInputValue = function (inputs, currentInput, formField){
                 } else if(!_.isEmpty(formField.value) &&
                    (input.typeShort === 'bytes' ||
                     input.typeShort === 'address')) {
-                    value = '0x'+ formField.value.replace('0x','');
+                    // If it looks like hex, then add 0x before
+                    value = /^[0-9a-f]+$/i.test(formField.value.replace('0x','')) ? '0x'+ formField.value.replace('0x','') : null;
 
                 // bool
                 } else if(input.typeShort === 'bool') {
@@ -432,3 +433,4 @@ Returns true if Main is the current network.
 Helpers.isOnMainNetwork = function () {
     return Session.get('network') == 'main';
 };
+

app/client/templates/elements/executeContract.js

@@ -202,7 +202,7 @@ Template['elements_executeContract_constant'].events({
 
     @event change .abi-input, input .abi-input
     */
-    'change .abi-input, input .abi-input': function(e, template) {
+    'change .abi-input, input .abi-input, blur .abi-input': function(e, template) {
         var inputs = Helpers.addInputValue(template.data.inputs, this, e.currentTarget);
         TemplateVar.set('inputs', inputs);
     }
@@ -262,7 +262,7 @@ Template['elements_executeContract_function'].events({
 
     @event change .abi-input, input .abi-input
     */
-    'change .abi-input, input .abi-input': function(e, template) {
+    'change .abi-input, input .abi-input, blur .abi-input': function(e, template) {
         var inputs = Helpers.addInputValue(template.data.inputs, this, e.currentTarget);
 
         TemplateVar.set('executeData', template.data.contractInstance[template.data.name].getData.apply(null, inputs));

app/client/templates/layout/header.js

@@ -25,11 +25,13 @@ Template['layout_header'].helpers({
     */
     'goToSend': function() {
         FlowRouter.watchPathChange();
-        var address = web3.toChecksumAddress(FlowRouter.getParam('address'));
-            
+        var address = web3.toChecksumAddress(FlowRouter.getParam('address'));  
+        var accounts = EthAccounts.find({}).fetch();
+
+        // For some reason the path /send/ doesn't show tokens anymore
         return (address)
             ? FlowRouter.path('sendFrom', {from: address})
-            : FlowRouter.path('send');
+            : FlowRouter.path('sendFrom', {from: accounts[0] ? accounts[0].address : null });
     },
     /**
     Calculates the total balance of all accounts + wallets.

app/client/templates/views/modals/addToken.js

@@ -66,6 +66,13 @@ Template['views_modals_addToken'].events({
     */
     'change input[name="address"], input input[name="address"]': function(e, template) {
         var tokenAddress = TemplateVar.getFrom('.token-address', 'value');
+
+        var l = e.currentTarget.value.length;
+        if (!tokenAddress && l > 2 && l < 6) {
+            e.currentTarget.value += '.thetoken.eth';
+            e.currentTarget.setSelectionRange(l,l+13);
+        }
+        
 
         if(!tokenAddress || (template.data && template.data.address && template.data.address == tokenAddress))
             return;