From fe036a3e4e67fa1b75b0273ed54bfa4b7eb70579 Mon Sep 17 00:00:00 2001 From: Estelle Comment Date: Mon, 5 Feb 2024 16:16:19 +0100 Subject: [PATCH] Upgrade conflicting patches --- ...al.patch => matrix-react-sdk+3.88.0.patch} | 22 +++++++++---------- ...9.0.0.patch => matrix-js-sdk+30.3.0.patch} | 18 +++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) rename patches/activate-cross-signing-and-secure-storage-react/{matrix-react-sdk+3.82.0+001+initial.patch => matrix-react-sdk+3.88.0.patch} (93%) rename patches/activate-expired-account-panel/{matrix-js-sdk+29.0.0.patch => matrix-js-sdk+30.3.0.patch} (87%) diff --git a/patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.82.0+001+initial.patch b/patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.88.0.patch similarity index 93% rename from patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.82.0+001+initial.patch rename to patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.88.0.patch index ec47e6655a..22289b9962 100644 --- a/patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.82.0+001+initial.patch +++ b/patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.88.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/matrix-react-sdk/src/components/structures/MatrixChat.tsx b/node_modules/matrix-react-sdk/src/components/structures/MatrixChat.tsx -index 7ce7ae2..0e66b0f 100644 +index 0e7d8e8..dbede57 100644 --- a/node_modules/matrix-react-sdk/src/components/structures/MatrixChat.tsx +++ b/node_modules/matrix-react-sdk/src/components/structures/MatrixChat.tsx -@@ -148,6 +148,7 @@ import { Filter } from "../views/dialogs/spotlight/Filter"; +@@ -147,6 +147,7 @@ import { Filter } from "../views/dialogs/spotlight/Filter"; import { checkSessionLockFree, getSessionLock } from "../../utils/SessionLock"; import { SessionLockStolenView } from "./auth/SessionLockStolenView"; import { ConfirmSessionLockTheftView } from "./auth/ConfirmSessionLockTheftView"; @@ -27,10 +27,10 @@ index 7ce7ae2..0e66b0f 100644 dis.dispatch({ action: "start_registration", diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/CrossSigningPanel.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/CrossSigningPanel.tsx -index 93b1333..2570ba2 100644 +index 91791e6..194df53 100644 --- a/node_modules/matrix-react-sdk/src/components/views/settings/CrossSigningPanel.tsx +++ b/node_modules/matrix-react-sdk/src/components/views/settings/CrossSigningPanel.tsx -@@ -227,14 +227,21 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { +@@ -228,14 +228,21 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { userSigningPrivateKeyCached; const actions: JSX.Element[] = []; @@ -54,7 +54,7 @@ index 93b1333..2570ba2 100644 {buttonCaption} , -@@ -242,7 +249,9 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { +@@ -243,7 +250,9 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { } if (keysExistAnywhere) { @@ -62,10 +62,10 @@ index 93b1333..2570ba2 100644 + // :TCHAP actions.push( + advancedActions.push( + // end :TCHAP: - + {_t("action|reset")} , -@@ -254,6 +263,13 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { +@@ -255,6 +264,13 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { actionRow =
{actions}
; } @@ -79,16 +79,16 @@ index 93b1333..2570ba2 100644 return ( <> {summarisedStatus} -@@ -309,6 +325,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { - - +@@ -312,6 +328,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> { + + + {advancedActionRow} {errorSection} {actionRow} diff --git a/node_modules/matrix-react-sdk/src/components/views/settings/SecureBackupPanel.tsx b/node_modules/matrix-react-sdk/src/components/views/settings/SecureBackupPanel.tsx -index 1a63164..8ccec1c 100644 +index 4a37950..8fed0f4 100644 --- a/node_modules/matrix-react-sdk/src/components/views/settings/SecureBackupPanel.tsx +++ b/node_modules/matrix-react-sdk/src/components/views/settings/SecureBackupPanel.tsx @@ -266,12 +266,23 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> { diff --git a/patches/activate-expired-account-panel/matrix-js-sdk+29.0.0.patch b/patches/activate-expired-account-panel/matrix-js-sdk+30.3.0.patch similarity index 87% rename from patches/activate-expired-account-panel/matrix-js-sdk+29.0.0.patch rename to patches/activate-expired-account-panel/matrix-js-sdk+30.3.0.patch index 53f28a74b8..42860b132c 100644 --- a/patches/activate-expired-account-panel/matrix-js-sdk+29.0.0.patch +++ b/patches/activate-expired-account-panel/matrix-js-sdk+30.3.0.patch @@ -1,25 +1,25 @@ diff --git a/node_modules/matrix-js-sdk/src/http-api/fetch.ts b/node_modules/matrix-js-sdk/src/http-api/fetch.ts -index 38d9b4a..d4bc0a0 100644 +index 0c6f9a5..5ff612e 100644 --- a/node_modules/matrix-js-sdk/src/http-api/fetch.ts +++ b/node_modules/matrix-js-sdk/src/http-api/fetch.ts -@@ -160,6 +160,12 @@ export class FetchHttpApi { +@@ -177,6 +177,12 @@ export class FetchHttpApi { } else if (err.errcode == "M_CONSENT_NOT_GIVEN") { this.eventEmitter.emit(HttpApiEvent.NoConsent, err.message, err.data.consent_uri); } -+ //:tchap: this error is sent by the synapse module (synapse-email-account-validity)[https://github.com/matrix-org/synapse-email-account-validity] ++ //:tchap: this error is sent by the synapse module (synapse-email-account-validity)[https://github.com/matrix-org/synapse-email-account-validity] + // when user account has expired + else if (err.errcode == 'ORG_MATRIX_EXPIRED_ACCOUNT') { + this.eventEmitter.emit(HttpApiEvent.ORG_MATRIX_EXPIRED_ACCOUNT, err); + } + //:tchap end - }); - // return the original promise, otherwise tests break due to it having to + throw err; + } diff --git a/node_modules/matrix-js-sdk/src/http-api/interface.ts b/node_modules/matrix-js-sdk/src/http-api/interface.ts -index 57e8a18..525860d 100644 +index ee4456d..54de701 100644 --- a/node_modules/matrix-js-sdk/src/http-api/interface.ts +++ b/node_modules/matrix-js-sdk/src/http-api/interface.ts -@@ -75,6 +75,10 @@ export interface IContentUri { +@@ -104,6 +104,10 @@ export interface IContentUri { export enum HttpApiEvent { SessionLoggedOut = "Session.logged_out", NoConsent = "no_consent", @@ -30,7 +30,7 @@ index 57e8a18..525860d 100644 } export type HttpApiEventHandlerMap = { -@@ -102,6 +106,9 @@ export type HttpApiEventHandlerMap = { +@@ -131,6 +135,9 @@ export type HttpApiEventHandlerMap = { * ``` */ [HttpApiEvent.NoConsent]: (message: string, consentUri: string) => void; @@ -41,7 +41,7 @@ index 57e8a18..525860d 100644 export interface UploadProgress { diff --git a/node_modules/matrix-js-sdk/src/sync.ts b/node_modules/matrix-js-sdk/src/sync.ts -index 84b6255..770d2f8 100644 +index 408aec6..c422f18 100644 --- a/node_modules/matrix-js-sdk/src/sync.ts +++ b/node_modules/matrix-js-sdk/src/sync.ts @@ -615,6 +615,14 @@ export class SyncApi {