ordering-ui-react-native 0.18.65 → 0.18.67

package/package.json

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

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { RefreshControl, ScrollView, View } from 'react-native'
 import { OText } from '../shared'
 import { useLanguage, useSession } from 'ordering-components/native'
@@ -10,6 +10,7 @@ export const DriverSchedule = (props: any) => {
     const theme = useTheme()
     const [, { refreshUserInfo }] = useSession()
     const [refreshing] = useState(false);
+    const [driverSchedule, setDriverSchedule] = useState([]);
 
     const daysOfWeek = [
         t('SUNDAY_ABBREVIATION', 'Sun'),
@@ -26,6 +27,32 @@ export const DriverSchedule = (props: any) => {
         return `${checkTime(hour)}:${checkTime(minute)}`
     }
 
+    useEffect(() => {
+        if (schedule) {
+            setDriverSchedule(schedule)
+        } else {
+            const _schedule: any = []
+            for (let i = 0; i < 7; i++) {
+                _schedule.push({
+                enabled: true,
+                lapses: [
+                  {
+                    open: {
+                      hour: 0,
+                      minute: 0
+                    },
+                    close: {
+                      hour: 23,
+                      minute: 59
+                    }
+                  }
+                ]
+              })
+            }
+            setDriverSchedule(_schedule)
+        }
+    }, [schedule])
+
     return (
         <ScrollView
             refreshControl={<RefreshControl
@@ -37,7 +64,7 @@ export const DriverSchedule = (props: any) => {
                 {t('SCHEDULE', 'Schedule')}
             </OText>
             <View style={{ padding: 30 }}>
-                {schedule.map((item: any, i: number) => (
+                {driverSchedule.map((item: any, i: number) => (
                     <DayContainer key={daysOfWeek[i]}>
                         <OText style={{ width: '20%' }} size={22} weight={700}>{daysOfWeek[i]}</OText>
                         <View style={{ width: '80%', alignItems: 'center' }}>

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

@@ -478,19 +478,17 @@ const ProfileUI = (props: ProfileParams) => {
               />
             </EditButton>
           )}
-          {!!user?.schedule && (
-            <Pressable style={{ marginBottom: 10 }} onPress={() => setOpenModal(true)}>
-              <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
-                <OText size={16}>{t('SCHEDULE', 'Schedule')}</OText>
-                <AntDesignIcon size={18} name='right' />
-              </View>
-              <View style={{
-                borderBottomColor: theme.colors.tabBar,
-                borderBottomWidth: 1,
-                marginTop: 10
-              }} />
-            </Pressable>
-          )}
+          <Pressable style={{ marginBottom: 10 }} onPress={() => setOpenModal(true)}>
+            <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+              <OText size={16}>{t('SCHEDULE', 'Schedule')}</OText>
+              <AntDesignIcon size={18} name='right' />
+            </View>
+            <View style={{
+              borderBottomColor: theme.colors.tabBar,
+              borderBottomWidth: 1,
+              marginTop: 10
+            }} />
+          </Pressable>
           <Actions>
             <LanguageSelector />
 

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

@@ -121,17 +121,17 @@ const WalletsUI = (props: any) => {
     <>
       <Container>
         <Header>
-        <View style={{
-          ...{
-            width: '100%',
-            display: 'flex',
-            flexDirection: 'row',
-            alignItems: 'center',
-            marginTop: 30,
-            justifyContent: 'space-between',
-            alignContent: 'center'
-          },
-        }}>
+          <View style={{
+            ...{
+              width: '100%',
+              display: 'flex',
+              flexDirection: 'row',
+              alignItems: 'center',
+              marginTop: 30,
+              justifyContent: 'space-between',
+              alignContent: 'center'
+            },
+          }}>
             {(!props.hideBackBtn || !hideWalletsTheme) && !isChewLayout && (
               <OButton
                 imgLeftStyle={{ width: 18 }}
@@ -145,7 +145,6 @@ const WalletsUI = (props: any) => {
                   shadowColor: '#FFF',
                   paddingLeft: 0,
                   paddingRight: 0,
-                  marginTop: 30,
                 }}
                 onClick={goToBack}
                 icon={AntDesignIcon}