Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting

src/components/views/elements/AppTile.js

@@ -35,12 +35,13 @@ import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
 import {Capability} from "../../../widgets/WidgetApi";
 import {sleep} from "../../../utils/promise";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;

src/components/views/elements/IRCTimelineProfileResizer.tsx

@@ -15,8 +15,9 @@ limitations under the License.
 */
 
 import React from 'react';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import Draggable, {ILocationState} from './Draggable';
+import { SettingLevel } from "../../../settings/SettingLevel";
 
 interface IProps {
     // Current room

src/components/views/elements/SettingsFlag.tsx

@@ -20,11 +20,12 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
+import { SettingLevel } from "../../../settings/SettingLevel";
 
 interface IProps {
     // The setting must be a boolean
     name: string;
-    level: string;
+    level: SettingLevel;
     roomId?: string; // for per-room settings
     label?: string; // untranslated
     isExplicit?: boolean;
@@ -52,8 +53,8 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         };
     }
 
-    private onChange = (checked: boolean): void => {
-        this.save(checked);
+    private onChange = async (checked: boolean) => {
+        await this.save(checked);
         this.setState({ value: checked });
         if (this.props.onChange) this.props.onChange(checked);
     };
@@ -62,8 +63,8 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         this.onChange(e.target.checked);
     };
 
-    private save = (val?: boolean): void => {
-        return SettingsStore.setValue(
+    private save = async (val?: boolean) => {
+        await SettingsStore.setValue(
             this.props.name,
             this.props.roomId,
             this.props.level,

src/components/views/elements/TextWithTooltip.js

@@ -47,11 +47,10 @@ export default class TextWithTooltip extends React.Component {
         return (
             <span onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave} className={this.props.class}>
                 {this.props.children}
-                <Tooltip
+                {this.state.hover && <Tooltip
                     label={this.props.tooltip}
-                    visible={this.state.hover}
                     tooltipClassName={this.props.tooltipClass}
-                    className={"mx_TextWithTooltip_tooltip"} />
+                    className={"mx_TextWithTooltip_tooltip"} /> }
             </span>
         );
     }