From 87aabd6ba52bdca65652857864801b49643eff68 Mon Sep 17 00:00:00 2001 From: olivier Date: Thu, 17 Aug 2023 15:42:28 +0200 Subject: [PATCH] move tchap urls to TchapUrls --- .../matrix-react-sdk+3.71.1.patch | 17 ++++++++++++----- src/tchap/util/TchapUrls.ts | 4 ++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/patches/cross-signing-ui/matrix-react-sdk+3.71.1.patch b/patches/cross-signing-ui/matrix-react-sdk+3.71.1.patch index 237d502d34..fe68d8df0a 100644 --- a/patches/cross-signing-ui/matrix-react-sdk+3.71.1.patch +++ b/patches/cross-signing-ui/matrix-react-sdk+3.71.1.patch @@ -1,4 +1,3 @@ - diff --git a/node_modules/matrix-react-sdk/res/css/views/auth/_CompleteSecurityBody.pcss b/node_modules/matrix-react-sdk/res/css/views/auth/_CompleteSecurityBody.pcss index c23f53b..7aa9f25 100644 --- a/node_modules/matrix-react-sdk/res/css/views/auth/_CompleteSecurityBody.pcss @@ -208,10 +207,18 @@ index 2cbfbf8..efe6b26 100644 diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx -index 94cf02d..52b9e53 100644 +index 94cf02d..8deef31 100644 --- a/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx +++ b/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx -@@ -193,6 +193,7 @@ export const DecryptionFailureBar: React.FC = ({ failures }) => { +@@ -29,6 +29,7 @@ import MatrixClientContext from "../../../contexts/MatrixClientContext"; + import SetupEncryptionDialog from "../dialogs/security/SetupEncryptionDialog"; + import { SetupEncryptionStore } from "../../../stores/SetupEncryptionStore"; + import Spinner from "../elements/Spinner"; ++import TchapUrls from "../../../../../../src/tchap/util/TchapUrls"; + + interface IProps { + failures: MatrixEvent[]; +@@ -193,6 +194,7 @@ export const DecryptionFailureBar: React.FC = ({ failures }) => { )} ); @@ -219,7 +226,7 @@ index 94cf02d..52b9e53 100644 button = ( = ({ failures }) => { +@@ -203,28 +205,43 @@ export const DecryptionFailureBar: React.FC = ({ failures }) => { {_t("Reset")} ); @@ -255,7 +262,7 @@ index 94cf02d..52b9e53 100644 + /* :TCHAP: Add for N bug */ message = {_t( + "Or if that doesn't work, please follow these steps.", + {}, -+ {a: (sub)=>{sub}} ++ {a: (sub)=>{sub}} + )}; + + // :TCHAP: shrink long banner diff --git a/src/tchap/util/TchapUrls.ts b/src/tchap/util/TchapUrls.ts index 4784fc09de..ce29b81063 100644 --- a/src/tchap/util/TchapUrls.ts +++ b/src/tchap/util/TchapUrls.ts @@ -5,4 +5,8 @@ export default class TchapUrls { //tchap status page public static statusPage = "https://status.tchap.numerique.gouv.fr" + //tchap FAQ page on locked messages + public static lockedMessagesPage = "https://tchap.beta.gouv.fr/faq/messages-verrouilles" + + }