diff --git a/com.twin.app.shoptime/src/components/TScroller/TScroller.jsx b/com.twin.app.shoptime/src/components/TScroller/TScroller.jsx
index f6cbc5e9..c70e074d 100644
--- a/com.twin.app.shoptime/src/components/TScroller/TScroller.jsx
+++ b/com.twin.app.shoptime/src/components/TScroller/TScroller.jsx
@@ -1,4 +1,10 @@
-import React, { useCallback, useEffect, useRef, useState, useMemo } from "react";
+import React, {
+ useCallback,
+ useEffect,
+ useRef,
+ useState,
+ useMemo,
+} from "react";
import classNames from "classnames";
import { useSelector } from "react-redux";
@@ -96,11 +102,14 @@ export default function TScroller({
[onScrollStop]
);
- const _onScroll = useCallback((ev)=>{
- if(onScroll){
- onScroll(ev);
- }
- },[onScroll]);
+ const _onScroll = useCallback(
+ (ev) => {
+ if (onScroll) {
+ onScroll(ev);
+ }
+ },
+ [onScroll]
+ );
const _cbScrollTo = useCallback(
(ref) => {
@@ -113,7 +122,7 @@ export default function TScroller({
[cbScrollTo]
);
- const relevantPositions = useMemo(()=>{
+ const relevantPositions = useMemo(() => {
switch (direction) {
case "horizontal":
return ["left", "right"];
@@ -122,7 +131,7 @@ export default function TScroller({
default:
return [];
}
- },[direction]);
+ }, [direction]);
return (
state.home.homeTopDisplayInfo
);
diff --git a/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx b/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
index 220d6de7..68150147 100644
--- a/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
+++ b/com.twin.app.shoptime/src/views/HomePanel/HomePanel.jsx
@@ -652,7 +652,7 @@ const HomePanel = ({ isOnTop }) => {
onExit={onExit}
onClose={onClose}
hasButton
- button1Text={$L("Exit")}
+ button1Text={$L("1232132131")}
button2Text={$L("Cancel")}
hasText
title={$L("Exit Shop Time")}
diff --git a/com.twin.app.shoptime/src/views/OnSalePanel/OnSalePanel.jsx b/com.twin.app.shoptime/src/views/OnSalePanel/OnSalePanel.jsx
index 7ee48a76..28cbcc6d 100644
--- a/com.twin.app.shoptime/src/views/OnSalePanel/OnSalePanel.jsx
+++ b/com.twin.app.shoptime/src/views/OnSalePanel/OnSalePanel.jsx
@@ -104,18 +104,25 @@ export default function OnSalePanel({ panelInfo, spotlightId }) {
setCategories(copiedCategoryInfos);
return;
}
-
if (categoryInfos) {
dispatch(copyCategoryInfos(categoryInfos));
setCategories(categoryInfos);
-
if (!selectedLgCatCd && !selectedLgCatNm) {
setSelectedLgCatCd(categoryInfos[0].lgCatCd);
setSelectedLgCatNm(categoryInfos[0].lgCatNm);
}
}
+ setSelectedLgCatCd(panelInfo?.lgCatCd);
+ setSelectedLgCatNm(panelInfo?.lgCatNm);
}
- }, [categories, categoryInfos, copiedCategoryInfos, previousPanelIsDetail]);
+ }, [
+ categories,
+ categoryInfos,
+ copiedCategoryInfos,
+ previousPanelIsDetail,
+ selectedLgCatCd,
+ selectedLgCatNm,
+ ]);
useEffect(() => {
if (selectedLgCatCd) {