Merge pull request #3769 from DaleMcGrew/Dale_WebApp_Nov6-2023

Fix for "WV-144 You can now only change your address from the Ballot change, but no way to find out what the app thinks your address is". Needs more testing.
wevote · Nov 6, 2023 · b407fc9 · b407fc9
2 parents feed884 + 04e92f9
commit b407fc9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/js/components/Ballot/BallotTitleHeader.jsx b/src/js/components/Ballot/BallotTitleHeader.jsx
@@ -193,35 +193,35 @@ class BallotTitleHeader extends Component {
                         </BallotAddress>
                       ) : (
                         <>
-                          {(substitutedAddress && substitutedAddress !== '' && substitutedAddress.length >= 2) ? (
+                          {((textForMapSearch && textForMapSearch !== '' && textForMapSearch.length >= 2) || (originalTextAddress && originalTextAddress !== '' && originalTextAddress.length >= 2)) ? (
                             <BallotAddress
                               allowTextWrap={allowTextWrap}
                               centerText={centerText}
                               className={linksOff ? '' : 'u-cursor--pointer'}
-                              id="ballotTitleBallotAddressSubstituted"
+                              id="ballotTitleBallotAddress"
                               onClick={this.showSelectBallotModalEditAddress}
                             >
                               Ballot for
                               {' '}
                               <span className={linksOff ? '' : 'u-link-color'}>
-                                {substitutedAddress}
+                                {(textForMapSearch && textForMapSearch !== '') ? textForMapSearch : originalTextAddress}
                               </span>
                               {linksOff ? <></> : editIconStyled}
                             </BallotAddress>
                           ) : (
                             <>
-                              {(originalTextAddress && originalTextAddress !== '' && originalTextAddress.length >= 2) ? (
+                              {(substitutedAddress && substitutedAddress !== '' && substitutedAddress.length >= 2) ? (
                                 <BallotAddress
                                   allowTextWrap={allowTextWrap}
                                   centerText={centerText}
                                   className={linksOff ? '' : 'u-cursor--pointer'}
-                                  id="ballotTitleBallotAddress"
+                                  id="ballotTitleBallotAddressSubstituted"
                                   onClick={this.showSelectBallotModalEditAddress}
                                 >
                                   Ballot for
                                   {' '}
                                   <span className={linksOff ? '' : 'u-link-color'}>
-                                    {(textForMapSearch && textForMapSearch !== '') ? textForMapSearch : originalTextAddress}
+                                    {substitutedAddress}
                                   </span>
                                   {linksOff ? <></> : editIconStyled}
                                 </BallotAddress>