fix conflicts

2 files changed, 11 insertions, 3 deletions

diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js
index 6b284f7c5..0908787da 100644
--- a/mascara/src/app/first-time/create-password-screen.js
+++ b/mascara/src/app/first-time/create-password-screen.js
@@ -63,7 +63,9 @@ class CreatePasswordScreen extends Component {
     return password === confirmPassword
   }
 
-  createAccount = () => {
+  createAccount = (event) => {
+    event.preventDefault()
+
     if (!this.isValid()) {
       return
     }
@@ -127,7 +129,7 @@ class CreatePasswordScreen extends Component {
               It allows you to hold ether & tokens, and interact with decentralized applications.
             </div>
           </div>}
-          <div className="create-password">
+          <form className="create-password">
             <div className="create-password__title">
               Create Password
             </div>
@@ -188,7 +190,7 @@ class CreatePasswordScreen extends Component {
             </a>
             { */ }
             <Breadcrumbs total={3} currentIndex={0} />
-          </div>
+          </form>
         </div>
       </div>
     )
diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css
index 2d05a48b8..f3df240e7 100644
--- a/mascara/src/app/first-time/index.css
+++ b/mascara/src/app/first-time/index.css
@@ -17,6 +17,12 @@
   font-family: Roboto;
 }
 
+@media screen and (min-height: 601px) {
+  .first-time-flow {
+    height: 100vh;
+  }
+}
+
 .alpha-warning__container {
   display: flex;
   justify-content: center;