diff --git a/app/components/UI/DrawerView/index.js b/app/components/UI/DrawerView/index.js
index 587f90131de..70627d20d2b 100644
--- a/app/components/UI/DrawerView/index.js
+++ b/app/components/UI/DrawerView/index.js
@@ -756,7 +756,7 @@ class DrawerView extends PureComponent {
{
name: strings('drawer.settings'),
icon: this.getFeatherIcon('settings'),
- warning: strings('drawer.settings_warning'),
+ warning: strings('drawer.settings_warning_short'),
action: this.showSettings
},
{
diff --git a/app/components/UI/HintModal/__snapshots__/index.test.js.snap b/app/components/UI/HintModal/__snapshots__/index.test.js.snap
index 83e001cc949..b6fd0c01f48 100644
--- a/app/components/UI/HintModal/__snapshots__/index.test.js.snap
+++ b/app/components/UI/HintModal/__snapshots__/index.test.js.snap
@@ -44,9 +44,9 @@ exports[`HintModal should render correctly 1`] = `
style={
Object {
"color": "#000000",
- "fontFamily": "EuclidCircularB-Regular",
+ "fontFamily": "EuclidCircularB-Bold",
"fontSize": 18,
- "fontWeight": "bold",
+ "fontWeight": "600",
}
}
>
diff --git a/app/components/UI/HintModal/index.js b/app/components/UI/HintModal/index.js
index af02c11104a..48a64440e50 100644
--- a/app/components/UI/HintModal/index.js
+++ b/app/components/UI/HintModal/index.js
@@ -21,7 +21,7 @@ const styles = StyleSheet.create({
},
recovery: {
fontSize: 18,
- ...fontStyles.extraBold,
+ ...fontStyles.bold,
color: colors.fontPrimary
},
leaveHint: {
diff --git a/app/components/UI/SettingsNotification/__snapshots__/index.test.js.snap b/app/components/UI/SettingsNotification/__snapshots__/index.test.js.snap
index c805ce17176..ca4eebfc575 100644
--- a/app/components/UI/SettingsNotification/__snapshots__/index.test.js.snap
+++ b/app/components/UI/SettingsNotification/__snapshots__/index.test.js.snap
@@ -8,6 +8,7 @@ exports[`SettingsNotification should render correctly as notification 1`] = `
"alignSelf": "center",
"flex": 1,
"flexDirection": "row",
+ "justifyContent": "flex-end",
"marginRight": 24,
},
null,
diff --git a/app/components/UI/SettingsNotification/index.js b/app/components/UI/SettingsNotification/index.js
index e71937fd784..67c5aac004f 100644
--- a/app/components/UI/SettingsNotification/index.js
+++ b/app/components/UI/SettingsNotification/index.js
@@ -9,6 +9,7 @@ const styles = StyleSheet.create({
menuItemWarning: {
flex: 1,
alignSelf: 'center',
+ justifyContent: 'flex-end',
flexDirection: 'row',
marginRight: 24
},
diff --git a/app/components/UI/StyledButton/styledButtonStyles.js b/app/components/UI/StyledButton/styledButtonStyles.js
index a4da77cd302..d02fdff8db5 100644
--- a/app/components/UI/StyledButton/styledButtonStyles.js
+++ b/app/components/UI/StyledButton/styledButtonStyles.js
@@ -113,7 +113,7 @@ const styles = StyleSheet.create({
},
viewText: {
fontSize: 18,
- ...fontStyles.extraBold,
+ ...fontStyles.bold,
color: colors.white
},
view: {
diff --git a/app/components/Views/ManualBackupStep1/__snapshots__/index.test.js.snap b/app/components/Views/ManualBackupStep1/__snapshots__/index.test.js.snap
index a0aba178a31..6d657d9ba29 100644
--- a/app/components/Views/ManualBackupStep1/__snapshots__/index.test.js.snap
+++ b/app/components/Views/ManualBackupStep1/__snapshots__/index.test.js.snap
@@ -529,9 +529,9 @@ exports[`ManualBackupStep1 should render correctly 1`] = `
style={
Object {
"color": "#FFFFFF",
- "fontFamily": "EuclidCircularB-Regular",
+ "fontFamily": "EuclidCircularB-Bold",
"fontSize": 16,
- "fontWeight": "bold",
+ "fontWeight": "600",
"lineHeight": 22,
"marginBottom": 8,
"textAlign": "center",
diff --git a/app/components/Views/ManualBackupStep1/index.js b/app/components/Views/ManualBackupStep1/index.js
index 26f96ec9a6b..414eaabd154 100644
--- a/app/components/Views/ManualBackupStep1/index.js
+++ b/app/components/Views/ManualBackupStep1/index.js
@@ -103,7 +103,7 @@ const styles = StyleSheet.create({
},
reveal: {
fontSize: Device.isMediumDevice() ? 13 : 16,
- ...fontStyles.extraBold,
+ ...fontStyles.bold,
color: colors.white,
lineHeight: 22,
marginBottom: 8,
diff --git a/app/components/Views/ManualBackupStep3/index.js b/app/components/Views/ManualBackupStep3/index.js
index 24d137fd912..b04ddb05895 100644
--- a/app/components/Views/ManualBackupStep3/index.js
+++ b/app/components/Views/ManualBackupStep3/index.js
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
-import { Alert, Text, View, SafeAreaView, StyleSheet, Keyboard, TouchableOpacity } from 'react-native';
+import { Alert, BackHandler, Text, View, SafeAreaView, StyleSheet, Keyboard, TouchableOpacity } from 'react-native';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { colors, fontStyles } from '../../../styles/common';
@@ -34,7 +34,7 @@ const styles = StyleSheet.create({
color: colors.fontPrimary,
justifyContent: 'center',
textAlign: 'center',
- ...fontStyles.extraBold
+ ...fontStyles.bold
},
baseText: {
fontSize: 16,
@@ -62,6 +62,9 @@ const styles = StyleSheet.create({
}
});
+const hardwareBackPress = () => ({});
+const HARDWARE_BACK_PRESS = 'hardwareBackPress';
+
/**
* View that's shown during the last step of
* the backup seed phrase flow
@@ -72,6 +75,9 @@ class ManualBackupStep3 extends PureComponent {
constructor(props) {
super(props);
this.steps = props.navigation.getParam('steps', undefined);
+ props.navigation.setParams({
+ headerLeft:
+ });
}
state = {
@@ -87,6 +93,10 @@ class ManualBackupStep3 extends PureComponent {
navigation: PropTypes.object
};
+ componentWillUnmount = () => {
+ BackHandler.removeEventListener(HARDWARE_BACK_PRESS, hardwareBackPress);
+ };
+
componentDidMount = async () => {
const currentSeedphraseHints = await AsyncStorage.getItem(SEED_PHRASE_HINTS);
const parsedHints = currentSeedphraseHints && JSON.parse(currentSeedphraseHints);
@@ -94,6 +104,7 @@ class ManualBackupStep3 extends PureComponent {
this.setState({
hintText: manualBackup
});
+ BackHandler.addEventListener(HARDWARE_BACK_PRESS, hardwareBackPress);
};
toggleHint = () => {
diff --git a/app/components/Views/Settings/__snapshots__/index.test.js.snap b/app/components/Views/Settings/__snapshots__/index.test.js.snap
index 6a3b650f705..be19f225235 100644
--- a/app/components/Views/Settings/__snapshots__/index.test.js.snap
+++ b/app/components/Views/Settings/__snapshots__/index.test.js.snap
@@ -16,6 +16,12 @@ exports[`Settings should render correctly 1`] = `
onPress={[Function]}
title="General"
/>
+
-
+
-
({});
+const HARDWARE_BACK_PRESS = 'hardwareBackPress';
+
/**
* View that shows the success message once
* the sync with the extension is complete
@@ -106,8 +118,13 @@ class SyncWithExtensionSuccess extends PureComponent {
iconSpringVal = new Animated.Value(0.4);
+ componentWillUnmount = () => {
+ BackHandler.removeEventListener(HARDWARE_BACK_PRESS, hardwareBackPress);
+ };
+
componentDidMount() {
this.animateIcon();
+ BackHandler.addEventListener(HARDWARE_BACK_PRESS, hardwareBackPress);
}
animateIcon() {
diff --git a/app/styles/common.js b/app/styles/common.js
index 02e52a5ef45..82e5ecc767c 100644
--- a/app/styles/common.js
+++ b/app/styles/common.js
@@ -88,9 +88,5 @@ export const fontStyles = {
bold: {
fontFamily: 'EuclidCircularB-Bold',
fontWeight: '600'
- },
- extraBold: {
- fontFamily: 'EuclidCircularB-Regular',
- fontWeight: 'bold'
}
};
diff --git a/locales/en.json b/locales/en.json
index 10738b7522d..5c2ba890102 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -226,6 +226,7 @@
"browser": "Browser",
"settings": "Settings",
"settings_warning": "Wallet unprotected",
+ "settings_warning_short": "Unprotected",
"help": "Get help",
"logout": "Log Out",
"logout_title": "Do you really want to log out?",
diff --git a/locales/es.json b/locales/es.json
index 3018b563db5..58547e9aa64 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -201,6 +201,7 @@
"browser": "Navegador",
"settings": "Ajustes",
"settings_warning": "Billetera desprotegida",
+ "settings_warning_short": "Desprotegida",
"help": "Ayuda",
"logout": "Salir",
"logout_title": "Realmente deseas salir?",