Merge pull request #12 from tchapgouv/upgrade-v3.113.0

Upgrade v3.113.0
tchapgouv · Oct 16, 2024 · b8a5bc0 · b8a5bc0
2 parents 892a9e6 + 6de6540
commit b8a5bc0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Changes in [3.113.0](https://github.com/element-hq/matrix-react-sdk/releases/tag/v3.113.0) (2024-10-15)
+=======================================================================================================
+Updates to js-sdk v34.8.0, although react-sdk has already stopped using the insecure functionality in question, so this release contains no functional changes.
+
 Changes in [3.112.0](https://github.com/element-hq/matrix-react-sdk/releases/tag/v3.112.0) (2024-10-08)
 =======================================================================================================
 ## ✨ Features

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "matrix-react-sdk",
     "version": "0.0.0",
-    "version-matrix": "3.112.0",
+    "version-matrix": "3.113.0",
     "description": "SDK for matrix.org using React for Tchap",
     "author": "DINUM",
     "repository": {
@@ -116,7 +116,7 @@
         "maplibre-gl": "^2.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "34.7.0",
+        "matrix-js-sdk": "34.8.0",
         "matrix-widget-api": "^1.9.0",
         "memoize-one": "^6.0.0",
         "minimist": "^1.2.5",

diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
@@ -51,6 +51,7 @@ import { startOidcLogin } from "../../../utils/oidc/authorize";
 import TchapUtils from '../../../../../../src/tchap/util/TchapUtils'; // :TCHAP: registration-for-mainlining
 import TchapUIFeature from "../../../../../../src/tchap/util/TchapUIFeature"; // :TCHAP: sso-agentconnect-flow
 import ProconnectButton from "../../../../../../src/tchap/components/views/sso/ProconnectButton"; // :TCHAP: sso-agentconnect-flow
+import TchapUrls from "../../../../../../src/tchap/util/TchapUrls";
 
 const debuglog = (...args: any[]): void => {
     if (SettingsStore.getValue("debug_registration")) {
@@ -643,7 +644,7 @@ export default class Registration extends React.Component<IProps, IState> {
             if (!this.props.mobileRegister && this.state.ssoFlow && TchapUIFeature.isSSOFlowActive()) {
                 ssoSection = <>
                     <ProconnectButton/>
-                    <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|sso|or")}</p>
+                    <p style={{textAlign: "center", fontWeight: "bold"}}>{_t("auth|proconnect|or")}</p>
                 </>
             }
             // }

diff --git a/src/components/views/right_panel/RightPanelTabs.tsx b/src/components/views/right_panel/RightPanelTabs.tsx
@@ -21,6 +21,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { UIComponent, UIFeature } from "../../../settings/UIFeature";
 import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
 import { isVideoRoom as calcIsVideoRoom } from "../../../utils/video-rooms";
+import TchapUIFeature from "../../../../../../src/tchap/util/TchapUIFeature";
 
 function shouldShowTabsForPhase(phase?: RightPanelPhases): boolean {
     const tabs = [
@@ -86,7 +87,9 @@ export const RightPanelTabs: React.FC<Props> = ({ phase, room }): JSX.Element |
             >
                 {_t("common|threads")}
             </NavItem>
-            {SettingsStore.getValue(UIFeature.Widgets) &&
+            {/* :TCHAP: hide-widgets-settings */}
+            {/* {SettingsStore.getValue(UIFeature.Widgets) && */}
+            {TchapUIFeature.showWidgetsSettings && SettingsStore.getValue(UIFeature.Widgets) &&
                 !isVideoRoom &&
                 shouldShowComponent(UIComponent.AddIntegrations) && (
                     <NavItem

diff --git a/src/components/views/rooms/RoomHeader.tsx b/src/components/views/rooms/RoomHeader.tsx
@@ -245,8 +245,9 @@ export default function RoomHeader({
     return (
         <>
             <Flex as="header" align="center" gap="var(--cpd-space-3x)" className="mx_RoomHeader light-panel">
-                <WithPresenceIndicator room={room} size="8px">
-                    {/* We hide this from the tabIndex list as it is a pointer shortcut and superfluous for a11y */}
+                {/* :TCHAP: customize-room-header-bar - RoomAvatar -> DecoratedRoomAvatar */}
+                {/* <WithPresenceIndicator room={room} size="8px">
+                    {/* We hide this from the tabIndex list as it is a pointer shortcut and superfluous for a11y
                     <RoomAvatar
                         room={room}
                         size="40px"
@@ -255,23 +256,18 @@ export default function RoomHeader({
                         tabIndex={-1}
                         aria-label={_t("room|header_avatar_open_settings_label")}
                     />
-                </WithPresenceIndicator>
+                </WithPresenceIndicator> */}
+                <DecoratedRoomAvatar room={room} size="40px" />
+                {/* end :TCHAP: */}
+                {/* :tchap: customize-room-header-bar - Add external caption when room is open to external */}
+                <TchapExternalRoomHeader room={room}></TchapExternalRoomHeader>
+                {/* :tchap: end */}
                 <button
                     aria-label={_t("right_panel|room_summary_card|title")}
                     tabIndex={0}
                     onClick={() => RightPanelStore.instance.showOrHidePhase(RightPanelPhases.RoomSummary)}
                     className="mx_RoomHeader_infoWrapper"
                 >
-                    {/* :TCHAP: customize-room-header-bar - RoomAvatar -> DecoratedRoomAvatar
-                    <WithPresenceIndicator room={room} size="8px">
-                        <RoomAvatar room={room} size="40px" oobData={oobData} />
-                    </WithPresenceIndicator>
-                    */}
-                    <DecoratedRoomAvatar room={room} size="40px" />
-                    {/* end :TCHAP: */}
-                    {/* :tchap: customize-room-header-bar - Add external caption when room is open to external */}
-                    <TchapExternalRoomHeader room={room}></TchapExternalRoomHeader>
-                    {/* :tchap: end */}
                     <Box flex="1" className="mx_RoomHeader_info">
                         <BodyText
                             as="div"
@@ -353,6 +349,9 @@ export default function RoomHeader({
                             { /* :TCHAP: customize-room-header-bar - activate video call only if directmessage and if feature is activated on homeserver }
                             {!isVideoRoom && videoCallButton}
                             */ }
+                            {!isDirectMessage && TchapUIFeature.isFeatureActiveForHomeserver("feature_video_group_call") &&
+                              !isVideoRoom && videoCallButton}
+
                             {isDirectMessage && TchapUIFeature.isFeatureActiveForHomeserver("feature_video_call") &&
                               !isVideoRoom && videoCallButton}
                             {/* end :TCHAP: */}
@@ -402,7 +401,7 @@ export default function RoomHeader({
                                     indicator={notificationLevelToIndicator(threadNotifications)}
                                     onClick={(evt) => {
                                         evt.stopPropagation();
-                                        RightPanelStore.instance.showOrHidePanel(RightPanelPhases.ThreadPanel);
+                                        RightPanelStore.instance.showOrHidePhase(RightPanelPhases.ThreadPanel);
                                         PosthogTrackers.trackInteraction("WebRoomHeaderButtonsThreadsButton", evt);
                                     }}
                                     aria-label={_t("common|threads")}

diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
@@ -36,6 +36,7 @@ import SettingsSubsection, { SettingsSubsectionText } from "../../shared/Setting
 import { useOwnDevices } from "../../devices/useOwnDevices";
 import DiscoverySettings from "../../discovery/DiscoverySettings";
 import SetIntegrationManager from "../../SetIntegrationManager";
+import TchapUIFeature from "../../../../../../../../src/tchap/util/TchapUIFeature";
 
 interface IIgnoredUserProps {
     userId: string;
@@ -377,7 +378,9 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
                 {warning}
                 { /* :TCHAP: change-sections-order-in-security-privacy-settings - move secureBackup and privacySection, and remove eventIndex */ }
                 {secureBackup}
-                <SetIntegrationManager />
+                {/* :TCHAP: hide-widgets-settings - <SetIntegrationManager />*/}
+                { TchapUIFeature.showWidgetsSettings && <SetIntegrationManager />}
+                {/* end :TCHAP: */}
                 <SettingsSection heading={_t("settings|security|encryption_section")}>
                     {crossSigning}
                     <CryptographyPanel />

diff --git a/yarn.lock b/yarn.lock
@@ -6595,10 +6595,10 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-matrix-js-sdk@34.7.0:
-  version "34.7.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.7.0.tgz#243e4eacbedd98a1096135a75765756cda910b7b"
-  integrity sha512-epauE/ZwksDyadm+0vg+g1keRUo600H/b1MzDZbaIrCY9fELzq3fIWctq9IxMQE/EEPe9jjLiNDooGJT5JJ2Ag==
+matrix-js-sdk@34.8.0:
+  version "34.8.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.8.0.tgz#7ee18fb2ca22fb96d72a6720d0e80f9de12dd4c6"
+  integrity sha512-zHYPE+vb6PP/dnRa6X3ktXf34yQg/Pct9r5CSP263hA4tRg5sKEVQgnY7KDADaABTvNMb9h7BZ5Xm9vjXsowNQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0"