From c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Mon, 18 Sep 2017 15:41:25 -0700
Subject: Fix merge conflict; separate onboarding buy screen

---
 mascara/src/app/first-time/backup-phrase-screen.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'mascara/src/app/first-time/backup-phrase-screen.js')

diff --git a/mascara/src/app/first-time/backup-phrase-screen.js b/mascara/src/app/first-time/backup-phrase-screen.js
index fdbba6550..c68dacea2 100644
--- a/mascara/src/app/first-time/backup-phrase-screen.js
+++ b/mascara/src/app/first-time/backup-phrase-screen.js
@@ -66,7 +66,7 @@ class BackupPhraseScreen extends Component {
     }
   }
 
-  renderSecretWordsContainer() {
+  renderSecretWordsContainer () {
     const { isShowingSecret } = this.state
 
     return (
@@ -197,7 +197,7 @@ class BackupPhraseScreen extends Component {
     ) 
   }
 
-  renderBack() {
+  renderBack () {
     return this.state.page === BackupPhraseScreen.PAGE.CONFIRM
       ? (
         <a
@@ -216,17 +216,17 @@ class BackupPhraseScreen extends Component {
       : null
   }
 
-  renderContent() {
-    switch(this.state.page) {
+  renderContent () {
+    switch (this.state.page) {
       case BackupPhraseScreen.PAGE.CONFIRM:
-        return this.renderConfirmationScreen();
+        return this.renderConfirmationScreen()
       case BackupPhraseScreen.PAGE.SECRET:
       default:
-        return this.renderSecretScreen();
+        return this.renderSecretScreen()
     }
   }
 
-  render() {
+  render () {
     return this.props.isLoading
       ? <LoadingScreen loadingMessage="Creating your new account" />
       : (
@@ -245,10 +245,10 @@ export default compose(
     ({ metamask: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
       seedWords,
       isLoading,
-      address: selectedAddress
+      address: selectedAddress,
     }),
     dispatch => ({
-      confirmSeedWords: () => dispatch(confirmSeedWords())
+      confirmSeedWords: () => dispatch(confirmSeedWords()),
     })
   )
 )(BackupPhraseScreen)
-- 
cgit