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

use merchant directly

Browse source
This commit is contained in:
carmenmaymo 2025-01-13 15:21:36 +01:00
parent b65ed2b9b2
commit c2c4347ce2
No known key found for this signature in database
GPG key ID: 6023F686B0F3102E
2 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/ppcp-settings/resources/js/Components/ReusableComponents/ConnectionInfo.js
View file

@ -1,17 +1,8 @@
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { useState, useEffect } from '@wordpress/element'; import { CommonHooks } from '../../data';
import {CommonHooks} from "../../data";
const ConnectionInfo = () => { const ConnectionInfo = () => {
const { merchant } = CommonHooks.useMerchantInfo(); const { merchant } = CommonHooks.useMerchantInfo();
const [connectionData, setConnectionData] = useState(getDefaultConnectionStatusData(merchant));
useEffect(() => {
if (merchant) {
setConnectionData(getDefaultConnectionStatusData(merchant));
}
}, [merchant]);
return ( return (
<div className="ppcp-r-connection-status__data"> <div className="ppcp-r-connection-status__data">
@ -31,16 +22,6 @@ const ConnectionInfo = () => {
); );
}; };
export default ConnectionInfo; export default ConnectionInfo;
export const getDefaultConnectionStatusData = (merchant = null) => {
if (!merchant) {
const contextMerchant = CommonHooks.useMerchantInfo()?.merchant || {};
return {
connectionStatus: contextMerchant.isConnected || false,
email: contextMerchant.email || '',
merchantId: contextMerchant.id || '',
clientId: contextMerchant.clientId || '',
};
}
return { return {
connectionStatus: merchant.isConnected || false, connectionStatus: merchant.isConnected || false,

16
modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/ConnectionStatus.js
View file

@ -1,13 +1,13 @@
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import SettingsCard from '../../../ReusableComponents/SettingsCard'; import SettingsCard from '../../../ReusableComponents/SettingsCard';
import ConnectionInfo, { import { CommonHooks } from '../../../../data';
getDefaultConnectionStatusData,
} from '../../../ReusableComponents/ConnectionInfo';
import TitleBadge, { import TitleBadge, {
TITLE_BADGE_NEGATIVE, TITLE_BADGE_NEGATIVE,
TITLE_BADGE_POSITIVE, TITLE_BADGE_POSITIVE,
} from '../../../ReusableComponents/TitleBadge'; } from '../../../ReusableComponents/TitleBadge';
import ConnectionInfo from '../../../ReusableComponents/ConnectionInfo';
const ConnectionStatus = () => { const ConnectionStatus = () => {
const { merchant } = CommonHooks.useMerchantInfo();
return ( return (
<SettingsCard <SettingsCard
className="ppcp-r-tab-overview-support" className="ppcp-r-tab-overview-support"
@ -20,7 +20,7 @@ const ConnectionStatus = () => {
<div className="ppcp-r-connection-status"> <div className="ppcp-r-connection-status">
<div className="ppcp-r-connection-status__status"> <div className="ppcp-r-connection-status__status">
<div className="ppcp-r-connection-status__status-status"> <div className="ppcp-r-connection-status__status-status">
{ getDefaultConnectionStatusData().connectionStatus ? ( { merchant.isConnected ? (
<TitleBadge <TitleBadge
type={ TITLE_BADGE_POSITIVE } type={ TITLE_BADGE_POSITIVE }
text={ __( text={ __(
@ -39,12 +39,8 @@ const ConnectionStatus = () => {
) } ) }
</div> </div>
</div> </div>
{ getDefaultConnectionStatusData().connectionStatus && ( { merchant.isConnected && (
<ConnectionInfo <ConnectionInfo connectionStatusDataDefault={ merchant } />
connectionStatusDataDefault={
getDefaultConnectionStatusData()
}
/>
) } ) }
</div> </div>
</SettingsCard> </SettingsCard>