Merge branch 't3chguy/cache-settings-localstorage' of github.com:matr…

…ix-org/matrix-react-sdk into t3chguy/cache-settings-localstorage
matrix-org · Apr 19, 2022 · 71b0f6f · 71b0f6f
2 parents d190334 + 73edd13
commit 71b0f6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/views/dialogs/devtools/ServerInfo.tsx b/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>
             }

diff --git a/test/end-to-end-tests/src/usecases/threads.ts b/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();
 }