From 08a6be5d62325c5e358f4d737ebe6119bacb13ac Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 1 Dec 2016 12:11:03 +0100
Subject: [PATCH] recovery phrase: move print button to modal actions

---
 .../AccountDetails/accountDetails.js          | 30 -------------------
 js/src/modals/CreateAccount/createAccount.js  | 23 ++++++++++++--
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
index 945bcc975..14c858c06 100644
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
+++ b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
@@ -15,15 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
-import PrintIcon from 'material-ui/svg-icons/action/print';
 
 import { Form, Input, InputAddress } from '../../../ui';
-import Button from '../../../ui/Button';
-
-import { createIdentityImg } from '../../../api/util/identity';
-import print from './print';
-import recoveryPage from './recovery-page.ejs';
-import ParityLogo from '../../../../assets/images/parity-logo-black-no-text.svg';
 
 export default class AccountDetails extends Component {
   static propTypes = {
@@ -49,7 +42,6 @@ export default class AccountDetails extends Component {
           label='address'
           value={ address } />
         { this.renderPhrase() }
-        { this.renderPhraseCopyButton() }
       </Form>
     );
   }
@@ -70,26 +62,4 @@ export default class AccountDetails extends Component {
         value={ phrase } />
     );
   }
-
-  renderPhraseCopyButton () {
-    const { phrase } = this.props;
-    if (!phrase) {
-      return null;
-    }
-
-    return (
-      <Button
-        icon={ <PrintIcon /> }
-        label={ 'print recovery phrase' }
-        onClick={ this.printPhrase }
-      />
-    );
-  }
-
-  printPhrase = () => {
-    const { address, phrase, name } = this.props;
-    const identity = createIdentityImg(address);
-
-    print(recoveryPage({ phrase, name, identity, address, logo: ParityLogo }));
-  }
 }
diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index e95dab2a7..9419e1076 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -20,6 +20,7 @@ import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
 import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
+import PrintIcon from 'material-ui/svg-icons/action/print';
 
 import { Button, Modal } from '../../ui';
 
@@ -32,6 +33,11 @@ import NewImport from './NewImport';
 import RawKey from './RawKey';
 import RecoveryPhrase from './RecoveryPhrase';
 
+import { createIdentityImg } from '../../api/util/identity';
+import print from './AccountDetails/print';
+import recoveryPage from './AccountDetails/recovery-page.ejs';
+import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
+
 const TITLES = {
   type: 'creation type',
   create: 'create account',
@@ -179,12 +185,18 @@ export default class CreateAccount extends Component {
         ];
 
       case 2:
-        return (
+        return [
+          createType === 'fromNew' ? (
+            <Button
+              icon={ <PrintIcon /> }
+              label='Print Phrase'
+              onClick={ this.printPhrase } />
+          ) : null,
           <Button
             icon={ <ActionDoneAll /> }
             label='Close'
             onClick={ this.onClose } />
-        );
+        ];
     }
   }
 
@@ -377,4 +389,11 @@ export default class CreateAccount extends Component {
 
     store.dispatch({ type: 'newError', error });
   }
+
+  printPhrase = () => {
+    const { address, phrase, name } = this.state;
+    const identity = createIdentityImg(address);
+
+    print(recoveryPage({ phrase, name, identity, address, logo: ParityLogo }));
+  }
 }