2 files changed, 5 insertions, 2 deletions
diff --git a/mascara/src/app/first-time/backup-phrase-screen.js b/mascara/src/app/first-time/backup-phrase-screen.js
index 52ec79307..fdbba6550 100644
--- a/mascara/src/app/first-time/backup-phrase-screen.js
+++ b/mascara/src/app/first-time/backup-phrase-screen.js
@@ -56,12 +56,13 @@ class BackupPhraseScreen extends Component {
   };
 
   constructor(props) {
+    const {seedWords} = props
     super(props)
     this.state = {
       isShowingSecret: false,
       page: BackupPhraseScreen.PAGE.SECRET,
       selectedSeeds: [],
-      shuffledSeeds: shuffle(props.seedWords.split(' ')),
+      shuffledSeeds: seedWords && shuffle(seedWords.split(' ')),
     }
   }
 
diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js
index 0a8417bfc..36a18956a 100644
--- a/mascara/src/app/first-time/buy-ether-screen.js
+++ b/mascara/src/app/first-time/buy-ether-screen.js
@@ -86,6 +86,8 @@ class BuyEtherScreen extends Component {
   }
 
   renderCoinbaseForm() {
+    const {goToCoinbase, address} = this.props;
+
     return (
       <div className="buy-ether__action-content-wrapper">
         <div>{this.renderCoinbaseLogo()}</div>
@@ -94,7 +96,7 @@ class BuyEtherScreen extends Component {
         <div className="buy-ether__buttons">
           <button
             className="first-time-flow__button"
-            onClick={() => this.goToCoinbase(address)}
+            onClick={() => goToCoinbase(address)}
           >
             Buy
           </button>