From f2da89802b6c577076dcf30b3411d6c45a94d9bd Mon Sep 17 00:00:00 2001
From: Bogomil-Stoyanov <bogi2208@gmail.com>
Date: Fri, 6 Dec 2024 15:30:20 +0200
Subject: [PATCH] UEPR-113 copy changes

---
 .../registration/phone-number-step.jsx        |  3 +++
 src/components/registration/steps.jsx         | 22 ++++++++++++++++---
 src/components/registration/steps.scss        | 11 ++++++++++
 src/components/slide/slide.scss               | 11 ++++++++++
 src/views/teacherregistration/l10n.json       |  7 +++++-
 .../teacherregistration.jsx                   |  2 +-
 6 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/components/registration/phone-number-step.jsx b/src/components/registration/phone-number-step.jsx
index 7390a21aa..03bd5ea6b 100644
--- a/src/components/registration/phone-number-step.jsx
+++ b/src/components/registration/phone-number-step.jsx
@@ -75,6 +75,9 @@ class PhoneNumberStep extends React.Component {
                                 this.props.intl.formatMessage({id: 'teacherRegistration.phoneConsent'})
                             }
                         />
+                        <div className="info-box">
+                            <intl.FormattedMessage id="teacherRegistration.phoneSecurityNotice" />
+                        </div>
                         <NextStepButton
                             text={<intl.FormattedMessage id="registration.nextStep" />}
                             waiting={this.props.waiting}
diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 055e6c394..01a4b23ba 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -1193,8 +1193,14 @@ class EmailStep extends React.Component {
                 <h2>
                     <FormattedMessage id="teacherRegistration.emailStepTitle" />
                 </h2>
+                <p className="description description-wide">
+                    <FormattedMessage id="teacherRegistration.emailStepDescription1" />
+                </p>
+                <p className="description description-wide">
+                    <FormattedMessage id="teacherRegistration.emailStepDescription2" />
+                </p>
                 <p className="description">
-                    <FormattedMessage id="teacherRegistration.emailStepDescription" />
+                    <FormattedMessage id="teacherRegistration.reviewProcess" />
                     <Tooltip
                         tipContent={
                             this.props.intl.formatMessage({id: 'registration.nameStepTooltip'})
@@ -1273,6 +1279,8 @@ const IntlEmailStep = injectIntl(EmailStep);
 
 const EducatorResourcesLink = chunks => <a href="/educators#resources">{chunks}</a>;
 
+const BoldText = chunks => <strong>{chunks}</strong>;
+const NewLine = () => <br />;
 /*
  * TEACHER APPROVAL STEP
  */
@@ -1289,9 +1297,17 @@ const TeacherApprovalStep = props => (
                 <Card className="confirm">
                     <h4><FormattedMessage id="registration.confirmYourEmail" /></h4>
                     <p>
-                        <FormattedMessage id="registration.confirmYourEmailDescription" /><br />
-                        <strong>{props.email}</strong>
+                        <FormattedMessage
+                            id="teacherRegistration.confirmYourEmailDescription"
+                            values={{b: BoldText, br: NewLine}}
+                        />
                     </p>
+                    <br />
+                    <p>
+                        <FormattedMessage
+                            id="teacherRegistration.confirmationEmail"
+                        />
+                        <strong>{props.email}</strong></p>
                 </Card>
             )
         }
diff --git a/src/components/registration/steps.scss b/src/components/registration/steps.scss
index 1dd988309..adde70a34 100644
--- a/src/components/registration/steps.scss
+++ b/src/components/registration/steps.scss
@@ -112,6 +112,17 @@
                 margin-bottom: 1.25rem;
             }
         }
+
+        .info-box{
+            display: block;
+            margin: 0 -4rem 0 -4rem;
+            background-color: #e0f4ff;
+            color: $ui-blue;
+            padding: 1rem; 
+            text-align: center;
+            font-size: 12px;
+            font-weight: bold;
+        }
     }
 
     &.organization-step {
diff --git a/src/components/slide/slide.scss b/src/components/slide/slide.scss
index 45928df61..f0c267416 100644
--- a/src/components/slide/slide.scss
+++ b/src/components/slide/slide.scss
@@ -15,6 +15,11 @@
         margin-bottom: 2rem;
     }
 
+    > .description-wide { 
+        margin: 0 -8rem 0 -8rem;
+    }
+
+
     .card {
         margin: 0 auto;
     }
@@ -30,3 +35,9 @@
         padding: 0;
     }
 }
+
+@media only screen and (max-width : 941px) {
+    .slide .description-wide { 
+        margin: 0 -2rem 2rem -2rem;
+    } 
+}
\ No newline at end of file
diff --git a/src/views/teacherregistration/l10n.json b/src/views/teacherregistration/l10n.json
index 4079b2e44..b034340c5 100644
--- a/src/views/teacherregistration/l10n.json
+++ b/src/views/teacherregistration/l10n.json
@@ -8,6 +8,7 @@
     "teacherRegistration.phoneStepDescription": "Your phone number will not be displayed publicly, and will be kept confidential and secure",
     "teacherRegistration.phoneConsent": "Yes, the Scratch Team may call me to verify my Teacher Account if needed",
     "teacherRegistration.validationPhoneNumber": "Please enter a valid phone number",
+    "teacherRegistration.phoneSecurityNotice": "To secure your account, we will send you a one-time passcode to verify it’s really you. ",
     "teacherRegistration.validationPhoneConsent": "You must consent to verification of your Teacher Account",
     "teacherRegistration.privacyDescription": "Your information will not be displayed publicly, and will be kept confidential and secure.",
     "teacherRegistration.organization": "Organization",
@@ -34,7 +35,11 @@
     "teacherRegistration.useScratchMaxLength": "Description must be at most 300 characters",
     "teacherRegistration.howUseScratch": "How do you plan to use Scratch at your organization?",
     "teacherRegistration.emailStepTitle": "Email Address",
-    "teacherRegistration.emailStepDescription": "We will send you a confirmation email that will allow you to access your Scratch Teacher Account.",
+    "teacherRegistration.emailStepDescription1": "We will send you an email from no-reply@scratch.mit.edu to verify your email address.",
+    "teacherRegistration.emailStepDescription2": " Once you confirm your email, we will proceed with reviewing your request for a Teacher Account.",
+    "teacherRegistration.reviewProcess": "The review process may take up to 24 hours.",
+    "teacherRegistration.confirmYourEmailDescription": "Please check your inbox for a confirmation email from <br></br> <b>no-reply@scratch.mit.edu</b> to verify your email address. ",
+    "teacherRegistration.confirmationEmail": "Click the link in the confirmation email sent to:",
     "teacherRegistration.validationEmailMatch": "The emails do not match",
     "teacherRegistration.validationAge": "Sorry, teachers must be at least 16 years old"
 }
diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
index 285aa673b..0da3e8e8b 100644
--- a/src/views/teacherregistration/teacherregistration.jsx
+++ b/src/views/teacherregistration/teacherregistration.jsx
@@ -106,7 +106,7 @@ class TeacherRegistration extends React.Component {
                     <Steps.RegistrationError>
                         {this.state.registrationError}
                     </Steps.RegistrationError> :
-                    <Progression step={this.state.step}>
+                    <Progression step={3}>
                         <Steps.UsernameStep
                             waiting={this.state.waiting}
                             onNextStep={this.handleAdvanceStep}