Merge pull request #80 from rnsdomains/develop

v2.0-beta.6 release merge.

src/app/components/GetDomainStateComponent.js

@@ -24,7 +24,9 @@ class GetDomainStateComponent extends Component {
   }
 
   render() {
-    const { strings, domain, getDomainState } = this.props;
+    const {
+      strings, domain, getDomainState, disableSearchButton,
+    } = this.props;
 
     const { invalid } = this.state;
 
@@ -47,7 +49,10 @@ class GetDomainStateComponent extends Component {
               className={invalid ? 'is-invalid' : null}
             />
             <InputGroup.Append>
-              <Button type="submit" size="sm">{strings.search}</Button>
+              <InputGroup.Text>{strings.rskTld}</InputGroup.Text>
+            </InputGroup.Append>
+            <InputGroup.Append>
+              <Button type="submit" size="sm" disabled={disableSearchButton}>{strings.search}</Button>
             </InputGroup.Append>
             <div className="invalid-feedback">
               {invalid}
@@ -63,8 +68,10 @@ GetDomainStateComponent.propTypes = {
   strings: propTypes.shape({
     search: propTypes.string.isRequired,
     invalid_name: propTypes.string.isRequired,
+    rskTld: propTypes.string.isRequired,
   }).isRequired,
   domain: propTypes.string,
+  disableSearchButton: propTypes.bool.isRequired,
   getDomainState: propTypes.func.isRequired,
 };
 

src/app/containers/GetDomainStateContainer.js

@@ -5,6 +5,7 @@ import { GetDomainStateComponent } from '../components';
 
 const mapStateToProps = state => ({
   domain: parse(state.router.location.search).domain,
+  disableSearchButton: (state.registrar.committing || state.registrar.committed) && state.router.location.pathname === '/registrar',
 });
 
 const mapDispatchToProps = dispatch => ({

src/app/tabs/registrar/actions.js

@@ -2,7 +2,8 @@ import {
   REQUEST_REGISTRAR_GET_COST, RECEIVE_REGISTRAR_GET_COST,
   REQUEST_REGISTRAR_COMMIT, RECEIVE_REGISTRAR_COMMIT, ERROR_REGISTRAR_COMMIT,
   REQUEST_REGISTRAR_REVEAL_COMMIT, RECEIVE_REGISTRAR_REVEAL_COMMIT,
-  RECEIVE_CAN_REVEAL_COMMIT,
+  RECEIVE_CAN_REVEAL_COMMIT, ERROR_REGISTRAR_REVEAL_COMMIT, SALT_NOT_FOUND,
+  REGISTRAR_COMMIT_CONFIRMED, REVEAL_COMMIT_CONFIRMED,
 } from './types';
 
 export const requestGetCost = duration => ({
@@ -19,9 +20,10 @@ export const requestCommitRegistrar = () => ({
   type: REQUEST_REGISTRAR_COMMIT,
 });
 
-export const receiveCommitRegistrar = hash => ({
+export const receiveCommitRegistrar = (hash, commitConfirmed) => ({
   type: RECEIVE_REGISTRAR_COMMIT,
   hash,
+  commitConfirmed,
 });
 
 export const errorRegistrarCommit = () => ({
@@ -36,7 +38,23 @@ export const receiveRevealCommit = () => ({
   type: RECEIVE_REGISTRAR_REVEAL_COMMIT,
 });
 
+export const errorRevealCommit = () => ({
+  type: ERROR_REGISTRAR_REVEAL_COMMIT,
+});
+
 export const receiveCanRevealCommit = canReveal => ({
   type: RECEIVE_CAN_REVEAL_COMMIT,
   canReveal,
 });
+
+export const saltNotFound = () => ({
+  type: SALT_NOT_FOUND,
+});
+
+export const commitTxMined = () => ({
+  type: REGISTRAR_COMMIT_CONFIRMED,
+});
+
+export const revealTxMined = () => ({
+  type: REVEAL_COMMIT_CONFIRMED,
+});

src/app/tabs/registrar/components/CommitComponent.js

@@ -1,51 +1,58 @@
-import React from 'react';
+import React, { Component } from 'react';
 import { multilanguage } from 'redux-multilanguage';
 import propTypes from 'prop-types';
 import {
   Container, Row, Col, Spinner, Button,
 } from 'react-bootstrap';
 
-const CommitComponent = (props) => {
-  const {
-    committing, strings, doCommitment, committed,
-  } = props;
+class CommitComponent extends Component {
+  componentDidMount() {
+    const { checkIfAlreadyCommitted } = this.props;
+    checkIfAlreadyCommitted();
+  }
 
-  return (
-    <Container>
-      <Row>
-        <Col md={6} className="offset-md-3">
-          <p>
-            2.
-            {strings.process_step_1_explanation}
-          </p>
-        </Col>
-      </Row>
-      <Row>
-        <Col>
-          {
-            committing
-              ? <Spinner animation="grow" variant="primary" />
-              : (
-                <Button
-                  disabled={committing || committed}
-                  onClick={doCommitment}
-                >
-                  {strings.process_step_1}
-                </Button>
-              )
-          }
-        </Col>
-      </Row>
-      <Row>
-        <Col md={8} className="offset-md-2">
-          <i>
-            {strings.process_step_2_explanation}
-          </i>
-        </Col>
-      </Row>
-    </Container>
-  );
-};
+  render() {
+    const {
+      committing, strings, doCommitment, committed,
+    } = this.props;
+
+    return (
+      <Container>
+        <Row>
+          <Col md={6} className="offset-md-3">
+            <p>
+              2.
+              {strings.process_step_1_explanation}
+            </p>
+          </Col>
+        </Row>
+        <Row>
+          <Col>
+            {
+              committing
+                ? <Spinner animation="grow" variant="primary" />
+                : (
+                  <Button
+                    disabled={committing || committed}
+                    onClick={doCommitment}
+                  >
+                    {strings.process_step_1}
+                  </Button>
+                )
+            }
+          </Col>
+        </Row>
+        <Row>
+          <Col md={8} className="offset-md-2">
+            <i>
+              {strings.process_step_2_explanation}
+            </i>
+          </Col>
+        </Row>
+      </Container>
+    );
+  }
+}
 
 CommitComponent.propTypes = {
   strings: propTypes.shape({
@@ -54,6 +61,7 @@ CommitComponent.propTypes = {
     process_step_2_explanation: propTypes.string.isRequired,
   }).isRequired,
   doCommitment: propTypes.func.isRequired,
+  checkIfAlreadyCommitted: propTypes.func.isRequired,
   committing: propTypes.bool.isRequired,
   committed: propTypes.bool.isRequired,
 };

src/app/tabs/registrar/components/RegistrarComponent.js

@@ -1,38 +1,78 @@
-import React from 'react';
+import React, { Component } from 'react';
 import propTypes from 'prop-types';
 import { multilanguage } from 'redux-multilanguage';
+import { Link } from 'react-router-dom';
+import { Card, Spinner } from 'react-bootstrap';
 import { TabWithSearchComponent } from '../../../components';
 import { RentalPeriodContainer, CommitContainer, RevealContainer } from '../containers';
 
-const RegistrarComponent = (props) => {
-  const {
-    strings, domain,
-  } = props;
-
-  return (
-    <div>
-      <TabWithSearchComponent>
-        <h2>
-          {strings.start_registration_for}
-          {' '}
-          <code>{domain}</code>
-        </h2>
-        <h4>registering a name requires you to complete 3 steps</h4>
-        <RentalPeriodContainer />
-        <hr />
-        <CommitContainer />
-        <RevealContainer />
-      </TabWithSearchComponent>
-    </div>
-  );
-};
+class RegistrarComponent extends Component {
+  componentDidMount() {
+    const { domain, getState } = this.props;
+    if (domain && getState) getState(domain);
+  }
+
+  render() {
+    const {
+      strings, domain, owned, blocked, domainStateLoading,
+    } = this.props;
+
+    let elementToRender;
+
+    if (domainStateLoading) {
+      elementToRender = <Spinner animation="grow" variant="primary" />;
+    } else if (owned) {
+      elementToRender = (
+        <Card.Text>
+          {strings.owned}
+          <br />
+          <Link to={`/admin?domain=${domain}`} className="btn btn-primary">{strings.admin_your_domain_title}</Link>
+        </Card.Text>
+      );
+    } else if (blocked) {
+      elementToRender = <h4>{strings.domain_not_available}</h4>;
+    } else {
+      const domainDisplay = `${domain}.rsk`;
+
+      elementToRender = (
+        <div>
+          <h2>
+            {strings.start_registration_for}
+            {' '}
+            <code>{domainDisplay}</code>
+          </h2>
+          <h4>registering a name requires you to complete 3 steps</h4>
+          <RentalPeriodContainer />
+          <hr />
+          <CommitContainer />
+          <RevealContainer />
+        </div>
+      );
+    }
+
+    return (
+      <div>
+        <TabWithSearchComponent>
+          {elementToRender}
+        </TabWithSearchComponent>
+      </div>
+    );
+  }
+}
 
 RegistrarComponent.propTypes = {
   strings: propTypes.shape({
     start_registration_for: propTypes.string.isRequired,
     rental_period: propTypes.string.isRequired,
+    domain_not_available: propTypes.string.isRequired,
+    admin_your_domain_title: propTypes.string.isRequired,
+    owned: propTypes.string.isRequired,
   }).isRequired,
   domain: propTypes.string.isRequired,
+  domainStateLoading: propTypes.string.isRequired,
+  owned: propTypes.bool.isRequired,
+  blocked: propTypes.bool.isRequired,
+  getState: propTypes.func.isRequired,
 };
 
 export default multilanguage(RegistrarComponent);