ordering-ui-react-native 0.21.75 → 0.21.77

package/package.json

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

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

@@ -46,7 +46,8 @@ const ProfileUI = (props: ProfileParams) => {
     toggleIsEdit,
     cleanFormState,
     handleToggleAvalaibleStatusDriver,
-    isAlsea
+    isAlsea,
+    isHideDriverStatus
   } = props;
 
   const [{ user, sessionLoading }] = useSession();
@@ -56,8 +57,6 @@ const ProfileUI = (props: ProfileParams) => {
   const { errors } = useForm();
   const theme = useTheme();
 
-  const isShowDriverStatus = user?.level === 4 && (props.isShowDriverStatus || (!props.isShowDriverStatus && !userState?.result?.result?.available))
-
   const [phoneInputData, setPhoneInputData] = useState({
     error: '',
     phone: {
@@ -362,7 +361,7 @@ const ProfileUI = (props: ProfileParams) => {
             />
           </CenterView>
 
-          {isShowDriverStatus && (
+          {user?.level === 4 && !isHideDriverStatus && (
             <EnabledStatusDriver>
               <View style={{ flex: 1 }}>
                 <OText
@@ -390,7 +389,7 @@ const ProfileUI = (props: ProfileParams) => {
                       !userState?.result?.result?.available,
                     )
                   }
-                  disabled={userState?.loading || userState?.result?.result?.available}
+                  disabled={userState?.loading}
                   animationSpeed={200}
                 />
               )}

package/themes/business/src/types/index.tsx

@@ -57,7 +57,7 @@ export interface ProfileParams {
   showField?: any;
   isRequiredField?: any;
   isAlsea?: boolean;
-  isShowDriverStatus?: boolean;
+  isHideDriverStatus?: boolean;
   isFocused?: boolean;
 }
 

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
-import { View, StyleSheet, TouchableOpacity, Platform, I18nManager, ScrollView, Keyboard, BackHandler } from 'react-native';
+import { View, StyleSheet, TouchableOpacity, Platform, I18nManager, ScrollView, Keyboard, BackHandler, SafeAreaView } from 'react-native';
 import { initStripe, useConfirmPayment } from '@stripe/stripe-react-native';
 import NativeStripeSdk from '@stripe/stripe-react-native/src/NativeStripeSdk'
 import Picker from 'react-native-country-picker-modal';
@@ -448,9 +448,9 @@ const CheckoutUI = (props: any) => {
 
 	return (
 		<>
-			<View style={styles.wrapperNavbar}>
-				<TopHeader>
-					<>
+			<SafeAreaView style={{ backgroundColor: theme.colors.backgroundPage }}>
+				<View style={styles.wrapperNavbar}>
+					<TopHeader>
 						<TopActions onPress={() => onNavigationRedirect('BottomTab', { screen: 'Cart' }, !props.fromMulti)}>
 							<IconAntDesign
 								name='arrowleft'
@@ -468,10 +468,10 @@ const CheckoutUI = (props: any) => {
 								{t('CHECKOUT', 'Checkout')}
 							</OText>
 						)}
-					</>
-				</TopHeader>
-			</View>
-			<Container forwardRef={containerRef} noPadding onScroll={handleScroll}>
+					</TopHeader>
+				</View>
+			</SafeAreaView>
+			<Container pt={0} forwardRef={containerRef} noPadding onScroll={handleScroll}>
 				<View style={styles.wrapperNavbar}>
 					<NavBar
 						hideArrowLeft