From df9ff572d4e1876e50df0c5818fb8b494d4c8d37 Mon Sep 17 00:00:00 2001
From: Thomas Belin <me@thomasbelin.fr>
Date: Mon, 11 Sep 2023 15:02:40 +0200
Subject: [PATCH] fix: Improve conversation join page copies (#4426)

---
 src/i18n/en-US.json                           | 10 +++-------
 src/script/component/DirectDownloadButton.tsx |  4 ++--
 src/script/page/ConversationJoin.tsx          |  7 +++++++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index 334f979109..e9855a5d5b 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -72,9 +72,8 @@
   "conversationJoin": {
     "loading": "Verifying link...",
     "description": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
-    "wirelessHeadline": "Don't want to create a {{brandName}} account?",
-    "wirelessLink": "Join the conversation as a temporary guest",
-    "wirelessNote": "(access expires after 24 hours)",
+    "conversationLocation": "The conversation takes place on {{domain}}",
+    "wirelessHeadline": "Don't have a {{brandName}} account? You can join as temporary guest in the browser.",
     "errorConversationNotFoundDescription": "The link to this group conversation has expired or is no longer valid.",
     "errorConversationNotFoundHeadline": "Conversation not found",
     "title": "You have been invited to join a conversation in {{brandName}}",
@@ -84,10 +83,7 @@
     "cannotJoinOnMobile": "At the moment, you can't join this conversation on your mobile device. Please open this link on your desktop instead."
   },
   "conversationJoinSelfHosted": {
-    "title": "You have been invited to join a Wire conversation",
-    "wirelessHeadline": "The conversation is hosted on {{domain}}.",
-    "wirelessHaveAccount": "Don't have a Wire account on this domain?",
-    "wirelessLink": "Join as Temporary Guest"
+    "title": "You have been invited to join conversation in Wire"
   },
   "userProfile": {
     "title": "You have been invited to view a user profile in {{brandName}}",
diff --git a/src/script/component/DirectDownloadButton.tsx b/src/script/component/DirectDownloadButton.tsx
index 0d5c4d7c71..a585da133f 100644
--- a/src/script/component/DirectDownloadButton.tsx
+++ b/src/script/component/DirectDownloadButton.tsx
@@ -19,7 +19,7 @@
 
 import {Runtime} from '@wireapp/commons';
 import {OperatingSystem} from '@wireapp/commons/src/main/util/Runtime';
-import {ButtonLink, ButtonProps, COLOR} from '@wireapp/react-ui-kit';
+import {ButtonLink, ButtonProps, ButtonVariant} from '@wireapp/react-ui-kit';
 import {useTranslation} from 'react-i18next';
 import {
   BRAND_NAME,
@@ -45,7 +45,7 @@ const DirectDownloadButton = ({children, ...props}: Props) => {
 
   return (
     <ButtonLink
-      backgroundColor={COLOR.GREEN}
+      variant={ButtonVariant.SECONDARY}
       href={SYSTEM_DEPENDENT_LINKS[Runtime.getOSFamily()] || DEFAULT_LINK}
       data-uie-name="go-direct-download"
       {...props}
diff --git a/src/script/page/ConversationJoin.tsx b/src/script/page/ConversationJoin.tsx
index 998bcd64e3..fb895d0d46 100644
--- a/src/script/page/ConversationJoin.tsx
+++ b/src/script/page/ConversationJoin.tsx
@@ -23,6 +23,7 @@ import {
   H1,
   H2,
   Loading,
+  Paragraph,
   QUERY,
   QueryKeys,
   Small,
@@ -96,6 +97,12 @@ export const ConversationJoin: React.FC<ConversationJoinProps> = ({location}) =>
               {hasDisplayedButtons() ? (
                 <>
                   <Text block>{t('description', {ns: translationNamespaces})}</Text>
+                  <Paragraph muted css={{marginTop: '8px'}}>
+                    {t('conversationLocation', {domain, ns: translationNamespaces})}
+                  </Paragraph>
+                  <Paragraph muted css={{marginTop: '8px'}}>
+                    {t('wirelessHeadline', {brandName: BRAND_NAME, domain, ns: translationNamespaces})}
+                  </Paragraph>
                   <FlexBox flexWrap="wrap" column={isMobile} css={{marginTop: 24}}>
                     <OpenWireButtons
                       translate={(key, substitutes) => t(key, {...substitutes, ns: translationNamespaces})}