From 1408b540e188e30750963c44e8439362c0cb3016 Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
Date: Sat, 2 May 2020 00:44:20 -0700
Subject: [PATCH 01/16] default student's country to educator's during reg

Ideally the classroom info would include the country code, not just the
country name. Since it doesn't, this change includes a new function to
look up a country code by the country's name (not label).
---
 src/components/registration/steps.jsx                 | 11 +++++++++--
 src/views/studentregistration/studentregistration.jsx |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 42bdb2db4..113777ef9 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -453,7 +453,7 @@ class DemographicsStep extends React.Component {
     handleChooseGender (name, gender) {
         this.setState({otherDisabled: gender !== 'other'});
     }
-    // look up country name using user's country code selection
+    // look up country name using user's country code selection ('us' -> 'United States')
     getCountryName (values) {
         if (values.countryCode) {
             const countryInfo = countryData.lookupCountryInfo(values.countryCode);
@@ -463,6 +463,12 @@ class DemographicsStep extends React.Component {
         }
         return null;
     }
+    // look up country code from country label ('United States' -> 'us')
+    // if `countryName` is not found, including if it's null or undefined, then this function will return undefined.
+    getCountryCode (countryName) {
+        const country = countryData.countryInfo.find(countryItem => countryItem.name === countryName);
+        return country && country.code;
+    }
     handleValidSubmit (formData) {
         const countryName = this.getCountryName(formData);
         if (countryName && formData.user) {
@@ -573,7 +579,7 @@ class DemographicsStep extends React.Component {
                             validations={{
                                 countryVal: values => this.countryValidator(values)
                             }}
-                            value={countryOptions[0].value}
+                            value={this.getCountryCode(this.props.countryName) || countryOptions[0].value}
                         />
                         <Checkbox
                             className="demographics-checkbox-is-robot"
@@ -598,6 +604,7 @@ class DemographicsStep extends React.Component {
 DemographicsStep.propTypes = {
     activeStep: PropTypes.number,
     birthOffset: PropTypes.number,
+    countryName: PropTypes.string, // like 'United States', not 'US' or 'United States of America'
     description: PropTypes.string,
     intl: intlShape,
     onNextStep: PropTypes.func,
diff --git a/src/views/studentregistration/studentregistration.jsx b/src/views/studentregistration/studentregistration.jsx
index 3ad1d70ab..3129e6e71 100644
--- a/src/views/studentregistration/studentregistration.jsx
+++ b/src/views/studentregistration/studentregistration.jsx
@@ -132,6 +132,7 @@ class StudentRegistration extends React.Component {
                             onNextStep={this.handleAdvanceStep}
                         />
                         <Steps.DemographicsStep
+                            countryName={this.state.classroom && this.state.classroom.educator.profile.country}
                             description={this.props.intl.formatMessage({
                                 id: 'registration.studentPersonalStepDescription'
                             })}

From 3c744bed4c393c94c3897f5e2196005bfc439119 Mon Sep 17 00:00:00 2001
From: Chris Garrity <chrisg@media.mit.edu>
Date: Fri, 8 May 2020 13:02:07 -0400
Subject: [PATCH 02/16] Enable Help widget

Enable Helpwidget, but keep showing the form for iOS 10 and lower.
---
 src/views/contact-us/contact-us.jsx | 144 +++++++++++-----------------
 1 file changed, 58 insertions(+), 86 deletions(-)

diff --git a/src/views/contact-us/contact-us.jsx b/src/views/contact-us/contact-us.jsx
index 9ae06031b..03b9e95fd 100644
--- a/src/views/contact-us/contact-us.jsx
+++ b/src/views/contact-us/contact-us.jsx
@@ -8,7 +8,7 @@ const render = require('../../lib/render.jsx');
 
 const HelpForm = require('../../components/helpform/helpform.jsx');
 const HelpWidget = require('../../components/helpwidget/helpwidget.jsx');
-const {CONTACT_US_POPUP} = require('../../lib/feature-flags.js');
+const bowser = require('bowser');
 
 const InformationPage = require('../../components/informationpage/informationpage.jsx');
 require('./contact-us.scss');
@@ -18,7 +18,8 @@ class ContactUs extends React.Component {
         super(props);
         this.state = {
             subject: '',
-            body: ''
+            body: '',
+            showForm: false
         };
         const query = window.location.search;
         let scratchId = '';
@@ -34,93 +35,62 @@ class ContactUs extends React.Component {
         } else if (query.indexOf('confirmation=') !== -1) {
             this.state.subject = 'Problem with email confirmation';
         }
+        // older iPads (iOS 10 or lower) cannot show help widget, show the form instead
+        if (bowser.osname === 'iOS' && parseInt(bowser.osversion, 10) < 11) {
+            this.state.showForm = true;
+        }
     }
     render () {
         return (
             <InformationPage
-                title={CONTACT_US_POPUP ?
-                    this.props.intl.formatMessage({id: 'contactUs.qTitle'}) :
-                    this.props.intl.formatMessage({id: 'contactUs.title'})}
+                title={this.props.intl.formatMessage({id: 'contactUs.qTitle'})}
             >
-                {!CONTACT_US_POPUP && (
-                    <div className="inner info-inner">
-                        <section id="contact-us">
-                            <span className="nav-spacer" />
-                            <p><FormattedMessage
-                                id="contactUs.intro"
-                                values={{faqLink: (
-                                    <a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
+                <div className="contact-us inner info-inner">
+                    <section
+                        className="helpwidget"
+                        id="contact-us"
+                    >
+                        <span className="nav-spacer" />
+                        <h3>
+                            <FormattedMessage id="contactUs.seeFaq" />
+                        </h3>
+                        <p><FormattedMessage
+                            id="contactUs.faqInfo"
+                            values={{faqLink: (
+                                <a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
+                            )}}
+                        /></p>
+                        <h3>
+                            <FormattedMessage id="contactUs.askCommunity" />
+                        </h3>
+                        <p><FormattedMessage id="contactUs.forumsIntro" /></p>
+                        <p><FormattedMessage id="contactUs.forumsHelp" /></p>
+                        <ul>
+                            <li><FormattedMessage
+                                id="contactUs.questionsText"
+                                values={{questionsLink: (
+                                    <a href="/discuss/4/"><FormattedMessage id="contactUs.questionsLinkText" /></a>
                                 )}}
-                            /></p>
-                            <p><FormattedMessage id="contactUs.forumsInfo" /></p>
-                            <ul>
-                                <li><FormattedMessage
-                                    id="contactUs.questionsForum"
-                                    values={{questionsLink: (
-                                        <a href="/discuss/4/"><FormattedMessage id="contactUs.questionsLinkText" /></a>
-                                    )}}
-                                /></li>
-                                <li><FormattedMessage
-                                    id="contactUs.scriptsForum"
-                                    values={{scriptsLink: (
-                                        <a href="/discuss/7/"><FormattedMessage id="contactUs.scriptsLinkText" /></a>
-                                    )}}
-                                /></li>
-                                <li><FormattedMessage
-                                    id="contactUs.bugsForum"
-                                    values={{bugsLink: (
-                                        <a href="/discuss/3/"><FormattedMessage id="contactUs.bugsLinkText" /></a>
-                                    )}}
-                                /></li>
-                            </ul>
+                            /></li>
+                            <li><FormattedMessage
+                                id="contactUs.scriptsText"
+                                values={{scriptsLink: (
+                                    <a href="/discuss/7/"><FormattedMessage id="contactUs.scriptsLinkText" /></a>
+                                )}}
+                            /></li>
+                            <li><FormattedMessage
+                                id="contactUs.bugsText"
+                                values={{bugsLink: (
+                                    <a href="/discuss/3/"><FormattedMessage id="contactUs.bugsLinkText" /></a>
+                                )}}
+                            /></li>
+                        </ul>
+                        <h3>
+                            <FormattedMessage id="contactUs.needSupport" />
+                        </h3>
+                        {this.state.showForm ? (
                             <p><FormattedMessage id="contactUs.formIntro" /></p>
-                        </section>
-                    </div>
-                )}
-                {CONTACT_US_POPUP && (
-                    <div className="contact-us inner info-inner">
-                        <section
-                            className="helpwidget"
-                            id="contact-us"
-                        >
-                            <span className="nav-spacer" />
-                            <h3>
-                                <FormattedMessage id="contactUs.seeFaq" />
-                            </h3>
-                            <p><FormattedMessage
-                                id="contactUs.faqInfo"
-                                values={{faqLink: (
-                                    <a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a>
-                                )}}
-                            /></p>
-                            <h3>
-                                <FormattedMessage id="contactUs.askCommunity" />
-                            </h3>
-                            <p><FormattedMessage id="contactUs.forumsIntro" /></p>
-                            <p><FormattedMessage id="contactUs.forumsHelp" /></p>
-                            <ul>
-                                <li><FormattedMessage
-                                    id="contactUs.questionsText"
-                                    values={{questionsLink: (
-                                        <a href="/discuss/4/"><FormattedMessage id="contactUs.questionsLinkText" /></a>
-                                    )}}
-                                /></li>
-                                <li><FormattedMessage
-                                    id="contactUs.scriptsText"
-                                    values={{scriptsLink: (
-                                        <a href="/discuss/7/"><FormattedMessage id="contactUs.scriptsLinkText" /></a>
-                                    )}}
-                                /></li>
-                                <li><FormattedMessage
-                                    id="contactUs.bugsText"
-                                    values={{bugsLink: (
-                                        <a href="/discuss/3/"><FormattedMessage id="contactUs.bugsLinkText" /></a>
-                                    )}}
-                                /></li>
-                            </ul>
-                            <h3>
-                                <FormattedMessage id="contactUs.needSupport" />
-                            </h3>
+                        ) : (
                             <p>
                                 <FormattedMessage
                                     id="contactUs.supportInfo"
@@ -132,21 +102,23 @@ class ContactUs extends React.Component {
                                     )}}
                                 />
                             </p>
-                        </section>
+                        )}
+                    </section>
+                    {!this.state.showForm && (
                         <HelpWidget
                             button
                             body={this.state.body}
                             subject={this.state.subject}
                         />
-                    </div>
-                )}
+                    )}
+                </div>
                 <nav>
                     <ol>
                         <li className="nav-header"><FormattedMessage id="contactUs.findHelp" /></li>
                         <li><a href="/info/faq"><FormattedMessage id="contactUs.faqLinkText" /></a></li>
                     </ol>
                 </nav>
-                {!CONTACT_US_POPUP && (
+                {this.state.showForm && (
                     <HelpForm
                         body={this.state.body}
                         subject={this.state.subject}

From fd6f488a9015f5dfd257a752aee30861eeb1e4b5 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 19:14:09 +0000
Subject: [PATCH 03/16] chore(package): update scratch-gui to version
 0.1.0-prerelease.20200508190247

Closes #3868
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fafc459c0..c287d9c19 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200506225657",
+    "scratch-gui": "0.1.0-prerelease.20200508190247",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From 140d9d0e156966542528301c3c9ebe6106ad919d Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Fri, 8 May 2020 19:14:13 +0000
Subject: [PATCH 04/16] chore(package): update lockfile package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 98ef3053d..0d153e562 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16257,9 +16257,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200506225657",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200506225657.tgz",
-      "integrity": "sha512-MhDIsvdMw8See61hf355CATKMO4v1y8vt3DNBjRj0of0pXF8PyagaF2+m2vMwe1/PvJkNhXmRkWbb+RwArKuyQ==",
+      "version": "0.1.0-prerelease.20200508190247",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200508190247.tgz",
+      "integrity": "sha512-rdxzagPivIb1YJx0jRBAywOMqJ2yImEPQCJYcQ0X1W0xc0EkBoZq3chelNIXIMnj37RmBKYi+5hqaCxmrJCV9w==",
       "dev": true
     },
     "scratch-l10n": {

From 62f6018baa1d7cae36b18481a02780039c3d04fa Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 16:36:31 +0000
Subject: [PATCH 05/16] chore(package): update scratch-gui to version
 0.1.0-prerelease.20200509162610

Closes #3873
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c287d9c19..410111a58 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200508190247",
+    "scratch-gui": "0.1.0-prerelease.20200509162610",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From 5e357cfc8a3610b16e57b1d57f677995051f8beb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 16:36:35 +0000
Subject: [PATCH 06/16] chore(package): update lockfile package-lock.json

---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d153e562..d5bae8c70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16257,9 +16257,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200508190247",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200508190247.tgz",
-      "integrity": "sha512-rdxzagPivIb1YJx0jRBAywOMqJ2yImEPQCJYcQ0X1W0xc0EkBoZq3chelNIXIMnj37RmBKYi+5hqaCxmrJCV9w==",
+      "version": "0.1.0-prerelease.20200509162610",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200509162610.tgz",
+      "integrity": "sha512-aFTQaN+WPrWfUh8ytgK1bfFqVcJZwmUjJhJhDxq3tVsL/LosB94ER5NblJtqjkGzUBnxC2ygWJHedQ//8rhlcQ==",
       "dev": true
     },
     "scratch-l10n": {

From 28cec76e12416669c555e3ef133ca26349e39fc4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 15:18:37 +0000
Subject: [PATCH 07/16] [Security] Bump concat-stream from 1.5.1 to 1.6.2

Bumps [concat-stream](https://github.com/maxogden/concat-stream) from 1.5.1 to 1.6.2. **This update includes security fixes.**
- [Release notes](https://github.com/maxogden/concat-stream/releases)
- [Commits](https://github.com/maxogden/concat-stream/compare/v1.5.1...v1.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 80 ++++-------------------------------------------
 1 file changed, 6 insertions(+), 74 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d153e562..4156e0194 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3643,8 +3643,7 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "buffer-xor": {
       "version": "1.0.3",
@@ -4266,7 +4265,6 @@
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -4277,14 +4275,12 @@
         "process-nextick-args": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-          "dev": true
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -4299,7 +4295,6 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
@@ -12187,68 +12182,6 @@
         "yakaa": "^1.0.1"
       },
       "dependencies": {
-        "concat-stream": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
-          "integrity": "sha1-87gKz54fSOOHXAaItBtsMWAu6hw=",
-          "requires": {
-            "inherits": "~2.0.1",
-            "readable-stream": "~2.0.0",
-            "typedarray": "~0.0.5"
-          },
-          "dependencies": {
-            "inherits": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-              "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-            },
-            "readable-stream": {
-              "version": "2.0.5",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz",
-              "integrity": "sha1-okJvjc1FUcd6M/lu3yiGojyClmk=",
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "process-nextick-args": "~1.0.6",
-                "string_decoder": "~0.10.x",
-                "util-deprecate": "~1.0.1"
-              },
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                  "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-                },
-                "process-nextick-args": {
-                  "version": "1.0.6",
-                  "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz",
-                  "integrity": "sha1-D5awAc6pCxJZLOVm7bl+wR5pvQU="
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-                },
-                "util-deprecate": {
-                  "version": "1.0.2",
-                  "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-                  "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-                }
-              }
-            },
-            "typedarray": {
-              "version": "0.0.6",
-              "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-              "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-            }
-          }
-        },
         "https-proxy-agent": {
           "version": "0.3.6",
           "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
@@ -18265,8 +18198,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "typedarray-to-buffer": {
       "version": "3.1.5",

From 3b8ab920af70f7883d8e5a9c3ff0c98bbd881238 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 21:27:15 +0000
Subject: [PATCH 08/16] Bump eslint-plugin-cypress from 2.2.1 to 2.10.3

Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 2.2.1 to 2.10.3.
- [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases)
- [Commits](https://github.com/cypress-io/eslint-plugin-cypress/compare/v2.2.1...v2.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5bae8c70..7ea148c21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5669,12 +5669,12 @@
       }
     },
     "eslint-plugin-cypress": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.2.1.tgz",
-      "integrity": "sha512-WkH81MEALKhnpeRo/wWHBHR883LdkS8aFzbGAGFxiwRwik2IKBZxb/JrxbiA6+SZskXGcmdEi6rwL7xmiqo9MA==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.10.3.tgz",
+      "integrity": "sha512-CvFeoCquShfO8gHNIKA1VpUTz78WtknMebLemBd1lRbcmJNjwpqCqpQYUG/XVja8GjdX/e2TJXYa+EUBxehtUg==",
       "dev": true,
       "requires": {
-        "globals": "^11.0.1"
+        "globals": "^11.12.0"
       },
       "dependencies": {
         "globals": {

From 209f09dbbc47859e2ff81229fde6777731a5e929 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 21:30:44 +0000
Subject: [PATCH 09/16] Bump redux-mock-store from 1.5.3 to 1.5.4

Bumps [redux-mock-store](https://github.com/arnaudbenard/redux-mock-store) from 1.5.3 to 1.5.4.
- [Release notes](https://github.com/arnaudbenard/redux-mock-store/releases)
- [Commits](https://github.com/arnaudbenard/redux-mock-store/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d5bae8c70..89300ea85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15383,9 +15383,9 @@
       }
     },
     "redux-mock-store": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.3.tgz",
-      "integrity": "sha512-ryhkkb/4D4CUGpAV2ln1GOY/uh51aczjcRz9k2L2bPx/Xja3c5pSGJJPyR25GNVRXtKIExScdAgFdiXp68GmJA==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/redux-mock-store/-/redux-mock-store-1.5.4.tgz",
+      "integrity": "sha512-xmcA0O/tjCLXhh9Fuiq6pMrJCwFRaouA8436zcikdIpYWWCjU76CRk+i2bHx8EeiSiMGnB85/lZdU3wIJVXHTA==",
       "dev": true,
       "requires": {
         "lodash.isplainobject": "^4.0.6"

From 00a854b2c37a3f3f2b54a5d5c5a768f954147e51 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 11 May 2020 23:38:08 +0000
Subject: [PATCH 10/16] Bump scratch-gui

Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200509162610 to 0.1.0-prerelease.20200511210757.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200509162610...0.1.0-prerelease.20200511210757)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 078339167..e90ead901 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16190,9 +16190,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200509162610",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200509162610.tgz",
-      "integrity": "sha512-aFTQaN+WPrWfUh8ytgK1bfFqVcJZwmUjJhJhDxq3tVsL/LosB94ER5NblJtqjkGzUBnxC2ygWJHedQ//8rhlcQ==",
+      "version": "0.1.0-prerelease.20200511210757",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200511210757.tgz",
+      "integrity": "sha512-QsHenc49vH5+Ald5occkLIq7+3EGrQYgvIXmrUeLWnuoyCbiR1QQpoiO6ge62Gt4WiebAbGBhUIizYW5TA3Yrw==",
       "dev": true
     },
     "scratch-l10n": {
diff --git a/package.json b/package.json
index 410111a58..f95fdb5da 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200509162610",
+    "scratch-gui": "0.1.0-prerelease.20200511210757",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From 82fb84bdfeb709846399cc92ffcf4bc9b956fe0b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 12 May 2020 13:25:29 +0000
Subject: [PATCH 11/16] Bump scratch-l10n from 3.8.20200505213509 to
 3.9.20200512112117

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.8.20200505213509 to 3.9.20200512112117.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e90ead901..1bab0eb0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16196,9 +16196,9 @@
       "dev": true
     },
     "scratch-l10n": {
-      "version": "3.8.20200505213509",
-      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.8.20200505213509.tgz",
-      "integrity": "sha512-Vh4UQFlNuTcDgSySsR/wYzQ842IEEE8nrpqybKxd+LDVUw0fDOGFQ2aKyE8GyUWBnyDsnWQTmozU9yTmYfwKBw==",
+      "version": "3.9.20200512112117",
+      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200512112117.tgz",
+      "integrity": "sha512-RsCZGxPgIDLytqwp3Ixy1D1V+YzdIhb7fHIQx5trv9PDwB6oel4cNdKnC4wprCOXtd348f/iHhA0pi2Md6bjcw==",
       "dev": true,
       "requires": {
         "@babel/cli": "^7.1.2",

From e38796afab5b1b38a45965c3cea26481843ae3c9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 12 May 2020 13:26:29 +0000
Subject: [PATCH 12/16] Bump scratch-gui

Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200511210757 to 0.1.0-prerelease.20200512121336.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200511210757...0.1.0-prerelease.20200512121336)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e90ead901..bb2bdc4cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16190,9 +16190,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200511210757",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200511210757.tgz",
-      "integrity": "sha512-QsHenc49vH5+Ald5occkLIq7+3EGrQYgvIXmrUeLWnuoyCbiR1QQpoiO6ge62Gt4WiebAbGBhUIizYW5TA3Yrw==",
+      "version": "0.1.0-prerelease.20200512121336",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200512121336.tgz",
+      "integrity": "sha512-1nJXmTVb0a4QymzzEKzxm7C6a3ozgBjtk8Jnx7j4yVrfvAT+TrFcSi57tF2m1uAFDVt9+xA0WZsqTbtUGevrKw==",
       "dev": true
     },
     "scratch-l10n": {
diff --git a/package.json b/package.json
index f95fdb5da..20cac0b1a 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200511210757",
+    "scratch-gui": "0.1.0-prerelease.20200512121336",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From ed402c5673a254c2e617754135a17a41072abe5c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 12 May 2020 14:12:18 +0000
Subject: [PATCH 13/16] Bump scratch-gui

Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200512121336 to 0.1.0-prerelease.20200512134106.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200512121336...0.1.0-prerelease.20200512134106)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 599b09e92..48b45509b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16190,9 +16190,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200512121336",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200512121336.tgz",
-      "integrity": "sha512-1nJXmTVb0a4QymzzEKzxm7C6a3ozgBjtk8Jnx7j4yVrfvAT+TrFcSi57tF2m1uAFDVt9+xA0WZsqTbtUGevrKw==",
+      "version": "0.1.0-prerelease.20200512134106",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200512134106.tgz",
+      "integrity": "sha512-O+AoC+rCZzDsvW4Algt+m8Jjr6COChfvuWF54Ma0ziswlQs96D70csYF8CXwT+pConL5QQ0DT3GzbRUqZieSvA==",
       "dev": true
     },
     "scratch-l10n": {
diff --git a/package.json b/package.json
index 20cac0b1a..7692e7948 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200512121336",
+    "scratch-gui": "0.1.0-prerelease.20200512134106",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From 1abcc5f7d985470c678f10ab08064077236cd068 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 12 May 2020 22:05:50 +0000
Subject: [PATCH 14/16] Bump scratch-l10n from 3.9.20200512112117 to
 3.9.20200512220101

Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.9.20200512112117 to 3.9.20200512220101.
- [Release notes](https://github.com/LLK/scratch-l10n/releases)
- [Commits](https://github.com/LLK/scratch-l10n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 48b45509b..b6ea32f1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16196,9 +16196,9 @@
       "dev": true
     },
     "scratch-l10n": {
-      "version": "3.9.20200512112117",
-      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200512112117.tgz",
-      "integrity": "sha512-RsCZGxPgIDLytqwp3Ixy1D1V+YzdIhb7fHIQx5trv9PDwB6oel4cNdKnC4wprCOXtd348f/iHhA0pi2Md6bjcw==",
+      "version": "3.9.20200512220101",
+      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200512220101.tgz",
+      "integrity": "sha512-CAUCdtecNvTIUfcUqp2OEg+pEETVvttHwObnmmV1WPXYjpubI9kHU5wHfmHSeiVj2LduoILrdHOafU1l/KAw0g==",
       "dev": true,
       "requires": {
         "@babel/cli": "^7.1.2",

From 86be0f1ea85bfea3bea9426c3d0d0e8d1e1db7a4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 May 2020 13:09:17 +0000
Subject: [PATCH 15/16] Bump scratch-gui

Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20200512134106 to 0.1.0-prerelease.20200513040928.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20200512134106...0.1.0-prerelease.20200513040928)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b6ea32f1a..7993f863f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16190,9 +16190,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20200512134106",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200512134106.tgz",
-      "integrity": "sha512-O+AoC+rCZzDsvW4Algt+m8Jjr6COChfvuWF54Ma0ziswlQs96D70csYF8CXwT+pConL5QQ0DT3GzbRUqZieSvA==",
+      "version": "0.1.0-prerelease.20200513040928",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200513040928.tgz",
+      "integrity": "sha512-IUGYqOntEPG8m2cj07mfifSzXVkLbPHadFbEeJk4AjW/6jqO5UufB3rTHU0j9fw3xr/DUqs5o9Ugpe2MThVo+A==",
       "dev": true
     },
     "scratch-l10n": {
diff --git a/package.json b/package.json
index 7692e7948..056db4140 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20200512134106",
+    "scratch-gui": "0.1.0-prerelease.20200513040928",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",

From 4bd813629f31d146aa70d1bcd7e4993c60b3e96f Mon Sep 17 00:00:00 2001
From: Ben Wheeler <wheeler.benjamin@gmail.com>
Date: Wed, 13 May 2020 13:20:36 -0400
Subject: [PATCH 16/16] safer referencing of teacher country

---
 src/views/studentregistration/studentregistration.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/studentregistration/studentregistration.jsx b/src/views/studentregistration/studentregistration.jsx
index 3129e6e71..1fb77d87e 100644
--- a/src/views/studentregistration/studentregistration.jsx
+++ b/src/views/studentregistration/studentregistration.jsx
@@ -132,7 +132,8 @@ class StudentRegistration extends React.Component {
                             onNextStep={this.handleAdvanceStep}
                         />
                         <Steps.DemographicsStep
-                            countryName={this.state.classroom && this.state.classroom.educator.profile.country}
+                            countryName={this.state.classroom && this.state.classroom.educator &&
+                                this.state.classroom.educator.profile && this.state.classroom.educator.profile.country}
                             description={this.props.intl.formatMessage({
                                 id: 'registration.studentPersonalStepDescription'
                             })}