Moved invalidateResolutionForStoreSelector into OBW

octaedro · octaedro · commit 83266f1822df · 2021-10-12T18:27:55.000-03:00
diff --git a/client/homescreen/activity-panel/index.js b/client/homescreen/activity-panel/index.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useDispatch, useSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { Badge } from '@woocommerce/components';
 import {
 	Button,
@@ -56,17 +56,10 @@ export const ActivityPanel = () => {
 		};
 	} );
 
-	const { invalidateResolutionForStoreSelector } = useDispatch(
-		ONBOARDING_STORE_NAME
-	);
-
 	const panels = getAllPanels( panelsData );
 
 	useEffect( () => {
 		if ( panelsData.isTaskListHidden !== undefined ) {
-			if ( ! panelsData.isTaskListHidden ) {
-				invalidateResolutionForStoreSelector( 'getTaskLists' );
-			}
 			const visiblePanels = panels.reduce(
 				( acc, panel ) => {
 					const panelId = snakeCase( panel.id );
diff --git a/client/profile-wizard/steps/store-details/index.js b/client/profile-wizard/steps/store-details/index.js
@@ -230,7 +230,13 @@ class StoreDetails extends Component {
 			isStoreDetailsPopoverVisible,
 			isSkipSetupPopoverVisible,
 		} = this.state;
-		const { skipProfiler, isLoading, isBusy, initialValues } = this.props;
+		const {
+			skipProfiler,
+			isLoading,
+			isBusy,
+			initialValues,
+			invalidateResolutionForStoreSelector,
+		} = this.props;
 
 		/* eslint-disable @wordpress/i18n-no-collapsible-whitespace */
 		const skipSetupText = __(
@@ -390,6 +396,9 @@ class StoreDetails extends Component {
 						isLink
 						className="woocommerce-profile-wizard__footer-link"
 						onClick={ () => {
+							invalidateResolutionForStoreSelector(
+								'getTaskLists'
+							);
 							this.setState( {
 								showUsageModal: true,
 								skipping: true,
@@ -498,13 +507,17 @@ export default compose(
 	} ),
 	withDispatch( ( dispatch ) => {
 		const { createNotice } = dispatch( 'core/notices' );
-		const { updateProfileItems } = dispatch( ONBOARDING_STORE_NAME );
+		const {
+			invalidateResolutionForStoreSelector,
+			updateProfileItems,
+		} = dispatch( ONBOARDING_STORE_NAME );
 		const { updateAndPersistSettingsForGroup } = dispatch(
 			SETTINGS_STORE_NAME
 		);
 
 		return {
 			createNotice,
+			invalidateResolutionForStoreSelector,
 			updateProfileItems,
 			updateAndPersistSettingsForGroup,
 		};
