Skip to content

Commit ad37573

Browse files
authored
Merge pull request #134 from SupahNickie/128-custom-purposes-on-intro
128 add custom purposes to intro screen
2 parents 2ffa8c3 + 3e45e1f commit ad37573

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

src/components/popup/intro/footer.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ export default class IntroFooter extends Component {
3636
store
3737
} = props;
3838

39+
let allPurposes = [];
40+
if (store.vendorList && store.vendorList.purposes) {
41+
allPurposes = allPurposes.concat(store.vendorList.purposes);
42+
}
43+
if (store.customPurposeList && store.customPurposeList.purposes) {
44+
allPurposes = allPurposes.concat(store.customPurposeList.purposes);
45+
}
46+
3947
return (
4048
<div>
4149
{!showFull &&
@@ -64,7 +72,7 @@ export default class IntroFooter extends Component {
6472
</LocalLabel>
6573
<LocalLabel providedValue={localization && localization.footer ? localization.footer.purposesHeader : ''} localizeKey='footer.purposesHeader' class={style.message2 + " primaryText"}>Purposes for storing information:</LocalLabel>
6674
<ul>
67-
{store && store.vendorList && store.vendorList.purposes && store.vendorList.purposes.map((purpose) => {
75+
{allPurposes.map((purpose) => {
6876
return <li class="primaryText">{purpose.name}</li>
6977
})}
7078
</ul>

src/components/popup/intro/footerV2.jsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ export default class IntroFooterV2 extends Component {
4141
config
4242
} = props;
4343

44+
let allPurposes = [];
45+
if (store.vendorList && store.vendorList.purposes) {
46+
allPurposes = allPurposes.concat(store.vendorList.purposes);
47+
}
48+
if (store.customPurposeList && store.customPurposeList.purposes) {
49+
allPurposes = allPurposes.concat(store.customPurposeList.purposes);
50+
}
51+
4452
const { isThinConsentToolShowing } = store;
4553

4654
return (
@@ -85,7 +93,7 @@ export default class IntroFooterV2 extends Component {
8593

8694
<LocalLabel providedValue={localization && localization.footer ? localization.footer.purposesHeader : ''} localizeKey='footer.purposesHeader' class={style.message2 + " primaryText"}>Purposes for storing information:</LocalLabel>
8795
<ul>
88-
{store && store.vendorList && store.vendorList.purposes && store.vendorList.purposes.map((purpose) => {
96+
{allPurposes.map((purpose) => {
8997
return <li class="primaryText">{purpose.name}</li>
9098
})}
9199
</ul>

0 commit comments

Comments
 (0)