diff --git a/com.twin.app.shoptime/src/actions/commonActions.js b/com.twin.app.shoptime/src/actions/commonActions.js index 27adc32d..6b60eff2 100644 --- a/com.twin.app.shoptime/src/actions/commonActions.js +++ b/com.twin.app.shoptime/src/actions/commonActions.js @@ -101,7 +101,11 @@ export const getHttpHeaderForServiceRequest = }; convertedRes["X-Device-Personalization"] = "Y"; - convertedRes["app_id"] = appinfo.id; + if(window.PalmSystem && window.PalmSystem.identifier){ + convertedRes["app_id"] = window.PalmSystem.identifier ?? appinfo.id; + }else{ + convertedRes["app_id"] = appinfo.id; + } //todo temp convertedRes["app_ver"] = "1.0.0"; //appinfo.version; convertedRes["cntry_cd"] = res["X-Device-Country"]; diff --git a/com.twin.app.shoptime/src/api/TAxios.js b/com.twin.app.shoptime/src/api/TAxios.js index 9c4b6e5a..66652d56 100644 --- a/com.twin.app.shoptime/src/api/TAxios.js +++ b/com.twin.app.shoptime/src/api/TAxios.js @@ -45,7 +45,7 @@ export const TAxios = ( }); }; - const executeRequest = (accessToken, dispatch, getState) => { + const executeRequest = (accessToken) => { const httpHeader = getState().common.httpHeader; const { mbr_no, deviceId } = getState().common.appStatus; const refreshToken = getState().localSettings.refreshToken; @@ -95,16 +95,16 @@ export const TAxios = ( //AccessToken 만료 if(res?.data?.retCode === 401){ dispatch(getReAuthenticationCode()); - checkAccessToken().then((accessToken) => { - executeRequest(accessToken, dispatch, getState); + checkAccessToken().then((token) => { + executeRequest(token); }); return; } //RefreshToken 만료 if(res?.data?.retCode === 402 ){ dispatch(getAuthenticationCode()); - checkAccessToken().then((accessToken) => { - executeRequest(accessToken, dispatch, getState); + checkAccessToken().then((token) => { + executeRequest(token); }); return; } @@ -118,7 +118,7 @@ export const TAxios = ( } }; - checkAccessToken().then((accessToken) => { - executeRequest(accessToken, dispatch, getState); + checkAccessToken().then((token) => { + executeRequest(token); }); }; diff --git a/com.twin.app.shoptime/src/lunaSend/account.js b/com.twin.app.shoptime/src/lunaSend/account.js index db90bb84..e8a9039f 100644 --- a/com.twin.app.shoptime/src/lunaSend/account.js +++ b/com.twin.app.shoptime/src/lunaSend/account.js @@ -125,7 +125,7 @@ export const launchMembershipAppNew = ( subscribe: false, parameters: { category: "MembershipApp", - params: { query: "", appReturn: { appId: appinfo.id } }, + params: { query: "", appReturn: { appId: window.PalmSystem.identifier ?? appinfo.id } }, }, onSuccess, onFailure, @@ -150,7 +150,7 @@ export const launchMembershipApp = ( subscribe: false, parameters: { id: "com.webos.app.membership", - params: { query: "", appReturn: { appId: appinfo.id } }, + params: { query: "", appReturn: { appId: window.PalmSystem.identifier ?? appinfo.id } }, }, onSuccess, onFailure, 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 0c9f175b..4287ffec 100644 --- a/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx +++ b/com.twin.app.shoptime/src/views/HomePanel/SubCategory/SubCategory.jsx @@ -57,7 +57,6 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => { const [firstChk, SetFirstChk] = useState(false); const timerRef = useRef(); - const scrollRef = useRef(); const { scrollTopByDistance } = useScrollTopByDistance(); const { cursorVisible } = useSelector((state) => state.common.appStatus); @@ -203,7 +202,6 @@ const SubCategory = ({ order, scrollTopBody, catCd }) => { direction="horizontal" cbScrollTo={getScrollTo} noScrollByWheel - ref={scrollRef} > {categoryItemInfos && categoryItemInfos.map(