ordering-ui-react-native 0.21.83-test → 0.21.84-test

package/package.json

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

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

@@ -1,7 +1,6 @@
 import React, { useState } from 'react'
-import { View, TouchableOpacity, Platform } from 'react-native'
+import { View, TouchableOpacity, Platform, StyleSheet } from 'react-native'
 import { useLanguage, useSession, useUtils, Sessions as SessionsController } from 'ordering-components/native'
-import NavBar from '../NavBar'
 import { SessionsParams } from '../../types'
 import { OAlert } from '../../../../../src/components/shared'
 import { OButton, OIcon, OText } from '../shared'
@@ -61,18 +60,43 @@ export const SessionsUI = (props: SessionsParams) => {
     })
   }
 
+  const styles = StyleSheet.create({
+    titleGroups: {
+      alignItems: 'center',
+      flexDirection: 'row',
+      minHeight: 33,
+    },
+    btnBackArrow: {
+      borderWidth: 0,
+      width: 32,
+      height: 32,
+      tintColor: theme.colors.textGray,
+      backgroundColor: theme.colors.clear,
+      borderColor: theme.colors.clear,
+      shadowColor: theme.colors.clear,
+      paddingLeft: 0,
+      paddingRight: 0,
+      marginTop: 10
+    },
+    innerPadding: {
+      paddingLeft: 10,
+      paddingRight: 10
+    }
+  });
+
   return (
     <Container
-      pdng={Platform.OS === 'ios' ? '10px' : '0'}
+      pdng={Platform.OS === 'ios' ? '10px' : '8px'}
+      style={Platform.OS !== 'ios' && styles.innerPadding}
     >
-      <NavBar
-        title={t('SESSIONS', 'Sessions')}
-        titleAlign={'center'}
-        onActionLeft={goToBack}
-        showCall={false}
-        paddingTop={10}
-        btnStyle={{ paddingLeft: 0 }}
-      />
+      <View style={styles.titleGroups}>
+        <TouchableOpacity onPress={() => goToBack()} style={styles.btnBackArrow}>
+          <OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
+        </TouchableOpacity>
+      </View>
+      <OText size={24} style={{ paddingTop: 12 }}>
+        {t('SESSIONS', 'Sessions')}
+      </OText>
       {user?.session_strategy === 'jwt_session' ? (
         <>
           {sessionsList.loading ? (

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

@@ -47,7 +47,8 @@ const ProfileUI = (props: ProfileParams) => {
     cleanFormState,
     handleToggleAvalaibleStatusDriver,
     isAlsea,
-    isHideDriverStatus
+    isHideDriverStatus,
+    navigation
   } = props;
 
   const [{ user, sessionLoading }] = useSession();
@@ -505,6 +506,17 @@ const ProfileUI = (props: ProfileParams) => {
               marginTop: 10
             }} />
           </Pressable>
+          <Pressable style={{ marginBottom: 10 }} onPress={() => navigation.navigate('Sessions')}>
+            <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+              <OText size={16}>{t('SESSIONS', 'Sessions')}</OText>
+              <AntDesignIcon size={18} name='right' />
+            </View>
+            <View style={{
+              borderBottomColor: theme.colors.tabBar,
+              borderBottomWidth: 1,
+              marginTop: 10
+            }} />
+          </Pressable>
           <Actions>
             <LanguageSelector />