From 975131a28ec08d0906138bd30706583586d4cba8 Mon Sep 17 00:00:00 2001
From: dalemcgrew <DaleMcGrew@yahoo.com>
Date: Mon, 27 Nov 2023 06:22:49 -0800
Subject: [PATCH] =?UTF-8?q?A=20temporary=20fix=20for=20WV-168=20has=20been?=
 =?UTF-8?q?=20put=20in=20place,=20but=20the=20real=20problem=20relates=20t?=
 =?UTF-8?q?o=20=E2=80=9CisOnPartnerUrl=E2=80=9C=20not=20being=20set=20corr?=
 =?UTF-8?q?ectly=20in=20the=20AppObservableStore.=20This=20will=20need=20t?=
 =?UTF-8?q?o=20be=20corrected=20because=20we=20ideally=20do=20not=20want?=
 =?UTF-8?q?=20to=20offer=20the=20Friends=20and=20Discuss=20features=20on?=
 =?UTF-8?q?=20partner=20websites.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/common/components/FAQBody.jsx          | 48 +++++++++++-------
 .../Navigation/SettingsPersonalSideBar.jsx    | 49 +++++++++----------
 2 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/js/common/components/FAQBody.jsx b/src/js/common/components/FAQBody.jsx
index 3d1ec3587..01ccbfb1e 100644
--- a/src/js/common/components/FAQBody.jsx
+++ b/src/js/common/components/FAQBody.jsx
@@ -66,7 +66,8 @@ export default class FAQBody extends Component {
 
         <strong>Who&apos;s behind We Vote?</strong>
         <br />
-        We Vote is a collaboration between two nonprofits (
+        We Vote is a collaboration between two nonprofits
+        {' '}
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="weVoteEducationWebsite"
@@ -79,7 +80,7 @@ export default class FAQBody extends Component {
         {/* August 2022, TODO: Re-enable this once the SSL cert is renewed */}
         {isCordova() ? (
           <>
-            WeVoteUSA.org - 501(c)(4) FEIN 81-1052585),&nbsp;
+            WeVoteUSA.org - 501(c)(4) FEIN 81-1052585,&nbsp;
           </>
         ) : (
           <>
@@ -91,7 +92,7 @@ export default class FAQBody extends Component {
                 body="WeVoteUSA.org"
               />
             </Suspense>
-            - 501(c)(4) FEIN 81-1052585),&nbsp;
+            - 501(c)(4) FEIN 81-1052585,&nbsp;
           </>
         )}
         both based in Oakland, CA. We do not support or oppose any political candidate or party.
@@ -101,46 +102,54 @@ export default class FAQBody extends Component {
 
         <strong>No really, who are you?</strong>
         <br />
-        We Vote is a volunteer-driven movement.
+        We are volunteers from across the country, in over 22 states. See our
+        {' '}
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="wevoteVolunteerNow"
             url="https://wevote.applytojob.com/apply"
             target="_blank"
-            body="(See volunteer openings here.)"
+            body="volunteer openings here"
           />
         </Suspense>
-        We
-        rely on volunteers across the country who use
-        their engineering, design, and other skills to build
-        We Vote. We are over 100 people who have donated 12,000+ volunteer hours, including
+        , and join us! We use our engineering, design, marketing, and other skills to build
+        We Vote. We are over 400 people (60+ active) who have donated 20,000+ volunteer hours, including
+        {' '}
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="wevoteGithubContributors"
             url="https://github.com/WeVote"
             target="_blank"
-            body="90+ contributors on GitHub."
+            body="100+ contributors on GitHub."
           />
         </Suspense>
-        We also have a
+        We also have
+        {' '}
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="weVoteAboutUsPage"
             url="https://WeVote.US/more/about"
             target="_blank"
-            body="small team of core staff"
+            body="volunteer board members"
           />
         </Suspense>
-        and volunteer board members.
+        .
+        <br />
+        <br />
+
+        <strong>How can I contact We Vote?</strong>
+        <br />
         Please feel free to reach out to us with questions via our
         <Suspense fallback={<></>}>
           <OpenExternalWebSite
             linkIdAttribute="weVoteContactUsPage"
             url="https://help.wevote.us/hc/en-us/requests/new"
             target="_blank"
-            body="Contact Us form."
+            body="Contact Us form"
           />
         </Suspense>
+        .
+        {' '}
         Our mailing address is:
         <br />
         We Vote
@@ -230,9 +239,9 @@ export default class FAQBody extends Component {
           <>
             If you like We Vote,
             {' '}
-            <Link to="/donate" className="u-cursor--pointer u-link-color">please donate</Link>
+            <Link to="/donate" className="u-cursor--pointer u-link-color">please donate monthly</Link>
             {' '}
-            so we can do more to help voters.
+            so we can help more voters.
           </>
         )}
         <br />
@@ -286,9 +295,14 @@ export default class FAQBody extends Component {
             url="https://wevote.applytojob.com/apply"
             target="_blank"
             className="open-web-site open-web-site__no-right-padding"
-            body="sign up to volunteer with We Vote."
+            body="sign up to volunteer"
           />
         </Suspense>
+        {' '}
+        and
+        {' '}
+        <Link to="/donate" className="u-cursor--pointer u-link-color">donate $5 monthly</Link>
+        .
         <br />
         <br />
         <Link to="/" className="u-cursor--pointer u-link-color">Let&apos;s get started!</Link>
diff --git a/src/js/components/Navigation/SettingsPersonalSideBar.jsx b/src/js/components/Navigation/SettingsPersonalSideBar.jsx
index ad21aef76..9c1d871a3 100644
--- a/src/js/components/Navigation/SettingsPersonalSideBar.jsx
+++ b/src/js/components/Navigation/SettingsPersonalSideBar.jsx
@@ -85,6 +85,7 @@ export default class SettingsPersonalSideBar extends Component {
     const { isOnPartnerUrl, isSignedIn, isOrganization, showPremiumFeatures, voterIsAdminForThisUrl } = this.state;
     const showSettingsInDevelopment = false; // If developing any of the new settings, change this to true
     const isOnPartnerUrlAndNotAdmin = isOnPartnerUrl && !voterIsAdminForThisUrl;
+    const alwaysTrue = true; // A temp fix for https://wevoteusa.atlassian.net/browse/WV-168
 
     return (
       <div className="card">
@@ -145,31 +146,29 @@ export default class SettingsPersonalSideBar extends Component {
             </div>
           )}
 
-          {!isOnPartnerUrl && (
-            <div className={String(editMode) === 'notifications' ?
-              'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
-              'SettingsItem__summary__item-container'}
-            >
-              <div>
-                <Link to="/settings/notifications" className="SettingsItem__summary__item" id="notifications">
-                  <span className={String(editMode) === 'notifications' ?
-                    'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
-                    'SettingsItem__summary__item__display-name'}
-                  >
-                    Notifications
-                  </span>
-                </Link>
-              </div>
+          <div className={String(editMode) === 'notifications' ?
+            'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
+            'SettingsItem__summary__item-container'}
+          >
+            <div>
+              <Link to="/settings/notifications" className="SettingsItem__summary__item" id="settingsNotifications">
+                <span className={String(editMode) === 'notifications' ?
+                  'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
+                  'SettingsItem__summary__item__display-name'}
+                >
+                  Notifications
+                </span>
+              </Link>
             </div>
-          )}
+          </div>
 
-          {!isOnPartnerUrl && (
+          {alwaysTrue && (/* {!isOnPartnerUrl && ( */
             <div className={String(editMode) === 'friends' ?
               'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
               'SettingsItem__summary__item-container'}
             >
               <div>
-                <Link to="/friends" className="SettingsItem__summary__item" id="notifications">
+                <Link to="/friends" className="SettingsItem__summary__item" id="settingsFriends">
                   <span className={String(editMode) === 'friends' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -181,13 +180,13 @@ export default class SettingsPersonalSideBar extends Component {
             </div>
           )}
 
-          {(isSignedIn && !isOnPartnerUrl) && (
+          {(isSignedIn && alwaysTrue/* && !isOnPartnerUrl */) && (
             <div className={String(editMode) === 'discuss' ?
               'SettingsItem__summary__item-container SettingsItem__summary__item-container--selected' :
               'SettingsItem__summary__item-container'}
             >
               <div>
-                <Link to="/news" className="SettingsItem__summary__item" id="notifications">
+                <Link to="/news" className="SettingsItem__summary__item" id="settingsDiscuss">
                   <span className={String(editMode) === 'discuss' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -205,7 +204,7 @@ export default class SettingsPersonalSideBar extends Component {
               'SettingsItem__summary__item-container '}
             >
               <div>
-                <Link to="/settings/domain" className="SettingsItem__summary__item" id="domain">
+                <Link to="/settings/domain" className="SettingsItem__summary__item" id="settingsDomain">
                   <span className={String(editMode) === 'domain' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -226,7 +225,7 @@ export default class SettingsPersonalSideBar extends Component {
               'SettingsItem__summary__item-container '}
             >
               <div>
-                <Link to="/settings/text" className="SettingsItem__summary__item" id="site text">
+                <Link to="/settings/text" className="SettingsItem__summary__item" id="settingsSiteText">
                   <span className={String(editMode) === 'text' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -244,7 +243,7 @@ export default class SettingsPersonalSideBar extends Component {
               'SettingsItem__summary__item-container '}
             >
               <div>
-                <Link to="/settings/sharing" className="SettingsItem__summary__item" id="sharing">
+                <Link to="/settings/sharing" className="SettingsItem__summary__item" id="settingsSharing">
                   <span className={String(editMode) === 'sharing' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -265,7 +264,7 @@ export default class SettingsPersonalSideBar extends Component {
               'SettingsItem__summary__item-container '}
             >
               <div>
-                <Link to="/settings/subscription" className="SettingsItem__summary__item" id="subscriptionPlan">
+                <Link to="/settings/subscription" className="SettingsItem__summary__item" id="settingsSubscriptionPlan">
                   <span className={String(editMode) === 'subscription' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}
@@ -286,7 +285,7 @@ export default class SettingsPersonalSideBar extends Component {
               'SettingsItem__summary__item-container '}
             >
               <div>
-                <Link to="/settings/analytics" className="SettingsItem__summary__item" id="analytics">
+                <Link to="/settings/analytics" className="SettingsItem__summary__item" id="settingsAnalytics">
                   <span className={String(editMode) === 'analytics' ?
                     'SettingsItem__summary__item__display-name SettingsItem__summary__item__display-name--selected' :
                     'SettingsItem__summary__item__display-name'}