Commit 6be9c092 by Giang Tran

edit moment

parent a2e12bf7
...@@ -16,7 +16,7 @@ const Item = (props) => { ...@@ -16,7 +16,7 @@ const Item = (props) => {
const {item} = props; const {item} = props;
const navigate = useNavigation(); const navigate = useNavigation();
return ( return (
<View style={styles.container}> <View style={[styles.container, props.isEnd ? {marginBottom: 60} : {}]}>
<Block flex={1} row> <Block flex={1} row>
{/* <View style={[styles.wrapLeft, {backgroundColor: item.color}]} /> {/* <View style={[styles.wrapLeft, {backgroundColor: item.color}]} />
<View style={styles.wrapDate}> <View style={styles.wrapDate}>
...@@ -82,9 +82,8 @@ const styles = StyleSheet.create({ ...@@ -82,9 +82,8 @@ const styles = StyleSheet.create({
elevation: 5, elevation: 5,
marginHorizontal: 10, marginHorizontal: 10,
backgroundColor: R.colors.white, backgroundColor: R.colors.white,
marginTop: 10,
borderRadius: HEIGHTXD(30), borderRadius: HEIGHTXD(30),
marginBottom: 10, marginTop: 10,
}, },
wrapRight: { wrapRight: {
borderLeftColor: R.colors.borderGray, borderLeftColor: R.colors.borderGray,
......
...@@ -80,6 +80,7 @@ const Success = (props) => { ...@@ -80,6 +80,7 @@ const Success = (props) => {
) : ( ) : (
<FlatList <FlatList
keyExtractor={(item) => item.transection_id + 'a'} keyExtractor={(item) => item.transection_id + 'a'}
showsVerticalScrollIndicator={false}
refreshing={isRefresh} refreshing={isRefresh}
onRefresh={onRefresh} onRefresh={onRefresh}
onEndReachedThreshold={0.01} onEndReachedThreshold={0.01}
...@@ -87,7 +88,9 @@ const Success = (props) => { ...@@ -87,7 +88,9 @@ const Success = (props) => {
onLoadMore(); onLoadMore();
}} }}
data={data} data={data}
renderItem={({item}) => <Item item={item} />} renderItem={({item, index}) => (
<Item item={item} isEnd={index + 1 == data.length} />
)}
/> />
)} )}
</View> </View>
......
...@@ -87,6 +87,7 @@ const Watting = (props) => { ...@@ -87,6 +87,7 @@ const Watting = (props) => {
) : ( ) : (
<FlatList <FlatList
keyExtractor={(item) => item.transection_id + 'a'} keyExtractor={(item) => item.transection_id + 'a'}
showsVerticalScrollIndicator={false}
refreshing={isRefresh} refreshing={isRefresh}
onRefresh={onRefresh} onRefresh={onRefresh}
onEndReachedThreshold={0.01} onEndReachedThreshold={0.01}
...@@ -94,7 +95,9 @@ const Watting = (props) => { ...@@ -94,7 +95,9 @@ const Watting = (props) => {
onLoadMore(); onLoadMore();
}} }}
data={data} data={data}
renderItem={({item}) => <Item item={item} />} renderItem={({item, index}) => (
<Item item={item} isEnd={index + 1 == data.length} />
)}
/> />
)} )}
</View> </View>
......
...@@ -62,13 +62,13 @@ const styles = StyleSheet.create({ ...@@ -62,13 +62,13 @@ const styles = StyleSheet.create({
}, },
btnRight: { btnRight: {
width: WIDTHXD(400), width: WIDTHXD(400),
height: HEIGHTXD(100), height: HEIGHTXD(120),
backgroundColor: R.colors.main, backgroundColor: R.colors.main,
borderRadius: 10, borderRadius: 10,
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
position: 'absolute', position: 'absolute',
bottom: 10, bottom: 20,
right: 30, right: 30,
shadowColor: '#AFA9A9', shadowColor: '#AFA9A9',
shadowOffset: { shadowOffset: {
...@@ -81,13 +81,13 @@ const styles = StyleSheet.create({ ...@@ -81,13 +81,13 @@ const styles = StyleSheet.create({
}, },
btnLeft: { btnLeft: {
width: WIDTHXD(400), width: WIDTHXD(400),
height: HEIGHTXD(100), height: HEIGHTXD(120),
backgroundColor: R.colors.main, backgroundColor: R.colors.main,
borderRadius: 10, borderRadius: 10,
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
position: 'absolute', position: 'absolute',
bottom: 10, bottom: 20,
left: 30, left: 30,
shadowColor: '#AFA9A9', shadowColor: '#AFA9A9',
shadowOffset: { shadowOffset: {
......
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