From d098d5b1a937f22785119f66f1b2a30f2865ea4a Mon Sep 17 00:00:00 2001
From: Tom Rees-Herdman <tom.rees-herdman@10up.com>
Date: Thu, 17 Oct 2024 16:34:33 +0100
Subject: [PATCH] Fix regression when creating a new Analytics property.

---
 .../components/common/AccountCreateLegacy.js   |  6 ++++--
 .../modules/analytics-4/datastore/accounts.js  | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/assets/js/modules/analytics-4/components/common/AccountCreateLegacy.js b/assets/js/modules/analytics-4/components/common/AccountCreateLegacy.js
index f3abe6aeeda..d122af33b77 100644
--- a/assets/js/modules/analytics-4/components/common/AccountCreateLegacy.js
+++ b/assets/js/modules/analytics-4/components/common/AccountCreateLegacy.js
@@ -66,10 +66,12 @@ export default function AccountCreateLegacy() {
 		[ createAccountURL, viewContext ]
 	);
 
-	const { resetAccountSummaries } = useDispatch( MODULES_ANALYTICS_4 );
+	const { resetAccountSummaries, resetAccountSettings } =
+		useDispatch( MODULES_ANALYTICS_4 );
 	const refetchAccountsHandler = useCallback( () => {
 		resetAccountSummaries();
-	}, [ resetAccountSummaries ] );
+		resetAccountSettings();
+	}, [ resetAccountSettings, resetAccountSummaries ] );
 
 	if ( ! hasResolvedAccounts ) {
 		return <ProgressBar />;
diff --git a/assets/js/modules/analytics-4/datastore/accounts.js b/assets/js/modules/analytics-4/datastore/accounts.js
index c2d6fce0dd2..ef0d605319d 100644
--- a/assets/js/modules/analytics-4/datastore/accounts.js
+++ b/assets/js/modules/analytics-4/datastore/accounts.js
@@ -111,6 +111,7 @@ const fetchCreateAccountStore = createFetchStore( {
 const START_SELECTING_ACCOUNT = 'START_SELECTING_ACCOUNT';
 const FINISH_SELECTING_ACCOUNT = 'FINISH_SELECTING_ACCOUNT';
 const RESET_ACCOUNT_SUMMARIES = 'RESET_ACCOUNT_SUMMARIES';
+const RESET_ACCOUNT_SETTINGS = 'RESET_ACCOUNT_SETTINGS';
 const TRANSFORM_AND_SORT_ACCOUNT_SUMMARIES =
 	'TRANSFORM_AND_SORT_ACCOUNT_SUMMARIES';
 
@@ -141,6 +142,20 @@ const baseActions = {
 		).invalidateResolutionForStoreSelector( 'getAccountSummaries' );
 	},
 
+	/**
+	 * Resets the account settings.
+	 *
+	 * @since n.e.x.t
+	 *
+	 * @return {Object} Redux-style action.
+	 */
+	resetAccountSettings() {
+		return {
+			payload: {},
+			type: RESET_ACCOUNT_SETTINGS,
+		};
+	},
+
 	/**
 	 * Creates a new Analytics (GA4) account.
 	 *
@@ -290,6 +305,9 @@ const baseReducer = createReducer( ( state, { type } ) => {
 
 		case RESET_ACCOUNT_SUMMARIES:
 			state.accountSummaries = undefined;
+			break;
+
+		case RESET_ACCOUNT_SETTINGS:
 			state.settings.accountID = undefined;
 			state.settings.propertyID = undefined;
 			state.settings.measurementID = undefined;