Reset the property ID when selecting a different account.

google · Apr 16, 2023 · 5203129 · 5203129
1 parent 3ecfabd
commit 5203129
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/assets/js/modules/analytics/components/common/AccountSelect.js b/assets/js/modules/analytics/components/common/AccountSelect.js
@@ -31,6 +31,10 @@ import { Select, Option } from '../../../../material-components';
 import { MODULES_ANALYTICS, ACCOUNT_CREATE } from '../../datastore/constants';
 import { trackEvent } from '../../../../util';
 import useViewContext from '../../../../hooks/useViewContext';
+import {
+	MODULES_ANALYTICS_4,
+	PROPERTY_CREATE,
+} from '../../../analytics-4/datastore/constants';
 const { useSelect, useDispatch } = Data;
 
 export default function AccountSelect( { hasModuleAccess } ) {
@@ -46,20 +50,25 @@ export default function AccountSelect( { hasModuleAccess } ) {
 		select( MODULES_ANALYTICS ).hasFinishedResolution( 'getAccounts' )
 	);
 
+	const { setPropertyID } = useDispatch( MODULES_ANALYTICS_4 );
+
 	const { selectAccount } = useDispatch( MODULES_ANALYTICS );
 	const onChange = useCallback(
 		( index, item ) => {
 			const newAccountID = item.dataset.value;
 			if ( accountID !== newAccountID ) {
 				selectAccount( newAccountID );
+
+				// Reset the property ID.
+				setPropertyID( PROPERTY_CREATE );
 				const action =
 					newAccountID === ACCOUNT_CREATE
 						? 'change_account_new'
 						: 'change_account';
 				trackEvent( `${ viewContext }_analytics`, action );
 			}
 		},
-		[ accountID, selectAccount, viewContext ]
+		[ accountID, selectAccount, setPropertyID, viewContext ]
 	);
 
 	if ( ! hasResolvedAccounts ) {