From 75e00c4485d943c3586685aa2b1ecc3723951759 Mon Sep 17 00:00:00 2001 From: yonghyon Date: Wed, 24 Jan 2024 13:29:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/features/panels/panelsSlice.js | 2 +- .../src/views/IntroPanel/IntroPanel.jsx | 1 - .../src/views/MainView/MainView.jsx | 26 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/com.twin.app.shoptime/src/features/panels/panelsSlice.js b/com.twin.app.shoptime/src/features/panels/panelsSlice.js index 4a9f6945..41e57e85 100644 --- a/com.twin.app.shoptime/src/features/panels/panelsSlice.js +++ b/com.twin.app.shoptime/src/features/panels/panelsSlice.js @@ -6,7 +6,7 @@ const initialState = { isModalOpen: false, }; -const forceTopPanels = [panel_names.ERROR_PANEL, panel_names.DEBUG_PANEL]; +const forceTopPanels = [panel_names.ERROR_PANEL, panel_names.DEBUG_PANEL, panel_names.INTRO_PANEL]; export const panels = createSlice({ name: "panels", diff --git a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx index 55d3fe34..5bc5c878 100644 --- a/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx +++ b/com.twin.app.shoptime/src/views/IntroPanel/IntroPanel.jsx @@ -44,7 +44,6 @@ export default function IntroPanel({ children, ...rest }) { const handleAgree = () => { dispatch(popPanel(Config.panel_names.INTRO_PANEL)); - dispatch(addPanels({ name: Config.panel_names.HOME_PANEL, panelInfo: {} })); }; const handleDisagree = () => { diff --git a/com.twin.app.shoptime/src/views/MainView/MainView.jsx b/com.twin.app.shoptime/src/views/MainView/MainView.jsx index 4149cbf4..c107bde8 100644 --- a/com.twin.app.shoptime/src/views/MainView/MainView.jsx +++ b/com.twin.app.shoptime/src/views/MainView/MainView.jsx @@ -92,9 +92,7 @@ export default function MainView() { useEffect(() => { if (!showLoadingPanel.show) { if (isTermAgreed) { - dispatch( - addPanels({ name: Config.panel_names.HOME_PANEL, panelInfo: {} }) - ); + } else { dispatch( addPanels({ name: Config.panel_names.INTRO_PANEL, panelInfo: {} }) @@ -113,15 +111,19 @@ export default function MainView() { preloadImages={preloadImages} onLoadComplete={onPreImageLoadComplete} /> -
- {renderTopPanel()} - {!isIntroPanel && } -
+ {isOnTop ? + + : +
+ {renderTopPanel()} +
+ } + );