Merge branch 'staging'

bitshares · Oct 9, 2017 · 8270a1f · 8270a1f
2 parents be644df + 7370892
commit 8270a1f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -1127,7 +1127,9 @@
     "account_exp": "This account will be created on the blockchain and will be your address for any transfers you want to make! <strong>There are no long Bitcoin-style addresses in Bitshares!</strong>",
     "understand_1": "I understand that noone can recover my password if I lose or forget it",
     "understand_2": "I have written down or oherwise stored my password",
-    "bts_rules": "The first rule of BitShares is: Do not lose your password.<br/>The second rule of BitShares is: Do not lose your password.<br />The third rule of BitShares is: We cannot recover your password.<br />The fourth rule: If you can remember the password, it's not secure.<br />The fifth rule: Use only randomly-generated passwords.<br />The sixth rule: Do not tell anyone your password.<br />The seventh rule: Always back up your password."
+    "understand_3": " I understand that I will lose access to my funds if I lose my password",
+    "bts_rules": "The first rule of BitShares is: Do not lose your password.<br/>The second rule of BitShares is: Do not lose your password.<br />The third rule of BitShares is: We cannot recover your password.<br />The fourth rule: If you can remember the password, it's not secure.<br />The fifth rule: Use only randomly-generated passwords.<br />The sixth rule: Do not tell anyone your password.<br />The seventh rule: Always back up your password.",
+    "ok_done": "OK, take me to the dashboard"
   },
   "borrow": {
     "title": "%(asset_symbol)s Margin",

diff --git a/app/components/Account/CreateAccountPassword.jsx b/app/components/Account/CreateAccountPassword.jsx
@@ -21,6 +21,10 @@ import Icon from "../Icon/Icon";
 import CopyButton from "../Utility/CopyButton";
 
 class CreateAccountPassword extends React.Component {
+    static contextTypes = {
+        router: React.PropTypes.object.isRequired
+    };
+
     constructor() {
         super();
         this.state = {
@@ -36,7 +40,8 @@ class CreateAccountPassword extends React.Component {
             generatedPassword: "P" + key.get_random_key().toWif(),
             confirm_password: "",
             understand_1: false,
-            understand_2: false
+            understand_2: false,
+            understand_3: false
         };
         this.onFinishConfirm = this.onFinishConfirm.bind(this);
 
@@ -196,7 +201,6 @@ class CreateAccountPassword extends React.Component {
                         noLabel
                     />
 
-                    <Translate component="p" content="wallet.account_exp" unsafe />
                 <section>
                     <label className="left-label"><Translate content="wallet.generated" />&nbsp;&nbsp;<span className="tooltip" data-html={true} data-tip={counterpart.translate("tooltip.generate")}><Icon name="question-circle" /></span></label>
                     <div style={{paddingBottom: "0.5rem"}}>
@@ -218,6 +222,13 @@ class CreateAccountPassword extends React.Component {
                     <div className="has-error"><Translate content="wallet.confirm_error" /></div> : null}
                 </section>
 
+            <br />
+            <div className="confirm-checks" onClick={this._onInput.bind(this, "understand_3")}>
+                <label>
+                    <input type="checkbox" onChange={() => {}} checked={this.state.understand_3}/>
+                    <Translate content="wallet.understand_3" />
+                </label>
+            </div>
             <br />
             <div className="confirm-checks" onClick={this._onInput.bind(this, "understand_1")}>
                 <label>
@@ -310,17 +321,11 @@ class CreateAccountPassword extends React.Component {
                 <div className="divider" />
                 <p className="txtlabel warning"><Translate unsafe content="wallet.password_lose_warning" /></p>
 
-                <div style={{width: "100%"}} onClick={() => {this.setState({step: 3});}} className="button"><Translate content="init_error.understand" /></div>
+                <div style={{width: "100%"}} onClick={() => {this.context.router.push("/dashboard");;}} className="button"><Translate content="wallet.ok_done" /></div>
             </div>
         );
     }
 
-    _onBackupDownload = () => {
-        this.setState({
-            step: 3
-        });
-    }
-
     _renderGetStarted() {
 
         return (