ordering-ui-react-native 0.16.15 → 0.16.16-release

package/themes/business/src/components/OrdersOption/index.tsx

@@ -5,8 +5,10 @@ import SelectDropdown from 'react-native-select-dropdown'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import FeatherIcon from 'react-native-vector-icons/Feather';
 import FontistoIcon from 'react-native-vector-icons/Fontisto'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 import { useTheme } from 'styled-components/native';
 import { DeviceOrientationMethods } from '../../../../../src/hooks/DeviceOrientation'
+import { NotificationSetting } from '../../../../../src/components/NotificationSetting'
 import { NewOrderNotification } from '../NewOrderNotification';
 
 import { OText, OButton, OModal, OIconButton, OInput, OIcon } from '../shared';
@@ -32,7 +34,8 @@ import {
   ItemContent,
   TimerInputWrapper,
   OverLine,
-  Actions
+  Actions,
+  InputContainer
 } from './styles';
 import { PreviousOrders } from '../PreviousOrders';
 import { OrdersOptionParams } from '../../types';
@@ -47,7 +50,7 @@ import { OrdersOptionDelivery } from '../OrdersOptionDelivery';
 import { OrdersOptionPaymethod } from '../OrdersOptionPaymethod';
 import { OrdersOptionDriver } from '../OrdersOptionDriver';
 import { OrdersOptionDate } from '../OrdersOptionDate';
-
+import { GestureEvent, GestureDetector } from 'react-native-gesture-handler'
 const tabsList: any = {
   pending: 1,
   inProgress: 2,
@@ -88,7 +91,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     handleClickLogisticOrder,
     logisticOrders,
     loadLogisticOrders,
-    isLogisticActivated
+    isLogisticActivated,
+    isAlsea
   } = props;
 
   const defaultSearchList = {
@@ -121,7 +125,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
   const [selectedTabStatus, setSelectedTabStatus] = useState([])
   const [hour, setHour] = useState(0)
   const [minute, setMinute] = useState(0)
-
+  const [openedSelect, setOpenedSelect] = useState('')
   const WIDTH_SCREEN = orientationState?.dimensions?.width
   const HEIGHT_SCREEN = orientationState?.dimensions?.height
   const IS_PORTRAIT = orientationState.orientation === PORTRAIT
@@ -401,19 +405,21 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     setOpenSLASettingModal(false)
   }
 
