ordering-ui-react-native 0.14.82 → 0.14.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.14.82",
+  "version": "0.14.83",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/BusinessesListing/index.tsx

@@ -167,7 +167,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
           >
             <OText size={14} numberOfLines={1} ellipsizeMode='tail'>
               {orderState.options?.moment
-                ? parseDate(orderState.options?.moment, { outputFormat: configs?.format_time?.value === '12' ? 'MM/DD hh:mma' : 'MM/DD HH:mm' })
+                ? parseDate(orderState?.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
                 : t('ASAP_ABBREVIATION', 'ASAP')}
             </OText>
           </WrapMomentOption>

package/src/components/Checkout/index.tsx

@@ -326,7 +326,7 @@ const CheckoutUI = (props: any) => {
                     <OText size={18} numberOfLines={1} ellipsizeMode='tail'>
                       {options?.moment
                         ? parseDate(options?.moment, {
-                          outputFormat: configs?.format_time?.value === '12' ? 'MM/DD hh:mma' : 'MM/DD HH:mm'
+                          outputFormat: configs?.dates_moment_format?.value
                         })
                         : t('ASAP_ABBREVIATION', 'ASAP')}
                     </OText>

package/themes/original/src/components/BusinessesListing/index.tsx

@@ -287,13 +287,8 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 								numberOfLines={1}
 								ellipsizeMode="tail"
 								color={theme.colors.textSecondary}>
-								{orderState.options?.moment
-									? parseDate(orderState.options?.moment, {
-										outputFormat:
-											configs?.format_time?.value === '12'
-												? 'MM/DD hh:mma'
-												: 'MM/DD HH:mm',
-									})
+								{orderState.options?.momentß
+									? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
 									: t('ASAP_ABBREVIATION', 'ASAP')}
 							</OText>
 							<OIcon

package/themes/original/src/components/Checkout/index.tsx

@@ -265,9 +265,7 @@ const CheckoutUI = (props: any) => {
 							>
 								<OText size={12} numberOfLines={1} ellipsizeMode='tail' color={theme.colors.textSecondary}>
 									{options?.moment
-										? parseDate(options?.moment, {
-											outputFormat: configs?.format_time?.value === '12' ? 'MM/DD hh:mma' : 'MM/DD HH:mm'
-										})
+										? parseDate(options?.moment, { outputFormat: configs?.dates_moment_format?.value })
 										: t('ASAP_ABBREVIATION', 'ASAP')}
 								</OText>
 								<OIcon

package/themes/original/src/components/WalletTransactionItem/index.tsx

@@ -15,7 +15,8 @@ export const WalletTransactionItem = (props: any) => {
   const {
     item,
     idx,
-    type
+    type,
+    withFormatPrice
   } = props
 
   const theme = useTheme()
@@ -38,7 +39,7 @@ export const WalletTransactionItem = (props: any) => {
             fontWeight: 'bold'
           }}
         >
-          {item?.amount > 0 && '+ '}{parsePrice(item?.amount)}
+          {item?.amount > 0 && '+ '}{withFormatPrice ? parsePrice(item?.amount) : item?.amount}
         </OText>
       </DateBlock>
       <MessageBlock>

package/themes/original/src/components/Wallets/index.tsx

@@ -19,7 +19,7 @@ import {
 } from './styles'
 
 import NavBar from '../NavBar'
-import { OIcon, OText } from '../shared';
+import { OText } from '../shared';
 import { NotFoundSource } from '../NotFoundSource';
 import { WalletTransactionItem } from '../WalletTransactionItem'
 
@@ -28,15 +28,15 @@ const WalletsUI = (props: any) => {
     navigation,
     walletList,
     transactionsList,
-    setWalletSelected
+    setWalletSelected,
+    isWalletCashEnabled,
+    isWalletPointsEnabled
   } = props
 
   const [, t] = useLanguage()
   const theme = useTheme()
-  const [{ parsePrice, parseDate }] = useUtils()
+  const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
-  const isWalletCashEnabled = configs?.wallet_cash_enabled?.value === '1'
-  const isWalletPointsEnabled = configs?.wallet_credit_point_enabled?.value === '1'
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
 
@@ -119,7 +119,6 @@ const WalletsUI = (props: any) => {
                   : t('POINTS', 'Points')}
               </OText>
             </BalanceElement>
-            {console.log(transactionsList)}
 
             <View style={{ marginTop: 20, width: '100%', paddingHorizontal: 1, paddingBottom: 40 }}>
               {!transactionsList?.loading &&
@@ -137,6 +136,7 @@ const WalletsUI = (props: any) => {
                         type={currentWalletSelected?.type}
                         key={transaction.id}
                         item={transaction}
+                        withFormatPrice={currentWalletSelected?.type === 'cash'}
                       />
                     ))}
                   </TransactionsWrapper>
@@ -155,7 +155,8 @@ const WalletsUI = (props: any) => {
                 </View>
               )}
 
-              {!(transactionsList?.loading && transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]) &&
+              {!transactionsList?.loading &&
+                !(transactionsList?.loading && transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]) &&
                 (transactionsList?.error ||
                   !transactionsList.list?.[`wallet:${currentWalletSelected?.id}`]?.length) &&
               (
@@ -208,9 +209,16 @@ const WalletsUI = (props: any) => {
 }
 
 export const Wallets = (props: any) => {
+  const [{ configs }] = useConfig()
+
+  const isWalletCashEnabled = configs?.wallet_cash_enabled?.value === '1'
+  const isWalletPointsEnabled = configs?.wallet_credit_point_enabled?.value === '1'
+
   const walletsProps = {
     ...props,
-    UIComponent: WalletsUI
+    UIComponent: WalletsUI,
+    isWalletCashEnabled,
+    isWalletPointsEnabled
   }
   return (
     <WalletList {...walletsProps} />