Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088

2021-08-11 20:51:47 +01:00
parent 29e5a69b7a eadc94035d
commit 5f54abc7e5
50 changed files with 2854 additions and 873 deletions
--- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js
@@ -79,7 +79,7 @@ export default class LabsUserSettingsTab extends React.Component {
            let hiddenReadReceipts;
            if (this.state.showHiddenReadReceipts) {
                hiddenReadReceipts = (
-                    <SettingsFlag name="feature_hidden_read_receipts" level={SettingLevel.ACCOUNT} />
+                    <SettingsFlag name="feature_hidden_read_receipts" level={SettingLevel.DEVICE} />
                );
            }