-  useEffect(() => {
-    setCurrentFilters(null)
-    onFiltered && onFiltered(null)
+  const handleClearFilters = () => {
     setSearch(defaultSearchList)
+  }
+
+  useEffect(() => {
     scrollRefTab.current?.scrollTo({ animated: true });
     scrollListRef.current?.scrollTo({ animated: true });
     scrollRef.current?.scrollTo({ y: 0, animated: true });
+    setTags({ values: [] })
   }, [currentTabSelected])
 
   useEffect(() => {
     setSelectedTabStatus(deliveryStatus)
   }, [])
-
+  
   return (
     // <GestureRecognizer
     //   onSwipeLeft={onSwipeLeft}
@@ -545,7 +551,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
         </ScrollView>
       </FiltersTab>
       <View style={{ flex: 1, minHeight: HEIGHT_SCREEN - 450 }}>
-        {currentTabSelected !== 'logisticOrders' && (
+        {currentTabSelected !== 'logisticOrders' && !isAlsea && (
           <View
             style={{
               display: 'flex',
@@ -725,11 +731,11 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
         </ScrollView>
       </View>
       {/* </GestureRecognizer> */}
-                
+
       {isBusinessApp && (
         <NewOrderNotification isBusinessApp={isBusinessApp} />
       )}
-      
+
       {(openSearchModal || openSLASettingModal) && (
         <OModal open={openSearchModal || openSLASettingModal} entireModal customClose>
           <ModalContainer
@@ -752,22 +758,34 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             {openSearchModal && (
               <SearchModalContent>
                 <ModalTitle>{t('SEARCH_ORDERS', 'Search orders')}</ModalTitle>
-                <OInput
-                  value={search.id}
-                  onChange={(value: any) => setSearch({ ...search, id: value })}
-                  style={styles.inputStyle}
-                  placeholder={t('ORDER_NUMBER', 'Order number')}
-                  autoCorrect={false}
-                />
+                <InputContainer>
+                  <OInput
+                    value={search.id}
+                    onChange={(value: any) => setSearch({ ...search, id: value })}
+                    style={styles.inputStyle}
+                    placeholder={t('ORDER_NUMBER', 'Order number')}
+                    autoCorrect={false}
+                  />
+                  <AntDesignIcon
+                    name='close'
+                    size={20}
+                    style={{ position: 'absolute', right: 12, top: 13 }}
+                    onPress={() => setSearch({ ...search, id: '' })}
+                  />
+                </InputContainer>
                 <OrdersOptionDate
                   {...props}
                   search={search}
                   onSearch={setSearch}
+                  setOpenedSelect={setOpenedSelect}
+                  openedSelect={openedSelect}
                 />
                 <OrdersOptionCity
                   {...props}
                   search={search}
                   onSearch={setSearch}
+                  setOpenedSelect={setOpenedSelect}
+                  openedSelect={openedSelect}
                 />
                 {isBusinessApp && (
                   <>
@@ -775,21 +793,29 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
                       {...props}
                       search={search}
                       onSearch={setSearch}
+                      setOpenedSelect={setOpenedSelect}
+                      openedSelect={openedSelect}
                     />
                     <OrdersOptionDelivery
                       {...props}
                       search={search}
                       onSearch={setSearch}
+                      setOpenedSelect={setOpenedSelect}
+                      openedSelect={openedSelect}
                     />
                     <OrdersOptionDriver
                       {...props}
                       search={search}
                       onSearch={setSearch}
+                      setOpenedSelect={setOpenedSelect}
+                      openedSelect={openedSelect}
                     />
                     <OrdersOptionPaymethod
                       {...props}
                       search={search}
                       onSearch={setSearch}
+                      setOpenedSelect={setOpenedSelect}
+                      openedSelect={openedSelect}
                     />
                   </>
                 )}
@@ -799,13 +825,24 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
                   imgRightSrc={null}
                   style={{
                     borderRadius: 7.6,
-                    marginBottom: 70,
+                    marginBottom: 10,
                     marginTop: 60,
                     zIndex: 12
                   }}
                   onClick={applyFilters}
                 />
-
+                <OButton
+                  text={t('CLEAR_SEARCh', 'Clear search')}
+                  imgRightSrc={null}
+                  bgColor='#fff'
+                  style={{
+                    borderRadius: 7.6,
+                    marginBottom: 0,
+                    marginTop: 0,
+                    zIndex: 12
+                  }}
+                  onClick={handleClearFilters}
+                />
               </SearchModalContent>
             )}
             {openSLASettingModal && (
@@ -934,6 +971,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
   const [, t] = useLanguage();
   const [configState] = useConfig()
   const theme = useTheme()
+  const [checkNotificationStatus, setCheckNotificationStatus] = useState({ open: false, checked: false })
   const ordersProps = {
     ...props,
     UIComponent: OrdersOptionUI,
@@ -1048,5 +1086,11 @@ export const OrdersOption = (props: OrdersOptionParams) => {
     ]
   };
 
-  return <OrderListGroups {...ordersProps} />;
+  return (<>
+    <OrderListGroups {...ordersProps} />
+    {props?.checkNotification && (
+      <NotificationSetting checkNotificationStatus={checkNotificationStatus}
+        setCheckNotificationStatus={setCheckNotificationStatus} />
+    )}
+  </>);
 };

package/themes/business/src/components/OrdersOption/styles.tsx

@@ -149,4 +149,8 @@ export const OverLine = styled.View`
 `
 export const Actions = styled.View`
 
-`
+`
+
+export const InputContainer = styled.View`
+  position: relative;
+`

package/themes/business/src/components/OrdersOptionBusiness/index.tsx

@@ -10,7 +10,9 @@ export const OrdersOptionBusinessUI = (props: any) => {
   const {
     search,
     onSearch,
-    businessesList
+    businessesList,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -25,6 +27,14 @@ export const OrdersOptionBusinessUI = (props: any) => {
     setOptionsList(businesses)
   }, [businessesList?.businesses])
 
+  const handleClear = () => {
+    onSearch({ ...search, business: '' })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('business')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -36,6 +46,10 @@ export const OrdersOptionBusinessUI = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_BUSINESS', 'Select Business')}
         dropViewMaxHeight={200}
+        handleClear={handleClear}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='business'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionCity/index.tsx

@@ -10,7 +10,9 @@ export const OrdersOptionCityUI = (props: any) => {
   const {
     search,
     onSearch,
-    allListValues
+    allListValues,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -27,6 +29,14 @@ export const OrdersOptionCityUI = (props: any) => {
     setOptionsList(cities)
   }, [allListValues?.countries])
 
+  const handleClear = () => {
+    onSearch({ ...search, city: '' })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('city')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -38,6 +48,10 @@ export const OrdersOptionCityUI = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_CITY', 'Select City')}
         dropViewMaxHeight={200}
+        handleClear={handleClear}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='city'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionDate/index.tsx

@@ -3,12 +3,16 @@ import { useLanguage } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { Container } from './styles';
 import ODropDownCalendar from '../shared/ODropDownCalendar';
-import { Platform } from 'react-native'
-
+import { Button, Platform, Touchable, TouchableOpacity, View } from 'react-native'
+import DoubleClick from 'react-native-double-tap'
+import { OText } from '../shared';
+import DoubleTap from 'react-native-double-tap';
 export const OrdersOptionDate = (props: any) => {
   const {
     search,
-    onSearch
+    onSearch,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -22,18 +26,23 @@ export const OrdersOptionDate = (props: any) => {
 
   const handleChangeOption = (option: any) => {
     if (option === 'calendar') {
-      onSearch({...search, date: {...search.date, type: option}})
+      onSearch({ ...search, date: { ...search.date, type: option } })
     } else {
-      onSearch({...search, date: {from: '', to: '', type: option}})
+      onSearch({ ...search, date: { from: '', to: '', type: option } })
     }
   }
 
   const handleChangeDate = (from: any, to: any) => {
-    onSearch({...search, date: {...search.date, from: from, to: to}})
+    onSearch({ ...search, date: { ...search.date, from: from, to: to } })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('calendar')
   }
 
   return (
     <Container isIos={Platform.OS === 'ios'}>
+
       <ODropDownCalendar
         options={optionsList}
         defaultValue={search.date.type}
@@ -47,6 +56,10 @@ export const OrdersOptionDate = (props: any) => {
         rangeDate={search.date}
         handleChangeDate={handleChangeDate}
         isCalendarAlwaysVisible
+        handleClear={() => onSearch({ ...search, date: { from: '', to: '', type: '' } })}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='calendar'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionDelivery/index.tsx

@@ -8,7 +8,9 @@ import { Platform } from 'react-native'
 export const OrdersOptionDelivery = (props: any) => {
   const {
     search,
-    onSearch
+    onSearch,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -18,6 +20,14 @@ export const OrdersOptionDelivery = (props: any) => {
     { value: '2', content: t('PICKUP', 'Pickup') }
   ]
 
+  const handleClear = () => {
+    onSearch({ ...search, delivery_type: '' })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('delivery_type')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -29,6 +39,10 @@ export const OrdersOptionDelivery = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_DELIVERY_TYPE', 'Select Delivery type')}
         dropViewMaxHeight={200}
+        handleClear={handleClear}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='delivery_type'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionDriver/index.tsx

@@ -9,7 +9,9 @@ export const OrdersOptionDriverUI = (props: any) => {
   const {
     search,
     onSearch,
-    driverList
+    driverList,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -24,6 +26,14 @@ export const OrdersOptionDriverUI = (props: any) => {
     setOptionsList(drivers)
   }, [driverList?.drivers])
 
+  const handleClear = () => {
+    onSearch({ ...search, driver: '' })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('driver')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -35,6 +45,10 @@ export const OrdersOptionDriverUI = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_DRIVER', 'Select Driver')}
         dropViewMaxHeight={165}
+        handleClear={handleClear}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='driver'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionPaymethod/index.tsx

@@ -9,7 +9,9 @@ export const OrdersOptionPaymethodUI = (props: any) => {
   const {
     search,
     onSearch,
-    paymethodList
+    paymethodList,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -24,6 +26,14 @@ export const OrdersOptionPaymethodUI = (props: any) => {
     setOptionsList(paymethods)
   }, [paymethodList?.paymethods])
 
+  const handleClear = () => {
+    onSearch({ ...search, paymethod: '' })
+  }
+
+  const handleOpenSelect = () => {
+    setOpenedSelect('paymethod')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -35,6 +45,10 @@ export const OrdersOptionPaymethodUI = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_PAYMETHOD', 'Select Paymethod')}
         dropViewMaxHeight={200}
+        handleClear={handleClear}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='paymethod'
       />
     </Container>
   );

package/themes/business/src/components/OrdersOptionStatus/index.tsx

@@ -11,7 +11,9 @@ export const OrdersOptionStatus = (props: any) => {
     tabs,
     orderStatus,
     search,
-    onSearch
+    onSearch,
+    setOpenedSelect,
+    openedSelect
   } = props
 
   const theme = useTheme();
@@ -29,6 +31,10 @@ export const OrdersOptionStatus = (props: any) => {
     setOptionsList(_optionList)
   }, [currentTabSelected, tabs, orderStatus])
 
+  const handleOpenSelect = () => {
+    setOpenedSelect('state')
+  }
+
   return (
     <Container isIos={Platform.OS === 'ios'}>
       <ODropDown
@@ -40,6 +46,9 @@ export const OrdersOptionStatus = (props: any) => {
         textcolor={theme.colors.unselectText}
         placeholder={t('SELECT_STATUS', 'Select Status')}
         dropViewMaxHeight={200}
+        handleOpenSelect={handleOpenSelect}
+        openedSelect={openedSelect}
+        selectType='state'
       />
     </Container>
   );

package/themes/business/src/components/PreviousMessages/index.tsx

@@ -176,17 +176,17 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
         slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
         percentage: 95,
       },
-      { 
-        key: 22, 
-        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'), 
-        slug: 'ORDER_LOOKING_FOR_DRIVER', 
+      {
+        key: 22,
+        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
+        slug: 'ORDER_LOOKING_FOR_DRIVER',
         percentage: 35
       },
-      { 
-        key: 23, 
-        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'), 
-        slug: 'ORDER_DRIVER_ON_WAY', 
-        percentage: 45 
+      {
+        key: 23,
+        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
+        slug: 'ORDER_DRIVER_ON_WAY',
+        percentage: 45
       }
     ];
 
@@ -230,6 +230,7 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
       fontWeight: '600',
       fontSize: 16,
       color: theme.colors.textGray,
+      width: '85%'
     },
     badge: {
       marginBottom: 6,
@@ -265,15 +266,13 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
             style={styles.cardButton}
             activeOpacity={1}>
             <Card key={order?.id}>
-              {!!order?.business?.logo && (
-                <Logo style={styles.logo}>
-                  <OIcon
-                    url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
-                    style={styles.icon}
-                  />
-                </Logo>
-              )}
-
+              <Logo style={styles.logo}>
+                <OIcon
+                  url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
+                  src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                  style={styles.icon}
+                />
+              </Logo>
               <Information>
                 <Header>
                   <OText numberOfLines={1} style={styles.title}>

package/themes/business/src/components/PreviousOrders/index.tsx

@@ -31,8 +31,8 @@ export const PreviousOrders = (props: any) => {
   const theme = useTheme();
   const [, setCurrentTime] = useState()
   const [allowColumns, setAllowColumns] = useState({
-    timer: true,
-    slaBar: true,
+    timer: configState?.configs?.order_deadlines_enabled?.value === '1',
+    slaBar: configState?.configs?.order_deadlines_enabled?.value === '1',
   })
 
   const [orientationState] = useDeviceOrientation();
@@ -104,8 +104,8 @@ export const PreviousOrders = (props: any) => {
     const offset = 300
     const cdtToutc = moment(order?.delivery_datetime).add(offset, 'minutes').format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
-      ? parseDate(order?.delivery_datetime_utc)
-      : parseDate(cdtToutc)
+      ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
+      : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
     const _eta = order?.eta_time
     const diffTimeAsSeconds = moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'seconds')
     return Math.ceil(diffTimeAsSeconds / 60)
@@ -178,33 +178,31 @@ export const PreviousOrders = (props: any) => {
                   activeOpacity={1}
                 >
                   <Card key={order.id}>
-                  {allowColumns?.slaBar && (
-                    <Timestatus style={{ backgroundColor: getStatusClassName(getDelayMinutes(order)) === 'in_time' ? '#00D27A' : getStatusClassName(getDelayMinutes(order)) === 'at_risk' ? '#FFC700' : getStatusClassName(getDelayMinutes(order)) === 'delayed' ? '#E63757' : '' }} />
-                  )}
-                    {
-                      order.business?.logo && (
-                        <Logo style={styles.logo}>
-                          <OIcon
-                            url={optimizeImage(
-                              order.business?.logo,
-                              'h_300,c_limit',
-                            )}
-                            style={styles.icon}
-                          />
-                        </Logo>
-                      )}
+                    {allowColumns?.slaBar && (
+                      <Timestatus style={{ backgroundColor: getStatusClassName(getDelayMinutes(order)) === 'in_time' ? '#00D27A' : getStatusClassName(getDelayMinutes(order)) === 'at_risk' ? '#FFC700' : getStatusClassName(getDelayMinutes(order)) === 'delayed' ? '#E63757' : '' }} />
+                    )}
+                    <Logo style={styles.logo}>
+                      <OIcon
+                        url={optimizeImage(
+                          order.business?.logo,
+                          'h_300,c_limit',
+                        )}
+                        src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                        style={styles.icon}
+                      />
+                    </Logo>
                     <Information>
-                      {order?.order_group_id && (
+                      {!!order?.order_group_id && (
                         <OText>
                           <OText>{(t('INVOICE_GROUP_NO', 'Group No.') + order?.order_group_id)}</OText>
                         </OText>
                       )}
-                      {order.business?.name && (
+                      {!!order.business?.name && (
                         <OText numberOfLines={1} style={styles.title}>
                           {order.business?.name}
                         </OText>
                       )}
-                      {order?.showNotification && (
+                      {!!order?.showNotification && (
                         <NotificationIcon>
                           <EntypoIcon
                             name="dot-single"
@@ -258,7 +256,7 @@ export const PreviousOrders = (props: any) => {
                 </TouchableOpacity>
                 {isLogisticOrder && (
                   <AcceptOrRejectOrder>
-                    {order?.order_group_id && order?.order_group ? (
+                    {!!order?.order_group_id && !!order?.order_group ? (
                       <OButton
                         text={t('VIEW_ORDER', 'View order')}
                         onClick={() => handlePressOrder({ ...order, logistic_order_id: _order?.id })}

package/themes/business/src/components/ProductItemAccordion/index.tsx

@@ -28,6 +28,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
     getProductMax,
     onDeleteProduct,
     onEditProduct,
+    currency
   } = props;
 
   const [, t] = useLanguage();
@@ -147,13 +148,13 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
               }}>
               <View style={{ flexDirection: 'row' }}>
                 <OText size={12} color={theme.colors.textGray}>
-                  {parsePrice(getProductPrice(product))}
+                  {parsePrice(getProductPrice(product), { currency })}
                 </OText>
 
                 {(
                   productInfo?.()?.ingredients?.length > 0 ||
                   productInfo?.()?.options?.length > 0 ||
-                  product.comment
+                  !!product.comment
                 ) && !isClickableEvent && (
                     <MaterialCommunityIcon name="chevron-down" size={12} />
                   )}
@@ -268,7 +269,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
                                   suboption.position,
                                 )
                                 : '',
-                            price: parsePrice(suboption.price),
+                            price: parsePrice(suboption.price, { currency }),
                           })}
                         </OText>
                       </ProductSubOption>
@@ -278,7 +279,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
               </ProductOptionsList>
             )}
 
-            {product.comment && (
+            {!!product.comment && (
               <ProductComment>
                 <OText
                   size={12}