no-derived-state.patch

diff --git a/client/my-sites/checkout/checkout/checkout-container.jsx b/client/my-sites/checkout/checkout/checkout-container.jsx
index 3f03dbf5ca..c5a68b0101 100644
--- a/client/my-sites/checkout/checkout/checkout-container.jsx
+++ b/client/my-sites/checkout/checkout/checkout-container.jsx
@@ -35,13 +35,10 @@ function isSiteCreatedDateNew( createdAt, creationWindowInMinutes = 5 ) {
 class CheckoutContainer extends React.Component {
 	state = {
 		headerText: '',
-		shouldDisplaySiteCreatedNotice:
-			this.props.isComingFromSignup &&
-			isSiteCreatedDateNew( get( this.props, 'selectedSite.options.created_at', '' ) ),
 	};
 
 	componentDidMount() {
-		if ( this.state.shouldDisplaySiteCreatedNotice ) {
+		if ( this.shouldDisplaySiteCreatedNotice() ) {
 			this.setHeaderText(
 				this.props.translate(
 					'Your WordPress.com site is ready! Finish your purchase to get the most out of it.'
@@ -50,6 +47,14 @@ class CheckoutContainer extends React.Component {
 		}
 	}
 
+	shouldDisplaySiteCreatedNotice() {
+		return (
+			this.props.isComingFromSignup &&
+			this.props.selectedSite &&
+			isSiteCreatedDateNew( get( this.props, 'selectedSite.options.created_at', '' ) )
+		);
+	}
+
 	renderCheckoutHeader() {
 		return this.state.headerText && <FormattedHeader headerText={ this.state.headerText } />;
 	}
@@ -74,7 +79,7 @@ class CheckoutContainer extends React.Component {
 		return (
 			<>
 				{ this.renderCheckoutHeader() }
-				{ this.state.shouldDisplaySiteCreatedNotice && (
+				{ this.shouldDisplaySiteCreatedNotice() && (
 					<TransactionData>
 						<SignupSiteCreatedNotice selectedSite={ this.props.selectedSite } />
 					</TransactionData>