Upgrade more conflicting patches

tchapgouv · Feb 5, 2024 · ba92009 · ba92009
1 parent a33ec08
commit ba92009
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/...ne-settings/matrix-react-sdk+3.82.0.patch → ...ne-settings/matrix-react-sdk+3.88.0.patch b/...ne-settings/matrix-react-sdk+3.82.0.patch → ...ne-settings/matrix-react-sdk+3.88.0.patch
@@ -1,16 +1,16 @@
 diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
-index 40acfb3..76515f4 100644
+index 79eae26..d8d7395 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
-@@ -59,6 +59,7 @@ import InlineSpinner from "../../../elements/InlineSpinner";
- import MatrixClientContext from "../../../../../contexts/MatrixClientContext";
+@@ -58,6 +58,7 @@ import Heading from "../../../typography/Heading";
+ import InlineSpinner from "../../../elements/InlineSpinner";
  import { ThirdPartyIdentifier } from "../../../../../AddThreepid";
- import { getDelegatedAuthAccountUrl } from "../../../../../utils/oidc/getDelegatedAuthAccountUrl";
+ import { SDKContext } from "../../../../../contexts/SDKContext";
 +import TchapUIFeature from '../../../../../../../../src/tchap/util/TchapUIFeature'; // :TCHAP:
 
  interface IProps {
      closeSettingsFn: () => void;
-@@ -324,7 +325,9 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
+@@ -325,7 +326,9 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
      private renderAccountSection(): JSX.Element {
          let threepidSection: ReactNode = null;
 
@@ -21,7 +21,7 @@ index 40acfb3..76515f4 100644
              const emails = this.state.loading3pids ? (
                  <InlineSpinner />
              ) : (
-@@ -532,7 +535,8 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
+@@ -533,7 +536,8 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
          }
 
          let discoverySection;

diff --git a/...server-list/matrix-react-sdk+3.82.0.patch → ...server-list/matrix-react-sdk+3.88.0.patch b/...server-list/matrix-react-sdk+3.82.0.patch → ...server-list/matrix-react-sdk+3.88.0.patch
@@ -26,7 +26,7 @@ index 8dbd7f0..0b9172c 100644
      font-size: $font-15px;
  }
 diff --git a/node_modules/matrix-react-sdk/src/components/views/directory/NetworkDropdown.tsx b/node_modules/matrix-react-sdk/src/components/views/directory/NetworkDropdown.tsx
-index d3840ca..63e8614 100644
+index e9885f4..c708933 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/directory/NetworkDropdown.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/directory/NetworkDropdown.tsx
 @@ -30,6 +30,7 @@ import { GenericDropdownMenu, GenericDropdownMenuItem } from "../../structures/G
@@ -37,7 +37,7 @@ index d3840ca..63e8614 100644
 
  const SETTING_NAME = "room_directory_servers";
 
-@@ -155,7 +156,8 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
+@@ -156,7 +157,8 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
          options: [
              {
                  key: { roomServer, instanceId: undefined },
@@ -47,13 +47,16 @@ index d3840ca..63e8614 100644
              },
              ...(roomServer === homeServer && protocols
                  ? Object.values(protocols)
-@@ -234,7 +236,8 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
+@@ -237,7 +239,11 @@ export const NetworkDropdown: React.FC<IProps> = ({ protocols, config, setConfig
              selectedLabel={(option) =>
                  option?.key
-                     ? _t("Show: %(instance)s rooms (%(server)s)", {
+                     ? _t("spotlight|public_rooms|network_dropdown_selected_label_instance", {
 -                          server: option.key.roomServer,
-+                          // :TCHAP: remove > server: option.key.roomServer,
-+                          server: TchapUtils.toFriendlyServerName(option.key.roomServer),
++                        /* :TCHAP:
++                        server: option.key.roomServer,
++                        */
++                        server: TchapUtils.toFriendlyServerName(option.key.roomServer),
++                        // end :TCHAP:
                            instance: option.key.instanceId ? option.label : "Matrix",
                        })
-                     : _t("Show: Matrix rooms")
+                     : _t("spotlight|public_rooms|network_dropdown_selected_label")
diff --git a/...-mainlining/matrix-react-sdk+3.82.0.patch → ...-mainlining/matrix-react-sdk+3.88.0.patch b/...-mainlining/matrix-react-sdk+3.82.0.patch → ...-mainlining/matrix-react-sdk+3.88.0.patch
@@ -1,20 +1,24 @@
 diff --git a/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx b/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
-index f4e8ff1..9ee93e1 100644
+index 4da7282..4928a4b 100644
 --- a/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/structures/auth/Registration.tsx
-@@ -50,8 +50,11 @@ import InteractiveAuth, { InteractiveAuthCallback } from "../InteractiveAuth";
+@@ -50,11 +50,15 @@ import InteractiveAuth, { InteractiveAuthCallback } from "../InteractiveAuth";
  import Spinner from "../../views/elements/Spinner";
  import { AuthHeaderDisplay } from "./header/AuthHeaderDisplay";
  import { AuthHeaderProvider } from "./header/AuthHeaderProvider";
 +import { AuthHeaderModifier } from './header/AuthHeaderModifier'; // :TCHAP:
  import SettingsStore from "../../../settings/SettingsStore";
  import { ValidatedServerConfig } from "../../../utils/ValidatedServerConfig";
+ import { Features } from "../../../settings/Settings";
+ import { startOidcLogin } from "../../../utils/oidc/authorize";
+
 +import TchapUtils from '../../../../../../src/tchap/util/TchapUtils'; // :TCHAP:
 +import TchapUrls from "../../../../../../src/tchap/util/TchapUrls";
- 
++
  const debuglog = (...args: any[]): void => {
      if (SettingsStore.getValue("debug_registration")) {
-@@ -280,11 +283,24 @@ export default class Registration extends React.Component<IProps, IState> {
+         logger.log.call(console, "Registration debuglog:", ...args);
+@@ -308,11 +312,24 @@ export default class Registration extends React.Component<IProps, IState> {
      }
 
      private onFormSubmit = async (formVals: Record<string, string>): Promise<void> => {
@@ -39,7 +43,7 @@ index f4e8ff1..9ee93e1 100644
          });
      };
 
-@@ -332,6 +348,10 @@ export default class Registration extends React.Component<IProps, IState> {
+@@ -360,6 +377,10 @@ export default class Registration extends React.Component<IProps, IState> {
                  errorText = _t("auth|username_in_use");
              } else if (response instanceof MatrixError && response.errcode === "M_THREEPID_IN_USE") {
                  errorText = _t("auth|3pid_in_use");
@@ -50,7 +54,7 @@ index f4e8ff1..9ee93e1 100644
              }
 
              this.setState({
-@@ -463,6 +483,11 @@ export default class Registration extends React.Component<IProps, IState> {
+@@ -491,6 +512,11 @@ export default class Registration extends React.Component<IProps, IState> {
              inhibit_login: undefined,
          };
          if (auth) registerParams.auth = auth;
@@ -62,7 +66,7 @@ index f4e8ff1..9ee93e1 100644
          debuglog("Registration: sending registration request:", auth);
          return this.state.matrixClient.registerRequest(registerParams);
      };
-@@ -694,6 +719,12 @@ export default class Registration extends React.Component<IProps, IState> {
+@@ -740,6 +766,12 @@ export default class Registration extends React.Component<IProps, IState> {
                              {errorText}
                              {serverDeadSection}
                          </AuthHeaderDisplay>
@@ -76,7 +80,7 @@ index f4e8ff1..9ee93e1 100644
                      </div>
                      <div className="mx_Register_footerActions">
 diff --git a/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx b/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
-index 41a2aed..0e19925 100644
+index 8c17216..36f6ccb 100644
 --- a/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/views/auth/RegistrationForm.tsx
 @@ -267,7 +267,7 @@ export default class RegistrationForm extends React.PureComponent<IProps, IState