Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore : move tchap urls to TchapUrls #645

Merged
merged 1 commit into from
Aug 18, 2023
Merged

chore : move tchap urls to TchapUrls #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions patches/cross-signing-ui/matrix-react-sdk+3.71.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -208,18 +207,26 @@ index 2cbfbf8..efe6b26 100644
</div>
</div>
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<IProps> = ({ 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<IProps> = ({ failures }) => {
)}
</React.Fragment>
);
+ /* :tchap: replace reset button by open-security button
button = (
<AccessibleButton
className="mx_DecryptionFailureBar_end_button"
@@ -203,28 +204,43 @@ export const DecryptionFailureBar: React.FC<IProps> = ({ failures }) => {
@@ -203,28 +205,43 @@ export const DecryptionFailureBar: React.FC<IProps> = ({ failures }) => {
{_t("Reset")}
</AccessibleButton>
);
Expand Down Expand Up @@ -255,7 +262,7 @@ index 94cf02d..52b9e53 100644
+ /* :TCHAP: Add for N bug */ message = <React.Fragment>{_t(
+ "Or if that doesn't work, please follow <a>these steps</a>.",
+ {},
+ {a: (sub)=><a href="https://tchap.beta.gouv.fr/faq/messages-verrouilles" target="_blank">{sub}</a>}
+ {a: (sub)=><a href={TchapUrls.lockedMessagesPage} target="_blank">{sub}</a>}
+ )}</React.Fragment>;
+
+ // :TCHAP: shrink long banner
Expand Down
4 changes: 4 additions & 0 deletions src/tchap/util/TchapUrls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


}
Loading