Commit fbce9686 by Giang Tran

fix bug home

parent 9f568dc5
import React, {useEffect, useState} from 'react';
import {Alert, Platform} from 'react-native';
import {Alert, Platform, View} from 'react-native';
import {connect} from 'react-redux';
import {getTransaction} from '../../apis/Functions/users';
import {getImagesHome} from '../../apis/Functions/General';
......@@ -180,7 +180,6 @@ const Home = (props) => {
};
return (
<>
<HomeView
data={data}
dataPrice={dataPriceFilter}
......@@ -193,11 +192,9 @@ const Home = (props) => {
onSortByPriceOpenClose={onSortByPriceOpenClose}
onSortByPriceHighLow={onSortByPriceHighLow}
/>
<VersionChecker />
</>
);
};
<VersionChecker />;
const mapStateToProps = (state) => {
return {
user: state.userReducer,
......
......@@ -4,13 +4,15 @@ import {
ImageBackground,
StyleSheet,
ScrollView,
TouchableOpacity,
Text,
} from 'react-native';
import HeaderHome from '../../components/Header/HeaderHome';
import {getFontXD} from '../../Config/Functions';
import R from '../../assets/R';
import SwiperComponent from './SwiperComponent';
import PriceListView from './PriceListView';
import VersionChecker from '../VersionChecker';
const HomeView = (props) => {
return (
<ImageBackground
......@@ -34,6 +36,8 @@ const HomeView = (props) => {
onSortByPriceOpenClose={props.onSortByPriceOpenClose}
onSortByPriceHighLow={props.onSortByPriceHighLow}
/>
<VersionChecker />
</ScrollView>
</ImageBackground>
);
......
......@@ -117,11 +117,10 @@ const TabNavigator = (props) => {
options={{
tabBarLabel: 'Overview',
tabBarIcon: ({color, size}) => (
<Icon name="landmark" size={size} color={color}/>
<Icon name="landmark" size={size} color={color} />
),
}}
/>
<Tab.Screen
name="Screen2"
component={Transaction}
......@@ -141,7 +140,7 @@ const TabNavigator = (props) => {
name="Pay"
component={PayScreenComponent}
options={{
tabBarButton: () => <PlussModal/>,
tabBarButton: () => <PlussModal />,
}}
/>
......@@ -166,7 +165,7 @@ const TabNavigator = (props) => {
options={{
tabBarLabel: props.language.language == 'vi' ? 'Tin tức' : 'News',
tabBarIcon: ({color, size}) => (
<Ionicons name="newspaper-outline" size={size} color={color}/>
<Ionicons name="newspaper-outline" size={size} color={color} />
),
}}
/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment