Commit 6ebd08d4 by Giang Tran

fix bug

parent dc328c41
...@@ -79,6 +79,8 @@ const BankInfor = (props) => { ...@@ -79,6 +79,8 @@ const BankInfor = (props) => {
return data; return data;
}; };
const onPress = async () => { const onPress = async () => {
const titles = [I18n.t('CardType').toLowerCase(), I18n.t('BankCode').toLowerCase(), I18n.t('CardNumberOrAccount').toLowerCase()]; const titles = [I18n.t('CardType').toLowerCase(), I18n.t('BankCode').toLowerCase(), I18n.t('CardNumberOrAccount').toLowerCase()];
const index = checkFormatArray([acc_type, bank_no, account_no]); const index = checkFormatArray([acc_type, bank_no, account_no]);
......
...@@ -11,7 +11,7 @@ import R from '../../../../assets/R'; ...@@ -11,7 +11,7 @@ import R from '../../../../assets/R';
import Block from '../../../../components/Block'; import Block from '../../../../components/Block';
import {useNavigation} from '@react-navigation/native'; import {useNavigation} from '@react-navigation/native';
import {DETAIL_REQUIRE_MONEY} from '../../../../routers/ScreenNames'; import {DETAIL_REQUIRE_MONEY} from '../../../../routers/ScreenNames';
import AppText from '../../../../components/AppText';
const Item = (props) => { const Item = (props) => {
const {item} = props; const {item} = props;
const navigate = useNavigation(); const navigate = useNavigation();
...@@ -44,7 +44,23 @@ const Item = (props) => { ...@@ -44,7 +44,23 @@ const Item = (props) => {
<Text numberOfLines={2} style={styles.txt}> <Text numberOfLines={2} style={styles.txt}>
{item.comments} {item.comments}
</Text> </Text>
<Text style={styles.txtDate}>{item.transection_date_timestamp}</Text> <View
style={{
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
}}>
<Text style={styles.txtDate}>
{item.transection_date_timestamp}
</Text>
{item.status == 0 ? (
<AppText style={{color: '#FFB721'}} i18nKey={'Waiting'}></AppText>
) : (
<AppText
style={{color: R.colors.green}}
i18nKey={'Success'}></AppText>
)}
</View>
</Block> </Block>
</Block> </Block>
</View> </View>
...@@ -95,7 +111,6 @@ const styles = StyleSheet.create({ ...@@ -95,7 +111,6 @@ const styles = StyleSheet.create({
txtDate: { txtDate: {
fontSize: getFontXD(39), fontSize: getFontXD(39),
color: '#363636', color: '#363636',
fontStyle: 'italic',
}, },
rowBet: { rowBet: {
flexDirection: 'row', flexDirection: 'row',
......
...@@ -24,12 +24,11 @@ const Success = (props) => { ...@@ -24,12 +24,11 @@ const Success = (props) => {
type: 'ALL', type: 'ALL',
platform: Platform.OS, platform: Platform.OS,
page_size: 10, page_size: 10,
status: -1, status: 1,
page_index: 1, page_index: 1,
start_date: '', start_date: '',
end_date: '', end_date: '',
}); });
console.log(res.data);
setisRefresh(false); setisRefresh(false);
if ((res.data.code = 200 && res.data.data)) { if ((res.data.code = 200 && res.data.data)) {
setData(res.data.data); setData(res.data.data);
...@@ -44,7 +43,6 @@ const Success = (props) => { ...@@ -44,7 +43,6 @@ const Success = (props) => {
}; };
const onLoadMore = () => { const onLoadMore = () => {
console.log(tottalPage);
if (page < tottalPage) getDataLoadMore(); if (page < tottalPage) getDataLoadMore();
}; };
......
...@@ -36,7 +36,6 @@ const Watting = (props) => { ...@@ -36,7 +36,6 @@ const Watting = (props) => {
start_date: '', start_date: '',
end_date: '', end_date: '',
}); });
console.log(res.data);
setisRefresh(false); setisRefresh(false);
if ((res.data.code = 200 && res.data.data)) { if ((res.data.code = 200 && res.data.data)) {
setData(res.data.data); setData(res.data.data);
...@@ -51,7 +50,6 @@ const Watting = (props) => { ...@@ -51,7 +50,6 @@ const Watting = (props) => {
}; };
const onLoadMore = () => { const onLoadMore = () => {
console.log(tottalPage);
if (page < tottalPage) getDataLoadMore(); if (page < tottalPage) getDataLoadMore();
}; };
......
...@@ -15,7 +15,7 @@ const Wallet = (props) => { ...@@ -15,7 +15,7 @@ const Wallet = (props) => {
const navigate = useNavigation(); const navigate = useNavigation();
return ( return (
<View style={{flex: 1}}> <View style={{flex: 1}}>
<HeaderBack isWhite={true} title={'Transfer'} /> <HeaderBack isWhite={true} title={'Wallet'} />
<View style={{flex: 1, backgroundColor: 'red'}}> <View style={{flex: 1, backgroundColor: 'red'}}>
<Tab.Navigator <Tab.Navigator
......
...@@ -115,8 +115,8 @@ const AddMethodPay = (props) => { ...@@ -115,8 +115,8 @@ const AddMethodPay = (props) => {
<SelectBankModal <SelectBankModal
title={I18n.t('SelectBank')} title={I18n.t('SelectBank')}
data={data} data={data}
onPressItem = {(item) => { onPressItem={(item) => {
setBankID(item) setBankID(item);
}} }}
/> />
<TextField <TextField
......
...@@ -13,18 +13,17 @@ import Block from '../../components/Block'; ...@@ -13,18 +13,17 @@ import Block from '../../components/Block';
const Item = (props) => { const Item = (props) => {
const {item} = props; const {item} = props;
console.log('noti', item);
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Block flex={1} row> <Block flex={1} row>
<View style={styles.wrapDate}> <View style={styles.wrapDate}>
<Image source={R.images.iconRecharge} style={styles.imgIcon} /> <Image source={{uri: item.icon}} style={styles.imgIcon} />
</View> </View>
<Block padding={[5, 10]} space={'between'} flex={1}> <Block padding={[5, 10]} space={'between'} flex={1}>
<View style={{justifyContent: 'center', flex: 1}}>
<Text numberOfLines={2} style={styles.txtBlack}> <Text numberOfLines={2} style={styles.txtBlack}>
{item.body} {item.body}
</Text> </Text>
</View>
<Text style={styles.txt}>{item.pushed_at}</Text> <Text style={styles.txt}>{item.pushed_at}</Text>
</Block> </Block>
</Block> </Block>
...@@ -77,7 +76,7 @@ const styles = StyleSheet.create({ ...@@ -77,7 +76,7 @@ const styles = StyleSheet.create({
alignItems: 'center', alignItems: 'center',
}, },
txtBlack: { txtBlack: {
fontSize: getFontXD(42), fontSize: getFontXD(36),
color: 'black', color: 'black',
}, },
imgIcon: { imgIcon: {
......
...@@ -22,6 +22,7 @@ export default { ...@@ -22,6 +22,7 @@ export default {
urlAddMethodBank: root + 'api/v1/customers/store-payment-method', urlAddMethodBank: root + 'api/v1/customers/store-payment-method',
urlDeleteMethodBank: root + 'api/v1/customers/delete-payment-method', urlDeleteMethodBank: root + 'api/v1/customers/delete-payment-method',
urlUpdateMethodBank: root + 'api/v1/customers/update-payment-method', urlUpdateMethodBank: root + 'api/v1/customers/update-payment-method',
urlGetDetailUser: root + 'api/v1/customers/detail',
//Home //Home
urlGetTransaction: root + 'api/v1/customers/statistic-transaction', urlGetTransaction: root + 'api/v1/customers/statistic-transaction',
......
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