diff --git a/modules/ppcp-settings/resources/js/Components/App.js b/modules/ppcp-settings/resources/js/Components/App.js index 1febe8674..6441d0a51 100644 --- a/modules/ppcp-settings/resources/js/Components/App.js +++ b/modules/ppcp-settings/resources/js/Components/App.js @@ -11,8 +11,8 @@ import { getQuery } from '../utils/navigation'; const SettingsApp = () => { const { isReady: onboardingIsReady, completed: onboardingCompleted } = OnboardingHooks.useSteps(); + const { isReady: merchantIsReady } = CommonHooks.useStore(); const { - isReady: merchantIsReady, merchant: { isSendOnlyCountry }, } = CommonHooks.useMerchantInfo(); diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Tabs/TabOverview.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Tabs/TabOverview.js index a5a1014e6..de1c16971 100644 --- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Tabs/TabOverview.js +++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Tabs/TabOverview.js @@ -28,7 +28,7 @@ import SpinnerOverlay from '../../../ReusableComponents/SpinnerOverlay'; const TabOverview = () => { const { isReady: areTodosReady } = TodosHooks.useTodos(); - const { isReady: merchantIsReady } = CommonHooks.useMerchantInfo(); + const { isReady: merchantIsReady } = CommonHooks.useStore(); if ( ! areTodosReady || ! merchantIsReady ) { return ; diff --git a/modules/ppcp-settings/resources/js/data/common/hooks.js b/modules/ppcp-settings/resources/js/data/common/hooks.js index 9a43989c1..49e5736a1 100644 --- a/modules/ppcp-settings/resources/js/data/common/hooks.js +++ b/modules/ppcp-settings/resources/js/data/common/hooks.js @@ -50,7 +50,6 @@ const useHooks = () => { } = dispatch; // Transient accessors. - const [ isReady ] = useTransient( 'isReady' ); const [ activeModal, setActiveModal ] = useTransient( 'activeModal' ); const [ activeHighlight, setActiveHighlight ] = useTransient( 'activeHighlight' ); @@ -72,7 +71,6 @@ const useHooks = () => { }; return { - isReady, activeModal, setActiveModal, activeHighlight, @@ -162,7 +160,7 @@ export const useWebhooks = () => { }; export const useMerchantInfo = () => { - const { isReady, features } = useHooks(); + const { features } = useHooks(); const merchant = useMerchant(); const { refreshMerchantData, setMerchant } = useDispatch( STORE_NAME ); @@ -187,7 +185,6 @@ export const useMerchantInfo = () => { }, [ refreshMerchantData, setMerchant ] ); return { - isReady, merchant, // Merchant details features, // Eligible merchant features verifyLoginStatus, // Callback