merge master

app/components/add-contributor/component.js

@@ -9,7 +9,7 @@ export default Component.extend({
 
   // Default attributes used by reset
   attributes: {
-    account: null,
+    address: null,
     name: null,
     kind: 'person',
     url: null,
@@ -24,9 +24,9 @@ export default Component.extend({
     this.reset();
   },
 
-  isValidAccount: computed('kredits.ethProvider', 'account', function() {
+  isValidAddress: computed('kredits.ethProvider', 'address', function() {
     // TODO: add proper address validation
-    return this.get('account') !== '';
+    return this.get('address') !== '';
   }),
   isValidName: isPresent('name'),
   isValidURL: isPresent('url'),
@@ -34,7 +34,7 @@ export default Component.extend({
   isValidGithubUsername: isPresent('github_username'),
   isValidWikiUsername: isPresent('wiki_username'),
   isValid: and(
-    'isValidAccount',
+    'isValidAddress',
     'isValidName',
     'isValidGithubUID'
   ),

app/components/add-contributor/template.hbs

@@ -9,11 +9,11 @@
     </label>
   </p>
   <p>
-    {{input name="account"
+    {{input name="address"
             type="text"
             placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4"
-            value=account
-            class=(if isValidAccount 'valid' '')}}
+            value=address
+            class=(if isValidAddress 'valid' '')}}
   </p>
   <p>
     <select required onchange={{action (mut kind) value="target.value"}}>

app/components/contributor-list/template.hbs

@@ -13,7 +13,7 @@
     <tr class="metadata {{if contributor.isCurrentUser 'current-user'}} {{if contributor.showMetadata 'visible'}}">
       <td colspan="2">
         <ul>
-          <li><a href="https://testnet.etherscan.io/address/{{contributor.account}}">Inspect Ethereum transactions</a></li>
+          <li><a href="https://testnet.etherscan.io/address/{{contributor.address}}">Inspect Ethereum transactions</a></li>
           {{#if contributor.ipfsHash}}
             <li><a href="https://ipfs.io/ipfs/{{contributor.ipfsHash}}">Inspect IPFS profile</a></li>
           {{/if}}