From 88c03c8810f56ba1a660c1c40e8e7ab8b2866298 Mon Sep 17 00:00:00 2001
From: "Brian.Jiang2021" <brian.jiang@bundleb2b.net>
Date: Wed, 6 Sep 2023 11:24:36 +0800
Subject: [PATCH] fix: theme compatible

---
 apps/storefront/src/utils/b3AccountItem.ts | 8 ++++----
 packages/global-b3/index.ts                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/storefront/src/utils/b3AccountItem.ts b/apps/storefront/src/utils/b3AccountItem.ts
index 32ee6cec..a31c501d 100644
--- a/apps/storefront/src/utils/b3AccountItem.ts
+++ b/apps/storefront/src/utils/b3AccountItem.ts
@@ -52,7 +52,7 @@ const redirectBcMenus = (
   // superAdmin exits's url
   const superAdminExistUrl = ['/accountSettings']
   const currentItem: CustomFieldItems =
-    accountTarget.find((item) => key.includes(item.originUrl)) || {}
+    accountTarget.find((item) => key?.includes(item.originUrl)) || {}
 
   // super admin
   if (currentItem?.newTargetUrl && +role === 3) {
@@ -70,7 +70,7 @@ const redirectBcMenus = (
 
 const getCurrentLoginUrl = (href: string): string => {
   // quit login
-  if (href.includes('logout')) {
+  if (href?.includes('logout')) {
     return '/login?loginFlag=3'
   }
 
@@ -87,11 +87,11 @@ const openPageByClick = ({
   isRegisterAndLogin,
   isAgenting,
 }: OpenPageByClickProps) => {
-  if (href.includes('/orders')) {
+  if (href?.includes('/orders')) {
     return role !== 100 ? '/orders' : '/login'
   }
   // register and login click
-  if (href.includes('/login') || isRegisterAndLogin || role === 100) {
+  if (href?.includes('/login') || isRegisterAndLogin || role === 100) {
     return getCurrentLoginUrl(href)
   }
 
diff --git a/packages/global-b3/index.ts b/packages/global-b3/index.ts
index 93885b9a..9feb83cd 100644
--- a/packages/global-b3/index.ts
+++ b/packages/global-b3/index.ts
@@ -32,7 +32,7 @@ const themeOtherElementConfig = () => {
       '[href="/account.php"] svg, [href="/account.php"] svg use, [href="/account.php"] span, [href="/account.php"], [href="/login.php"] span, [href="/login.php"] svg use, [href="/login.php"] svg, [href="/login.php"]',
     SuperMarket: '[href="/login.php"] span, [href="/account.php"] span',
     LifeStyle:
-      '.navUser-item--account a svg, .navUser-item--account a, .navUser-item .needsclick, .navUser-item .needsclick svg, .navUser-item .needsclick span, .navUser-item a, .navUser-item a svg, .navUser-item a svg use, .navUser-item a span',
+      '.navUser-item--account a, .navUser-item--account a svg, .navUser-section-sub .navUser-item .needsclick, .navUser-section-sub .navUser-item .needsclick svg, .navUser-section-sub .navUser-item .needsclick span, .navUser-section-sub .navUser-item a, .navUser-section-sub .navUser-item a svg, .navUser-section-sub .navUser-item a svg use, .navUser-section-sub .navUser-item a span',
   }
 
   if (window?.B3CustomConfig) {