ordering-ui-react-native 0.22.38 → 0.22.39

package/package.json

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

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

@@ -859,8 +859,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 						) : (
 							<OButton
 								text={t('CANCEL', 'Cancel')}
-								bgColor={theme.colors.white}
-								borderColor={theme.colors.primary}
+								bgColor={theme.colors.secundary}
+								borderColor={theme.colors.secundary}
+								textStyle={{ color: theme.colors.black }}
 								style={{ borderRadius: 7.6, borderWidth: 1, shadowOpacity: 0 }}
 								onClick={() => navigation?.canGoBack() && navigation.goBack()}
 							/>
@@ -887,6 +888,8 @@ const AddressFormUI = (props: AddressFormParams) => {
 						<OButton
 							text={t('SAVE', 'Save')}
 							textStyle={{ color: theme.colors.white }}
+							bgColor={theme.colors.primary}
+							borderColor={theme.colors.primary}
 							imgRightSrc={null}
 							style={{ marginHorizontal: 30, marginBottom: 10 }}
 							onClick={() => setSaveMapLocation(true)}

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

@@ -620,13 +620,15 @@ const CheckoutUI = (props: any) => {
 											<OButton
 												text={t('SIGN_UP', 'Sign up')}
 												textStyle={{ color: theme.colors.white }}
+												bgColor={theme.colors.primary}
+												borderColor={theme.colors.primary}
 												style={{ borderRadius: 7.6, marginTop: 20 }}
 												onClick={() => setOpenModal({ ...openModal, signup: true })}
 											/>
 											<OButton
 												text={t('LOGIN', 'Login')}
-												textStyle={{ color: theme.colors.primary }}
-												bgColor={theme.colors.white}
+												textStyle={{ color: theme.colors.white }}
+												bgColor={theme.colors.primary}
 												borderColor={theme.colors.primary}
 												style={{ borderRadius: 7.6, marginTop: 20 }}
 												onClick={() => setOpenModal({ ...openModal, login: true })}

package/themes/original/src/components/ProductForm/ActionButton.tsx

@@ -5,7 +5,7 @@ import { TouchableOpacity, View } from 'react-native'
 import { OButton, OText } from '../shared';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 
-export const ActionButton = (props : any) => {
+export const ActionButton = (props: any) => {
     const {
         navigation,
         isHaveWeight,
@@ -23,18 +23,20 @@ export const ActionButton = (props : any) => {
         handleUpdateGuest,
         actionStatus
     } = props
-    const [,t] = useLanguage()
+    const [, t] = useLanguage()
     const [{ auth }] = useSession()
     const [orderState] = useOrder()
     const theme = useTheme()
-	const [{ configs }] = useConfig()
+    const [{ configs }] = useConfig()
     const unaddressedTypes = configs?.unaddressed_order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
-	const isAllowUnaddressOrderType = unaddressedTypes.includes(orderState?.options?.type)
-
+    const isAllowUnaddressOrderType = unaddressedTypes.includes(orderState?.options?.type)
     const saveErrors =
-		orderState.loading ||
-		maxProductQuantity === 0 ||
-		Object.keys(errors)?.length > 0;
+        orderState.loading ||
+        maxProductQuantity === 0 ||
+        Object.keys(errors)?.length > 0;
+    const buttonColor = saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order))
+
+
 
     return (
         <View
@@ -60,9 +62,9 @@ export const ActionButton = (props : any) => {
                             color: saveErrors || isSoldOut || maxProductQuantity <= 0 ? theme.colors.primary : theme.colors.white,
                             fontSize: orderState.loading || editMode ? 10 : 14
                         }}
+                        bgColor={buttonColor ? theme.colors.lightGray : theme.colors.primary}
+                        borderColor={!buttonColor ? theme.colors.white : theme.colors.primary}
                         style={{
-                            backgroundColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.lightGray : theme.colors.primary,
-                            borderColor: saveErrors || isSoldOut || maxProductQuantity <= 0 || (product?.minimum_per_order && ((productCart?.quantity + productAddedToCartLength) < product?.minimum_per_order)) || (product?.maximum_per_order && ((productCart?.quantity + productAddedToCartLength) > product?.maximum_per_order)) ? theme.colors.white : theme.colors.primary,
                             opacity: saveErrors || isSoldOut || maxProductQuantity <= 0 ? 0.3 : 1,
                             borderRadius: 7.6,
                             height: 44,

package/themes/original/src/components/UpsellingProducts/UpsellingContent.tsx

@@ -20,7 +20,7 @@ import IconAntDesign from 'react-native-vector-icons/AntDesign';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { UpsellingLayout } from './UpsellingLayout';
 
-export const UpsellingContent = (props : any) => {
+export const UpsellingContent = (props: any) => {
     const {
         onGoBack,
         handleUpsellingPage,
@@ -44,12 +44,10 @@ export const UpsellingContent = (props : any) => {
     const commentDelayTime = isChewLayout ? 500 : null
 
     const cartList = (carts && Object.values(carts).filter((_cart: any) => _cart?.products?.length > 0 && _cart.uuid !== cart?.uuid)) || []
-    
+
     const styles = StyleSheet.create({
         closeUpsellingButton: {
             borderRadius: 7.6,
-            borderColor: theme.colors.primary,
-            backgroundColor: theme.colors.primary,
             borderWidth: 1,
             alignSelf: 'center',
             height: 44,
@@ -160,8 +158,10 @@ export const UpsellingContent = (props : any) => {
                 <OButton
                     imgRightSrc=''
                     text={t('CHECKOUT', 'Checkout')}
-                    style={{ ...styles.closeUpsellingButton }}
                     textStyle={{ color: theme.colors.white, fontSize: 14 }}
+                    bgColor={theme.colors.primary}
+                    borderColor={theme.colors.primary}
+                    style={{ ...styles.closeUpsellingButton }}
                     onClick={() => handleUpsellingPage(cart)}
                 />
             </View>