[251123] Merge: develop_si base로 develop을 merge함

com.twin.app.shoptime/src/utils/Config.js

@@ -79,7 +79,7 @@ export const ACTIVE_POPUP = {
   exitPopup: 'exitPopup',
   favoritePopup: 'favoritePopup',
   loginPopup: 'loginPopup',
-  logoutPopup: 'logoutPopup', 
+  logoutPopup: 'logoutPopup',
   noShowPopup: 'noShowPopup',
   optionPopup: 'optionPopup',
   qrPopup: 'qrPopup',
@@ -113,7 +113,7 @@ export const ACTIVE_POPUP = {
   toast: 'toast',
   optionalConfirm: 'optionalConfirm',
   energyPopup: 'energyPopup',
-  addCartPopup: 'addCartPopup',  
+  addCartPopup: 'addCartPopup',
 };
 export const DEBUG_VIDEO_SUBTITLE_TEST = false;
 export const AUTO_SCROLL_DELAY = 600;
@@ -587,6 +587,7 @@ export const ERROR_MESSAGES_GROUPS = [
 ];
 
 export const LOG_CONTEXT_NAME = {
+// <<<<<<< HEAD
   SHOPTIME: 'shoptime',
   HOME: 'shoptime.home',
   CHECKOUT: 'shoptime.checkout',
@@ -608,6 +609,29 @@ export const LOG_CONTEXT_NAME = {
   ENTRY: 'shoptime.entry',
   MYORDER: 'shoptime.myorder',
   DETAILPAGE: 'shoptime.detailpage',
+// =======
+//   SHOPTIME: "shoptime",
+//   HOME: "shoptime.home",
+//   CHECKOUT: "shoptime.checkout",
+//   PINCODE: "shoptime.pincode",
+//   YOUMAYLIKE: "shoptime.youmayalsolike",
+//   SHOW: "shoptime.show",
+//   SHOPBYMOBILE: "shoptime.shopbymobile",
+//   GNB: "shoptime.gnb",
+//   REMINDERS: "shoptime.reminders",
+//   MYPAGE: "shoptime.mypage",
+//   FEATURED_BRANDS: "shoptime.featuredpartner",
+//   MYINFO: "shoptime.myinfo",
+//   ON_SALE: "shoptime.onsale",
+//   TRENDING_NOW: "shoptime.trendingnow",
+//   HOT_PICKS: "shoptime.hotpicks",
+//   SEARCH: "shoptime.search",
+//   THEME_CURATION: "shoptime.themecuration",
+//   CATEGORY: "shoptime.category",
+//   ENTRY: "shoptime.entry",
+//   MYORDER: "shoptime.myorder",
+//   DETAILPAGE: "shoptime.detailpage",
+// >>>>>>> gitlab/develop
 };
 
 export const LOG_MESSAGE_ID = {