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

Jetpack: Send user to wp-admin after buying a plan #19039

Merged
merged 1 commit into from
Oct 20, 2017
Merged

Jetpack: Send user to wp-admin after buying a plan #19039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Link to Jetpack Admin Page after plan is set up in Jetpack Thank You … 
…Page
  • Loading branch information
@oskosk
oskosk committed Oct 20, 2017
commit 21b6b988f897787ddf76c37b70b086e32409cd61
6 changes: 4 additions & 2 deletions client/my-sites/checkout/checkout-thank-you/jetpack-thank-you-card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import HappyChatButton from 'components/happychat/button';
import { getSelectedSite, getSelectedSiteId } from 'state/ui/selectors';
import {
getRawSite,
getSiteAdminUrl,
isJetpackSite,
isJetpackSiteMainNetworkSite,
isJetpackSiteMultiSite,
Expand Down Expand Up @@ -540,8 +541,8 @@ class JetpackThankYouCard extends Component {
}

renderAction( progress = 0 ) {
const { selectedSite: site, translate } = this.props;
const buttonUrl = site && site.URL;
const { jetpackAdminPageUrl, selectedSite: site, translate } = this.props;
const buttonUrl = site && jetpackAdminPageUrl;
// We return instructions for setting up manually
// when we finish if something errored
if ( this.isErrored() && ! this.props.isInstalling ) {
Expand Down Expand Up @@ -661,6 +662,7 @@ export default connect(
selectedSite: selectedSite,
isRequestingSites: isRequestingSites( state ),
siteId,
jetpackAdminPageUrl: getSiteAdminUrl( state, siteId, 'admin.php?page=jetpack' ),
planFeatures,
planClass,
planSlug,
Expand Down