From 429b7fc9649d304632692d592be3631f8a4b1468 Mon Sep 17 00:00:00 2001
From: dalemcgrew <DaleMcGrew@yahoo.com>
Date: Fri, 27 Oct 2023 16:03:54 -0700
Subject: [PATCH] Updated disclosure text as required by Google Play store.
 Also transitioning /more/privacy links to /privacy.

---
 .../components/Navigation/FooterMainPrivateLabeled.jsx   | 2 +-
 src/js/components/Navigation/FooterMainWeVote.jsx        | 2 +-
 src/js/components/Navigation/HeaderBarProfilePopUp.jsx   | 2 +-
 src/js/components/Navigation/SettingsSectionFooter.jsx   | 2 +-
 src/js/components/Ready/ReadyFinePrint.jsx               | 9 +++++----
 src/js/components/SignIn/SignInModalOriginal.jsx         | 2 +-
 src/js/components/Welcome/WelcomeFooter.jsx              | 2 +-
 src/js/pages/Settings/SettingsMenuMobile.jsx             | 2 +-
 src/js/utils/applicationUtils.js                         | 4 +++-
 src/js/utils/cordovaUtilsPageEnumeration.js              | 1 +
 10 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/js/components/Navigation/FooterMainPrivateLabeled.jsx b/src/js/components/Navigation/FooterMainPrivateLabeled.jsx
index ac50d437a..bb030ed84 100644
--- a/src/js/components/Navigation/FooterMainPrivateLabeled.jsx
+++ b/src/js/components/Navigation/FooterMainPrivateLabeled.jsx
@@ -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>
diff --git a/src/js/components/Navigation/FooterMainWeVote.jsx b/src/js/components/Navigation/FooterMainWeVote.jsx
index f6ee63492..80f402d73 100644
--- a/src/js/components/Navigation/FooterMainWeVote.jsx
+++ b/src/js/components/Navigation/FooterMainWeVote.jsx
@@ -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>
diff --git a/src/js/components/Navigation/HeaderBarProfilePopUp.jsx b/src/js/components/Navigation/HeaderBarProfilePopUp.jsx
index 0d885cae1..88c89bc3e 100644
--- a/src/js/components/Navigation/HeaderBarProfilePopUp.jsx
+++ b/src/js/components/Navigation/HeaderBarProfilePopUp.jsx
@@ -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 && (
diff --git a/src/js/components/Navigation/SettingsSectionFooter.jsx b/src/js/components/Navigation/SettingsSectionFooter.jsx
index 75a963ced..68420caf8 100644
--- a/src/js/components/Navigation/SettingsSectionFooter.jsx
+++ b/src/js/components/Navigation/SettingsSectionFooter.jsx
@@ -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>
diff --git a/src/js/components/Ready/ReadyFinePrint.jsx b/src/js/components/Ready/ReadyFinePrint.jsx
index 0a0653b95..fdbb62316 100644
--- a/src/js/components/Ready/ReadyFinePrint.jsx
+++ b/src/js/components/Ready/ReadyFinePrint.jsx
@@ -69,7 +69,7 @@ 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>
@@ -77,8 +77,9 @@ class ReadyFinePrint extends Component {
                   <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."
@@ -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>
diff --git a/src/js/components/SignIn/SignInModalOriginal.jsx b/src/js/components/SignIn/SignInModalOriginal.jsx
index 54e6f5e2b..64703d3e3 100644
--- a/src/js/components/SignIn/SignInModalOriginal.jsx
+++ b/src/js/components/SignIn/SignInModalOriginal.jsx
@@ -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 }} />
diff --git a/src/js/components/Welcome/WelcomeFooter.jsx b/src/js/components/Welcome/WelcomeFooter.jsx
index f6dd8f9bc..22e61cb89 100644
--- a/src/js/components/Welcome/WelcomeFooter.jsx
+++ b/src/js/components/Welcome/WelcomeFooter.jsx
@@ -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>
diff --git a/src/js/pages/Settings/SettingsMenuMobile.jsx b/src/js/pages/Settings/SettingsMenuMobile.jsx
index 8e25a3714..eb314fc2f 100644
--- a/src/js/pages/Settings/SettingsMenuMobile.jsx
+++ b/src/js/pages/Settings/SettingsMenuMobile.jsx
@@ -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>
diff --git a/src/js/utils/applicationUtils.js b/src/js/utils/applicationUtils.js
index 6e7e05ec2..a7dd7720e 100644
--- a/src/js/utils/applicationUtils.js
+++ b/src/js/utils/applicationUtils.js
@@ -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;
@@ -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') ||
diff --git a/src/js/utils/cordovaUtilsPageEnumeration.js b/src/js/utils/cordovaUtilsPageEnumeration.js
index c6caccfe9..d91ef8f39 100644
--- a/src/js/utils/cordovaUtilsPageEnumeration.js
+++ b/src/js/utils/cordovaUtilsPageEnumeration.js
@@ -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') ||