From 13c7f4bd05285d28c8b4033e3cd5f98d17e60b27 Mon Sep 17 00:00:00 2001 From: dongyoungKo Date: Fri, 28 Feb 2025 16:37:15 +0900 Subject: [PATCH] =?UTF-8?q?[SHOPTIME-5110]=20=EB=AF=B8=EA=B5=AD=20/=20webO?= =?UTF-8?q?S24=20/=20=EC=95=B1=20=EC=B2=AB=20=EC=A7=84=EC=9E=85=20?= =?UTF-8?q?=EC=8B=9C=20508=20error=20shcnf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [수정사항] deviceId가 없는 경우 API 호출을 하지 않음 --- com.twin.app.shoptime/src/App/App.js | 75 +++++++++++++++++----------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/com.twin.app.shoptime/src/App/App.js b/com.twin.app.shoptime/src/App/App.js index 285ae3ad..f392a276 100644 --- a/com.twin.app.shoptime/src/App/App.js +++ b/com.twin.app.shoptime/src/App/App.js @@ -4,17 +4,20 @@ import React, { useMemo, useRef, useState, -} from "react"; +} from 'react'; -import { useDispatch, useSelector } from "react-redux"; +import { + useDispatch, + useSelector, +} from 'react-redux'; -import platform from "@enact/core/platform"; -import { Job } from "@enact/core/util"; -import ThemeDecorator from "@enact/sandstone/ThemeDecorator"; -import Spotlight from "@enact/spotlight"; +import platform from '@enact/core/platform'; +import { Job } from '@enact/core/util'; +import ThemeDecorator from '@enact/sandstone/ThemeDecorator'; +import Spotlight from '@enact/spotlight'; -import appinfo from "../../webos-meta/appinfo.json"; -import { types } from "../actions/actionTypes"; +import appinfo from '../../webos-meta/appinfo.json'; +import { types } from '../actions/actionTypes'; import { changeAppStatus, checkFirstLaunch, @@ -27,30 +30,41 @@ import { setDeepLink, setGNBMenu, setSecondLayerInfo, -} from "../actions/commonActions"; -import { getShoptimeTerms } from "../actions/empActions"; -import { getHomeMenu, getHomeTerms } from "../actions/homeActions"; +} from '../actions/commonActions'; +import { getShoptimeTerms } from '../actions/empActions'; +import { + getHomeMenu, + getHomeTerms, +} from '../actions/homeActions'; import { getMyRecommandedKeyword, getMyUpcomingAlertShow, setMyTermsWithdraw, -} from "../actions/myPageActions"; -import { pushPanel } from "../actions/panelActions"; -import { countryCode, ricCode } from "../api/apiConfig"; -import NotSupportedVersion from "../components/NotSupportedVersion/NotSupportedVersion"; -import TPopUp from "../components/TPopUp/TPopUp"; -import usePrevious from "../hooks/usePrevious"; -import { checkValidCountry } from "../lunaSend/common"; -import { lunaTest } from "../lunaSend/lunaTest"; -import { store } from "../store/store"; -import * as Config from "../utils/Config"; -import { $L, clearLaunchParams, getLaunchParams } from "../utils/helperMethods"; -import { SpotlightIds } from "../utils/SpotlightIds"; -import ErrorBoundary from "../views/ErrorBoundary"; -import MainView from "../views/MainView/MainView"; -import css from "./App.module.less"; -import { handleBypassLink } from "./bypassLinkHandler"; -import { handleDeepLink } from "./deepLinkHandler"; +} from '../actions/myPageActions'; +import { pushPanel } from '../actions/panelActions'; +import { + countryCode, + ricCode, +} from '../api/apiConfig'; +import NotSupportedVersion + from '../components/NotSupportedVersion/NotSupportedVersion'; +import TPopUp from '../components/TPopUp/TPopUp'; +import usePrevious from '../hooks/usePrevious'; +import { checkValidCountry } from '../lunaSend/common'; +import { lunaTest } from '../lunaSend/lunaTest'; +import { store } from '../store/store'; +import * as Config from '../utils/Config'; +import { + $L, + clearLaunchParams, + getLaunchParams, +} from '../utils/helperMethods'; +import { SpotlightIds } from '../utils/SpotlightIds'; +import ErrorBoundary from '../views/ErrorBoundary'; +import MainView from '../views/MainView/MainView'; +import css from './App.module.less'; +import { handleBypassLink } from './bypassLinkHandler'; +import { handleDeepLink } from './deepLinkHandler'; let foreGroundChangeTimer = null; @@ -331,11 +345,12 @@ function AppBase(props) { webOSVersion && Number(webOSVersion) >= 6 && deviceCountryCode && - deviceCountryCode === "US" + deviceCountryCode === "US" && + deviceId ) { dispatch(getShoptimeTerms()); } - }, [webOSVersion]); + }, [webOSVersion, deviceId]); useEffect(() => { console.log("App.js introTermsAgree", introTermsAgree);