feat(error_view): Personalize new compatibility view to be tchap frie…

…ndly
tchapgouv · Sep 16, 2024 · 903b28d · 903b28d
1 parent b1d6220
commit 903b28d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 172 deletions.
diff --git a/config.dev.json b/config.dev.json
@@ -32,10 +32,11 @@
     "default_country_code": "FR",
     "show_labs_settings": false,
     "features": {
-        "feature_video_rooms": false,
+        "feature_video_rooms": true,
         "feature_notification_settings2": false,
         "feature_new_room_decoration_ui": true,
-        "feature_rust_crypto": true
+        "feature_rust_crypto": true,
+        "feature_group_calls": true
     },
     "feedback": {
         "existing_issues_url": "https://github.com/tchapgouv/tchap-web-v4/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc",
@@ -89,7 +90,7 @@
         "description": "You are on dev env",
         "show_once": false
     },
-    "desktopBuilds": {
+    "desktop_builds": {
         "available": false
     },
     "mobile_builds": {
@@ -124,5 +125,8 @@
         ],
         "feature_screenshare_call": ["*"]
     },
-    "map_style_url": "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json"
+    "map_style_url": "https://openmaptiles.geo.data.gouv.fr/styles/osm-bright/style.json",
+    "element_call": {
+        "url": "https://element-call.tchap.incubateur.net/"
+    }
 }
diff --git a/modules/tchap-translations/tchap_translations.json b/modules/tchap-translations/tchap_translations.json
@@ -798,16 +798,44 @@
         "en": "Hang tight. We are updating %(brand)s to make encryption faster and more reliable. Don't worry, it can take some time",
         "fr": "Accrochez-vous. Nous mettons à jour %(brand)s pour que le chiffrement soit plus rapide et plus fiable. N'ayez crainte, cela peut prendre jusqu'à 10 minutes"
     },
-    "incompatible_browser|continue_warning": {
-        "en": "I still want to use this browser",
-        "fr": "Je souhaite tout de même continuer sur ce navigateur"
+    "incompatible_browser|supported_browsers": {
+        "en": "For the best experience, use recent version of <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge>, or <Safari>Safari</Safari>.",
+        "fr": "Pour une meilleure expérience, veuillez utiliser des versions récentes de <Chrome>Chrome</Chrome>, <Firefox>Firefox</Firefox>, <Edge>Edge</Edge>, ou <Safari>Safari</Safari>."
     },
-    "incompatible_browser|summary": {
-        "en": "This browser version cannot run %(brand)s properly",
-        "fr": "Cette version de navigateur ne permet pas une exécution optimale de %(brand)s"
+    "incompatible_browser|description": {
+        "en": "%(brand)s uses some browser features which are not available in your current browser. %(detail)s",
+        "fr": "%(brand)s utilise des fonctionnalités non disponibles dans votre version courante du navigateur. %(detail)s"
     },
-    "incompatible_browser|browser_links": {
-        "en": "Please install a recent version of <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, <edgeLink> Edge </edgeLink> or <safariLink>Safari</safariLink> for the best experience.",
-        "fr": "Pour une expérience optimale, veuillez installer une version récente de l'un des navigateurs suivants : <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, <edgeLink> Edge </edgeLink> ou <safariLink>Safari</safariLink>."
+    "incompatible_browser|detail_can_continue": {
+        "en": "If you continue, some features may stop working and there is a risk that you may lose data in the future.",
+        "fr": "Si vous continuez, certaines fonctionnalités cesseront de fonctionner et vous pouvez potentiellement perdre des données"
+    },
+    "incompatible_browser|detail_no_continue": {
+        "en": "Try updating this browser if you're not using the latest version and try again.",
+        "fr": "Essayez de mettre à jour votre navigateur si vous n'utilisez pas la dernière version de celle-ci et réessayez"
+    },
+    "incompatible_browser|learn_more": {
+        "en": "Learn more",
+        "fr": "En savoir plus"
+    },
+    "incompatible_browser|title": {
+        "en": "%(brand)s does not support this browser",
+        "fr": "%(brand)s ne supporte pas cette version de navigateur"
+    },
+    "incompatible_browser|use_desktop_heading": {
+        "en": "Use %(brand)s Desktop instead",
+        "fr": "Utliser %(brand)s en tant qu'application Bureau"
+    },
+    "incompatible_browser|use_mobile_heading": {
+        "en": "Use %(brand)s on mobile instead",
+        "fr": "Utiliser %(brand)s sur mobile"
+    },
+    "incompatible_browser|use_mobile_heading_after_desktop": {
+        "en": "Or use our mobile app",
+        "fr": "Ou utiliser notre application mobile"
+    },
+    "incompatible_browser|continue": {
+        "en": "Continue anyway",
+        "fr": "Continuer tout de même"
     }
 }
diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx
diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx
@@ -29,7 +29,7 @@ import { Icon as LinuxIcon } from "../../../res/themes/element/img/compound/linu
 // PostCSS variables will be accessible.
 import "../../../res/css/structures/ErrorView.pcss";
 
-interface IProps {
+interface IProps {  
     // both of these should already be internationalised
     title: string;
     messages?: string[];
@@ -39,12 +39,14 @@ interface IProps {
 export const ErrorView: React.FC<IProps> = ({ title, messages, footer, children }) => {
     return (
         <div className="mx_ErrorView cpd-theme-light">
-            <img
+            {/* :TCHAP: <img
                 className="mx_ErrorView_logo"
                 height="160"
-                src="themes/element/img/logos/element-app-logo.png"
-                alt="Element"
-            />
+                src="themes/tchap/img/logos/tchap-app-logo.png"
+                alt="Tchap"
+            /> */}
+            <img className="mx_ErrorView_logo" height="160" src="themes/tchap/img/logos/tchap-logo.svg" alt="Tchap" />
+            {/* end :TCHAP: */}
             <div className="mx_ErrorView_container">
                 <Heading size="md" weight="semibold">
                     {title}

diff --git a/tchap-4.7.2-dev-upgrade2-20240916.tar.gz b/tchap-4.7.2-dev-upgrade2-20240916.tar.gz
diff --git a/test/unit-tests/tchap/components/views/dialogs/__snapshots__/BugReportDialog-test.tsx.snap b/test/unit-tests/tchap/components/views/dialogs/__snapshots__/BugReportDialog-test.tsx.snap
@@ -31,6 +31,11 @@ exports[`<BugReportDialog> should render as expected 1`] = `
           class="mx_Dialog_content"
           id="mx_Dialog_content"
         >
+          <p>
+            <b>
+              bug_reporting
+            </b>
+          </p>
           <p>
             bug_reporting
           </p>
@@ -135,6 +140,11 @@ exports[`<BugReportDialog> should render as expected 1`] = `
         class="mx_Dialog_content"
         id="mx_Dialog_content"
       >
+        <p>
+          <b>
+            bug_reporting
+          </b>
+        </p>
         <p>
           bug_reporting
         </p>