)}
diff --git a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx
index 8f4fc890..fc17ac70 100644
--- a/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx
+++ b/com.twin.app.shoptime/src/views/HomePanel/PopularShow/PopularShow.jsx
@@ -160,12 +160,11 @@ const PopularShow = ({ homeChk = true, order, scrollTopBody, ...rest }) => {
)}
{drawChk && homeChk === true && (
-
-
+
+
)}
diff --git a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx
index 4287ffec..579a86dd 100644
--- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx
+++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx
@@ -45,8 +45,9 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
const categoryInfos = useSelector(
(state) => state.onSale.onSaleData?.data.categoryInfos
);
+
const categoryItemInfos = useSelector(
- (state) => state.main.subCategoryData?.categoryItemInfos?.subCatItemList
+ (state) => state.main.subCategoryData?.categoryItemInfos
);
const [currentLgCatCd, setCurrentLgCatCd] = useState(catCd ? catCd : null);
@@ -87,8 +88,8 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
{
name: panel_names.CATEGORY_PANEL,
panelInfo: {
- lgCatCd: categoryItemInfos[0].lgCatCd,
- lgCatNm: categoryItemInfos[0].catNm,
+ lgCatCd: categoryItemInfos?.lgCatCd,
+ lgCatNm: categoryItemInfos?.catNm,
tab: 1,
},
},
@@ -98,8 +99,8 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
});
useEffect(() => {
if (categoryInfos && !currentLgCatCd) {
- const initialLgCatCd = categoryInfos[0].lgCatCd;
- const initialLgCatNm = categoryInfos[0].catNm;
+ const initialLgCatCd = categoryInfos.lgCatCd;
+ const initialLgCatNm = categoryInfos.catNm;
setCurrentLgCatCd(initialLgCatCd);
setCurrentLgCatNm(initialLgCatNm);
}
@@ -129,7 +130,7 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
useEffect(() => {
if (categoryItemInfos) {
- const prdtId = categoryItemInfos[0].prdtId;
+ const prdtId = categoryItemInfos?.subCatItemList.prdtId;
setTargetId("spotlightId-" + removeDotAndColon(prdtId));
}
}, [categoryItemInfos]);
@@ -204,7 +205,7 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
noScrollByWheel
>
{categoryItemInfos &&
- categoryItemInfos.map(
+ categoryItemInfos?.subCatItemList.map(
(
{
prdtId,
@@ -236,15 +237,12 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => {
)}
{drawChk && (
-