ordering-ui-react-native 0.12.58 → 0.12.62

package/package.json

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

package/src/components/AppleLogin/index.tsx

@@ -10,8 +10,7 @@ import { useTheme } from 'styled-components/native';
 import { OText } from '../shared';
 import { AppleLoginParams } from '../../types';
 
-export const AppleLogin = (props : AppleLoginParams) => {
-
+export const AppleLogin = (props: AppleLoginParams) => {
   const {
     notificationState,
     handleErrors,
@@ -55,7 +54,7 @@ export const AppleLogin = (props : AppleLoginParams) => {
           handleErrors && handleErrors(t('ERROR_LOGIN_APPLE', 'Error login with apple'))
         }
 
-      } catch (error : any) {
+      } catch (error: any) {
         handleErrors && handleErrors(error.message)
       }
     } else {
@@ -70,15 +69,22 @@ export const AppleLogin = (props : AppleLoginParams) => {
         });
         const { code } = await appleAuthAndroid.signIn();
         handleLoginApple(code)
-      } catch (error : any) {
+      } catch (error: any) {
         handleErrors && handleErrors(error?.message)
       }
     }
   }
   const handleLoginApple = async (code: string) => {
-    const body: any = {
-      code,
-      platform: Platform.OS === 'ios' && 'ios'
+    let body: any
+    if (Platform.OS === 'ios') {
+      body = {
+        code,
+        platform: 'ios'
+      }
+    } else {
+      body = {
+        code
+      }
     }
     if (notificationState?.notification_token) {
       body.notification_token = notificationState.notification_token
@@ -99,7 +105,7 @@ export const AppleLogin = (props : AppleLoginParams) => {
       } else {
         handleErrors && handleErrors(result || t('ERROR_LOGIN_AUTH_APPLE', 'Error login auth with apple'))
       }
-    } catch (error : any) {
+    } catch (error: any) {
       handleLoading && handleLoading(false)
       handleErrors && handleErrors(error?.message)
     }

package/themes/doordash/src/components/Cart/index.tsx

@@ -242,6 +242,7 @@ const CartUI = (props: any) => {
                         marginTop: 10
                       }}
                       multiline
+                      inputStyle={{color: theme.colors.textPrimary}}
                     />
                     {commentState?.loading && (
                       <View style={{ position: 'absolute', right: 20 }}>

package/themes/doordash/src/components/LastOrders/index.tsx

@@ -43,7 +43,7 @@ const LastOrdersUI = (props: LastOrdersParams) => {
   })
 
   const goToOrders = useCallback((order) => {
-    navigation.navigate('BottomTab', { screen: 'MyOrders' });
+    navigation.navigate('OrderDetails', { orderId: order.uuid });
   }, [])
 
   return (

package/themes/doordash/src/components/OrderSummary/index.tsx

@@ -255,6 +255,7 @@ const OrderSummaryUI = (props: any) => {
                           marginTop: 10
                         }}
                         multiline
+                        inputStyle={{color: theme.colors.textPrimary}}
                       />
                       {commentState?.loading && (
                         <View style={{ position: 'absolute', right: 20 }}>

package/themes/instacart/src/components/OrderDetails/index.tsx

@@ -480,8 +480,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 </Table>
                 {order?.comment && (
                   <Table>
-                    <OText style={{ flex: 1 }}>{t('COMMENT', 'Comment')}</OText>
-                    <OText style={{ maxWidth: '70%' }}>
+                    <OText color={theme.colors.textPrimary} size={12} style={{ flex: 1 }}>{t('COMMENT', 'Comment')}</OText>
+                    <OText color={theme.colors.textPrimary} size={12} style={{ maxWidth: '70%' }}>
                       {order?.comment}
                     </OText>
                   </Table>

package/themes/single-business/src/components/Cart/index.tsx

@@ -8,7 +8,7 @@ import {
   useValidationFields,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { ScrollView, View, useWindowDimensions } from 'react-native';
+import { ScrollView, View, useWindowDimensions, ActivityIndicator, StyleSheet } from 'react-native';
 import {
   CheckoutAction,
   OSBill,
@@ -20,13 +20,14 @@ import {
   BIHeader,
   BIInfo,
   BIContentInfo,
-  BITotal
+  BITotal,
+  TopHeader
 } from './styles';
 
 import { ProductItemAccordion } from '../ProductItemAccordion';
 import { CouponControl } from '../CouponControl';
 
-import { OButton, OIcon, OModal, OText } from '../shared';
+import { OButton, OInput, OModal, OText, OIcon } from '../shared';
 import { ProductForm } from '../ProductForm';
 import { UpsellingProducts } from '../UpsellingProducts';
 import { convertHoursToMinutes, verifyDecimals } from '../../utils';
@@ -37,6 +38,7 @@ import AntIcon from 'react-native-vector-icons/AntDesign'
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
 import { TaxInformation } from '../TaxInformation';
 import { TouchableOpacity } from 'react-native';
+
 const CartUI = (props: any) => {
   const {
     cart,
@@ -48,6 +50,8 @@ const CartUI = (props: any) => {
     removeProduct,
     handleCartOpen,
     setIsCartsLoading,
+    handleChangeComment,
+    commentState
   } = props
 
   const theme = useTheme();
@@ -184,6 +188,15 @@ const CartUI = (props: any) => {
     )
   }
 
+  const styles = StyleSheet.create({
+    headerItem: {
+      overflow: 'hidden',
+      backgroundColor: theme.colors.clear,
+      width: 35,
+      marginVertical: 18,
+    },
+  })
+
   return (
     cart?.products?.length > 0 ? (
       <ScrollView
@@ -304,6 +317,39 @@ const CartUI = (props: any) => {
                     </OSTable>
                   )}
 
+                  {cart?.status !== 2 && (
+                    <OSTable>
+                      <View style={{ width: '100%', marginTop: 0 }}>
+                        <OText size={14} style={{ marginBottom: 10 }}>{t('COMMENTS', 'Comments')}</OText>
+                        <View style={{ flex: 1, width: '100%' }}>
+                          <OInput
+                            value={cart?.comment}
+                            placeholder={t('SPECIAL_COMMENTS', 'Special Comments')}
+                            onChange={(value: string) => handleChangeComment(value)}
+                            style={{
+                              borderColor: theme.colors.border,
+                              borderRadius: 10,
+                              marginBottom: 20,
+                              height: 104,
+                              maxHeight: 104,
+                              alignItems: 'flex-start',
+                            }}
+                            multiline
+                          />
+                          {commentState?.loading && (
+                            <View style={{ position: 'absolute', right: 20 }}>
+                              <ActivityIndicator
+                                size='large'
+                                style={{ height: 100 }}
+                                color={theme.colors.primary}
+                              />
+                            </View>
+                          )}
+                        </View>
+                      </View>
+                    </OSTable>
+                  )}
+
                   <OSTotal>
                     <OSTable style={{ marginTop: 15 }}>
                       <OText size={14} lineHeight={21} weight={'600'}>
@@ -392,7 +438,24 @@ const CartUI = (props: any) => {
             onSave={handlerProductAction}
             onClose={() => setModalIsOpen(false)}
           />
+        </OModal>
 
+        <OModal
+          open={openTaxModal.open}
+          onClose={() => setOpenTaxModal({ open: false, data: null })}
+          entireModal
+          customClose
+        >
+          <>
+            <TopHeader>
+              <TouchableOpacity
+                style={styles.headerItem}
+                onPress={() => setOpenTaxModal({ open: false, data: null })}>
+                <OIcon src={theme.images.general.close} width={16} />
+              </TouchableOpacity>
+            </TopHeader>
+            <TaxInformation data={openTaxModal.data} products={cart?.products} />
+          </>
         </OModal>
       </ScrollView>
     ) : (
@@ -410,13 +473,6 @@ const CartUI = (props: any) => {
             image={theme.images.general.notFound}
           />
         </View>
-        <OModal
-          open={openTaxModal.open}
-          onClose={() => setOpenTaxModal({ open: false, data: null })}
-          entireModal
-        >
-          <TaxInformation data={openTaxModal.data} products={cart?.products} />
-        </OModal>
       </Container>
     )
   )

package/themes/single-business/src/components/Cart/styles.tsx

@@ -100,3 +100,12 @@ export const BITotal = styled.View`
   flex-direction: column;
   align-items: flex-end;
 `
+
+export const TopHeader = styled.View`
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  z-index: 1;
+  padding-horizontal: 40px;
+`