adminnistrateur
/
ilink-world
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mofication alert succes nano sante payement autre carte

This commit is contained in:
Novic-Djef 2023-10-10 21:04:43 +01:00
parent dfd62a6652
commit 28156a2e77
9 changed files with 1201 additions and 1207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1937
android/app/src/main/assets/index.android.bundle
View File

File diff suppressed because one or more lines are too long

10
app/screens/WebviewScreen.js
View File

@ -3,7 +3,6 @@ import React, {useState, useEffect, useCallback} from 'react';
import {ActivityIndicator, Platform, Alert, ProgressBarAndroid, Dimensions, StyleSheet, View, Text,} from 'react-native'; import {ActivityIndicator, Platform, Alert, ProgressBarAndroid, Dimensions, StyleSheet, View, Text,} from 'react-native';
import WebView from 'react-native-webview'; import WebView from 'react-native-webview';
import {connect, useDispatch} from 'react-redux'; import {connect, useDispatch} from 'react-redux';
import {createStructuredSelector} from 'reselect';
import {ScreenComponent} from "../components/ScreenComponent"; import {ScreenComponent} from "../components/ScreenComponent";
import {readUser} from "../webservice/AuthApi"; import {readUser} from "../webservice/AuthApi";
import queryString from 'query-string'; import queryString from 'query-string';
@ -11,8 +10,6 @@ import I18n from "react-native-i18n";
import {bindActionCreators} from "redux"; import {bindActionCreators} from "redux";
import { envoieUserWalletToCardAction, getCommissionUserWalletToCardAction } from "../webservice/EnvoieUserApi" import { envoieUserWalletToCardAction, getCommissionUserWalletToCardAction } from "../webservice/EnvoieUserApi"
import { fetchActivePaySubscription } from '../redux/insurance/insurance.actions'; 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 = ({ const WebviewScreen = ({
navigation, navigation,
@ -117,13 +114,14 @@ const WebviewScreen = ({
navigation.goBack() navigation.goBack()
Alert.alert(I18n.t('PAYMENT_ERROR'), I18n.t('PAYMENT_COULD_NOT_MADE'), [{text:"Ok",onPress:()=>{}}]) Alert.alert(I18n.t('PAYMENT_ERROR'), I18n.t('PAYMENT_COULD_NOT_MADE'), [{text:"Ok",onPress:()=>{}}])
} }
else if(status === "1") { if(status === "1") {
// navigation.goBack()
if(transactionType === "USER_CARD_WALLET" ){ if(transactionType === "USER_CARD_WALLET" ){
envoieUserWalletToCardAction({ envoieUserWalletToCardAction({
payment_transaction_id: transaction_id, payment_transaction_id: transaction_id,
...requestBody ...requestBody
}, true) }, true)
navigation.goBack()
} }
if(transactionType === "USER_PAY_INSURANCE") { if(transactionType === "USER_PAY_INSURANCE") {
@ -131,6 +129,7 @@ const WebviewScreen = ({
payment_transaction_id: transaction_id, payment_transaction_id: transaction_id,
...requestBody ...requestBody
}, true) }, true)
navigation.goBack()
} }
// Marquez la redirection comme déjà effectuée // Marquez la redirection comme déjà effectuée
setHasRedirected(true); setHasRedirected(true);
@ -189,7 +188,6 @@ const mapStateToProps = state => ({
}); });
const mapDispatchToProps = dispatch => bindActionCreators({ const mapDispatchToProps = dispatch => bindActionCreators({
//payment_transaction,
envoieUserWalletToCardAction, envoieUserWalletToCardAction,
getCommissionUserWalletToCardAction, getCommissionUserWalletToCardAction,
fetchActivePaySubscription fetchActivePaySubscription

174
app/screens/home/Home.js
View File

@ -516,7 +516,7 @@ class Home extends BaseScreen {
if (c.length > 0 && pays) { if (c.length > 0 && pays) {
this.setState({filternetwork: c[0], myNetwork: c[0], filternetworkTemp: c[0]}) this.setState({filternetwork: c[0], myNetwork: c[0], filternetworkTemp: c[0]})
// this.retrieveAllPoint(pays) this.retrieveAllPoint(pays)
} else { } else {
if (this.state.user) { if (this.state.user) {
@ -1739,7 +1739,7 @@ class Home extends BaseScreen {
translucent={true} translucent={true}
/> />
{/* Start here to comment */} {/* Start here to comment */}
{/* { {
(this.state.loadingDialog || this.props.loading) ? (this.state.loadingDialog || this.props.loading) ?
<View <View
style={{ style={{
@ -1760,7 +1760,7 @@ class Home extends BaseScreen {
fontWeight: 'bold' fontWeight: 'bold'
}}>{I18n.t("LOADING_DOTS")}</Text> }}>{I18n.t("LOADING_DOTS")}</Text>
</View> : null </View> : null
} */} }
<IMap <IMap
ref={(re) => { ref={(re) => {
this.map = re this.map = re
@ -2468,98 +2468,98 @@ class Home extends BaseScreen {
</TouchableOpacity>) </TouchableOpacity>)
} }
// retrieveAllPoint(dial_code) { retrieveAllPoint(dial_code) {
// /* let markers= this.markerManager.getLocalMarkers() /* let markers= this.markerManager.getLocalMarkers()
// console.log( markers.length) console.log( markers.length)
// if(markers.length>0){ if(markers.length>0){
// console.debug("load from local") console.debug("load from local")
// for (let p of markers) { for (let p of markers) {
// console.log(` ${p.lastname}`); console.log(` ${p.lastname}`);
// } }
// this.markerManager.close(); this.markerManager.close();
// this.setState({allpoint: [], loadingDialog: false}) this.setState({allpoint: [], loadingDialog: false})
// }else*/ }else*/
// getMakersFrom(dial_code).then((data) => { getMakersFrom(dial_code).then((data) => {
// new Promise((resolve, reject) => { new Promise((resolve, reject) => {
// try { try {
// const ds = data.datas const ds = data.datas
// this.setState({allpoint: ds, loadingDialog: false}) this.setState({allpoint: ds, loadingDialog: false})
// resolve(ds) resolve(ds)
// } catch (e) { } catch (e) {
// //Crashlytics.log(e.message) //Crashlytics.log(e.message)
// console.warn(e.message) console.warn(e.message)
// reject(new Error(e.message)) reject(new Error(e.message))
// } }
// }).then((ds) => { }).then((ds) => {
// // this.markerManager.insertMarkers(ds).then((res)=>{console.warn(res)}) // this.markerManager.insertMarkers(ds).then((res)=>{console.warn(res)})
// this.onLoadMore() this.onLoadMore()
// }).catch((e) => { }).catch((e) => {
// this.setState({loadingDialog: false}) this.setState({loadingDialog: false})
// //Crashlytics.log(e.message) //Crashlytics.log(e.message)
// console.log("on get marker") console.log("on get marker")
// Alert.alert( Alert.alert(
// I18n.t("UNABLE_TO_CONNECT_TITLE"), I18n.t("UNABLE_TO_CONNECT_TITLE"),
// I18n.t('TEXT_NETWORK_UNABLE') I18n.t('TEXT_NETWORK_UNABLE')
// , ,
// [ [
// { {
// text: I18n.t("NO"), onPress: () => { text: I18n.t("NO"), onPress: () => {
// BackHandler.exitApp() BackHandler.exitApp()
// } }
// }, },
// { {
// text: I18n.t("YES"), onPress: () => { text: I18n.t("YES"), onPress: () => {
// this.setState({loadingDialog: true}) this.setState({loadingDialog: true})
// if (dial_code !== null && dial_code !== undefined) if (dial_code !== null && dial_code !== undefined)
// this.retrieveAllPoint(dial_code) this.retrieveAllPoint(dial_code)
// else else
// this.requestCameraPermission() this.requestCameraPermission()
// } }
// } }
// ], ],
// {cancelable: false} {cancelable: false}
// ) )
// }) })
// }).catch((e) => { }).catch((e) => {
// console.log("on retreive>getmarkers", e.message) console.log("on retreive>getmarkers", e.message)
// this.setState({loadingDialog: false}) this.setState({loadingDialog: false})
// if (this.state.allpoint.length <= 0) { if (this.state.allpoint.length <= 0) {
// console.log("no point") console.log("no point")
// Alert.alert( Alert.alert(
// I18n.t("UNABLE_TO_CONNECT_TITLE"), I18n.t("UNABLE_TO_CONNECT_TITLE"),
// I18n.t('TEXT_NETWORK_UNABLE') I18n.t('TEXT_NETWORK_UNABLE')
// , ,
// [ [
// { {
// text: I18n.t("NO"), onPress: () => { text: I18n.t("NO"), onPress: () => {
// BackHandler.exitApp() BackHandler.exitApp()
// } }
// }, },
// { {
// text: I18n.t("YES"), onPress: () => { text: I18n.t("YES"), onPress: () => {
// if (this.state.allpoint.length <= 0) { if (this.state.allpoint.length <= 0) {
// this.setState({loadingDialog: true}) this.setState({loadingDialog: true})
// if (dial_code !== null && dial_code !== undefined) if (dial_code !== null && dial_code !== undefined)
// this.retrieveAllPoint(dial_code) this.retrieveAllPoint(dial_code)
// else else
// this.requestCameraPermission() this.requestCameraPermission()
// } }
// } }
// } }
// ], ],
// {cancelable: false} {cancelable: false}
// ) )
// } }
// }) })
// } }
showLoadMoreView() { showLoadMoreView() {
if (this.state.isNeedLoadMore) if (this.state.isNeedLoadMore)

1
app/screens/nano-sante/paymentCard/AutreCarteN.js
View File

@ -322,6 +322,7 @@ class AutreCarteN extends Component {
this.props.fetchActivePaySubscriptionReset(); this.props.fetchActivePaySubscriptionReset();
IlinkEmitter.emit('refreshWallet'); IlinkEmitter.emit('refreshWallet');
this.props.navigation.pop(); this.props.navigation.pop();
navigation.goBack()
}, },
}, },
], ],

4
app/screens/nano-sante/paymentCard/carteLierN.js
View File

@ -21,6 +21,7 @@ import {connect, useDispatch} from 'react-redux';
import {useFormik} from 'formik'; import {useFormik} from 'formik';
import * as Yup from 'yup'; import * as Yup from 'yup';
import * as Utils from '../../../utils/UtilsFunction' import * as Utils from '../../../utils/UtilsFunction'
import {IlinkEmitter} from '../../../utils/events';
import { optionenvoieautrewalletNanoSanteScreen} from '../../../utils/UtilsFunction' import { optionenvoieautrewalletNanoSanteScreen} from '../../../utils/UtilsFunction'
import {Color} from "../../../config/Color"; import {Color} from "../../../config/Color";
import I18n from 'react-native-i18n'; import I18n from 'react-native-i18n';
@ -170,7 +171,8 @@ const CarteLierN = ({
{ {
text: I18n.t("OK"), onPress: () => { text: I18n.t("OK"), onPress: () => {
dispatch(fetchActivePaySubscriptionReset()); dispatch(fetchActivePaySubscriptionReset());
// navigation.pop() IlinkEmitter.emit('refreshWallet');
this.props.navigation.pop();
} }
} }
], ],

230
app/screens/wallet/WalletDetailUser.js
View File

@ -818,12 +818,7 @@ class WalletDetailUser extends Component {
renderModalHistoryDetail = () => { renderModalHistoryDetail = () => {
const {historyItemDetail} = this.state; const {historyItemDetail} = this.state;
// const ma_condition = historyItemDetail.operation === "carte vers wallet" || historyItemDetail.operation === "carte vers mobile money" || historyItemDetail.operation === "carte vers cash"; 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";
const { type } = historyItemDetail;
const isType10 = type === 10;
const isType11 = type === 11;
const isType21 = type === 21;
return ( return (
@ -831,7 +826,7 @@ class WalletDetailUser extends Component {
<Dialog.Container useNativeDriver={true} visible={this.state.displayModalHistory}> <Dialog.Container useNativeDriver={true} visible={this.state.displayModalHistory}>
<Dialog.Title>{I18n.t('HISTORY_DETAIL')}</Dialog.Title> <Dialog.Title>{I18n.t('HISTORY_DETAIL')}</Dialog.Title>
{isType10 || isType11 || isType21 ? ( {ma_condition ? (
<View> <View>
<View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}> <View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
@ -955,123 +950,120 @@ class WalletDetailUser extends Component {
</View> </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'}}> <View style={{flex: 1, alignItems: 'flex-end'}}>
<Text <Text
style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.reseau_payeur}</Text> style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.reseau_payeur}</Text>
</View> </View>
// <View> </View>
// <View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}> </View>
// <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>
)} )}

23
app/screens/wallet/user/RetraitCarteVersCashUser.js
View File

@ -261,20 +261,13 @@ class RetraitCarteVersCashUser extends Component {
</View> </View>
</View> </View>
<View style={{paddingVertical: 10}}> <View style={{paddingVertical: 10}}>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}> <View style={{flex: 1}}>
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text> <Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('TTC_AMOUNT')}: </Text>
</View> </View>
<View style={{flex: 1, alignItems: 'flex-end'}}> <View style={{flex: 1, alignItems: 'flex-end'}}>
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</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}}>
<View style={{flex: 1}}>
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('NET_AMOUNT')}: </Text>
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text style={[Typography.caption1, Color.grayColor]}></Text>
</View> </View>
</View> </View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
@ -283,7 +276,15 @@ class RetraitCarteVersCashUser extends Component {
</View> </View>
<View style={{flex: 1, alignItems: 'flex-end'}}> <View style={{flex: 1, alignItems: 'flex-end'}}>
<Text <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> </View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>

23
app/screens/wallet/user/RetraitCarteVersWalletUser.js
View File

@ -304,20 +304,13 @@ class RetraitCarteVersWalletUser extends Component {
</View> </View>
</View> </View>
<View style={{paddingVertical: 10}}> <View style={{paddingVertical: 10}}>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}> <View style={{flex: 1}}>
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('EXCHANGE_TAUX')}: </Text> <Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('TTC_AMOUNT')}: </Text>
</View> </View>
<View style={{flex: 1, alignItems: 'flex-end'}}> <View style={{flex: 1, alignItems: 'flex-end'}}>
<Text style={[Typography.caption1, Color.grayColor]}>{exchange_rate}</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}}>
<View style={{flex: 1}}>
<Text tyle={[Typography.body2, FontWeight.bold]}>{I18n.t('NET_AMOUNT')}: </Text>
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text style={[Typography.caption1, Color.grayColor]}></Text>
</View> </View>
</View> </View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
@ -326,7 +319,15 @@ class RetraitCarteVersWalletUser extends Component {
</View> </View>
<View style={{flex: 1, alignItems: 'flex-end'}}> <View style={{flex: 1, alignItems: 'flex-end'}}>
<Text <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> </View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>

2
package.json
View File

@ -6,7 +6,7 @@
"start": "node node_modules/react-native/local-cli/cli.js start", "start": "node node_modules/react-native/local-cli/cli.js start",
"test": "jest", "test": "jest",
"postinstall": "node ./fix-android/android-release-fix.js", "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", "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": "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", "start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8",