@riosst100/pwa-marketplace 3.2.7 → 3.2.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "3.2.7",
+  "version": "3.2.8",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/components/LiveChat/liveChat.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import cn from 'classnames';
-import { ArrowSquareDown } from 'iconsax-react';
+import { Messages3 } from 'iconsax-react';
 import ChatContent from './chatContent';
 import { Send } from 'iconsax-react';
 import Button from '@magento/venia-ui/lib/components/Button';
@@ -71,68 +71,38 @@ const liveChat = (props) => {
     const { open, setOpen, chatData } = props;
     const [{ isSignedIn }] = useUserContext();
 
-    const dataTabs =
-        [
-            {
-                id: isSignedIn ? 'login-chat' : 'guest-chat',
-                title: isSignedIn ? 'Login Chat' : 'Guest Chat',
-                content: <ChatContentComponent chatData={chatData} />
-            },
-            {
-                id: !isSignedIn ? 'login-chat' : 'guest-chat',
-                title: !isSignedIn ? 'Login Chat' : 'Guest Chat',
-                content: isSignedIn ? <ChatContentComponent chatData={chatData} /> : <LoginComponent />
-            }
-        ];
-
     return (
         <>
             <div
                 className={cn(
-                    'bg-white flex flex-col w-full max-w-[380px] h-[520px] fixed right-6 animate-anima-slide-up z-50 shadow-type-1',
-                    open ? 'animate-anima-slide-up bottom-0' : 'animate-anima-slide-down bottom-[-468px]'
+                    'flex flex-col w-full max-w-[150px] fixed z-50',
+                    'bottom-[30px] right-[30px]'
                 )}
             >
-                <div
-                    className='bg-darkblue-900 p-4 rounded-t-md cursor-pointer flex justify-between items-center'
-                    onClick={() => setOpen(!open)}
+                <Link
+                    className='bg-darkblue-900 p-4 px-6 rounded-[40px] cursor-pointer flex justify-between items-center'
+                    to={'/messages'}
                 >
                     <span className='text-white font-medium'>
                         <FormattedMessage
-                            id={'chat.ChatWith'}
+                            id={'chat.messageButton'}
                             defaultMessage={
-                                'Chat with Gundam Info'
+                                'Messages'
                             }
                         />
                     </span>
                     <span>
-                        <ArrowSquareDown
-                            size="14"
+                        <Messages3
+                            size="24"
                             className={
                                 cn(
-                                    'transition-all text-white',
-                                    open ? 'rotate-180' : '',
+                                    'transition-all text-white'
                                 )
                             }
                         />
                     </span>
 
-                </div>
-                <div
-                    className={cn(
-                        'border border-gray-100 p-4 w-full h-full flex flex-col gap-3',
-                        'max-h-[468px]'
-                    )}
-                >
-                    <Tabs
-                        data={dataTabs}
-                        tabContentWrapperClassName='!p-0 h-full'
-                        hasContent
-                        tabWrapperClassName='justify-around'
-                        rootClassName="mb-0"
-                        tabTitleClassName="pt-0 pb-2 text-[12px]"
-                    />
-                </div>
+                </Link>
             </div>
             <style jsx="true">
                 {`

package/src/components/RFQPage/quoteDetail.js

@@ -13,7 +13,7 @@ import LoadingIndicator from '@magento/venia-ui/lib/components/LoadingIndicator'
 
 const quoteDetail = () => {
     const { formatMessage } = useIntl();
-    const { id } = useParams();
+    const { urlKey } = useParams();
     const location = useLocation();
     const locationRfq = location && location.state && location.state.rfq ? location.state.rfq : null;
     const { loadRfqDetail, rfqDetailState, handleSendRfqMessage, startDetailPolling, stopDetailPolling, handleConvertQuickrfqToCart } = useRFQ();
@@ -31,15 +31,20 @@ const quoteDetail = () => {
     // prefer image from info_buy_request if available; otherwise use placeholder
     const urlImage = 'https://pwa-tcgcollective.local:8255/media/catalog/product/s/-/s-l1600_6__1.jpg?auto=webp&format=pjpg&width=495&height=618.75&fit=cover';
 
+    // Ensure we always pass a valid Int quickrfqId: prefer rfq.quickrfq_id, fallback to route param id
+    // Ensure we always pass a valid Int quickrfqId: prefer route param id, fallback to detailData.quickrfq_id
     useEffect(() => {
         if (!locationRfq) {
-            const parsedId = id ? parseInt(id, 10) : NaN;
-            if (!isNaN(parsedId)) {
-                const variables = { quickrfqId: parsedId };
-                loadRfqDetail(variables);
+            const fromParam = urlKey ? parseInt(urlKey, 10) : NaN;
+            const fromData = detailData && detailData.quickrfq_id
+                ? (typeof detailData.quickrfq_id === 'number' ? detailData.quickrfq_id : parseInt(detailData.quickrfq_id, 10))
+                : NaN;
+            const finalId = !isNaN(fromParam) ? fromParam : fromData;
+            if (!isNaN(finalId)) {
+                loadRfqDetail({ quickrfqId: finalId });
             }
         }
-    }, [id, locationRfq, loadRfqDetail]);
+    }, [urlKey, detailData, locationRfq, loadRfqDetail]);
 
     // start polling messages every 5s while on detail page; stop on unmount
     useEffect(() => {
@@ -50,7 +55,9 @@ const quoteDetail = () => {
     }, [startDetailPolling, stopDetailPolling]);
 
     const rfq = locationRfq || detailData || {};
-    const quickrfqIdValue = rfq && rfq.quickrfq_id ? (typeof rfq.quickrfq_id === 'number' ? rfq.quickrfq_id : parseInt(rfq.quickrfq_id, 10)) : (id ? parseInt(id, 10) : null);
+    const quickrfqIdValue = rfq && rfq.quickrfq_id
+        ? (typeof rfq.quickrfq_id === 'number' ? rfq.quickrfq_id : parseInt(rfq.quickrfq_id, 10))
+        : (urlKey ? parseInt(urlKey, 10) : null);
     const [isConverting, setIsConverting] = useState(false);
     const [convertError, setConvertError] = useState(null);
     const [convertSuccess, setConvertSuccess] = useState(null);
@@ -95,7 +102,7 @@ const quoteDetail = () => {
         <div className='relative grid gap-y-md'>
             <StoreTitle>{PAGE_TITLE}</StoreTitle>
             <div aria-live="polite" className="text-xl font-medium text-left">
-                {PAGE_TITLE} - #{id}
+                {PAGE_TITLE} - #{quickrfqIdValue}
             </div>
             <div className='rounded-md border border-gray-100 px-4 py-6 flex flex-col-reverse md_flex-row justify-between gap-x-10'>
                 <div className='flex flex-col gap-y-4 w-full md_w-6/12'>

package/src/overwrites/venia-ui/lib/components/Footer/footer.js

@@ -1,11 +1,11 @@
-import React, { Fragment } from 'react';
+import React, { useState, Fragment } from 'react';
 import { Facebook, Instagram, Twitter, Linkedin } from 'react-feather';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 import { shape, string } from 'prop-types';
 import { useFooter } from '@magento/peregrine/lib/talons/Footer/useFooter';
 import { useLocation } from 'react-router-dom';
-
+import LiveChat from '@riosst100/pwa-marketplace/src/components/LiveChat';
 import Logo from '@magento/venia-ui/lib/components/Logo';
 import Newsletter from '@magento/venia-ui/lib/components/Newsletter';
 import { useStyle } from '@magento/venia-ui/lib/classify';
@@ -14,12 +14,17 @@ import { DEFAULT_LINKS, LOREM_IPSUM } from './sampleData';
 import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
 import cn from 'classnames';
 import Divider from '@riosst100/pwa-marketplace/src/components/Divider';
-
+import Button from '@magento/venia-ui/lib/components/Button';
 const Footer = props => {
     const { links } = props;
     const classes = useStyle(defaultClasses, props.classes);
     const talonProps = useFooter();
 
+    const [openChat, setOpenChat] = useState(false);
+    const toggleChat = () => {
+        setOpenChat(!openChat);
+    }
+
     const location = useLocation();
     const isCheckoutPage = location.pathname === '/checkout';
 
@@ -86,6 +91,10 @@ const Footer = props => {
                 }
             }
         >
+            <LiveChat
+                open={openChat}
+                setOpen={setOpenChat}
+            />
             {!isCheckoutPage && <div className={classes.links} style={{"display":"flex"}}>
                 {linkGroups}
                 {/* <div>

package/src/talons/SellerMegaMenu/useSellerMegaMenu.js

@@ -208,9 +208,6 @@ export const useSellerMegaMenu = (props = {}) => {
             megaMenuData
         );
 
-        console.log('megaMenuData',megaMenuData)
-        console.log('activeCategory',activeCategory)
-
         if (activeCategory) {
             setActiveCategoryId(activeCategory.path[0]);
             setActiveCategory(activeCategory);
@@ -223,8 +220,6 @@ export const useSellerMegaMenu = (props = {}) => {
     useEffect(() => {
         const { search, pathname } = location;
 
-        console.log('category555',category)
-
         if (!hasCategoryPath(pathname) && category && category.url_path) {
             const url_path = category.url_path;
             const categoryUrlPath = `/${url_path}${categoryUrlSuffix || ''}`;
@@ -244,17 +239,11 @@ export const useSellerMegaMenu = (props = {}) => {
         if (activeCategory && activeCategory.default_top_filter) {
             const defaultTopFilter = activeCategory.default_top_filter;
 
-            console.log('activeCategory',activeCategory)
-            console.log('2defaultTopFilte344444',defaultTopFilter)
-            console.log('search',search)
-
             const attrCode = defaultTopFilter.attribute_code;
             const label = defaultTopFilter.label;
             const value = defaultTopFilter.value;
 
             if (!search.includes(attrCode)) {
-                console.log('setDefaultSubcategoryAndTopFilter',attrCode)
-
                 setDefaultSubcategoryAndTopFilter(
                     label + ',' + value, 
                     attrCode + '[filter]',