Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676

 Conflicts:

	src/SlashCommands.tsx

	src/i18n/strings/de_DE.json

src/components/views/elements/AccessibleTooltipButton.tsx

@@ -25,6 +25,7 @@ interface ITooltipProps extends React.ComponentProps<typeof AccessibleButton> {
     title: string;
     tooltip?: React.ReactNode;
     tooltipClassName?: string;
+    forceHide?: boolean;
 }
 
 interface IState {
@@ -39,7 +40,16 @@ export default class AccessibleTooltipButton extends React.PureComponent<IToolti
         };
     }
 
+    componentDidUpdate(prevProps: Readonly<ITooltipProps>) {
+        if (!prevProps.forceHide && this.props.forceHide && this.state.hover) {
+            this.setState({
+                hover: false,
+            });
+        }
+    }
+
     onMouseOver = () => {
+        if (this.props.forceHide) return;
         this.setState({
             hover: true,
         });

src/components/views/elements/AppTile.js

@@ -311,16 +311,16 @@ export default class AppTile extends React.Component {
             this.props.onEditClick();
         } else {
             // TODO: Open the right manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 IntegrationManagers.sharedInstance().openAll(
                     this.props.room,
-                    'type_' + this.props.type,
+                    'type_' + this.props.app.type,
                     this.props.app.id,
                 );
             } else {
                 IntegrationManagers.sharedInstance().getPrimaryManager().open(
                     this.props.room,
-                    'type_' + this.props.type,
+                    'type_' + this.props.app.type,
                     this.props.app.id,
                 );
             }

src/components/views/elements/InlineSpinner.js

@@ -28,7 +28,7 @@ export default createReactClass({
         const imgClass = this.props.imgClassName || "";
 
         let imageSource;
-        if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+        if (SettingsStore.getValue('feature_new_spinner')) {
             imageSource = require("../../../../res/img/spinner.svg");
         } else {
             imageSource = require("../../../../res/img/spinner.gif");

src/components/views/elements/ManageIntegsButton.js

@@ -34,7 +34,7 @@ export default class ManageIntegsButton extends React.Component {
         if (!managers.hasManager()) {
             managers.openNoManagerDialog();
         } else {
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 managers.openAll(this.props.room);
             } else {
                 managers.getPrimaryManager().open(this.props.room);

src/components/views/elements/Spinner.js

@@ -22,7 +22,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 
 const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
     let imageSource;
-    if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+    if (SettingsStore.getValue('feature_new_spinner')) {
         imageSource = require("../../../../res/img/spinner.svg");
     } else {
         imageSource = require("../../../../res/img/spinner.gif");

src/components/views/elements/StyledRadioGroup.tsx

@@ -25,6 +25,7 @@ interface IDefinition<T extends string> {
     disabled?: boolean;
     label: React.ReactChild;
     description?: React.ReactChild;
+    checked?: boolean; // If provided it will override the value comparison done in the group
 }
 
 interface IProps<T extends string> {
@@ -33,7 +34,7 @@ interface IProps<T extends string> {
     definitions: IDefinition<T>[];
     value?: T; // if not provided no options will be selected
     outlined?: boolean;
-    onChange(newValue: T);
+    onChange(newValue: T): void;
 }
 
 function StyledRadioGroup<T extends string>({name, definitions, value, className, outlined, onChange}: IProps<T>) {
@@ -46,7 +47,7 @@ function StyledRadioGroup<T extends string>({name, definitions, value, className
             <StyledRadioButton
                 className={classNames(className, d.className)}
                 onChange={_onChange}
-                checked={d.value === value}
+                checked={d.checked !== undefined ? d.checked : d.value === value}
                 name={name}
                 value={d.value}
                 disabled={d.disabled}