Merge branch 'develop' into florianduros/tooltip-update

2024-04-16 09:51:05 +02:00
parent 6c9d8e5231 31373399f9
commit e53b175a6b
18 changed files with 823 additions and 8 deletions
--- a/test/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
+++ b/test/components/views/dialogs/security/CreateSecretStorageDialog-test.tsx
@@ -50,6 +50,7 @@ describe("CreateSecretStorageDialog", () => {
        mockCrypto = mocked(mockClient.getCrypto()!);
        Object.assign(mockCrypto, {
            isKeyBackupTrusted: jest.fn(),
+            isDehydrationSupported: jest.fn(() => false),
            bootstrapCrossSigning: jest.fn(),
            bootstrapSecretStorage: jest.fn(),
        });