ordering-ui-react-native 0.10.3 → 0.11.3

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

@@ -50,10 +50,7 @@ export const Home = (props: any) => {
             </OText>
 
             <OText style={styles.textSubtitle} color={theme.colors.inputChat}>
-              {t(
-                'BUSINESS_WELCOME_SUBTITLE',
-                "Let's start to administrate your business now",
-              )}
+              {t(props.title.key, props.title.value)}
             </OText>
           </View>
 
@@ -80,7 +77,7 @@ export const Home = (props: any) => {
 const styles = StyleSheet.create({
   logo: {
     height: 65,
-    width: 250,
+    width: 300,
   },
   wrapperContent: {
     width: '100%',

package/themes/business/src/components/Home/styles.tsx

@@ -10,8 +10,7 @@ export const Container = styled.View`
 `;
 
 export const LogoWrapper = styled.View`
-  margin-top: 30px;
-  margin-bottom: 50px;
+  margin-vertical: 50px;
   align-items: center;
   justify-content: center;
 `;

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

@@ -60,8 +60,6 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
           withCountryNameButton
           countryCodes={countryCodes}
           //@ts-ignore
-          closeButtonImageStyle={{ width: 15, height: 15 }}
-          closeButtonImage={theme.images.general.close}
           renderFlagButton={() => (
             <TouchableOpacity onPress={() => setCountryModalVisible(true)}>
               <LanguageItem justifyContent="space-between">
@@ -79,7 +77,7 @@ const LanguageSelectorUI = (props: LanguageSelectorParams) => {
 
                 <OIcon
                   src={theme?.images?.general?.chevronDown}
-                  color={theme.colors.backArrow}
+
                   width={20}
                   height={20}
                 />

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

@@ -15,7 +15,7 @@ import { PreviousMessages } from '../PreviousMessages';
 // import { Contacts } from '../Contacts';
 import { FiltersTab, TabsContainer, TagsContainer, Tag } from './styles';
 import { MessagesOptionParams } from '../../types';
-
+import { useDeviceOrientation } from '../../../../../src/hooks/DeviceOrientation';
 const MessagesOptionUI = (props: MessagesOptionParams) => {
   const {
     orders,
@@ -31,7 +31,7 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
   const [, t] = useLanguage();
 
   const { loading, error, data: values } = orders;
-
+  const [{ dimensions }] = useDeviceOrientation();
   const tabs = [
     { key: 0, text: t('ORDERS', 'Orders'), tags: [0, 1] },
     // { key: 1, text: t('CONTACTS', 'Contacts'), tags: [2, 3, 4] },
@@ -139,11 +139,14 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
     tab: {
       fontFamily: 'Poppins',
       fontStyle: 'normal',
-      fontSize: 14,
-      marginBottom: 10,
+      fontSize: 16,
+      paddingBottom: 5,
+      marginBottom: -1,
+      zIndex: 100,
+      borderColor: theme.colors.textGray,
     },
     tagsContainer: {
-      alignItems: 'center',
+      marginBottom: 20,
     },
     tag: {
       fontFamily: 'Poppins',
@@ -152,7 +155,6 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
       fontSize: 14,
     },
     pressable: {
-      flex: 0.5,
       alignItems: 'center',
     },
     loadButton: {
@@ -178,11 +180,14 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
       </View>
 
       <FiltersTab>
-        <TabsContainer>
+        <TabsContainer width={dimensions.width - 42}>
           {tabs.map((tab: any) => (
             <Pressable
               key={tab.key}
-              style={styles.pressable}
+              style={{
+                ...styles.tab,
+                borderBottomWidth: 1,
+              }}
               onPress={() => handleChangeTab(tab.tags)}>
               <OText
                 style={styles.tab}
@@ -199,16 +204,6 @@ const MessagesOptionUI = (props: MessagesOptionParams) => {
                 {tab.text}
                 {` ${tab.key === 0 ? `(${unreadMessages || 0})` : ''}`}
               </OText>
-
-              <View
-                style={{
-                  width: '100%',
-                  borderBottomColor:
-                    JSON.stringify(tabsFilter) === JSON.stringify(tab.tags)
-                      ? theme.colors.textGray
-                      : theme.colors.tabBar,
-                  borderBottomWidth: 1.75,
-                }}></View>
             </Pressable>
           ))}
         </TabsContainer>

package/themes/business/src/components/MessagesOption/styles.tsx

@@ -7,6 +7,9 @@ export const FiltersTab = styled.View`
 export const TabsContainer = styled.View`
   display: flex;
   flex-direction: row;
+  justify-content: space-between;
+  border-bottom-width: 1px;
+  border-bottom-color: #e9ecef;
 `;
 
 export const TagsContainer = styled.ScrollView`