From 57b45fdf4ba25638b0bb3928e66d5b55424ad3c4 Mon Sep 17 00:00:00 2001
From: Nicholas Case <nicholas.case@rakuten.com>
Date: Tue, 26 Jun 2018 07:29:00 -0700
Subject: [PATCH 1/2] 128 add custom purposes to intro screen

---
 src/components/popup/intro/footer.jsx   | 10 +++++++++-
 src/components/popup/intro/footerV2.jsx | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/popup/intro/footer.jsx b/src/components/popup/intro/footer.jsx
index e905092..b89df05 100644
--- a/src/components/popup/intro/footer.jsx
+++ b/src/components/popup/intro/footer.jsx
@@ -36,6 +36,14 @@ export default class IntroFooter extends Component {
             store
         } = props;
 
+        let allPurposes = [];
+        if (store && store.vendorList && store.vendorList.purposes) {
+            allPurposes = allPurposes.concat(store.vendorList.purposes);
+        }
+        if (store && store.customPurposeList && store.customPurposeList.purposes) {
+            allPurposes = allPurposes.concat(store.customPurposeList.purposes);
+        }
+
         return (
             <div>
                 {!showFull &&
@@ -64,7 +72,7 @@ export default class IntroFooter extends Component {
                         </LocalLabel>
                         <LocalLabel providedValue={localization && localization.footer ? localization.footer.purposesHeader : ''} localizeKey='footer.purposesHeader' class={style.message2 + " primaryText"}>Purposes for storing information:</LocalLabel>
                         <ul>
-                            {store && store.vendorList && store.vendorList.purposes && store.vendorList.purposes.map((purpose) => {
+                            {allPurposes.map((purpose) => {
                                 return <li class="primaryText">{purpose.name}</li>
                             })}
                         </ul>
diff --git a/src/components/popup/intro/footerV2.jsx b/src/components/popup/intro/footerV2.jsx
index 244b340..1418af4 100644
--- a/src/components/popup/intro/footerV2.jsx
+++ b/src/components/popup/intro/footerV2.jsx
@@ -36,6 +36,14 @@ export default class IntroFooterV2 extends Component {
             store
         } = props;
 
+        let allPurposes = [];
+        if (store && store.vendorList && store.vendorList.purposes) {
+            allPurposes = allPurposes.concat(store.vendorList.purposes);
+        }
+        if (store && store.customPurposeList && store.customPurposeList.purposes) {
+            allPurposes = allPurposes.concat(store.customPurposeList.purposes);
+        }
+
         return (
             <div class={style.footerV2}>
                 {!showFull &&
@@ -66,7 +74,7 @@ export default class IntroFooterV2 extends Component {
 
                             <LocalLabel providedValue={localization && localization.footer ? localization.footer.purposesHeader : ''} localizeKey='footer.purposesHeader' class={style.message2 + " primaryText"}>Purposes for storing information:</LocalLabel>
                             <ul>
-                                {store && store.vendorList && store.vendorList.purposes && store.vendorList.purposes.map((purpose) => {
+                                {allPurposes.map((purpose) => {
                                     return <li class="primaryText">{purpose.name}</li>
                                 })}
                             </ul>

From 3e45e1f6a9997b5d6a2692d93d35acfa72cab382 Mon Sep 17 00:00:00 2001
From: Nicholas Case <nicholas.case@rakuten.com>
Date: Tue, 26 Jun 2018 16:38:58 -0700
Subject: [PATCH 2/2] 128 cleanup

---
 src/components/popup/intro/footer.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/popup/intro/footer.jsx b/src/components/popup/intro/footer.jsx
index b89df05..b452380 100644
--- a/src/components/popup/intro/footer.jsx
+++ b/src/components/popup/intro/footer.jsx
@@ -37,10 +37,10 @@ export default class IntroFooter extends Component {
         } = props;
 
         let allPurposes = [];
-        if (store && store.vendorList && store.vendorList.purposes) {
+        if (store.vendorList && store.vendorList.purposes) {
             allPurposes = allPurposes.concat(store.vendorList.purposes);
         }
-        if (store && store.customPurposeList && store.customPurposeList.purposes) {
+        if (store.customPurposeList && store.customPurposeList.purposes) {
             allPurposes = allPurposes.concat(store.customPurposeList.purposes);
         }