Uh oh!
There was an error while loading. Please reload this page.
Old merges + IAB Validation - #204
Merged
Merged
Conversation
Cpex 0000 refactoring See merge request cmp/cmp!1
use all indexes
…29/frontend/cmp into CPEX/PROJ-93 # Conflicts: # src/index.html
� Conflicts: � .eslintrc � package.json � src/components/app.jsx � src/components/app.less � src/components/app.test.js � src/components/button/button.jsx � src/components/button/button.less � src/components/closebutton/closebutton.jsx � src/components/footer/footer.jsx � src/components/footer/footer.less � src/components/label/label.jsx � src/components/panel/panel.jsx � src/components/popup/details/details.jsx � src/components/popup/details/details.less � src/components/popup/details/details.test.js � src/components/popup/details/purposes/purposes.jsx � src/components/popup/details/purposes/purposes.less � src/components/popup/details/purposes/purposes.test.js � src/components/popup/details/vendors/vendors.jsx � src/components/popup/details/vendors/vendors.less � src/components/popup/details/vendors/vendors.test.js � src/components/popup/intro/footer.jsx � src/components/popup/intro/footer.less � src/components/popup/intro/intro.jsx � src/components/popup/intro/intro.less � src/components/popup/popup.jsx � src/components/popup/popup.less � src/components/popup/popup.test.js � src/components/switch/switch.jsx � src/components/switch/switch.test.js � src/docs/lib/stub.js � src/index.html � src/lib/cmp.js � src/lib/config.js � src/lib/cookie/cookie.js � src/lib/cookie/cookie.test.js � src/lib/cookie/cookieutils.js � src/lib/init.js � src/lib/portal.js � src/lib/store.js � src/lib/translations.js � src/lib/utils.js � src/lib/vendor.js � yarn.lock
Merge digitrust
� Conflicts: � spec/configuration.spec.js � spec/intro.spec.js � spec/purposes.spec.js � spec/vendors.spec.js
zackcarlson
suggested changes
Nov 26, 2019
| > | ||
| <ThemeProvider theme={config.theme || mapLegacyTheme(config.css)}> | ||
| <div class={style.gdpr}> | ||
| {showPopup && ( |
Contributor
There was a problem hiding this comment.
@LassaLek The showPopup and showFooter booleans both evaluate to false, at least when running locally, and therefore these two components never render to the screen.
| const showPopup = | ||
| store.isConsentToolShowing || | ||
| store.isFooterConsentToolShowing || | ||
| store.isThinConsentToolShowing; |
Contributor
There was a problem hiding this comment.
@LassaLek When logging isThinConsentToolShowing, it doesn't appear to exist on the store object.
| }); | ||
| it('returns true if atleast one cookie is not set', () => { | ||
| it("returns true if atleast one cookie is not set", () => { |
Contributor
There was a problem hiding this comment.
@LassaLekreturns true if atleast one cookie is not set fails and returns false
| }); | ||
| it('handles reprompt options', () => { | ||
| it("handles reprompt options", () => { |
| @@ -1,88 +1,100 @@ | |||
| /* eslint-disable react/jsx-no-bind */ | |||
Contributor
There was a problem hiding this comment.
@LassaLek This file should be updated or deleted given that the functionality to select, accept, reject, and viewing vendors was moved to another file (details.jsx, I believe)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.