From 7557655a06de842a4b42be358b5ee52e2ea6bdbc Mon Sep 17 00:00:00 2001
From: caseymm <casey@bocoup.com>
Date: Fri, 22 Oct 2021 13:28:17 -0700
Subject: [PATCH] remove paragraph prop

---
 .../text-and-media-snippet.jsx                | 14 ++------
 .../annual-report/2020/annual-report.jsx      | 36 ++++++++++---------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/components/text-and-media-snippet/text-and-media-snippet.jsx b/src/components/text-and-media-snippet/text-and-media-snippet.jsx
index 57d80e9ac..590636456 100644
--- a/src/components/text-and-media-snippet/text-and-media-snippet.jsx
+++ b/src/components/text-and-media-snippet/text-and-media-snippet.jsx
@@ -32,16 +32,9 @@ const TextAndMediaSnippet = props => (
         }
         <div className="half">
             <h5>{props.title}</h5>
-            {props.children &&
-                <p>
-                    {props.children}
-                </p>
-            }
-            {props.paragraph &&
-                <p>
-                    {props.paragraph}
-                </p>
-            }
+            <p>
+                {props.children}
+            </p>
         </div>
         {props.className === 'reverse' &&
             <div className="half">
@@ -67,7 +60,6 @@ const TextAndMediaSnippet = props => (
 TextAndMediaSnippet.propTypes = {
     children: PropTypes.node,
     title: PropTypes.string,
-    paragraph: PropTypes.string,
     largeImage: PropTypes.string,
     className: PropTypes.string,
     videoId: PropTypes.string,
diff --git a/src/views/annual-report/2020/annual-report.jsx b/src/views/annual-report/2020/annual-report.jsx
index c85547884..a4a0abad6 100644
--- a/src/views/annual-report/2020/annual-report.jsx
+++ b/src/views/annual-report/2020/annual-report.jsx
@@ -1244,23 +1244,21 @@ class AnnualReport extends React.Component {
                                             title={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.connectivityExample1Title'}
                                             )}
-                                            paragraph={this.props.intl.formatMessage(
-                                                {id: 'annualReport.2020.connectivityExample1Paragraph'}
-                                            )}
                                             alt={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.altTutorial'}
                                             )}
                                             type="image"
                                             largeImage="/images/annual-report/2020/connectivity/TutorialUI.svg"
-                                        />
+                                        >
+                                            <FormattedMessage
+                                                id="annualReport.2020.connectivityExample1Paragraph"
+                                            />
+                                        </TextAndMediaSnippet>
                                         <TextAndMediaSnippet
                                             className="regular"
                                             title={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.connectivityExample2Title'}
                                             )}
-                                            paragraph={this.props.intl.formatMessage(
-                                                {id: 'annualReport.2020.connectivityExample2Paragraph'}
-                                            )}
                                             alt={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.altGettingStarted'}
                                             )}
@@ -1268,21 +1266,26 @@ class AnnualReport extends React.Component {
                                             videoId="xfh9bvbeik"
                                             largeImage="/images/annual-report/2020/connectivity/Getting Started with Scratch video.png"
                                             spinnerColor="blue"
-                                        />
+                                        >
+                                            <FormattedMessage
+                                                id="annualReport.2020.connectivityExample2Paragraph"
+                                            />
+                                        </TextAndMediaSnippet>
                                         <TextAndMediaSnippet
                                             className="full-width"
                                             title={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.connectivityExample3Title'}
                                             )}
-                                            paragraph={this.props.intl.formatMessage(
-                                                {id: 'annualReport.2020.connectivityExample3Paragraph'}
-                                            )}
                                             alt={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.altEditor'}
                                             )}
                                             type="image"
                                             largeImage="/images/annual-report/2020/connectivity/isiXhosa_scratcheditor.jpg"
-                                        />
+                                        >
+                                            <FormattedMessage
+                                                id="annualReport.2020.connectivityExample3Paragraph"
+                                            />
+                                        </TextAndMediaSnippet>
                                     </div>
                                 </div>
                             </div>
@@ -1538,15 +1541,16 @@ class AnnualReport extends React.Component {
                                             title={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.adaptationSnapshot2Title'}
                                             )}
-                                            paragraph={this.props.intl.formatMessage(
-                                                {id: 'annualReport.2020.adaptationSnapshot2Text'}
-                                            )}
                                             alt={this.props.intl.formatMessage(
                                                 {id: 'annualReport.2020.altImageBubbles'}
                                             )}
                                             type="image"
                                             largeImage="/images/annual-report/2020/adaptation/BYIS Graphic.svg"
-                                        />
+                                        >
+                                            <FormattedMessage
+                                                id="annualReport.2020.adaptationSnapshot2Text"
+                                            />
+                                        </TextAndMediaSnippet>
                                     </div>
                                 </div>