Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount
This commit is contained in:
@@ -40,7 +40,7 @@ export default class HelpUserSettingsTab extends React.Component {
|
||||
};
|
||||
}
|
||||
|
||||
componentWillMount(): void {
|
||||
componentDidMount(): void {
|
||||
PlatformPeg.get().getAppVersion().then((ver) => this.setState({vectorVersion: ver})).catch((e) => {
|
||||
console.error("Error getting vector version: ", e);
|
||||
});
|
||||
|
||||
@@ -81,7 +81,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
|
||||
};
|
||||
}
|
||||
|
||||
async componentWillMount(): void {
|
||||
async componentDidMount(): void {
|
||||
const platform = PlatformPeg.get();
|
||||
|
||||
const autoLaunchSupported = await platform.supportsAutoLaunch();
|
||||
|
||||
Reference in New Issue
Block a user