use merchant directly

woocommerce · Jan 13, 2025 · c2c4347 · c2c4347
1 parent b65ed2b
commit c2c4347
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/ConnectionInfo.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/ConnectionInfo.js
@@ -1,17 +1,8 @@
 import { __ } from '@wordpress/i18n';
-import { useState, useEffect } from '@wordpress/element';
-import {CommonHooks} from "../../data";
-
+import { CommonHooks } from '../../data';
 
 const ConnectionInfo = () => {
-    const { merchant } = CommonHooks.useMerchantInfo();
-    const [connectionData, setConnectionData] = useState(getDefaultConnectionStatusData(merchant));
-
-    useEffect(() => {
-        if (merchant) {
-            setConnectionData(getDefaultConnectionStatusData(merchant));
-        }
-    }, [merchant]);
+	const { merchant } = CommonHooks.useMerchantInfo();
 
 	return (
         <div className="ppcp-r-connection-status__data">
@@ -31,16 +22,6 @@ const 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 {
         connectionStatus: merchant.isConnected || false,

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