diff --git a/CHANGELOG.md b/CHANGELOG.md index 65a501849e..ec1af4929c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [3.56.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.56.0) (2022-09-28) +===================================================================================================== + +## 🔒 Security +* Fix for [CVE-2022-39249](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39249) +* Fix for [CVE-2022-39250](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39250) +* Fix for [CVE-2022-39251](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39251) +* Fix for [CVE-2022-39236](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE%2D2022%2D39236) + Changes in [3.55.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.55.0) (2022-09-20) =============================================================================================================== diff --git a/package.json b/package.json index 00d49ff8d8..1c447bfe66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.55.0", + "version": "3.56.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -92,7 +92,7 @@ "maplibre-gl": "^1.15.2", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "19.7.0", "matrix-widget-api": "^1.1.1", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx index 9ae8aa7a45..9c601d1ab5 100644 --- a/src/components/views/rooms/EventTile.tsx +++ b/src/components/views/rooms/EventTile.tsx @@ -628,9 +628,11 @@ export class UnwrappedEventTile extends React.Component { } if (!userTrust.isCrossSigningVerified()) { - // user is not verified, so default to everything is normal + // If the message is unauthenticated, then display a grey + // shield, otherwise if the user isn't cross-signed then + // nothing's needed this.setState({ - verified: E2EState.Normal, + verified: encryptionInfo.authenticated ? E2EState.Normal : E2EState.Unauthenticated, }, this.props.onHeightChanged); // Decryption may have caused a change in size return; } diff --git a/yarn.lock b/yarn.lock index 90b89d77d8..1aee0c2a78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6925,9 +6925,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "19.6.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/45348a354eb275fe79f4a5ff7407a76dacdcc526" +matrix-js-sdk@19.7.0: + version "19.7.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.7.0.tgz#ccadae630c56032b040c87b163475a04601409ce" + integrity sha512-mFN1LBmEpYHCH6II1F8o7y8zJr0kn1yX7ga7tRXHbLJAlBS4bAXRsEoAzdv6OrV8/dS325JlVUYQLHFHQWjYxg== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0"