diff --git a/views/Menu.tsx b/views/Menu.tsx index 1b91d97ca..3be89a58a 100644 --- a/views/Menu.tsx +++ b/views/Menu.tsx @@ -69,9 +69,7 @@ export default class Menu extends React.Component { }; UNSAFE_componentWillMount() { - const { SettingsStore, navigation } = this.props; - - SettingsStore.getSettings(); + const { navigation } = this.props; // triggers when loaded from navigation or back action navigation.addListener('focus', this.handleFocus); diff --git a/views/Settings/Currency.tsx b/views/Settings/Currency.tsx index 22d0ec14f..e263afedb 100644 --- a/views/Settings/Currency.tsx +++ b/views/Settings/Currency.tsx @@ -61,9 +61,7 @@ export default class Currency extends React.Component< prevState: Readonly, _snapshot?: any ): Promise { - const { SettingsStore } = this.props; - const { getSettings } = SettingsStore; - const settings = await getSettings(); + const { settings } = this.props.SettingsStore; if (prevState.selectedCurrency !== settings.fiat) { this.setState({ selectedCurrency: settings.fiat diff --git a/views/Settings/Security.tsx b/views/Settings/Security.tsx index 276b612c4..a879ebef7 100644 --- a/views/Settings/Security.tsx +++ b/views/Settings/Security.tsx @@ -81,7 +81,6 @@ export default class Security extends React.Component< }; componentDidMount() { - this.checkSettings(); this.props.navigation.addListener('focus', this.checkSettings); } diff --git a/views/Settings/Settings.tsx b/views/Settings/Settings.tsx index 07b9d44ec..405c4897c 100644 --- a/views/Settings/Settings.tsx +++ b/views/Settings/Settings.tsx @@ -40,9 +40,7 @@ interface SettingsProps { @observer export default class Settings extends React.Component { UNSAFE_componentWillMount() { - const { SettingsStore, navigation } = this.props; - - SettingsStore.getSettings(); + const { navigation } = this.props; // triggers when loaded from navigation or back action navigation.addListener('focus', this.handleFocus); diff --git a/views/Tools.tsx b/views/Tools.tsx index a2a1c8303..2b8739e66 100644 --- a/views/Tools.tsx +++ b/views/Tools.tsx @@ -33,9 +33,7 @@ interface ToolsProps { @observer export default class Tools extends React.Component { UNSAFE_componentWillMount() { - const { SettingsStore, navigation } = this.props; - - SettingsStore.getSettings(); + const { navigation } = this.props; // triggers when loaded from navigation or back action navigation.addListener('focus', this.handleFocus);