UX improvements for XSSS

patches/activate-cross-signing-and-secure-storage-react/matrix-react-sdk+3.63.0.patch

@@ -115,7 +115,7 @@ index 56fdb5e..d67fb6d 100644
              return this.state.crossSigningInfo
                  .checkDeviceTrust(this.state.crossSigningInfo, deviceInfo, false, true)
 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 2e6e6fb..dae664a 100644
+index 2e6e6fb..f718552 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
 @@ -30,6 +30,7 @@ import AccessibleButton from "../elements/AccessibleButton";
@@ -126,7 +126,7 @@ index 2e6e6fb..dae664a 100644
 
  interface IState {
      loading: boolean;
-@@ -460,6 +461,12 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
+@@ -460,17 +461,24 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
          let actionRow;
          if (actions.length) {
              actionRow = <div className="mx_SecureBackupPanel_buttonRow">{actions}</div>;
@@ -139,3 +139,16 @@ index 2e6e6fb..dae664a 100644
          }
 
          return (
+             <div>
+-                <p>
++                 <p>
+                     {_t(
+                         "Back up your encryption keys with your account data in case you " +
+                             "lose access to your sessions. Your keys will be secured with a " +
+                             "unique Security Key.",
+                     )}
+                 </p>
++                
+                 {statusDescription}
+                 <details>
+                     <summary>{_t("Advanced")}</summary>

patches/cross-signing-ui/matrix-react-sdk+3.63.0.patch

@@ -108,7 +108,7 @@ index cf0c160..9a970b9 100644
                                  kind="primary"
                                  className="mx_Dialog_primary mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn"
 diff --git a/node_modules/matrix-react-sdk/src/components/structures/auth/CompleteSecurity.tsx b/node_modules/matrix-react-sdk/src/components/structures/auth/CompleteSecurity.tsx
-index 8da8e5c..746ab0a 100644
+index 8da8e5c..1fdb336 100644
 --- a/node_modules/matrix-react-sdk/src/components/structures/auth/CompleteSecurity.tsx
 +++ b/node_modules/matrix-react-sdk/src/components/structures/auth/CompleteSecurity.tsx
 @@ -22,6 +22,7 @@ import SetupEncryptionBody from "./SetupEncryptionBody";
@@ -132,7 +132,7 @@ index 8da8e5c..746ab0a 100644
 -                    onClick={this.onSkipClick}
 +                    // :tchap: remove onClick={this.onSkipClick}
 +                    // add instead
-+                    onClick={TchapUIFeature.isCrossSigningAndSecureStorageActive ? tchapOnSkipClick : this.onSkipClick}
++                    onClick={TchapUIFeature.isCrossSigningAndSecureStorageActive() ? tchapOnSkipClick : this.onSkipClick}
 +                    // end :tchap:
                      className="mx_CompleteSecurity_skip"
                      aria-label={_t("Skip verification for now")}

patches/patches.json

@@ -140,8 +140,8 @@
     ]
   },
   "cross-signing-ui": {
-    "comments" : "reword cross-signing dialogs and remove confirmation dialog",
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/406",
+    "comments": "reword cross-signing dialogs and remove confirmation dialog",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/406",
     "package": "matrix-react-sdk",
     "files": [
       "src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx",
@@ -151,8 +151,8 @@
     ]
   },
   "temp-settings-remove-enable-email-notifications-option": {
-    "comments" : "Notifications by email is currently not activated on Tchap backend. So we must remove this option.",
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/405",
+    "comments": "Notifications by email is currently not activated on Tchap backend. So we must remove this option.",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/405",
     "package": "matrix-react-sdk",
     "files": [
       "src/components/views/settings/Notifications.tsx"
@@ -174,24 +174,24 @@
      ]
   },  
   "fix-inviting-a-person-already-present-in-the-room" : {
-    "comments" : "When inviting by its email adress someone already in the room, the error message was wrong and break the invitation process",
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/394",
+    "comments": "When inviting by its email adress someone already in the room, the error message was wrong and break the invitation process",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/394",
     "package": "matrix-react-sdk",
     "files": [
       "src/utils/MultiInviter.ts"
     ]
   },
   "activate-cross-signing-and-secure-storage-js": {
-    "comments" : "introduce a feature flag for activating cross signing and secure storage",
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/433",
+    "comments": "introduce a feature flag for activating cross signing and secure storage",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/433",
     "package": "matrix-js-sdk",
     "files": [
       "src/client.ts"
     ]
   },
   "activate-cross-signing-and-secure-storage-react": {
     "comments" : "introduce a feature flag for activating cross signing and secure storage (unify previous patches)",
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/433",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/433",
     "package": "matrix-react-sdk",
     "files": [
       "src/components/views/settings/SecureBackupPanel.tsx",
@@ -201,11 +201,18 @@
     ]
   },
   "add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq": {
-    "github-issue" : "https://github.com/tchapgouv/tchap-web-v4/issues/395",
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/395",
     "package": "matrix-react-sdk",
     "files": [
       "src/components/structures/UserMenu.tsx",
       "res/css/structures/_UserMenu.pcss"
     ]
+  },
+  "ux-improvements-for-xsss": {
+    "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/442",
+    "package": "matrix-react-sdk",
+    "files": [
+      "src/components/views/dialogs/security/AccessSecretStorageDialog.tsx"
+    ]
   }
 }

patches/ux-improvements-for-xsss/matrix-react-sdk+3.63.0.patch

@@ -0,0 +1,31 @@
+diff --git a/node_modules/matrix-react-sdk/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/node_modules/matrix-react-sdk/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+index 586ce4a..7d7a735 100644
+--- a/node_modules/matrix-react-sdk/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
++++ b/node_modules/matrix-react-sdk/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+@@ -408,13 +408,15 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
+                                     autoComplete="off"
+                                 />
+                             </div>
++                            {/*
++                             :TCHAP: hide for csss feature
+                             <span className="mx_AccessSecretStorageDialog_recoveryKeyEntry_entryControlSeparatorText">
+                                 {_t("%(securityKey)s or %(recoveryFile)s", {
+                                     recoveryFile: "",
+                                     securityKey: "",
+                                 })}
+                             </span>
+-                            <div>
++                             <div>
+                                 <input
+                                     type="file"
+                                     className="mx_AccessSecretStorageDialog_recoveryKeyEntry_fileInput"
+@@ -425,7 +427,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
+                                 <AccessibleButton kind="primary" onClick={this.onRecoveryKeyFileUploadClick}>
+                                     {_t("Upload")}
+                                 </AccessibleButton>
+-                            </div>
++                            :end TCHAP
++                            </div> */}
+                         </div>
+                         {recoveryKeyFeedback}
+                         <DialogButtons