Merge pull request #1522 from Hirobreak/captchakey

captcha key

Author: danieltigse

electron_app/src/backup/exporter.js

@@ -61,6 +61,7 @@ const start = async () => {
   const [reId, domain = APP_DOMAIN] = recipientId.split('@');
   try {
     const accountObj = {
+      recipientId: account.recipientId,
       email: `${reId}@${domain}`,
       username: reId,
       domain: domain,

email_login/src/components/customCheckbox.scss

@@ -22,7 +22,7 @@
     height: 10px;
     width: 10px;
     border-radius: 3px;
-    border: solid 2px #fff;
+    border: solid 2px #8a8a8a;
     opacity: 0.2;
     margin-left: 0px;
 
@@ -34,7 +34,7 @@
 
     &.checkmark-checked {
       background-color: #ffffff;
-      border-color: transparent !important;
+      border-color: transparent;
       opacity: 1;
 
       &:after {

email_login/src/new-components/signup/SignUpCreateAccountWrapper.js

@@ -28,7 +28,6 @@ class SignUpCreateAccountWrapper extends Component {
         image: undefined
       },
       termsConditions: false,
-      promiseCall: false,
       enableButton: false,
       createAccount: false,
       error: undefined
@@ -98,13 +97,6 @@ class SignUpCreateAccountWrapper extends Component {
               )}
             </span>
           </div>
-          <div className="checkbox-container">
-            <CustomCheckbox
-              value={this.state.promiseCall}
-              onChange={this.handleCheckPromiseCall}
-            />
-            <span className="checkmark-label">{create.lifeTip}</span>
-          </div>
         </div>
         <Button
           text={create.button}
@@ -137,11 +129,11 @@ class SignUpCreateAccountWrapper extends Component {
       });
       return;
     }
-    const { randomId, image } = result.body;
+    const { captchaKey, image } = result.body;
     this.setState({
       captcha: {
         ...this.state.captcha,
-        randomId,
+        randomId: captchaKey,
         image
       }
     });
@@ -237,16 +229,6 @@ class SignUpCreateAccountWrapper extends Component {
     );
   };
 
-  handleCheckPromiseCall = () => {
-    const newValue = !this.state.promiseCall;
-    this.setState(
-      {
-        promiseCall: newValue
-      },
-      this.shouldEnableButton
-    );
-  };
-
   shouldEnableButton = () => {
     const shouldEnable =
       this.state.termsConditions &&