verification: add mainnet BadgeReg ids (#4190)

* verification: mainnet BadgeReg ids * verification: fetch contracts by name * verification: better wording * typo * reregistered badges
openethereum · Jan 19, 2017 · ff3ae33 · ff3ae33
1 parent 516e16a
commit ff3ae33
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/js/src/contracts/badgereg.js b/js/src/contracts/badgereg.js
@@ -73,6 +73,26 @@ export default class BadgeReg {
       });
   }
 
+  fetchCertifierByName (name) {
+    return this
+      .getContract()
+      .then((badgeReg) => {
+        return badgeReg.instance.fromName.call({}, [ name ]);
+      })
+      .then(([ id, address, owner ]) => {
+        if (address === ZERO20) {
+          throw new Error(`Certifier ${name} does not exist.`);
+        }
+
+        return this.fetchMeta(id)
+          .then(({ title, icon }) => {
+            const data = { address, id, name, title, icon };
+            this.certifiers[id] = data;
+            return data;
+          });
+      });
+  }
+
   fetchMeta (id) {
     return this
       .getContract()

diff --git a/js/src/modals/Verification/GatherData/gatherData.js b/js/src/modals/Verification/GatherData/gatherData.js
@@ -115,13 +115,26 @@ export default class GatherData extends Component {
     if (!fee) {
       return (<p>Fetching the fee…</p>);
     }
+    if (fee.eq(0)) {
+      return (
+        <div className={ styles.container }>
+          <InfoIcon />
+          <p className={ styles.message }>
+            <FormattedMessage
+              id='ui.verification.gatherData.nofee'
+              defaultMessage='There is no additional fee.'
+            />
+          </p>
+        </div>
+      );
+    }
     return (
       <div className={ styles.container }>
         <InfoIcon />
         <p className={ styles.message }>
           <FormattedMessage
             id='ui.verification.gatherData.fee'
-            defaultMessage='The fee is {amount} ETH.'
+            defaultMessage='The additional fee is {amount} ETH.'
             values={ {
               amount: fromWei(fee).toFixed(3)
             } }

diff --git a/js/src/modals/Verification/email-store.js b/js/src/modals/Verification/email-store.js
@@ -23,7 +23,8 @@ import VerificationStore, {
 } from './store';
 import { isServerRunning, postToServer } from '../../3rdparty/email-verification';
 
-const EMAIL_VERIFICATION = 7; // id in the `BadgeReg.sol` contract
+// name in the `BadgeReg.sol` contract
+const EMAIL_VERIFICATION = 'emailverification';
 
 export default class EmailVerificationStore extends VerificationStore {
   @observable email = '';

diff --git a/js/src/modals/Verification/sms-store.js b/js/src/modals/Verification/sms-store.js
@@ -23,7 +23,8 @@ import VerificationStore, {
 } from './store';
 import { isServerRunning, postToServer } from '../../3rdparty/sms-verification';
 
-const SMS_VERIFICATION = 0; // id in the `BadgeReg.sol` contract
+// name in the `BadgeReg.sol` contract
+const SMS_VERIFICATION = 'smsverification';
 
 export default class SMSVerificationStore extends VerificationStore {
   @observable number = '';

diff --git a/js/src/modals/Verification/store.js b/js/src/modals/Verification/store.js
@@ -47,13 +47,13 @@ export default class VerificationStore {
   @observable isCodeValid = null;
   @observable confirmationTx = null;
 
-  constructor (api, abi, certifierId, account, isTestnet) {
+  constructor (api, abi, certifierName, account, isTestnet) {
     this.api = api;
     this.account = account;
     this.isTestnet = isTestnet;
 
     this.step = LOADING;
-    Contracts.get().badgeReg.fetchCertifier(certifierId)
+    Contracts.get().badgeReg.fetchCertifierByName(certifierName)
       .then(({ address }) => {
         this.contract = new Contract(api, abi).at(address);
         this.load();