diff --git a/app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap b/app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap index 042bc064d6b..3b4ced5f45c 100644 --- a/app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap +++ b/app/components/UI/AccountInfoCard/__snapshots__/index.test.js.snap @@ -45,7 +45,7 @@ exports[`AccountInfoCard should render correctly 1`] = ` numberOfLines={1} style={ Object { - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Bold", "fontSize": 16, "fontWeight": "600", @@ -60,7 +60,7 @@ exports[`AccountInfoCard should render correctly 1`] = ` numberOfLines={1} style={ Object { - "color": "#000000", + "color": "#24292E", "flexGrow": 1, "fontFamily": "EuclidCircularB-Bold", "fontSize": 16, @@ -78,7 +78,7 @@ exports[`AccountInfoCard should render correctly 1`] = ` style={ Object { "alignSelf": "flex-start", - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Regular", "fontSize": 14, "fontWeight": "100", diff --git a/app/components/UI/AssetList/index.js b/app/components/UI/AssetList/index.js index 07c4c31b97d..dc56faa968e 100644 --- a/app/components/UI/AssetList/index.js +++ b/app/components/UI/AssetList/index.js @@ -1,10 +1,11 @@ import React, { PureComponent } from 'react'; -import { Text, View, StyleSheet } from 'react-native'; +import { View, StyleSheet } from 'react-native'; import PropTypes from 'prop-types'; import { strings } from '../../../../locales/i18n'; import StyledButton from '../StyledButton'; // eslint-disable-line import/no-unresolved import AssetIcon from '../AssetIcon'; import { fontStyles } from '../../../styles/common'; +import Text from '../../Base/Text'; const styles = StyleSheet.create({ rowWrapper: { diff --git a/app/components/UI/BiometryButton/__snapshots__/index.test.js.snap b/app/components/UI/BiometryButton/__snapshots__/index.test.js.snap index 47166de2fc3..a7a712f4332 100644 --- a/app/components/UI/BiometryButton/__snapshots__/index.test.js.snap +++ b/app/components/UI/BiometryButton/__snapshots__/index.test.js.snap @@ -13,7 +13,7 @@ exports[`BiometryButton should render correctly 1`] = ` > @@ -36,7 +36,7 @@ exports[`CustomGas should render correctly 1`] = ` style={ Object { "alignSelf": "center", - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Bold", "fontSize": 14, "fontWeight": "600", @@ -85,7 +85,7 @@ exports[`CustomGas should render correctly 1`] = ` @@ -38,7 +38,7 @@ exports[`TransactionReviewData should render correctly 1`] = ` style={ Object { "alignSelf": "center", - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Bold", "fontSize": 14, "fontWeight": "600", @@ -57,7 +57,7 @@ exports[`TransactionReviewData should render correctly 1`] = ` @@ -134,13 +133,11 @@ exports[`ChoosePassword should render correctly 1`] = ` style={ Array [ Object { - "color": "#8E8E93", + "color": "#24292E", "fontFamily": "EuclidCircularB-Regular", - "fontSize": 12, + "fontSize": 16, "fontWeight": "400", - "height": 20, - "marginTop": 14, - "textAlign": "left", + "marginBottom": 12, }, Object { "position": "absolute", @@ -182,13 +179,12 @@ exports[`ChoosePassword should render correctly 1`] = ` @@ -196,6 +192,7 @@ exports[`ChoosePassword should render correctly 1`] = ` @@ -249,20 +244,19 @@ exports[`ChoosePassword should render correctly 1`] = ` "alignSelf": "flex-end", "position": "absolute", "right": 17, - "top": 50, + "top": 52, } } /> @@ -282,11 +276,11 @@ exports[`ChoosePassword should render correctly 1`] = ` @@ -347,7 +341,7 @@ exports[`ChoosePassword should render correctly 1`] = ` onPress={[Function]} style={ Object { - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Regular", "fontSize": 14, "fontWeight": "400", diff --git a/app/components/Views/ChoosePassword/index.js b/app/components/Views/ChoosePassword/index.js index bc412367a4b..5601e44c747 100644 --- a/app/components/Views/ChoosePassword/index.js +++ b/app/components/Views/ChoosePassword/index.js @@ -29,7 +29,7 @@ import { SEED_PHRASE_HINTS, BIOMETRY_CHOICE_DISABLED } from '../../../constants/storage'; -import { getPasswordStrengthWord, passwordRequirementsMet } from '../../../util/password'; +import { getPasswordStrengthWord, passwordRequirementsMet, MIN_PASSWORD_LENGTH } from '../../../util/password'; import { CHOOSE_PASSWORD_STEPS } from '../../../constants/onboarding'; @@ -71,13 +71,13 @@ const styles = StyleSheet.create({ alignItems: 'center' }, title: { - fontSize: 24, + fontSize: Device.isAndroid() ? 20 : 25, marginTop: 20, marginBottom: 20, color: colors.fontPrimary, justifyContent: 'center', textAlign: 'center', - ...fontStyles.normal + ...fontStyles.bold }, subtitle: { fontSize: 16, @@ -118,6 +118,7 @@ const styles = StyleSheet.create({ textDecorationColor: colors.blue }, field: { + marginVertical: 5, position: 'relative' }, input: { @@ -144,11 +145,10 @@ const styles = StyleSheet.create({ marginBottom: 30 }, biometryLabel: { - fontSize: 14, - color: colors.fontPrimary, - position: 'absolute', - top: 0, - left: 0 + flex: 1, + fontSize: 16, + color: colors.black, + ...fontStyles.normal }, biometrySwitch: { position: 'absolute', @@ -156,11 +156,16 @@ const styles = StyleSheet.create({ right: 0 }, hintLabel: { + color: colors.black, + fontSize: 16, + marginBottom: 12, + ...fontStyles.normal + }, + passwordStrengthLabel: { height: 20, - marginTop: 14, - fontSize: 12, - color: colors.grey450, - textAlign: 'left', + marginTop: 10, + fontSize: 15, + color: colors.black, ...fontStyles.normal }, showPassword: { @@ -182,7 +187,7 @@ const styles = StyleSheet.create({ }, showMatchingPasswords: { position: 'absolute', - top: 50, + top: 52, right: 17, alignSelf: 'flex-end' } @@ -571,14 +576,14 @@ class ChoosePassword extends PureComponent { autoCapitalize="none" /> {(password !== '' && ( - + {strings('choose_password.password_strength')} {' '} {strings(`choose_password.strength_${passwordStrengthWord}`)} - )) || } + )) || } {strings('choose_password.confirm_password')} @@ -600,8 +605,8 @@ class ChoosePassword extends PureComponent { ) : null} - - {strings('choose_password.must_be_at_least', { number: 8 })} + + {strings('choose_password.must_be_at_least', { number: MIN_PASSWORD_LENGTH })} {this.renderSwitch()} diff --git a/app/components/Views/EnterPasswordSimple/__snapshots__/index.test.js.snap b/app/components/Views/EnterPasswordSimple/__snapshots__/index.test.js.snap index 3284eee2aac..0ff57e33882 100644 --- a/app/components/Views/EnterPasswordSimple/__snapshots__/index.test.js.snap +++ b/app/components/Views/EnterPasswordSimple/__snapshots__/index.test.js.snap @@ -51,7 +51,7 @@ exports[`EnterPasswordSimple should render correctly 1`] = ` @@ -191,8 +202,9 @@ exports[`ImportFromSeed should render correctly 1`] = ` @@ -281,14 +299,16 @@ exports[`ImportFromSeed should render correctly 1`] = ` style={ Object { "marginVertical": 5, + "position": "relative", } } > @@ -364,6 +390,7 @@ exports[`ImportFromSeed should render correctly 1`] = ` {hideSeedPhraseInput ? ( {strings('import_from_seed.confirm_password')} - {strings('choose_password.must_be_at_least', { number: 8 })} + {strings('choose_password.must_be_at_least', { number: MIN_PASSWORD_LENGTH })} diff --git a/app/components/Views/Login/index.js b/app/components/Views/Login/index.js index 4695544d0e2..518bcaa85cf 100644 --- a/app/components/Views/Login/index.js +++ b/app/components/Views/Login/index.js @@ -85,7 +85,8 @@ const styles = StyleSheet.create({ flexDirection: 'column' }, label: { - fontSize: 14, + color: colors.black, + fontSize: 16, marginBottom: 12, ...fontStyles.normal }, @@ -114,11 +115,17 @@ const styles = StyleSheet.create({ biometryLabel: { flex: 1, fontSize: 16, + color: colors.black, ...fontStyles.normal }, biometrySwitch: { flex: 0 }, + input: { + ...fontStyles.normal, + fontSize: 16, + paddingTop: 2 + }, cant: { width: 280, alignSelf: 'center', @@ -478,6 +485,7 @@ class Login extends PureComponent { {strings('login.type_delete')} @@ -417,7 +417,7 @@ exports[`Confirm should render correctly 1`] = ` style={ Object { "alignItems": "center", - "color": "#000000", + "color": "#24292E", "fontFamily": "EuclidCircularB-Bold", "fontSize": 16, "fontWeight": "600", diff --git a/app/components/Views/SendFlow/Confirm/index.js b/app/components/Views/SendFlow/Confirm/index.js index 4a755bd4b70..bc15e4c73e6 100644 --- a/app/components/Views/SendFlow/Confirm/index.js +++ b/app/components/Views/SendFlow/Confirm/index.js @@ -87,7 +87,7 @@ const styles = StyleSheet.create({ marginVertical: 3 }, textAmount: { - fontFamily: 'Roboto-Light', + ...fontStyles.normal, fontWeight: fontStyles.light.fontWeight, color: colors.black, fontSize: 44, diff --git a/app/components/Views/SendFlow/SendTo/__snapshots__/index.test.js.snap b/app/components/Views/SendFlow/SendTo/__snapshots__/index.test.js.snap index 7c5e3703cb9..d6855203729 100644 --- a/app/components/Views/SendFlow/SendTo/__snapshots__/index.test.js.snap +++ b/app/components/Views/SendFlow/SendTo/__snapshots__/index.test.js.snap @@ -162,7 +162,7 @@ exports[`SendTo should render correctly 1`] = ` { switch (strength) { case 0: