4b365bae2c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into florianduros/encryption-tab  
							
							
							
						 
						
							2025-01-08 11:44:56 +01:00  
				
					
						
							
							
								 
						
							
							
								69ee8fd96a 
								
									
								
							
								 
							
						 
						
							
							
								
								Change License: AGPL + Element Commercial ( #28856 )  
							
							... 
							
							
							
							* Add commercial licence and update config files
* Update license in headers
* Revert "Update license in headers"
This reverts commit 7ed7949485 
							
						 
						
							2025-01-06 11:18:54 +00:00  
				
					
						
							
							
								 
						
							
							
								1e42f28a69 
								
									
								
							
								 
							
						 
						
							
							
								
								Harden Settings using mapped types ( #28775 )  
							
							... 
							
							
							
							* Harden Settings using mapped types
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix issues found during hardening
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove oidc native flow stale key
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-12-23 20:25:15 +00:00  
				
					
						
							
							
								 
						
							
							
								c805cd8260 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into florianduros/encryption-tab  
							
							
							
						 
						
							2024-12-19 13:13:30 +01:00  
				
					
						
							
							
								 
						
							
							
								fec324ec10 
								
									
								
							
								 
							
						 
						
							
							
								
								Update CreateSecretStorageDialog-test snapshot  
							
							
							
						 
						
							2024-12-18 10:50:11 +01:00  
				
					
						
							
							
								 
						
							
							
								1aace3f87e 
								
									
								
							
								 
							
						 
						
							
							
								
								Update & add tests to user settings common  
							
							
							
						 
						
							2024-12-17 18:20:30 +01:00  
				
					
						
							
							
								 
						
							
							
								980b922348 
								
									
								
							
								 
							
						 
						
							
							
								
								Enable key backup by default ( #28691 )  
							
							... 
							
							
							
							* Factor out crypto setup process into a store
To make components pure and avoid react 18 dev mode problems due
to components making requests when mounted.
* fix test
* test for the store
* Add comment
* Enable key backup by default
When we set up cross signing, so the key backup key will be stored locally along with the cross signing keys until the user sets up recovery (4s). This will mean that a user can restore their backup if they log in on a new device as long as they verify with the one they registered on.
Replaces https://github.com/element-hq/element-web/pull/28267 
* Fix test
* Prompt user to set up 4S on logout
* Fix test
* Add playwright test for key backup by default
* Fix imports
* This isn't unexpected anymore
* Update doc
* Fix docs and function name on renderSetupBackupDialog()
* Use checkKeyBackupAndEnable
* Docs for setup encryption toast
* Also test the toast appears
* Update mock for the method we use now
* Okay fine I guess we need both
* Swap here too
* Fix comment & doc comments 
							
						 
						
							2024-12-17 14:50:48 +00:00  
				
					
						
							
							
								 
						
							
							
								d2acce1221 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove manual device verification which is not supported by the new cryptography stack ( #28588 )  
							
							... 
							
							
							
							* Remove call of `MatrixClient.setDeviceVerified`
* Replace usage of deprecated crypto events
* Replace deprecated imports
* Remove legacy button in `UntrustedDeviceDialog`
* Review fixes
* Add tests
* Fix doc 
							
						 
						
							2024-12-03 15:26:37 +00:00  
				
					
						
							
							
								 
						
							
							
								0429809c00 
								
									
								
							
								 
							
						 
						
							
							
								
								New UX for Share dialog ( #28598 )  
							
							... 
							
							
							
							* New UX for `ShareDialog`
* Use new named import
* Rewrite tests
* Add e2e tests
* Use `box-sizing` for social buttons
* Update e2e tests 
							
						 
						
							2024-12-02 18:10:17 +00:00  
				
					
						
							
							
								 
						
							
							
								d8ebc68aa8 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove abandoned Voice Broadcasts labs flag ( #28548 )  
							
							... 
							
							
							
							* Remove abandoned Voice Broadcasts labs flag
Any existing voice broadcasts will be shown as a series of voice messages which will sequence play as normal
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Remove dead code
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-12-02 10:53:27 +00:00  
				
					
						
							
							
								 
						
							
							
								6d8cbf39f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `EventTile.tsx` ( #28510 )  
							
							... 
							
							
							
							* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `EventTile.tsx`
* Use `roomContext.isRoomEncrypted` 
							
						 
						
							2024-12-02 10:20:13 +00:00  
				
					
						
							
							
								 
						
							
							
								3dbcb5efa3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/vector-im/element-web  into dbkr/stateafter  
							
							... 
							
							
							
							# Conflicts:
#	test/unit-tests/components/structures/RoomView-test.tsx
#	test/unit-tests/components/structures/TimelinePanel-test.tsx 
							
						 
						
							2024-11-27 10:47:35 +00:00  
				
					
						
							
							
								 
						
							
							
								ede91bf921 
								
									
								
							
								 
							
						 
						
							
							
								
								Use `CryptoApi.getKeyBackupInfo` instead of deprecated `MatrixClient.getKeyBackupVersion` ( #28450 )  
							
							... 
							
							
							
							* Use `CryptoApi.getKeyBackupInfo` instead of deprecated `MatrixClient.getKeyBackupVersion`
* Review changes
---------
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-25 09:30:42 +00:00  
				
					
						
							
							
								 
						
							
							
								ca33d9165a 
								
									
								
							
								 
							
						 
						
							
							
								
								Migrate to React 18 createRoot API ( #28256 )  
							
							... 
							
							
							
							* Migrate to React 18 createRoot API
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Discard changes to src/components/views/settings/devices/DeviceDetails.tsx
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Attempt to stabilise test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* legacyRoot?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-20 13:29:23 +00:00  
				
					
						
							
							
								 
						
							
							
								0ae74a9e1f 
								
									
								
							
								 
							
						 
						
							
							
								
								Reset cross-signing before backup when resetting both ( #28402 )  
							
							... 
							
							
							
							* reset cross-signing before backup when resetting both
* add test for AccessSecretStorageDialog
* fix unit test 
							
						 
						
							2024-11-19 03:17:24 +00:00  
				
					
						
							
							
								 
						
							
							
								eb938c21d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Update dependency @vector-im/compound-design-tokens to v1.9.1 ( #28438 )  
							
							... 
							
							
							
							* Update dependency @vector-im/compound-design-tokens to v1.9.1
* Update snapshots
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-13 11:08:25 +00:00  
				
					
						
							
							
								 
						
							
							
								c67e67af4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Use new `CrytoApi.restoreKeyBackup` & `CrytoApi.restoreKeyBackupFromPassphrase` api ( #28385 )  
							
							... 
							
							
							
							* Use new `CrytoApi.restoreKeyBackup` & `CrytoApi.restoreKeyBackupFromPassprhase` api
* Use new `CrytoApi.restoreKeyBackup` api in `SetupEncryptionStore`
* Add tests to `RestoreKeyBackupDialog` 
							
						 
						
							2024-11-13 10:32:06 +00:00  
				
					
						
							
							
								 
						
							
							
								27a43e860a 
								
									
								
							
								 
							
						 
						
							
							
								
								Use React Suspense when rendering async modals ( #28386 )  
							
							... 
							
							
							
							* Use React Suspense when rendering async modals
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update src/Modal.tsx
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-12 21:19:11 +00:00  
				
					
						
							
							
								 
						
							
							
								044eaf7eb5 
								
									
								
							
								 
							
						 
						
							
							
								
								Update calls to addEventToTimeline and addLiveEvents for new signature  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-06 14:55:21 +00:00  
				
					
						
							
							
								 
						
							
							
								502cc91dfe 
								
									
								
							
								 
							
						 
						
							
							
								
								Switch ModalManager to the React 18 createRoot API ( #28336 )  
							
							... 
							
							
							
							* Remove boilerplate around dispatcher and settings watchers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Move state update listeners from constructor to componentDidMount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Switch ModalManager to the React 18 createRoot API
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-11-04 11:34:00 +00:00  
				
					
						
							
							
								 
						
							
							
								386b782f2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove "Upgrade your encryption" flow in `CreateSecretStorageDialog` ( #28290 )  
							
							... 
							
							
							
							* Remove "Upgrade your encryption" flow
* Rename and remove tests
* Remove `BackupTrustInfo`
* Get keybackup when bootstraping the secret storage.
* Update src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
---------
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> 
							
						 
						
							2024-10-30 11:22:05 +00:00  
				
					
						
							
							
								 
						
							
							
								d8800ef987 
								
									
								
							
								 
							
						 
						
							
							
								
								Update to React 18 ( #24763 )  
							
							... 
							
							
							
							* Upgrade target to es2021
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Upgrade target to es2021
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Upgrade to es2022
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Upgrade to es2022
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix babel config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix babel config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix React contexts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix types
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Fix React state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update to React 18
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update to React 18
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Install @testing-library/dom
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Update lockfile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Yarn lock update
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-21 13:50:06 +00:00  
				
					
						
							
							
								 
						
							
							
								46d13921d0 
								
									
								
							
								 
							
						 
						
							
							
								
								First batch: remove deprecated calls on `MatrixClient` ( #28207 )  
							
							... 
							
							
							
							* Remove `initCrypto` mocking
* Remove `MatrixClient.downloadKeys` mocking
* Remove `MatrixClient.getStoredDevice` mocking
* Replace `MatrixClient.setGlobalBlacklistUnverifiedDevices` by `MatrixClient.CryptoApi.globalBlacklistUnverifiedDevices`
* Remove `MatrixClient.getStoredCrossSigningForUser` mocking
* Replace `MatrixClient.legacyDeviceVerification` by `MatrixClient.CryptoApi.requestDeviceVerification`
* Remove `MatrixClient.isCrossSigningReady` mock
* Replace `MatrixClient.bootstrapCrossSigning` by `MatrixClient.getCrypto.bootstrapCrossSigning`
* Replace `MatrixClient.getCryptoTrustCrossSignedDevices` by `MatrixClient.getCrypto.getTrustCrossSignedDevices`
* Replace `MatrixClient.hasSecretStorageKey` by `MatrixClient.SecretStorage.hasKey`
* Replace `MatrixClient.getDefaultSecretStorageKeyId` by `MatrixClient.SecretStorage.getDefaultKeyId`
* Remove `MatrixClient.encryptAndSendToDevices` call 
							
						 
						
							2024-10-21 12:53:39 +01:00  
				
					
						
							
							
								 
						
							
							
								061c8217b3 
								
									
								
							
								 
							
						 
						
							
							
								
								- Remove deprecated  `MatrixClient.keyBackupKeyFromPassword` call. ( #28233 )  
							
							... 
							
							
							
							- The `keyBackupKeyFromPassword` call is bound to the `keyCallback` props in `RestoreKeyBackupDialog` which is not used in `CreateSecretStorageDialog`
- Remove code bound to `keyCallback` props 
							
						 
						
							2024-10-21 09:59:07 +00:00  
				
					
						
							
							
								 
						
							
							
								06d1239608 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix develop changelog parsing ( #28232 )  
							
							... 
							
							
							
							* Fix develop changelog parsing and DRY it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* duh
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Improve coverage
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Typeguards!
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
* Discard changes to test/unit-tests/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap
---------
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-18 11:20:52 +00:00  
				
					
						
							
							
								 
						
							
							
								7236953d07 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove references to `MatrixClient.crypto` ( #28204 )  
							
							... 
							
							
							
							* Remove `VerificationExplorer`
* Remove `remakeolm` slash command
* Remove call to `crypto.cancelAndResendAllOutgoingKeyRequests`
* Remove crypto mock in `LoginWithQR-test.tsx`
* Remove `StopGadWidgetDriver.sendToDevice`
* Remove remaining mock 
							
						 
						
							2024-10-17 08:50:44 +01:00  
				
					
						
							
							
								 
						
							
							
								571ada37a7 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace `MatrixClient.isCryptoEnabled` by `MatrixClient.getCrypto` ( #140 )  
							
							... 
							
							
							
							* Replace `MatrixClient.isCryptoEnabled` by `MatrixClient.getCrypto`
* Cast `cryptoEnabled` as `boolean`
* Fix `MatrixChat-test`
(cherry picked from commit 950ab1940bfcea9443f03284f9175d319c13a44c) 
							
						 
						
							2024-10-16 09:42:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f78f6b3a9a 
								
									
								
							
								 
							
						 
						
							
							
								
								Iterate  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-16 09:09:41 +01:00  
				
					
						
							
							
								 
						
							
							
								68c0c4c833 
								
									
								
							
								 
							
						 
						
							
							
								
								Iterate  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 18:29:37 +01:00  
				
					
						
							
							
								 
						
							
							
								67659ab353 
								
									
								
							
								 
							
						 
						
							
							
								
								Iterate  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 16:22:11 +01:00  
				
					
						
							
							
								 
						
							
							
								f0ee7f7905 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge matrix-react-sdk into element-web  
							
							... 
							
							
							
							Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 15:32:09 +01:00  
				
					
						
							
							
								 
						
							
							
								b084ff2313 
								
									
								
							
								 
							
						 
						
							
							
								
								Prepare for repo merge  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2024-10-15 11:35:21 +01:00