Fix scroll and button text and secure now goes to next step (#1737)

* Fix scroll and button text * Update tests * secure now goes to next step Co-authored-by: Ibrahim Taveras <ibrahimtaveras00@gmail.com>
MetaMask · Jul 30, 2020 · d8c629b · d8c629b
1 parent 42e68d0
commit d8c629b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/app/components/Views/AccountBackupStep1/index.js b/app/components/Views/AccountBackupStep1/index.js
@@ -185,6 +185,7 @@ const AccountBackupStep1 = props => {
 	const hideRemindLaterModal = () => {
 		setToggleSkipCheckbox(false);
 		setRemindLaterModal(false);
+		goNext();
 	};
 
 	const skip = async () => {

diff --git a/app/components/Views/ChoosePassword/__snapshots__/index.test.js.snap b/app/components/Views/ChoosePassword/__snapshots__/index.test.js.snap
@@ -13,7 +13,7 @@ exports[`ChoosePassword should render correctly 1`] = `
     style={
       Object {
         "flex": 1,
-        "marginHorizontal": 32,
+        "marginBottom": 10,
       }
     }
     testID="choose-password-screen"
@@ -49,6 +49,7 @@ exports[`ChoosePassword should render correctly 1`] = `
       style={
         Object {
           "flex": 1,
+          "paddingHorizontal": 32,
         }
       }
       viewIsInsideTabBar={false}
@@ -318,7 +319,6 @@ exports[`ChoosePassword should render correctly 1`] = `
               Object {
                 "height": 18,
                 "margin": 10,
-                "marginLeft": -6,
                 "width": 18,
               }
             }
@@ -361,6 +361,7 @@ exports[`ChoosePassword should render correctly 1`] = `
       <View
         style={
           Object {
+            "flex": 1,
             "marginTop": 20,
             "paddingHorizontal": 10,
           }
@@ -382,7 +383,7 @@ exports[`ChoosePassword should render correctly 1`] = `
           testID="submit-button"
           type="blue"
         >
-          NEXT
+          Create password
         </StyledButton>
       </View>
     </KeyboardAwareScrollViewMock>

diff --git a/app/components/Views/ChoosePassword/index.js b/app/components/Views/ChoosePassword/index.js
@@ -30,10 +30,11 @@ const styles = StyleSheet.create({
 	},
 	wrapper: {
 		flex: 1,
-		marginHorizontal: 32
+		marginBottom: 10
 	},
 	scrollableWrapper: {
-		flex: 1
+		flex: 1,
+		paddingHorizontal: 32
 	},
 	keyboardScrollableWrapper: {
 		flexGrow: 1
@@ -91,8 +92,7 @@ const styles = StyleSheet.create({
 	checkbox: {
 		width: 18,
 		height: 18,
-		margin: 10,
-		marginLeft: -6
+		margin: 10
 	},
 	label: {
 		...fontStyles.normal,
@@ -117,6 +117,7 @@ const styles = StyleSheet.create({
 		...fontStyles.normal
 	},
 	ctaWrapper: {
+		flex: 1,
 		marginTop: 20,
 		paddingHorizontal: 10
 	},

diff --git a/app/components/Views/ChoosePasswordSimple/__snapshots__/index.test.js.snap b/app/components/Views/ChoosePasswordSimple/__snapshots__/index.test.js.snap
@@ -298,7 +298,7 @@ exports[`ChoosePasswordSimple should render correctly 1`] = `
         testID="submit-button"
         type="blue"
       >
-        NEXT
+        Create password
       </StyledButton>
     </View>
   </View>

diff --git a/locales/en.json b/locales/en.json
@@ -141,7 +141,7 @@
 		"subtitle": "This password will unlock your MetaMask wallet only on this device.",
 		"password": "New Password",
 		"confirm_password": "Confirm Password",
-		"create_button": "NEXT",
+		"create_button": "Create password",
 		"import_with_seed_phrase": "Import with seed phrase",
 		"password_length_error": "The password needs to be at least 8 characters long",
 		"password_dont_match": "Passwords don't match",

diff --git a/locales/es.json b/locales/es.json
@@ -110,7 +110,7 @@
 		"subtitle": "Utilizarás esta contraseña para acceder a tu billetera de MetaMask solamente en este dispositivo.",
 		"password": "Nueva Contraseña",
 		"confirm_password": "Confirmar Contraseña",
-		"create_button": "Siguiente",
+		"create_button": "Crear contraseña",
 		"import_with_seed_phrase": "Importar con frase semilla",
 		"password_length_error": "La contraseña debe contener al menos 8 caracteres",
 		"password_dont_match": "Las contraseñas no coinciden",