Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Take down US survey #2085

Merged
merged 2 commits into from Sep 16, 2019
Merged

Take down US survey #2085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bebdd6
removed US survey
jlieb10 Sep 16, 2019
8d181ea
linted
jlieb10 Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...sets/pages/contributions-landing/components/ContributionThankYou/ContributionThankYou.jsx
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ import {
trackComponentLoad,
} from 'helpers/tracking/behaviour';
import TrackableButton from 'components/button/trackableButton';
import type { IsoCountry } from 'helpers/internationalisation/country';

// ----- Types ----- //

Expand All @@ -39,7 +38,6 @@ type PropTypes = {|
csrf: string,
emailValidated: boolean,
paymentComplete: boolean,
countryForSurvey: IsoCountry,
|};
/* eslint-enable react/no-unused-prop-types */

Expand Down Expand Up @@ -187,7 +185,7 @@ function ContributionThankYou(props: PropTypes) {
</section>
) : null}
{ renderIdentityCTA() }
<ContributionSurvey isRunning={props.countryForSurvey === 'US'} />
<ContributionSurvey isRunning={false} />
<MarketingConsent />
<SpreadTheWord />
<div className="gu-content__return-link">
Expand Down
9 changes: 3 additions & 6 deletions ...s/contributions-landing/components/ContributionThankYou/ContributionThankYouContainer.jsx
View file
Open in desktop
Expand Up @@ -8,20 +8,17 @@ import { type ThankYouPageStageMap, type ThankYouPageStage } from '../../contrib
import ContributionThankYou from './ContributionThankYou';
import ContributionThankYouSetPassword from './ContributionThankYouSetPassword';
import ContributionThankYouPasswordSet from './ContributionThankYouPasswordSet';
import type { IsoCountry } from 'helpers/internationalisation/country';

// ----- Types ----- //

/* eslint-disable react/no-unused-prop-types */
type PropTypes = {|
thankYouPageStage: ThankYouPageStage,
countryForSurvey: IsoCountry,
|};
/* eslint-enable react/no-unused-prop-types */

const mapStateToProps = state => ({
thankYouPageStage: state.page.form.thankYouPageStage,
countryForSurvey: state.common.internationalisation.countryId,
});

// ----- Render ----- //
Expand All @@ -30,16 +27,16 @@ function ContributionThankYouContainer(props: PropTypes) {

const thankYouPageStage: ThankYouPageStageMap<React$Element<*>> = {
thankYou: (
<ContributionThankYou countryForSurvey={props.countryForSurvey} />
<ContributionThankYou />
),
thankYouSetPassword: (
<ContributionThankYouSetPassword />
),
thankYouPasswordDeclinedToSet: (
<ContributionThankYou countryForSurvey={props.countryForSurvey} />
<ContributionThankYou />
),
thankYouPasswordSet: (
<ContributionThankYouPasswordSet countryForSurvey={props.countryForSurvey} />
<ContributionThankYouPasswordSet />
),
};

Expand Down
8 changes: 2 additions & 6 deletions ...contributions-landing/components/ContributionThankYou/ContributionThankYouPasswordSet.jsx
View file
Open in desktop
Expand Up @@ -9,15 +9,11 @@ import SvgArrowLeft from 'components/svgs/arrowLeftStraight';
import { ContributionThankYouBlurb } from './ContributionThankYouBlurb';
import SpreadTheWord from 'components/spreadTheWord/spreadTheWord';
import ContributionSurvey from '../ContributionSurvey/ContributionsSurvey';
import type { IsoCountry } from 'helpers/internationalisation/country';

// ----- Types ----- //
type PropTypes = {|
countryForSurvey: IsoCountry,
|}

// ----- Render ----- //
function ContributionThankYouPasswordSet(props: PropTypes) {
function ContributionThankYouPasswordSet() {
const title = 'You now have a Guardian account';
const body = 'Please check your inbox to validate your email address – it only takes a minute. And then sign in on each of the devices you use to access The Guardian.';

Expand All @@ -30,7 +26,7 @@ function ContributionThankYouPasswordSet(props: PropTypes) {
{body}
</p>
</section>
<ContributionSurvey isRunning={props.countryForSurvey === 'US'} />
<ContributionSurvey isRunning={false} />
<MarketingConsent />
<SpreadTheWord />
<div className="gu-content__return-link">
Expand Down