Merge pull request #4854 from DaleMcGrew/Dale_WebApp_Jun27-2026

DaleMcGrew · web-flow · commit 7dff9f8f5ad1 · 2026-07-01T08:01:54.000-07:00
Because we altered "Sign In or Join" text to "Sign in | Join", I needed to convert two props coming into SignInModal over to node from string.
diff --git a/src/js/common/components/SignIn/SignInModal.jsx b/src/js/common/components/SignIn/SignInModal.jsx
@@ -83,12 +83,12 @@ class SignInModal extends Component {
     renderLog('SignInModal');  // Set LOG_RENDER_EVENTS to log all renders
     const {
       classes,
-      signedInContentHeader = (<></>),
-      signedInContentSubHeader = (<></>),
-      signInSubTitle = '',
-      signInTitle = '',
-      signedInTitle = (<></>),
-      signedOutTitle = (<></>),
+      signedInContentHeader = <></>,
+      signedInContentSubHeader = <></>,
+      signInSubTitle = <></>,
+      signInTitle = <></>,
+      signedInTitle = <></>,
+      signedOutTitle = <></>,
     } = this.props;
     const { isSignedIn, showSignInModalSimple } = this.state;
 
@@ -159,8 +159,8 @@ SignInModal.propTypes = {
   classes: PropTypes.object,
   signedInContentHeader: PropTypes.node,
   signedInContentSubHeader: PropTypes.node,
-  signInSubTitle: PropTypes.string,
-  signInTitle: PropTypes.string,
+  signInSubTitle: PropTypes.node,
+  signInTitle: PropTypes.node,
   signedInTitle: PropTypes.node,
   signedOutTitle: PropTypes.node,
   toggleOnClose: PropTypes.func,
diff --git a/src/js/common/components/SignIn/SignInOptionsPanel.jsx b/src/js/common/components/SignIn/SignInOptionsPanel.jsx
@@ -52,8 +52,8 @@ export default class SignInOptionsPanel extends Component {
       isOnWeVoteRootUrl: true,
       isOnWeVotePartnerSubdomainUrl: false,
       isOnFacebookSupportedDomainUrl: false,
-      pleaseSignInTitleFromState: '',
-      pleaseSignInSubTitle: '',
+      pleaseSignInTitleFromState: <></>,
+      pleaseSignInSubTitle: <></>,
       showTwitterDisconnect: false,
       showRecommendedText: false,
     };
@@ -99,14 +99,14 @@ export default class SignInOptionsPanel extends Component {
 
     if (this.props.pleaseSignInTitle || this.props.pleaseSignInSubTitle || this.props.pleaseSignInTextOff) {
       this.setState({
-        pleaseSignInTitleFromState: this.props.pleaseSignInTitle || '',
-        pleaseSignInSubTitle: this.props.pleaseSignInSubTitle || '',
+        pleaseSignInTitleFromState: this.props.pleaseSignInTitle || <></>,
+        pleaseSignInSubTitle: this.props.pleaseSignInSubTitle || <></>,
       }, () => this.localStoreSignInStartFullUrl());
     } else if (getStartedMode && getStartedMode === 'startup') {
       // js/pages/Startup
       this.setState({
-        pleaseSignInTitleFromState: '',
-        pleaseSignInSubTitle: '',
+        pleaseSignInTitleFromState: <></>,
+        pleaseSignInSubTitle: <></>,
         showRecommendedText: false,
       });
       pathname = '/settings/profile';
@@ -125,8 +125,8 @@ export default class SignInOptionsPanel extends Component {
         Cookies.set('sign_in_start_full_url', signInStartFullUrl, { expires: 31, path: '/' });
       }
       this.setState({
-        pleaseSignInTitleFromState: 'Please sign in to get started.',
-        pleaseSignInSubTitle: 'Use Twitter to verify your account most quickly.',
+        pleaseSignInTitleFromState: <>Please sign in to get started.</>,
+        pleaseSignInSubTitle: <>Use Twitter to verify your account most quickly.</>,
       });
     } else if (getStartedMode && getStartedMode === 'getStartedForOrganizations') {
       pathname = '/settings/profile';
@@ -138,8 +138,8 @@ export default class SignInOptionsPanel extends Component {
         Cookies.set('sign_in_start_full_url', signInStartFullUrl, { expires: 1, path: '/' });
       }
       this.setState({
-        pleaseSignInTitleFromState: 'Please sign in to get started.',
-        pleaseSignInSubTitle: 'Use Twitter to verify your account most quickly.',
+        pleaseSignInTitleFromState: <>Please sign in to get started.</>,
+        pleaseSignInSubTitle: <>Use Twitter to verify your account most quickly.</>,
       });
     } else if (getStartedMode && getStartedMode === 'getStartedForVoters') {
       pathname = '/settings/profile';
@@ -151,19 +151,19 @@ export default class SignInOptionsPanel extends Component {
         Cookies.set('sign_in_start_full_url', signInStartFullUrl, { expires: 1, path: '/' });
       }
       this.setState({
-        pleaseSignInTitleFromState: 'Please sign in to get started.',
-        pleaseSignInSubTitle: '',
+        pleaseSignInTitleFromState: <>Please sign in to get started.</>,
+        pleaseSignInSubTitle: <></>,
       });
     } else {
       const isOnWeVoteRootUrl = AppObservableStore.isOnWeVoteRootUrl();
       const isOnWeVotePartnerSubdomainUrl = AppObservableStore.isOnWeVotePartnerSubdomainUrl();
       // No need to query an api to get this answer.  Creates an unneeded dependency:  const isOnFacebookSupportedDomainUrl = AppObservableStore.isOnFacebookSupportedDomainUrl() || window.location.href.includes('ngrok');
-      let pleaseSignInSubTitle = '';
+      let pleaseSignInSubTitle = <></>;
       if (isOnWeVoteRootUrl || isOnWeVotePartnerSubdomainUrl || isOnFacebookSupportedDomainUrl) {
-        pleaseSignInSubTitle = '';
+        pleaseSignInSubTitle = <></>;
       }
       this.setState({
-        pleaseSignInTitleFromState: '',
+        pleaseSignInTitleFromState: <></>,
         pleaseSignInSubTitle,
       }, () => this.localStoreSignInStartFullUrl());
     }
@@ -672,8 +672,8 @@ SignInOptionsPanel.propTypes = {
   externalUniqueId: PropTypes.string,
   inModal: PropTypes.bool,
   pleaseSignInTextOff: PropTypes.bool,
-  pleaseSignInTitle: PropTypes.string,
-  pleaseSignInSubTitle: PropTypes.string,
+  pleaseSignInTitle: PropTypes.node,
+  pleaseSignInSubTitle: PropTypes.node,
   closeSignInModal: PropTypes.func,
   focusedOnSingleInputToggle: PropTypes.func,
 };
diff --git a/src/js/common/pages/ChallengeStart/ChallengeStartPreview.jsx b/src/js/common/pages/ChallengeStart/ChallengeStartPreview.jsx
@@ -183,8 +183,8 @@ class ChallengeStartPreview extends Component {
         { showSignInModal && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in to publish your Democracy Challenge"
-              signInSubTitle="You can continue making changes after signing in."
+              signInTitle={<>Sign in to publish your Democracy Challenge</>}
+              signInSubTitle={<>You can continue making changes after signing in.</>}
               toggleOnClose={this.toggleShowSignInModal}
               uponSuccessfulSignIn={this.functionToUseWhenSignedIn}
             />
diff --git a/src/js/components/Activity/ActivityPostPublicToggle.jsx b/src/js/components/Activity/ActivityPostPublicToggle.jsx
@@ -191,8 +191,8 @@ class ActivityPostPublicToggle extends Component {
             <div>
               <Suspense fallback={<></>}>
                 <SignInOptionsPanel
-                  pleaseSignInTitle="Sign In to Make Your Posts Public"
-                  pleaseSignInSubTitle=""
+                  pleaseSignInTitle={<>Sign In to Make Your Posts Public</>}
+                  pleaseSignInSubTitle={<></>}
                   inModal
                 />
               </Suspense>
diff --git a/src/js/components/Ballot/PositionRowEmpty.jsx b/src/js/components/Ballot/PositionRowEmpty.jsx
@@ -153,8 +153,8 @@ class PositionRowEmpty extends Component {
         { showSignInModal && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in to ask your friends"
-              signInSubTitle=""
+              signInTitle={<>Sign in to ask your friends</>}
+              signInSubTitle={<></>}
               toggleOnClose={this.closeSignInModal}
               uponSuccessfulSignIn={this.askFriendsSignInComplete}
             />
diff --git a/src/js/components/CompleteYourProfile/CompleteYourProfileOnBallot.jsx b/src/js/components/CompleteYourProfile/CompleteYourProfileOnBallot.jsx
@@ -381,8 +381,8 @@ class CompleteYourProfileOnBallot extends Component {
         {(showSignInModal && !VoterStore.getVoterIsSignedIn()) && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in or join to save your ballot choices & settings"
-              signInSubTitle=""
+              signInTitle={<>Sign in or join to save your ballot choices & settings</>}
+              signInSubTitle={<></>}
               toggleOnClose={this.toggleShowSignInModal}
               uponSuccessfulSignIn={this.toggleShowSignInModal}
             />
diff --git a/src/js/components/Friends/AddFriendsByEmail.jsx b/src/js/components/Friends/AddFriendsByEmail.jsx
@@ -335,8 +335,8 @@ class AddFriendsByEmail extends Component {
                 </Alert>
                 <Suspense fallback={<></>}>
                   <SignInOptionsPanel
-                    pleaseSignInTitle="Sign In to Send Your Friend Requests"
-                    pleaseSignInSubTitle=""
+                    pleaseSignInTitle={<>Sign In to Send Your Friend Requests</>}
+                    pleaseSignInSubTitle={<></>}
                   />
                 </Suspense>
               </>
diff --git a/src/js/components/Friends/FindFriendsStart.jsx b/src/js/components/Friends/FindFriendsStart.jsx
@@ -147,8 +147,8 @@ class FindFriendsStart extends Component {
             <SetUpSignInOptionsPanelWrapper>
               <Suspense fallback={<></>}>
                 <SignInOptionsPanel
-                  pleaseSignInTitle={(contactsWithAccountCount > 0) ? 'Sign in to connect with your friends' : ''}
-                  pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? 'After you sign in, you will be able to choose which friends to collaborate with.' : ''}
+                  pleaseSignInTitle={(contactsWithAccountCount > 0) ? <>Sign in to connect with your friends</> : <></>}
+                  pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? <>After you sign in, you will be able to choose which friends to collaborate with.</> : <></>}
                 />
               </Suspense>
             </SetUpSignInOptionsPanelWrapper>
diff --git a/src/js/components/Navigation/HeaderBackTo.jsx b/src/js/components/Navigation/HeaderBackTo.jsx
@@ -275,7 +275,7 @@ class HeaderBackTo extends Component {
           <Suspense fallback={<></>}>
             <SignInModal
               signInTitle={<SignInJoinText />}
-              signInSubTitle=""
+              signInSubTitle={<></>}
               toggleOnClose={this.closeSignInModal}
               uponSuccessfulSignIn={this.closeSignInModal}
             />
diff --git a/src/js/components/Navigation/HeaderBackToBallot.jsx b/src/js/components/Navigation/HeaderBackToBallot.jsx
@@ -800,7 +800,7 @@ class HeaderBackToBallot extends Component {
             <Suspense fallback={<></>}>
               <SignInModal
                 signInTitle={<SignInJoinText />}
-                signInSubTitle=""
+                signInSubTitle={<></>}
                 toggleOnClose={this.closeSignInModal}
                 uponSuccessfulSignIn={this.closeSignInModal}
               />
diff --git a/src/js/components/Navigation/HeaderBackToVoterGuides.jsx b/src/js/components/Navigation/HeaderBackToVoterGuides.jsx
@@ -366,7 +366,7 @@ class HeaderBackToVoterGuides extends Component {
           <Suspense fallback={<></>}>
             <SignInModal
               signInTitle={<SignInJoinText />}
-              signInSubTitle=""
+              signInSubTitle={<></>}
               toggleOnClose={this.closeSignInModal}
               uponSuccessfulSignIn={this.closeSignInModal}
             />
diff --git a/src/js/components/Navigation/HeaderBarModals.jsx b/src/js/components/Navigation/HeaderBarModals.jsx
@@ -385,7 +385,7 @@ class HeaderBarModals extends Component {
         <Suspense fallback={<></>}>
           <SignInModal
             signInTitle={<SignInJoinText />}
-            signInSubTitle=""
+            signInSubTitle={<></>}
             toggleOnClose={this.closeSignInModal}
             uponSuccessfulSignIn={this.closeSignInModal}
           />
diff --git a/src/js/components/Navigation/WelcomeAppbar.jsx b/src/js/components/Navigation/WelcomeAppbar.jsx
@@ -465,7 +465,7 @@ class WelcomeAppbar extends Component {
           <Suspense fallback={<></>}>
             <SignInModal
               signInTitle={<SignInJoinText />}
-              signInSubTitle=""
+              signInSubTitle={<></>}
               toggleOnClose={this.closeSignInModal}
               uponSuccessfulSignIn={this.closeSignInModal}
             />
diff --git a/src/js/components/PositionItem/PositionPublicToggle.jsx b/src/js/components/PositionItem/PositionPublicToggle.jsx
@@ -216,8 +216,8 @@ class PositionPublicToggle extends Component {
                   Click the &quot;Friends&quot; toggle to show to WeVote friends only.
                 </>
               )}
-              signInTitle="Sign in to make your endorsements public."
-              signInSubTitle=""
+              signInTitle={<>Sign in to make your endorsements public.</>}
+              signInSubTitle={<></>}
               signedInTitle={<>Public</>}
               signedOutTitle={<>Show to Public</>}
               toggleOnClose={this.togglePositionPublicHelpModal}
diff --git a/src/js/components/SetUpAccount/SetUpAccountInviteContactsSignIn.jsx b/src/js/components/SetUpAccount/SetUpAccountInviteContactsSignIn.jsx
@@ -148,8 +148,8 @@ class SetUpAccountInviteContactsSignIn extends React.Component {
         <SetUpSignInOptionsPanelWrapper>
           <Suspense fallback={<></>}>
             <SignInOptionsPanel
-              pleaseSignInTitle={(contactsWithAccountCount > 0) ? 'Sign in to connect with your friends' : ''}
-              pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? 'After you sign in, you will be able to choose which friends to collaborate with.' : ''}
+              pleaseSignInTitle={(contactsWithAccountCount > 0) ? <>Sign in to connect with your friends</> : <></>}
+              pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? <>After you sign in, you will be able to choose which friends to collaborate with.</> : <></>}
             />
           </Suspense>
         </SetUpSignInOptionsPanelWrapper>
diff --git a/src/js/components/Share/ShareModalText.jsx b/src/js/components/Share/ShareModalText.jsx
@@ -1,3 +1,5 @@
+import React from 'react';
+
 // eslint-disable-next-line import/prefer-default-export
 export function returnShareModalText (whatAndHowMuchToShare) {
   let allOpinionsRadioButtonText;
@@ -9,7 +11,7 @@ export function returnShareModalText (whatAndHowMuchToShare) {
   if (whatAndHowMuchToShare.startsWith('ballotShareOptions')) {
     allOpinionsRadioButtonText = 'Ballot with my choices';
     noOpinionsRadioButtonText = 'Ballot only';
-    shareModalDescription = 'Share with your friends a link to this list of ballot choices to help them make their own choices.';
+    shareModalDescription = <>Share with your friends a link to this list of ballot choices to help them make their own choices.</>;
     shareModalTitle = 'Share ballot';
   } else if (whatAndHowMuchToShare.startsWith('candidateShareOptions')) {
     allOpinionsRadioButtonDescription = '';
diff --git a/src/js/components/Share/ShareModalTitleArea.jsx b/src/js/components/Share/ShareModalTitleArea.jsx
@@ -223,7 +223,7 @@ class ShareModalTitleArea extends Component {
         {(showSignInModal && !VoterStore.getVoterIsSignedIn()) && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in to share your choices"
+              signInTitle={<>Sign in to share your choices</>}
               signInSubTitle={shareModalDescription}
               toggleOnClose={this.toggleShowSignInModal}
               uponSuccessfulSignIn={this.toggleShowSignInModal}
diff --git a/src/js/components/Values/IssueCard.jsx b/src/js/components/Values/IssueCard.jsx
@@ -371,8 +371,8 @@ class IssueCard extends Component {
         {(showSignInModal && !VoterStore.getVoterIsSignedIn()) && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in to save your values."
-              signInSubTitle=""
+              signInTitle={<>Sign in to save your values.</>}
+              signInSubTitle={<></>}
               toggleOnClose={this.toggleShowSignInModal}
               uponSuccessfulSignIn={this.toggleShowSignInModal}
             />
diff --git a/src/js/components/Widgets/FollowToggle.jsx b/src/js/components/Widgets/FollowToggle.jsx
@@ -546,8 +546,8 @@ export default class FollowToggle extends Component {
         {(showSignInModal && !VoterStore.getVoterIsSignedIn()) && (
           <Suspense fallback={<></>}>
             <SignInModal
-              signInTitle="Sign in to save who you follow."
-              signInSubTitle=""
+              signInTitle={<>Sign in to save who you follow.</>}
+              signInSubTitle={<></>}
               toggleOnClose={this.toggleShowSignInModal}
               uponSuccessfulSignIn={this.toggleShowSignInModal}
             />
diff --git a/src/js/components/Widgets/ItemActionBar/ChooseOrOpposeSignInModal.jsx b/src/js/components/Widgets/ItemActionBar/ChooseOrOpposeSignInModal.jsx
@@ -137,8 +137,8 @@ class ChooseOrOpposeIntroModal extends Component {
               Save your choices for access on any device.
             </div>
             <SignInOptionsPanel
-              pleaseSignInTitle=""
-              pleaseSignInSubTitle=""
+              pleaseSignInTitle={<></>}
+              pleaseSignInSubTitle={<></>}
               toggleSignInModal={this.props.onClose}
               inModal
             />
diff --git a/src/js/pages/Activity/News.jsx b/src/js/pages/Activity/News.jsx
@@ -122,7 +122,7 @@ class News extends Component {
       }, () => this.openActivityTidbitDrawer(activityTidbitWeVoteIdForDrawer));
       AnalyticsActions.saveActionNews(VoterStore.electionId());
     }
-    AppObservableStore.setShowSelectBallotModal(false, false, false);
+    AppObservableStore.setShowSelectBallotModal(false, false);
     this.preloadTimer = setTimeout(() => lazyPreloadPages(), 2000);
     window.scrollTo(0, 0);
   }
@@ -137,8 +137,9 @@ class News extends Component {
       this.activityStoreListener.remove();
       this.voterStoreListener.remove();
       window.removeEventListener('scroll', this.onScroll);
-      if (this.positionItemTimer) clearTimeout(this.positionItemTimer);
       if (this.activityTidbitDrawerTimer) clearTimeout(this.activityTidbitDrawerTimer);
+      if (this.positionItemTimer) clearTimeout(this.positionItemTimer);
+      if (this.preloadTimer) clearTimeout(this.preloadTimer);
     }
   }
 
@@ -243,7 +244,7 @@ class News extends Component {
       this.setState({
         localPositionListForOrgHasBeenRetrieved,
       });
-      OrganizationActions.positionListForOpinionMaker(speakerOrganizationWeVoteId, false);
+      OrganizationActions.positionListForOpinionMaker(speakerOrganizationWeVoteId, false, false);
       OrganizationActions.positionListForOpinionMakerForFriends(speakerOrganizationWeVoteId, false);
     }
   }
@@ -282,7 +283,7 @@ class News extends Component {
     const imageUrl = normalizedImagePath('/img/global/photos/Alissa_B-128x128.jpg');
     const testimonial = 'Great way to sort through my ballot! My husband and I used WeVote during the last election to learn more about our ballots and make some tough choices. Between following various organizations, and friending a couple of trusted friends, we felt like we had an excellent pool of information to draw from.';
 
-    // August 23, 2020: These resolve a problem that exists in the WebApp, but looks much worse in
+    // August 23, 2020: These resolve a problem that exists in the WebApp but looks much worse in
     // Cordova -- Stop allowing horizontal scroll, (and vertical scroll of the entire window in some cases)
     // by removing some styles that force some elements to be wider than the device window
     const unsetMarginsIfCordova = isCordova() ? { margin: 'unset' } : {};
@@ -447,8 +448,8 @@ class News extends Component {
                 <Suspense fallback={<></>}>
                   <SignInOptionsWrapper style={expandSideMarginsIfCordova}>
                     <SignInOptionsPanel
-                          pleaseSignInTitle="Sign In to Join the Discussion"
-                          pleaseSignInSubTitle="WeVote is a community of friends who care about voting and democracy."
+                          pleaseSignInTitle={<>Sign In to Join the Discussion</>}
+                          pleaseSignInSubTitle={<>WeVote is a community of friends who care about voting and democracy.</>}
                     />
                   </SignInOptionsWrapper>
                 </Suspense>
@@ -517,7 +518,7 @@ class News extends Component {
                 />
               </Suspense>
             </ShowMoreItemsWrapper>
-            {/* August 2020:  This height adjustment for Cordova stops the footer-container from bouncing up about 60px on first render of the page */}
+            {/* August 2020: This height adjustment for Cordova stops the footer-container from bouncing up about 60px on first render of the page */}
             <LoadingItemsWheel style={isCordova() ? { height: 150 } : {}}>
               {loadingMoreItems && (
               <CircularProgress />
