mofication alert succes nano sante payement autre carte
This commit is contained in:
Novic-Djef
parent
dfd62a6652
commit
28156a2e77
File diff suppressed because one or more lines are too long
|
|
@ -3,7 +3,6 @@ import React, {useState, useEffect, useCallback} from 'react';
|
|||
import {ActivityIndicator, Platform, Alert, ProgressBarAndroid, Dimensions, StyleSheet, View, Text,} from 'react-native';
|
||||
import WebView from 'react-native-webview';
|
||||
import {connect, useDispatch} from 'react-redux';
|
||||
import {createStructuredSelector} from 'reselect';
|
||||
import {ScreenComponent} from "../components/ScreenComponent";
|
||||
import {readUser} from "../webservice/AuthApi";
|
||||
import queryString from 'query-string';
|
||||
|
|
@ -11,8 +10,6 @@ import I18n from "react-native-i18n";
|
|||
import {bindActionCreators} from "redux";
|
||||
import { envoieUserWalletToCardAction, getCommissionUserWalletToCardAction } from "../webservice/EnvoieUserApi"
|
||||
import { fetchActivePaySubscription } from '../redux/insurance/insurance.actions';
|
||||
//import { payment_transaction } from '../webservice/agent/RetraitCarteVersWalletApi';
|
||||
import {USER_CARD_WALLET, USER_PAY_INSURANCE} from '../redux/types/NanoSanteKeyType'
|
||||
|
||||
const WebviewScreen = ({
|
||||
navigation,
|
||||
|
|
@ -117,13 +114,14 @@ const WebviewScreen = ({
|
|||
navigation.goBack()
|
||||
Alert.alert(I18n.t('PAYMENT_ERROR'), I18n.t('PAYMENT_COULD_NOT_MADE'), [{text:"Ok",onPress:()=>{}}])
|
||||
}
|
||||
else if(status === "1") {
|
||||
// navigation.goBack()
|
||||
if(status === "1") {
|
||||
|
||||
if(transactionType === "USER_CARD_WALLET" ){
|
||||
envoieUserWalletToCardAction({
|
||||
payment_transaction_id: transaction_id,
|
||||
...requestBody
|
||||
}, true)
|
||||
navigation.goBack()
|
||||
}
|
||||
|
||||
if(transactionType === "USER_PAY_INSURANCE") {
|
||||
|
|
@ -131,6 +129,7 @@ const WebviewScreen = ({
|
|||
payment_transaction_id: transaction_id,
|
||||
...requestBody
|
||||
}, true)
|
||||
navigation.goBack()
|
||||
}
|
||||
// Marquez la redirection comme déjà effectuée
|
||||
setHasRedirected(true);
|
||||
|
|
@ -189,7 +188,6 @@ const mapStateToProps = state => ({
|
|||
});
|
||||
|
||||
const mapDispatchToProps = dispatch => bindActionCreators({
|
||||
//payment_transaction,
|
||||
envoieUserWalletToCardAction,
|
||||
getCommissionUserWalletToCardAction,
|
||||
fetchActivePaySubscription
|
||||
|
|
|
|||
|
|
@ -516,7 +516,7 @@ class Home extends BaseScreen {
|
|||
if (c.length > 0 && pays) {
|
||||
|
||||
this.setState({filternetwork: c[0], myNetwork: c[0], filternetworkTemp: c[0]})
|
||||
// this.retrieveAllPoint(pays)
|
||||
this.retrieveAllPoint(pays)
|
||||
|
||||
} else {
|
||||
if (this.state.user) {
|
||||
|
|
@ -1739,7 +1739,7 @@ class Home extends BaseScreen {
|
|||
translucent={true}
|
||||
/>
|
||||
{/* Start here to comment */}
|
||||
{/* {
|
||||
{
|
||||
(this.state.loadingDialog || this.props.loading) ?
|
||||
<View
|
||||
style={{
|
||||
|
|
@ -1760,7 +1760,7 @@ class Home extends BaseScreen {
|
|||
fontWeight: 'bold'
|
||||
}}>{I18n.t("LOADING_DOTS")}</Text>
|
||||
</View> : null
|
||||
} */}
|
||||
}
|
||||
<IMap
|
||||
ref={(re) => {
|
||||
this.map = re
|
||||
|
|
@ -2468,98 +2468,98 @@ class Home extends BaseScreen {
|
|||
</TouchableOpacity>)
|
||||
}
|
||||
|
||||
// retrieveAllPoint(dial_code) {
|
||||
// /* let markers= this.markerManager.getLocalMarkers()
|
||||
// console.log( markers.length)
|
||||
// if(markers.length>0){
|
||||
// console.debug("load from local")
|
||||
// for (let p of markers) {
|
||||
// console.log(` ${p.lastname}`);
|
||||
// }
|
||||
// this.markerManager.close();
|
||||
retrieveAllPoint(dial_code) {
|
||||
/* let markers= this.markerManager.getLocalMarkers()
|
||||
console.log( markers.length)
|
||||
if(markers.length>0){
|
||||
console.debug("load from local")
|
||||
for (let p of markers) {
|
||||
console.log(` ${p.lastname}`);
|
||||
}
|
||||
this.markerManager.close();
|
||||
|
||||
// this.setState({allpoint: [], loadingDialog: false})
|
||||
// }else*/
|
||||
// getMakersFrom(dial_code).then((data) => {
|
||||
// new Promise((resolve, reject) => {
|
||||
// try {
|
||||
// const ds = data.datas
|
||||
// this.setState({allpoint: ds, loadingDialog: false})
|
||||
this.setState({allpoint: [], loadingDialog: false})
|
||||
}else*/
|
||||
getMakersFrom(dial_code).then((data) => {
|
||||
new Promise((resolve, reject) => {
|
||||
try {
|
||||
const ds = data.datas
|
||||
this.setState({allpoint: ds, loadingDialog: false})
|
||||
|
||||
// resolve(ds)
|
||||
// } catch (e) {
|
||||
// //Crashlytics.log(e.message)
|
||||
// console.warn(e.message)
|
||||
// reject(new Error(e.message))
|
||||
// }
|
||||
// }).then((ds) => {
|
||||
// // this.markerManager.insertMarkers(ds).then((res)=>{console.warn(res)})
|
||||
// this.onLoadMore()
|
||||
// }).catch((e) => {
|
||||
// this.setState({loadingDialog: false})
|
||||
// //Crashlytics.log(e.message)
|
||||
// console.log("on get marker")
|
||||
resolve(ds)
|
||||
} catch (e) {
|
||||
//Crashlytics.log(e.message)
|
||||
console.warn(e.message)
|
||||
reject(new Error(e.message))
|
||||
}
|
||||
}).then((ds) => {
|
||||
// this.markerManager.insertMarkers(ds).then((res)=>{console.warn(res)})
|
||||
this.onLoadMore()
|
||||
}).catch((e) => {
|
||||
this.setState({loadingDialog: false})
|
||||
//Crashlytics.log(e.message)
|
||||
console.log("on get marker")
|
||||
|
||||
// Alert.alert(
|
||||
// I18n.t("UNABLE_TO_CONNECT_TITLE"),
|
||||
// I18n.t('TEXT_NETWORK_UNABLE')
|
||||
// ,
|
||||
// [
|
||||
// {
|
||||
// text: I18n.t("NO"), onPress: () => {
|
||||
// BackHandler.exitApp()
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// text: I18n.t("YES"), onPress: () => {
|
||||
// this.setState({loadingDialog: true})
|
||||
// if (dial_code !== null && dial_code !== undefined)
|
||||
// this.retrieveAllPoint(dial_code)
|
||||
// else
|
||||
// this.requestCameraPermission()
|
||||
// }
|
||||
// }
|
||||
Alert.alert(
|
||||
I18n.t("UNABLE_TO_CONNECT_TITLE"),
|
||||
I18n.t('TEXT_NETWORK_UNABLE')
|
||||
,
|
||||
[
|
||||
{
|
||||
text: I18n.t("NO"), onPress: () => {
|
||||
BackHandler.exitApp()
|
||||
}
|
||||
},
|
||||
{
|
||||
text: I18n.t("YES"), onPress: () => {
|
||||
this.setState({loadingDialog: true})
|
||||
if (dial_code !== null && dial_code !== undefined)
|
||||
this.retrieveAllPoint(dial_code)
|
||||
else
|
||||
this.requestCameraPermission()
|
||||
}
|
||||
}
|
||||
|
||||
// ],
|
||||
// {cancelable: false}
|
||||
// )
|
||||
// })
|
||||
],
|
||||
{cancelable: false}
|
||||
)
|
||||
})
|
||||
|
||||
// }).catch((e) => {
|
||||
// console.log("on retreive>getmarkers", e.message)
|
||||
}).catch((e) => {
|
||||
console.log("on retreive>getmarkers", e.message)
|
||||
|
||||
// this.setState({loadingDialog: false})
|
||||
// if (this.state.allpoint.length <= 0) {
|
||||
// console.log("no point")
|
||||
// Alert.alert(
|
||||
// I18n.t("UNABLE_TO_CONNECT_TITLE"),
|
||||
// I18n.t('TEXT_NETWORK_UNABLE')
|
||||
// ,
|
||||
// [
|
||||
// {
|
||||
// text: I18n.t("NO"), onPress: () => {
|
||||
// BackHandler.exitApp()
|
||||
// }
|
||||
// },
|
||||
// {
|
||||
// text: I18n.t("YES"), onPress: () => {
|
||||
// if (this.state.allpoint.length <= 0) {
|
||||
// this.setState({loadingDialog: true})
|
||||
// if (dial_code !== null && dial_code !== undefined)
|
||||
// this.retrieveAllPoint(dial_code)
|
||||
// else
|
||||
// this.requestCameraPermission()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
this.setState({loadingDialog: false})
|
||||
if (this.state.allpoint.length <= 0) {
|
||||
console.log("no point")
|
||||
Alert.alert(
|
||||
I18n.t("UNABLE_TO_CONNECT_TITLE"),
|
||||
I18n.t('TEXT_NETWORK_UNABLE')
|
||||
,
|
||||
[
|
||||
{
|
||||
text: I18n.t("NO"), onPress: () => {
|
||||
BackHandler.exitApp()
|
||||
}
|
||||
},
|
||||
{
|
||||
text: I18n.t("YES"), onPress: () => {
|
||||
if (this.state.allpoint.length <= 0) {
|
||||
this.setState({loadingDialog: true})
|
||||
if (dial_code !== null && dial_code !== undefined)
|
||||
this.retrieveAllPoint(dial_code)
|
||||
else
|
||||
this.requestCameraPermission()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ],
|
||||
// {cancelable: false}
|
||||
// )
|
||||
// }
|
||||
// })
|
||||
],
|
||||
{cancelable: false}
|
||||
)
|
||||
}
|
||||
})
|
||||
|
||||
// }
|
||||
}
|
||||
|
||||
showLoadMoreView() {
|
||||
if (this.state.isNeedLoadMore)
|
||||
|
|
|
|||
|
|
@ -322,6 +322,7 @@ class AutreCarteN extends Component {
|
|||
this.props.fetchActivePaySubscriptionReset();
|
||||
IlinkEmitter.emit('refreshWallet');
|
||||
this.props.navigation.pop();
|
||||
navigation.goBack()
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import {connect, useDispatch} from 'react-redux';
|
|||
import {useFormik} from 'formik';
|
||||
import * as Yup from 'yup';
|
||||
import * as Utils from '../../../utils/UtilsFunction'
|
||||
import {IlinkEmitter} from '../../../utils/events';
|
||||
import { optionenvoieautrewalletNanoSanteScreen} from '../../../utils/UtilsFunction'
|
||||
import {Color} from "../../../config/Color";
|
||||
import I18n from 'react-native-i18n';
|
||||
|
|
@ -170,7 +171,8 @@ const CarteLierN = ({
|
|||
{
|
||||
text: I18n.t("OK"), onPress: () => {
|
||||
dispatch(fetchActivePaySubscriptionReset());
|
||||
// navigation.pop()
|
||||
IlinkEmitter.emit('refreshWallet');
|
||||
this.props.navigation.pop();
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -818,20 +818,15 @@ class WalletDetailUser extends Component {
|
|||
|
||||
renderModalHistoryDetail = () => {
|
||||
const {historyItemDetail} = this.state;
|
||||
// const ma_condition = historyItemDetail.operation === "carte vers wallet" || historyItemDetail.operation === "carte vers mobile money" || historyItemDetail.operation === "carte vers cash";
|
||||
const { type } = historyItemDetail;
|
||||
|
||||
const isType10 = type === 10;
|
||||
const isType11 = type === 11;
|
||||
const isType21 = type === 21;
|
||||
|
||||
const ma_condition = historyItemDetail.operation === "Retrait de carte vers wallet" || historyItemDetail.operation === "Retrait de carte vers cash" || historyItemDetail.operation === "Envoi de carte vers autre wallet";
|
||||
|
||||
return (
|
||||
|
||||
|
||||
<Dialog.Container useNativeDriver={true} visible={this.state.displayModalHistory}>
|
||||
|
||||
<Dialog.Title>{I18n.t('HISTORY_DETAIL')}</Dialog.Title>
|
||||
{isType10 || isType11 || isType21 ? (
|
||||
{ma_condition ? (
|
||||
<View>
|
||||
<View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
|
|
@ -955,123 +950,120 @@ class WalletDetailUser extends Component {
|
|||
|
||||
</View>
|
||||
) : (
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
|
||||
<View>
|
||||
<View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text style={[styles.body2]}>{I18n.t('OPERATION')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.operation}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text style={[styles.body2]}>{I18n.t('TRANSACTION_ID')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.id_transaction}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text style={[styles.body2]}>Date</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('INIT_COUNTRY')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.init_country}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('AMOUNT')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('FEES_AND_TAXES')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.frais}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('NET_AMOUNT')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_net_init}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('EMETTEUR')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.emetteur}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('DESTINATAIRE')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.destinataire}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('FINAL_COUNTRY')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.final_country}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('NET_AMOUNT')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_net_final}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2]}>{I18n.t('ACTIVE_WALLET')}</Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.reseau_payeur}</Text>
|
||||
</View>
|
||||
// <View>
|
||||
// <View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text style={[styles.body2]}>{I18n.t('OPERATION')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.operation}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text style={[styles.body2]}>{I18n.t('TRANSACTION_ID')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.id_transaction}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text style={[styles.body2]}>Date</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('INIT_COUNTRY')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.init_country}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('AMOUNT')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('FEES_AND_TAXES')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.frais}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('NET_AMOUNT')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_net_init}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('EMETTEUR')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.emetteur}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('DESTINATAIRE')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.destinataire}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('FINAL_COUNTRY')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.final_country}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('NET_AMOUNT')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_net_final}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// <View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
// <View style={{flex: 1}}>
|
||||
// <Text tyle={[Typography.body2]}>{I18n.t('ACTIVE_WALLET')}</Text>
|
||||
// </View>
|
||||
// <View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
// <Text
|
||||
// style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.reseau_payeur}</Text>
|
||||
// </View>
|
||||
// </View>
|
||||
// </View>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
// </View>
|
||||
</View>
|
||||
)}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -261,20 +261,13 @@ class RetraitCarteVersCashUser extends Component {
|
|||
</View>
|
||||
</View>
|
||||
<View style={{paddingVertical: 10}}>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('NET_AMOUNT')}: </Text>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('TTC_AMOUNT')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}></Text>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{`${thousands(montant_net_init, ' ')} ${this.state.wallet.card_currency_code}`}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
|
|
@ -283,7 +276,15 @@ class RetraitCarteVersCashUser extends Component {
|
|||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{`${thousands(montant_net_init, ' ')} ${this.state.wallet.card_currency_code}`}</Text>
|
||||
style={[Typography.caption1, Color.grayColor]}></Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
|
|
|
|||
|
|
@ -304,20 +304,13 @@ class RetraitCarteVersWalletUser extends Component {
|
|||
</View>
|
||||
</View>
|
||||
<View style={{paddingVertical: 10}}>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('NET_AMOUNT')}: </Text>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('TTC_AMOUNT')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}></Text>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{`${thousands(montant_net_init, ' ')} ${this.state.wallet.card_currency_code}`}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
|
|
@ -326,7 +319,15 @@ class RetraitCarteVersWalletUser extends Component {
|
|||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text
|
||||
style={[Typography.caption1, Color.grayColor]}>{`${thousands(montant_net_init, ' ')} ${this.state.wallet.card_currency_code}`}</Text>
|
||||
style={[Typography.caption1, Color.grayColor]}></Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
<View style={{flex: 1}}>
|
||||
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text>
|
||||
</View>
|
||||
<View style={{flex: 1, alignItems: 'flex-end'}}>
|
||||
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{flexDirection: 'row', marginTop: 10}}>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"start": "node node_modules/react-native/local-cli/cli.js start",
|
||||
"test": "jest",
|
||||
"postinstall": "node ./fix-android/android-release-fix.js",
|
||||
"release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && del /s /q ./android/app/src/main/res/drawable-* && del /s /q ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk",
|
||||
"release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && del /s /q ./android/app/src/main/res/drawable-* && del /s /q ./android/app/src/main/res/raw/* && cd ./android && gradlew assembleRelease && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk",
|
||||
"debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ && cd ./android && gradlew clean && gradlew assembleDebug && cd .. && adb install ./android/app/build/outputs/apk/debug/app-debug.apk",
|
||||
"start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8",
|
||||
"start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8",
|
||||
|
|
|
|||
Loading…
Reference in New Issue