woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 18:16:38 +08:00
Code Issues Projects Packages Wiki Activity Actions

♻️ Move module-level loader into Settings tab

Browse source
This commit is contained in:
Philipp Stracker 2025-01-21 16:07:29 +01:00
parent 8e4462d1fe
commit 882ef34479
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/ppcp-settings/resources/js/Components/App.js
View file

@ -9,7 +9,6 @@ import SettingsScreen from './Screens/Settings';
const SettingsApp = () => { const SettingsApp = () => {
const onboardingProgress = OnboardingHooks.useSteps(); const onboardingProgress = OnboardingHooks.useSteps();
const { isReady: settingsIsReady } = SettingsHooks.useStore();
const { const {
isReady: merchantIsReady, isReady: merchantIsReady,
merchant: { isSendOnlyCountry }, merchant: { isSendOnlyCountry },
@ -32,11 +31,7 @@ const SettingsApp = () => {
} ); } );
const Content = useMemo( () => { const Content = useMemo( () => {
if ( if ( ! onboardingProgress.isReady || ! merchantIsReady ) {
! onboardingProgress.isReady ||
! merchantIsReady ||
! settingsIsReady
) {
return <SpinnerOverlay />; return <SpinnerOverlay />;
} }
if ( isSendOnlyCountry ) { if ( isSendOnlyCountry ) {
@ -51,7 +46,6 @@ const SettingsApp = () => {
merchantIsReady, merchantIsReady,
onboardingProgress.completed, onboardingProgress.completed,
onboardingProgress.isReady, onboardingProgress.isReady,
settingsIsReady,
] ); ] );
return <div className={ wrapperClass }>{ Content }</div>; return <div className={ wrapperClass }>{ Content }</div>;

6
modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettings.js
View file

@ -2,8 +2,10 @@ import ConnectionStatus from './TabSettingsElements/ConnectionStatus';
import CommonSettings from './TabSettingsElements/CommonSettings'; import CommonSettings from './TabSettingsElements/CommonSettings';
import ExpertSettings from './TabSettingsElements/ExpertSettings'; import ExpertSettings from './TabSettingsElements/ExpertSettings';
import { SettingsHooks } from '../../../data'; import { SettingsHooks } from '../../../data';
import SpinnerOverlay from '../../ReusableComponents/SpinnerOverlay';
const TabSettings = () => { const TabSettings = () => {
const { isReady } = SettingsHooks.useStore();
const { settings, setSettings } = SettingsHooks.useSettings(); const { settings, setSettings } = SettingsHooks.useSettings();
const updateFormValue = ( key, value ) => { const updateFormValue = ( key, value ) => {
@ -13,6 +15,10 @@ const TabSettings = () => {
} ); } );
}; };
if ( ! isReady ) {
return <SpinnerOverlay />;
}
return ( return (
<> <>
<div className="ppcp-r-settings"> <div className="ppcp-r-settings">