diff --git a/com.twin.app.shoptime/src/App/App.js b/com.twin.app.shoptime/src/App/App.js index 9c0893d4..13f6b116 100644 --- a/com.twin.app.shoptime/src/App/App.js +++ b/com.twin.app.shoptime/src/App/App.js @@ -121,7 +121,9 @@ function AppBase(props) { (state) => state.common.appStatus.cursorVisible ); const introTermsAgree = useSelector((state) => state.common.introTermsAgree); - const optionalTermsAgree = useSelector((state) => state.common.optionalTermsAgree); + const optionalTermsAgree = useSelector( + (state) => state.common.optionalTermsAgree + ); // termsFlag 전체 상태 확인 const termsFlag = useSelector((state) => state.common.termsFlag); const termsData = useSelector((state) => state.home.termsData); @@ -131,10 +133,10 @@ function AppBase(props) { if (!terms) { return false; } - const optionalTerm = terms.find(term => term.trmsTpCd === "MST00405"); - return optionalTerm ? optionalTerm.trmsPopFlag === 'Y' : false; + const optionalTerm = terms.find((term) => term.trmsTpCd === "MST00405"); + return optionalTerm ? optionalTerm.trmsPopFlag === "Y" : false; }, [termsData]); - + useEffect(() => { if (termsData?.data?.terms) { dispatch(getTermsAgreeYn()); @@ -375,7 +377,6 @@ function AppBase(props) { // }, 3000); // }, [dispatch]); - // 약관 동의 및 선택 약관 팝업 처리 useEffect(() => { if (introTermsAgree === undefined) { @@ -430,7 +431,8 @@ function AppBase(props) { }, [dispatch]); return ( - + // + <> {webOSVersion === "" ? null : Number(webOSVersion) < 4 ? ( ) : ( @@ -444,7 +446,8 @@ function AppBase(props) { } /> )} - + + // ); } diff --git a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx index 83227be3..498f9382 100644 --- a/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx +++ b/com.twin.app.shoptime/src/views/FeaturedBrandsPanel/FeaturedBrandsPanel.jsx @@ -110,7 +110,7 @@ const hasTemplateCodeWithValue = (array, value) => const shouldRenderComponent = (data) => { return ( (Array.isArray(data) && data.length > 0) || - (typeof data === "object" && Object.keys(data).length > 0) + (data && typeof data === "object" && Object.keys(data).length > 0) ); }; @@ -403,7 +403,6 @@ const FeaturedBrandsPanel = ({ isOnTop, panelInfo, spotlightId }) => { (containerId) => setFocusedContainerId(containerId), [] ); - const renderPageItem = useCallback(() => { return ( <>