Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated disclosure text as required by Google Play store. Also transitioning /more/privacy links to /privacy. #3763

Merged
merged 1 commit into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js/components/Navigation/FooterMainPrivateLabeled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class FooterMainPrivateLabeled extends Component {
className={classes.link}
/>
<RowSpacer />
<Link id="footerLinkPrivacy" className={classes.link} to="/more/privacy">Privacy</Link>
<Link id="footerLinkPrivacy" className={classes.link} to="/privacy">Privacy</Link>
<RowSpacer />
<Link id="footerLinkTermsOfUse" className={classes.link} to="/more/terms">Terms</Link>
</OneRow>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Navigation/FooterMainWeVote.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class FooterMainWeVote extends Component {
className={classes.link}
/>
<RowSpacer />
<Link id="footerLinkPrivacy" className={classes.link} to="/more/privacy">Privacy</Link>
<Link id="footerLinkPrivacy" className={classes.link} to="/privacy">Privacy</Link>
<RowSpacer />
<Link id="footerLinkTermsOfUse" className={classes.link} to="/more/terms">Terms</Link>
</OneRow>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Navigation/HeaderBarProfilePopUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class HeaderBarProfilePopUp extends Component {
<span className="u-no-break">Terms of Service</span>
</Link>
<span style={{ paddingLeft: 20 }} />
<Link id="profilePopUpPrivacyPolicy" onClick={this.hideProfilePopUp} to="/more/privacy">
<Link id="profilePopUpPrivacyPolicy" onClick={this.hideProfilePopUp} to="/privacy">
<span className="u-no-break">Privacy Policy</span>
</Link>
{webAppConfig.SHOW_CORDOVA_URL_FIELD && (
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Navigation/SettingsSectionFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class SettingsSectionFooter extends Component {
)}
/>
<span style={{ paddingLeft: 15 }} />
<Link to="/more/privacy"><TermsAndPrivacyText>Privacy</TermsAndPrivacyText></Link>
<Link to="/privacy"><TermsAndPrivacyText>Privacy</TermsAndPrivacyText></Link>
<span style={{ paddingLeft: 15 }} />
<Link to="/more/terms"><TermsAndPrivacyText>Terms</TermsAndPrivacyText></Link>
</OneRow>
Expand Down
9 changes: 5 additions & 4 deletions src/js/components/Ready/ReadyFinePrint.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,17 @@ class ReadyFinePrint extends Component {

<ListTitleRow onClick={this.contentUnfurledLink}>
<Dot><StepNumber>b</StepNumber></Dot>
<StepTitle>We Vote data comes from official and unofficial sources</StepTitle>
<StepTitle>We Vote does not represent a government entity</StepTitle>
</ListTitleRow>
{contentUnfurled && (
<ListRow>
<Dot><StepNumberPlaceholder>&nbsp;</StepNumberPlaceholder></Dot>
<StepText id="readyFinePrintStepTextB">
<Suspense fallback={<></>}>
<ReadMore
textToDisplay="We Vote uses ballot data aggregated from government, nonpartisan, and partisan sources.
We cannot guarantee 100% of the items on your official ballot will be shown on We Vote.
textToDisplay="We Vote should not be considered official government information.
We use ballot data aggregated from government, nonpartisan, and partisan sources, but
we cannot guarantee 100% of the items on your official ballot will be shown on We Vote.
We Vote strives to provide a balanced selection of clearly identified voting guides from newspapers and media.
Partisan voter guides are also provided from a diversity of sources and points-of-view.
These voting guides are captured and updated by volunteers."
Expand Down Expand Up @@ -116,7 +117,7 @@ class ReadyFinePrint extends Component {
<StepText id="readyFinePrintStepTextD">
We Vote will never share or sell your contact information.
{' '}
<Link to="/more/privacy" className="u-link-color">See full privacy policy here</Link>
<Link to="/privacy" className="u-link-color">See full privacy policy here</Link>
{' '}
which includes description of how we use and protect your data.
</StepText>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/SignIn/SignInModalOriginal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ class SignInModalOriginal extends Component {
{isCordova() && (
<div className="text-center">
<span id="termsAndPrivacySignInModal" className="terms-and-privacy">
<Link to="/more/privacy" onClick={this.closeFunction}>
<Link to="/privacy" onClick={this.closeFunction}>
<span className="u-no-break" style={{ color: 'black', textDecoration: 'underline' }}>Privacy Policy</span>
</Link>
<span style={{ paddingLeft: 20 }} />
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Welcome/WelcomeFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class WelcomeFooter extends Component {
className={classes.link}
/>
</Suspense>
<Link id="footerLinkPrivacy" className={classes.link} to="/more/privacy">Privacy Policy</Link>
<Link id="footerLinkPrivacy" className={classes.link} to="/privacy">Privacy Policy</Link>
<Link id="footerLinkTermsOfUse" className={classes.link} to="/more/terms">Terms of Service</Link>
<Link id="footerLinkAttributions" className={classes.link} to="/more/attributions">Attributions</Link>
</Column>
Expand Down
2 changes: 1 addition & 1 deletion src/js/pages/Settings/SettingsMenuMobile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export default class SettingsMenuMobile extends Component {
<span className="u-no-break">Terms of Service</span>
</Link>
<span style={{ paddingLeft: 20 }} />
<Link to="/more/privacy">
<Link to="/privacy">
<span className="u-no-break">Privacy Policy</span>
</Link>
</span>
Expand Down
4 changes: 3 additions & 1 deletion src/js/utils/applicationUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ export function getApplicationViewBooleans (pathname) {
pathnameLowerCase === '/more/sign_in' ||
pathnameLowerCase === '/more/terms' ||
pathnameLowerCase === '/more/verify' ||
pathnameLowerCase === '/privacy' ||
pathnameLowerCase.startsWith('/verifythisisme/') ||
pathnameLowerCase === '/welcomehome') {
contentFullWidthMode = true;
} else if (pathnameLowerCase.startsWith('/ballot/vote')) {
contentFullWidthMode = false; // I set this to false to fix the header padding issues in /ballot/vote
contentFullWidthMode = false; // I set this to false, to fix the header padding issues in /ballot/vote
voteMode = true;
} else if (pathnameLowerCase.startsWith('/ballot')) {
contentFullWidthMode = false;
Expand Down Expand Up @@ -233,6 +234,7 @@ export function getApplicationViewBooleans (pathname) {
(pathnameLowerCase === '/more/terms') ||
pathnameLowerCase.startsWith('/news') ||
pathnameLowerCase.startsWith('/office') || // Show Footer if back to not specified above
(pathnameLowerCase === '/privacy') ||
pathnameLowerCase.startsWith('/values') ||
pathnameLowerCase.startsWith('/settings/account') ||
pathnameLowerCase.startsWith('/settings/domain') ||
Expand Down
1 change: 1 addition & 0 deletions src/js/utils/cordovaUtilsPageEnumeration.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export function pageEnumeration () {
path.startsWith('/more/attributions') ||
path.startsWith('/more/donate') ||
path.startsWith('/more/privacy') ||
path.startsWith('/privacy') ||
path.startsWith('/more/terms')) {
return CordovaPageConstants.moreTerms;
} else if (path.startsWith('/more/faq') ||
Expand Down