Merge pull request #3207 from benjiwheeler/join-flow-welcome-text

add instructions text to join flow welcome step

src/components/join-flow/join-flow-steps.scss

@@ -18,6 +18,14 @@
     margin-bottom: .5rem;
 }
 
+.join-flow-instructions {
+    font-size: .875rem;
+    font-weight: bold;
+    line-height: 1.37500rem;
+    margin-bottom: 1rem;
+    text-align: center;
+}
+
 .validation-full-width-input {
     transform: translate(21.5625rem, 0);
 }

src/components/join-flow/join-flow.jsx

@@ -42,6 +42,7 @@ class JoinFlow extends React.Component {
                     <BirthDateStep onNextStep={this.handleAdvanceStep} />
                     <EmailStep onNextStep={this.handleAdvanceStep} />
                     <WelcomeStep
+                        email={this.state.formData.email}
                         username={this.state.formData.username}
                         onNextStep={this.handleAdvanceStep}
                     />

src/components/join-flow/welcome-step.jsx

@@ -60,7 +60,16 @@ class WelcomeStep extends React.Component {
                             )}`}
                             waiting={isSubmitting}
                             onSubmit={handleSubmit}
-                        />
+                        >
+                            <div className="join-flow-instructions">
+                                <FormattedMessage
+                                    id="registration.welcomeStepInstructions"
+                                    values={{
+                                        email: this.props.email
+                                    }}
+                                />
+                            </div>
+                        </JoinFlowStep>
                     );
                 }}
             </Formik>
@@ -69,6 +78,7 @@ class WelcomeStep extends React.Component {
 }
 
 WelcomeStep.propTypes = {
+    email: PropTypes.string,
     intl: intlShape,
     onNextStep: PropTypes.func,
     username: PropTypes.string

src/l10n.json

@@ -195,6 +195,7 @@
     "registration.waitForApprovalDescription": "You can log into your Scratch Account now, but the features specific to Teachers are not yet available. Your information is being reviewed. Please be patient, the approval process can take up to one day. You will receive an email indicating your account has been upgraded once your account has been approved.",
     "registration.welcomeStepDescription": "You have successfully set up a Scratch account! You are now a member of the class:",
     "registration.welcomeStepDescriptionNonEducator": "You’re now logged in! You can start exploring and creating projects.",
+    "registration.welcomeStepInstructions": "Want to share and comment? Click the link on the email we sent to {email}.",
     "registration.welcomeStepPrompt": "To get started, click on the button below.",
     "registration.welcomeStepTitle": "Hurray! Welcome to Scratch!",
     "registration.welcomeStepTitleNonEducator": "Welcome to Scratch, {username}!",