Skip to content

Commit

Permalink
Settings: Fix useSiteCopy features requesting selector
Browse files Browse the repository at this point in the history
  • Loading branch information
tyxla committed Jan 20, 2025
1 parent 570d43b commit a97f811
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions client/landing/stepper/hooks/use-site-copy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
isFetchingUserPurchases,
getUserPurchases,
} from 'calypso/state/purchases/selectors';
import getSiteFeatures from 'calypso/state/selectors/get-site-features';
import isRequestingSiteFeatures from 'calypso/state/selectors/is-requesting-site-features';
import siteHasFeature from 'calypso/state/selectors/site-has-feature';
import { fetchSiteFeatures } from 'calypso/state/sites/features/actions';
import type { SiteSelect } from '@automattic/data-stores';
Expand Down Expand Up @@ -65,10 +65,9 @@ export const useSiteCopy = (
WPCOM_FEATURES_COPY_SITE,
options.enabled
);
const { isRequesting: isRequestingSiteFeatures } = useSelector( ( state ) => {
const siteFeatures = getSiteFeatures( state, site?.ID );
return siteFeatures ? siteFeatures : { isRequesting: true };
} );
const requestingSiteFeatures = useSelector( ( state ) =>
isRequestingSiteFeatures( state, site?.ID )
);
const isAtomic = useSelect(
( select ) =>
site && options.enabled && ( select( SITE_STORE ) as SiteSelect ).isSiteAtomic( site?.ID ),
Expand Down Expand Up @@ -128,11 +127,11 @@ export const useSiteCopy = (
shouldShowSiteCopyItem,
startSiteCopy,
resumeSiteCopy,
isFetching: isLoadingPurchases || isRequestingSiteFeatures,
isFetching: isLoadingPurchases || requestingSiteFeatures,
} ),
[
isLoadingPurchases,
isRequestingSiteFeatures,
requestingSiteFeatures,
resumeSiteCopy,
shouldShowSiteCopyItem,
startSiteCopy,
Expand Down

0 comments on commit a97f811

Please sign in to comment.