Merge branch 't3chguy/cache-settings-localstorage' of github.com:matrix-org/matrix-react-sdk into t3chguy/cache-settings-localstorage

Author: t3chguy

src/components/views/dialogs/devtools/ServerInfo.tsx

@@ -74,13 +74,13 @@ const ServerInfo = ({ onBack }: IDevtoolsProps) => {
             }
 
             <h4>{ _t("Client Versions") }</h4>
-            { capabilities !== FAILED_TO_LOAD
+            { clientVersions !== FAILED_TO_LOAD
                 ? <SyntaxHighlight language="json" children={JSON.stringify(clientVersions, null, 4)} />
                 : <div>{ _t("Failed to load.") }</div>
             }
 
             <h4>{ _t("Server Versions") }</h4>
-            { capabilities !== FAILED_TO_LOAD
+            { serverVersions !== FAILED_TO_LOAD
                 ? <SyntaxHighlight language="json" children={JSON.stringify(serverVersions, null, 4)} />
                 : <div>{ _t("Failed to load.") }</div>
             }

test/end-to-end-tests/src/usecases/threads.ts

@@ -92,7 +92,7 @@ export async function redactThreadMessage(session: ElementSession): Promise<void
     session.log.done();
 
     await session.query(".mx_ThreadView .mx_RedactedBody");
-    await session.delay(200); // give the app a chance to settle
+    await session.delay(1000); // give the app a chance to settle
 
     session.log.endGroup();
 }