Workaround: dealing with both checksum and lowercase addresses

ethereum · Oct 11, 2018 · 8d61dbf · 8d61dbf
1 parent 007b535
commit 8d61dbf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/app/client/lib/helpers/templateHelpers.js b/app/client/lib/helpers/templateHelpers.js
@@ -144,9 +144,13 @@ Template.registerHelper('selectAccounts', function(hideWallets) {
   });
 
   // array of string addresses
-  var accountsAddresses = accounts.map(function(e) {
-    return e.address;
-  });
+  // we can't be sure how the addresses would look like, checksum or lowercase,
+  // so we add both types to the search.
+  var accountsAddresses = _.flatten(
+    accounts.map(function(e) {
+      return [e.address, web3.utils.toChecksumAddress(e.address)];
+    })
+  );
 
   if (hideWallets !== true)
     accounts = _.union(

diff --git a/app/client/templates/views/send.js b/app/client/templates/views/send.js
@@ -621,6 +621,13 @@ Template['views_send'].events({
       if (sendAll && (selectedAccount.owners || tokenAddress !== 'ether'))
         sendAll = false;
 
+      // if is a wallet contract, normalize addresses to lowercase
+      if (selectedAccount.owners) {
+        selectedAccount.owners = selectedAccount.owners.map(function(e) {
+          return e.toLowerCase();
+        });
+      }
+
       console.log('Providing gas: ', estimatedGas, sendAll ? '' : ' + 100000');
 
       if (TemplateVar.get('selectedAction') === 'deploy-contract' && !data)