From d68ea2f157afc421412de82a90a94bb6d8775238 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Tue, 24 Oct 2023 18:55:37 -0300
Subject: [PATCH 1/5] fix design

---
 packages/layout/src/FormPageLayout/FormSteps.tsx                | 2 +-
 packages/onboarding-ui/.i18n/en.i18n.json                       | 2 +-
 packages/onboarding-ui/src/common/EmailCodeFallback.tsx         | 2 +-
 .../src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/layout/src/FormPageLayout/FormSteps.tsx b/packages/layout/src/FormPageLayout/FormSteps.tsx
index 1644c2d13a..795dfd3809 100644
--- a/packages/layout/src/FormPageLayout/FormSteps.tsx
+++ b/packages/layout/src/FormPageLayout/FormSteps.tsx
@@ -14,7 +14,7 @@ const FormSteps = ({
   const { t } = useTranslation();
 
   return (
-    <Box mbe={8} fontScale='c2' color='neutral-600'>
+    <Box mbe={8} fontScale='c2' color='font-secondary-info'>
       {t('component.form.steps', { currentStep, stepCount })}
     </Box>
   );
diff --git a/packages/onboarding-ui/.i18n/en.i18n.json b/packages/onboarding-ui/.i18n/en.i18n.json
index d14288af95..e76d3f8e47 100644
--- a/packages/onboarding-ui/.i18n/en.i18n.json
+++ b/packages/onboarding-ui/.i18n/en.i18n.json
@@ -260,7 +260,7 @@
       "title": "Awaiting confirmation",
       "content": {
         "securityCode": "Security code",
-        "sentEmail": "Email sent to <1>{{email}}</1> with a confirmation link.Please verify that the security code below matches the one in the email."
+        "sentEmail": "Email sent to <1>{{emailAddress}}</1> with a confirmation link.Please verify that the security code below matches the one in the email."
       }
     },
     "loginForm": {
diff --git a/packages/onboarding-ui/src/common/EmailCodeFallback.tsx b/packages/onboarding-ui/src/common/EmailCodeFallback.tsx
index 83e8c5e6a7..7a50e2e327 100644
--- a/packages/onboarding-ui/src/common/EmailCodeFallback.tsx
+++ b/packages/onboarding-ui/src/common/EmailCodeFallback.tsx
@@ -12,7 +12,7 @@ const EmailCodeFallback = ({
   onResendEmailRequest,
   onChangeEmailRequest,
 }: EmailCodeFallbackProps): ReactElement => (
-  <Box fontScale='c1'>
+  <Box fontScale='p2'>
     <Trans i18nKey='component.emailCodeFallback'>
       Didn’t receive email?
       <ActionLink onClick={onResendEmailRequest}>Resend</ActionLink>
diff --git a/packages/onboarding-ui/src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx b/packages/onboarding-ui/src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx
index 383c984546..b78f03d0be 100644
--- a/packages/onboarding-ui/src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx
+++ b/packages/onboarding-ui/src/forms/AwaitConfirmationForm/AwaitConfirmationForm.tsx
@@ -31,7 +31,7 @@ const AwaitingConfirmationForm = ({
         <Form.Title>{t('form.awaitConfirmationForm.title')}</Form.Title>
       </Form.Header>
       <Form.Container>
-        <Box fontScale='c1' mbe={24}>
+        <Box fontScale='p2' mbe={24}>
           <Trans i18nKey='form.awaitConfirmationForm.content.sentEmail'>
             Email sent to <strong>{{ emailAddress }}</strong> with a
             confirmation link.Please verify that the security code below matches

From b3ec093c84f062fc7426e9e858504b536b2afb60 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Tue, 24 Oct 2023 19:06:46 -0300
Subject: [PATCH 2/5] title

---
 packages/layout/src/FormPageLayout/FormTitle.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/layout/src/FormPageLayout/FormTitle.tsx b/packages/layout/src/FormPageLayout/FormTitle.tsx
index 47f03e31aa..9a29faa8c0 100644
--- a/packages/layout/src/FormPageLayout/FormTitle.tsx
+++ b/packages/layout/src/FormPageLayout/FormTitle.tsx
@@ -8,7 +8,7 @@ const FormTitle = forwardRef<
     children: ReactNode;
   }
 >((props, ref) => (
-  <Box mbe={8} fontScale='h2' fontWeight={800} {...props} ref={ref} />
+  <Box mbe={8} fontScale='h3' fontWeight={800} {...props} ref={ref} />
 ));
 
 export default FormTitle;

From e557fade80f3233c77bd2a9e8eca5f6334aaf285 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Tue, 31 Oct 2023 13:50:45 -0300
Subject: [PATCH 3/5] qa review

---
 .../src/forms/RegisterServerForm/RegisterServerForm.tsx  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
index 7b65ed86c1..ac78d9e902 100644
--- a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
+++ b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
@@ -5,7 +5,6 @@ import {
   Field,
   EmailInput,
   CheckBox,
-  Icon,
   FieldLabel,
   FieldRow,
   FieldError,
@@ -107,14 +106,6 @@ const RegisterServerForm = ({
                 htmlFor={emailField}
               >
                 {t('form.registeredServerForm.fields.accountEmail.inputLabel')}
-                <Icon
-                  title={t(
-                    'form.registeredServerForm.fields.accountEmail.tooltipLabel'
-                  )}
-                  mis={4}
-                  size='x16'
-                  name='info'
-                />
               </FieldLabel>
               <FieldRow>
                 <Controller

From 53601a80dbbe4d653a56e74c50e8aaa696c5102c Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Thu, 16 Nov 2023 14:59:44 -0300
Subject: [PATCH 4/5] offline button

---
 .../src/forms/RegisterServerForm/RegisterServerForm.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
index ac78d9e902..11a36c140c 100644
--- a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
+++ b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
@@ -203,7 +203,7 @@ const RegisterServerForm = ({
               <Button
                 type='submit'
                 primary
-                disabled={isSubmitting || isValidating}
+                disabled={isSubmitting || isValidating || offline}
               >
                 {t('component.form.action.registerWorkspace')}
               </Button>

From 90ef6e3f8044d3cfda476bbd31ba270b59fbe7d2 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Thu, 16 Nov 2023 15:03:55 -0300
Subject: [PATCH 5/5] Create mighty-chicken-sip.md

---
 .changeset/mighty-chicken-sip.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/mighty-chicken-sip.md

diff --git a/.changeset/mighty-chicken-sip.md b/.changeset/mighty-chicken-sip.md
new file mode 100644
index 0000000000..12fea679f0
--- /dev/null
+++ b/.changeset/mighty-chicken-sip.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/layout": patch
+"@rocket.chat/onboarding-ui": patch
+---
+
+Adjust some font scales and text colors, fix some wrong translations, remove description from admin email on register server step, disable register workspace button when air-gapped.