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 1/4] 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 }));
+  }
 }

From 6822433a830c5144786b6f5e02ec1f7aaf056022 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 1 Dec 2016 12:12:38 +0100
Subject: [PATCH 2/4] recovery phrase: move print helpers

---
 js/src/modals/CreateAccount/createAccount.js                  | 4 ++--
 js/src/modals/CreateAccount/{AccountDetails => }/print.js     | 0
 .../CreateAccount/{AccountDetails => }/recovery-page.ejs      | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename js/src/modals/CreateAccount/{AccountDetails => }/print.js (100%)
 rename js/src/modals/CreateAccount/{AccountDetails => }/recovery-page.ejs (100%)

diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index 9419e1076..ba8c6969a 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -34,8 +34,8 @@ 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 print from './print';
+import recoveryPage from './recovery-page.ejs';
 import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
 
 const TITLES = {
diff --git a/js/src/modals/CreateAccount/AccountDetails/print.js b/js/src/modals/CreateAccount/print.js
similarity index 100%
rename from js/src/modals/CreateAccount/AccountDetails/print.js
rename to js/src/modals/CreateAccount/print.js
diff --git a/js/src/modals/CreateAccount/AccountDetails/recovery-page.ejs b/js/src/modals/CreateAccount/recovery-page.ejs
similarity index 100%
rename from js/src/modals/CreateAccount/AccountDetails/recovery-page.ejs
rename to js/src/modals/CreateAccount/recovery-page.ejs

From a1c174666743835b006ef90214c493e7d7ec7688 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 1 Dec 2016 15:19:42 +0100
Subject: [PATCH 3/4] show recovery print button if recovered account

---
 js/src/modals/CreateAccount/createAccount.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index ba8c6969a..40b7fbcd2 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -186,7 +186,7 @@ export default class CreateAccount extends Component {
 
       case 2:
         return [
-          createType === 'fromNew' ? (
+          createType === 'fromNew' || createType === 'fromPhrase' ? (
             <Button
               icon={ <PrintIcon /> }
               label='Print Phrase'

From 7049336800c12b2ab5fbde81a0b8c07f2a013067 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Thu, 1 Dec 2016 15:40:20 +0100
Subject: [PATCH 4/4] show recovery print button on first run

---
 js/src/modals/FirstRun/firstRun.js | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
index 3a676fc3b..cf1a5a093 100644
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -18,6 +18,7 @@ import React, { Component, PropTypes } from 'react';
 import ActionDone from 'material-ui/svg-icons/action/done';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
+import PrintIcon from 'material-ui/svg-icons/action/print';
 
 import { Button, Modal } from '../../ui';
 
@@ -27,6 +28,11 @@ import Completed from './Completed';
 import TnC from './TnC';
 import Welcome from './Welcome';
 
+import { createIdentityImg } from '../../api/util/identity';
+import print from '../CreateAccount/print';
+import recoveryPage from '../CreateAccount/recovery-page.ejs';
+import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
+
 const STAGE_NAMES = ['welcome', 'terms', 'new account', 'recovery', 'completed'];
 
 export default class FirstRun extends Component {
@@ -107,7 +113,6 @@ export default class FirstRun extends Component {
 
     switch (stage) {
       case 0:
-      case 3:
         return (
           <Button
             icon={ <NavigationArrowForward /> }
@@ -133,6 +138,20 @@ export default class FirstRun extends Component {
             onClick={ this.onCreate } />
         );
 
+      case 3:
+        return [
+          <Button
+            icon={ <PrintIcon /> }
+            label='Print Phrase'
+            onClick={ this.printPhrase }
+          />,
+          <Button
+            icon={ <NavigationArrowForward /> }
+            label='Next'
+            onClick={ this.onNext }
+          />
+        ];
+
       case 4:
         return (
           <Button
@@ -205,4 +224,11 @@ export default class FirstRun 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 }));
+  }
 }