Skip to content

Commit 875b150

Browse files
authored
Revert "Reader: reader and account flows set Reader as the user's default…" (#99441)
This reverts commit 80675dc.
1 parent 99aaa10 commit 875b150

File tree

2 files changed

+4
-27
lines changed

2 files changed

+4
-27
lines changed

Diff for: client/signup/config/flows-pure.js

-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { isEnabled } from '@automattic/calypso-config';
22
import { HOSTING_LP_FLOW, ONBOARDING_FLOW, ONBOARDING_GUIDED_FLOW } from '@automattic/onboarding';
33
import { translate } from 'i18n-calypso';
4-
import { savePreference } from 'calypso/state/preferences/actions';
5-
import { READER_AS_LANDING_PAGE_PREFERENCE } from 'calypso/state/sites/selectors/has-reader-as-landing-page';
64

75
const noop = () => {};
86

@@ -92,14 +90,6 @@ export function generateFlows( {
9290
providesDependenciesInQuery: [ 'toStepper' ],
9391
optionalDependenciesInQuery: [ 'toStepper' ],
9492
hideProgressIndicator: true,
95-
postCompleteCallback: async ( { dispatch } ) => {
96-
dispatch(
97-
savePreference( READER_AS_LANDING_PAGE_PREFERENCE, {
98-
useReaderAsLandingPage: true,
99-
updatedAt: Date.now(),
100-
} )
101-
);
102-
},
10393
},
10494
{
10595
name: 'business',
@@ -382,14 +372,6 @@ export function generateFlows( {
382372
lastModified: '2025-01-28',
383373
showRecaptcha: true,
384374
hideProgressIndicator: true,
385-
postCompleteCallback: async ( { dispatch } ) => {
386-
dispatch(
387-
savePreference( READER_AS_LANDING_PAGE_PREFERENCE, {
388-
useReaderAsLandingPage: true,
389-
updatedAt: Date.now(),
390-
} )
391-
);
392-
},
393375
},
394376
{
395377
name: 'crowdsignal',

Diff for: client/signup/main.jsx

+4-9
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,7 @@ class Signup extends Component {
395395

396396
if ( flow.postCompleteCallback ) {
397397
const siteId = dependencies && dependencies.siteId;
398-
await flow.postCompleteCallback( {
399-
siteId,
400-
flowName: this.props.flowName,
401-
dispatch: this.props.dispatch,
402-
} );
398+
await flow.postCompleteCallback( { siteId, flowName: this.props.flowName } );
403399
}
404400
};
405401

@@ -635,7 +631,7 @@ class Signup extends Component {
635631
dependencies.oauth2_client_id && ! progress?.[ 'oauth2-user' ]?.service; // service is set for social signup (e.g. Google, Apple)
636632
// If the user is not logged in, we need to log them in first.
637633
// And if it's regular oauth client signup, we perform the oauth login because the WPCC user creation code automatically logs the user in.
638-
// There's no need to turn the bearer token into a cookie. If we log user in again, it will cause an activation error.
634+
// Theres no need to turn the bearer token into a cookie. If we log user in again, it will cause an activation error.
639635
// However, we need to skip this to perform a regular login for social sign in.
640636
if ( ! userIsLoggedIn && ( config.isEnabled( 'oauth' ) || isRegularOauth2ClientSignup ) ) {
641637
debug( `Handling oauth login` );
@@ -1016,10 +1012,9 @@ export default connect(
10161012
hostingFlow,
10171013
};
10181014
},
1019-
( dispatch ) => ( {
1020-
dispatch,
1015+
{
10211016
submitSignupStep,
10221017
removeStep,
10231018
addStep,
1024-
} )
1019+
}
10251020
)( Signup );

0 commit comments

Comments
 (0)