diff --git a/src/js/common/pages/Challenge/ChallengeLeaderboard.jsx b/src/js/common/pages/Challenge/ChallengeLeaderboard.jsx index 0856c6367..e06a568aa 100644 --- a/src/js/common/pages/Challenge/ChallengeLeaderboard.jsx +++ b/src/js/common/pages/Challenge/ChallengeLeaderboard.jsx @@ -61,8 +61,8 @@ const ChallengeLeaderboard = ({ classes, challengeWeVoteId, clearSearchFunction, {!!(rankOfVoter) && ( - - )} + + )}
diff --git a/src/js/common/utils/textFormat.js b/src/js/common/utils/textFormat.js index 82afea156..3a8515f0e 100644 --- a/src/js/common/utils/textFormat.js +++ b/src/js/common/utils/textFormat.js @@ -33,7 +33,8 @@ export function calculateBallotBaseUrl (incomingBallotBaseUrl, incomingPathname) ballotBaseUrl = `${temp4}/ballot`; // console.log("ballotBaseUrl:", ballotBaseUrl); } else { - ballotBaseUrl = incomingPathname || '/ballot'; + // ballotBaseUrl = incomingPathname || '/ballot'; // Changed for WV-676 but needs review + ballotBaseUrl = incomingBallotBaseUrl || '/ballot'; } return ballotBaseUrl; } diff --git a/src/js/components/Navigation/SettingsPersonalSideBar.jsx b/src/js/components/Navigation/SettingsPersonalSideBar.jsx index b691711b2..6589eb5aa 100644 --- a/src/js/components/Navigation/SettingsPersonalSideBar.jsx +++ b/src/js/components/Navigation/SettingsPersonalSideBar.jsx @@ -82,10 +82,11 @@ export default class SettingsPersonalSideBar extends Component { renderLog('SettingsPersonalSideBar'); // Set LOG_RENDER_EVENTS to log all renders // console.log("SettingsPersonalSideBar, isOrganization: ", this.state.isOrganization); const { editMode } = this.props; - const { isOnPartnerUrl, isSignedIn, isOrganization, showPremiumFeatures, voterIsAdminForThisUrl } = this.state; + 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 + const pigsCanFly = false; return (
@@ -110,7 +111,7 @@ export default class SettingsPersonalSideBar extends Component {
)} - {(isSignedIn) && ( + {(isSignedIn && pigsCanFly) && ( // Turning this off until we can work on it more
slide.index === selectedStepIndex); + const { title, titleId, description, descriptionId, imgSrc } = data.find((slide) => slide.index === selectedStepIndex); // console.log('AnnotatedSlideshow selectedStepIndex:', selectedStepIndex, 'length:', length); return ( - {title} - {description} + {title} + {description} {!inModal && (