From 852b8880d84bee14d7f5e50eb5b1d11c2d2ec4d6 Mon Sep 17 00:00:00 2001
From: Carl <carl.liu@bundleb2b.net>
Date: Mon, 12 Jun 2023 09:09:45 +0800
Subject: [PATCH] fix: bc user quote does not distinguish between channels

---
 apps/storefront/src/components/layout/B3Logo.tsx        | 2 +-
 apps/storefront/src/pages/quote/QuotesList.tsx          | 3 ++-
 apps/storefront/src/shared/service/b2b/graphql/quote.ts | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/storefront/src/components/layout/B3Logo.tsx b/apps/storefront/src/components/layout/B3Logo.tsx
index 70656f65..f6c1c645 100644
--- a/apps/storefront/src/components/layout/B3Logo.tsx
+++ b/apps/storefront/src/components/layout/B3Logo.tsx
@@ -33,7 +33,7 @@ export default function B3Logo() {
     <Box
       sx={{
         flexShrink: '0',
-        height: `${isMobile ? '15vw' : '70px'}`,
+        height: 'auto',
         width: `${isMobile ? '45%' : '100%'}`,
         '& img': {
           width: '100%',
diff --git a/apps/storefront/src/pages/quote/QuotesList.tsx b/apps/storefront/src/pages/quote/QuotesList.tsx
index f5d9311f..7261b796 100644
--- a/apps/storefront/src/pages/quote/QuotesList.tsx
+++ b/apps/storefront/src/pages/quote/QuotesList.tsx
@@ -187,6 +187,7 @@ function QuotesList() {
       companyInfo: { id: companyB2BId },
       salesRepCompanyId,
       openAPPParams,
+      currentChannelId,
     },
     dispatch,
   } = useContext(GlobaledContext)
@@ -230,7 +231,7 @@ function QuotesList() {
     const key = isB2BUser ? 'quotes' : 'customerQuotes'
     const {
       [key]: { edges = [], totalCount },
-    } = await fn(params)
+    } = await fn({ ...params, currentChannelId })
 
     const quoteDraftAllList = B3LStorage.get('b2bQuoteDraftList') || []
     if (params.offset === 0 && quoteDraftAllList.length) {
diff --git a/apps/storefront/src/shared/service/b2b/graphql/quote.ts b/apps/storefront/src/shared/service/b2b/graphql/quote.ts
index 88cb7bcc..07464e0f 100644
--- a/apps/storefront/src/shared/service/b2b/graphql/quote.ts
+++ b/apps/storefront/src/shared/service/b2b/graphql/quote.ts
@@ -25,6 +25,7 @@ const getQuotesList = (data: CustomFieldItems, type: string) => `{
         ? `dateCreatedEndAt: "${data.dateCreatedEndAt}"`
         : ''
     }
+    ${type === 'bc' ? `channelId: ${data?.currentChannelId || 1}` : ''}
   ) {
     totalCount,
     edges {