imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

Browse source
This commit is contained in:
Travis Ralston 2020-04-01 11:14:19 -06:00 • committed by GitHub
commit 07030a9466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 640 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/tabs/user/HelpUserSettingsTab.js
View file

@ -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);
});

2
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View file

@ -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();