Correction de bugs

This commit is contained in:
Brice 2020-11-30 18:25:24 +01:00
parent 2ecdc04ada
commit 67d72b36ec
5 changed files with 108 additions and 90 deletions

File diff suppressed because one or more lines are too long

View File

@ -1653,7 +1653,7 @@ class Home extends BaseScreen {
translucent={true}
/>
{/* Start here to comment */}
{
{/*{
(this.state.loadingDialog || this.props.loading) ?
<View
style={{
@ -1705,7 +1705,7 @@ class Home extends BaseScreen {
}
}])
}}
/>
/>*/}
{this.makeCardSearch()}
{this.makeSlidingUp()}
{this.makeDialogLoader()}

View File

@ -54,6 +54,7 @@ class CautionNanoCreditAgent extends Component {
withdrawalInCash: true,
wallet: store.getState().walletDetailReducer.result.response
};
console.log("Wallet", this.state.wallet);
this.props.getNanoCreditDemandDetailReset();
this.props.cautionCreditDemandAgentReset();
@ -240,6 +241,7 @@ class CautionNanoCreditAgent extends Component {
const {result, error} = this.props;
if (error !== null) {
console.log(error);
if (typeof error.data !== 'undefined') {
Alert.alert(
I18n.t("ERROR_LABLE"),
@ -255,6 +257,7 @@ class CautionNanoCreditAgent extends Component {
{cancelable: false}
)
}
}
if (result !== null) {
@ -276,7 +279,7 @@ class CautionNanoCreditAgent extends Component {
)
}
}
}
};
updateLangue() {
this.props.navigation.setParams({name: I18n.t('REFUND_NANO_CREDIT')})
@ -357,6 +360,7 @@ class CautionNanoCreditAgent extends Component {
<>
{(this.props.loading || this.props.loadingGetNanoCreditDemandDetail) && this.renderLoader()}
{this.state.isDataSubmit && this.renderRefundNanoCreditResponse()}
{this.state.triggerSubmitClick && this.renderGetNanoCreditDemandDetailResponse()}
{
(resultGetNanoCreditDemandDetail !== null) &&
(typeof resultGetNanoCreditDemandDetail.response !== 'undefined') &&

View File

@ -59,6 +59,7 @@ import {
} from '../../webservice/WalletTransactionHistoryApi';
import {resetCommissionReducer, transferCommissionAction} from '../../webservice/WalletTransferCommission';
import {readUser} from '../../webservice/AuthApi';
import {store} from "../../redux/store";
let moment = require('moment-timezone');
const thousands = require('thousands');
@ -86,7 +87,7 @@ class WalletDetail extends Component {
scrollHeaderY: 0,
displayModalHistory: false,
displaySuperHyperModalHistory: false,
historyItemDetail: null
historyItemDetail: null,
};
this.renderContent = null;
@ -142,6 +143,9 @@ class WalletDetail extends Component {
payload => {
const {result} = this.props;
console.log("will focus");
this.setState({
wallet: {currency_code: ''}
}, ()=>{
if (result !== null) {
if (typeof result.response !== 'undefined') {
const wallet = result.response[0];
@ -166,6 +170,7 @@ class WalletDetail extends Component {
})
}
}
})
});
}
@ -735,7 +740,7 @@ class WalletDetail extends Component {
<Text style={[Typography.overline, Color.grayColor], {marginTop: 4}}>
{
isEqual(element, 'montant') ?
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet.currency_code}`
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet !== undefined ? this.state.wallet.currency_code : ""}`
: isEqual(element, 'destinataire') ?
item[element].length > 13 ? cutString(item[element], 13) : item[element]
: isEqual(element, 'date_creation') ?
@ -1584,7 +1589,7 @@ class WalletDetail extends Component {
<Text style={[Typography.overline, Color.grayColor], {marginTop: 4}}>
{
isEqual(element, 'montant') ?
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet.currency_code}`
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet !== undefined ? this.state.wallet.currency_code : ""}`
: isEqual(element, 'destinataire') ?
item[element].length > 13 ? cutString(item[element], 13) : item[element]
: isEqual(element, 'date') ?
@ -1599,7 +1604,7 @@ class WalletDetail extends Component {
<Text style={[Typography.overline, Color.grayColor], {marginTop: 4}}>
{
isEqual(element, 'montant') ?
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet.currency_code}`
` ${item[element].length > 8 ? cutString(thousands(item[element], ' '), 6) : thousands(item[element], ' ')} ${this.state.wallet !== undefined ? this.state.wallet.currency_code : ""}`
: isEqual(element, 'destinataire') ?
item[element].length > 13 ? cutString(item[element], 13) : item[element]
: isEqual(element, 'date') ?

View File

@ -2,7 +2,16 @@ import { cautionCreditDemandtUrl, getNanoCreditDemandUrl } from "../IlinkConstan
import axios from "axios";
import I18n from 'react-native-i18n';
import {store} from "../../redux/store";
import { fetchCautionCreditDemandAgentPending, fetchCautionCreditDemandAgentSuccess, fetchCautionCreditDemandAgentError, fetchCautionCreditDemandAgentReset, fetchGetNanoCreditDemandDetailPending, fetchGetNanoCreditDemandDetailSuccess, fetchGetNanoCreditDemandDetailReset } from "../../redux/actions/NanoCreditAction";
import {
fetchCautionCreditDemandAgentError,
fetchCautionCreditDemandAgentPending,
fetchCautionCreditDemandAgentReset,
fetchCautionCreditDemandAgentSuccess,
fetchGetNanoCreditDemandDetailError,
fetchGetNanoCreditDemandDetailPending,
fetchGetNanoCreditDemandDetailReset,
fetchGetNanoCreditDemandDetailSuccess
} from "../../redux/actions/NanoCreditAction";
export const cautionCreditDemandAgentAction = (data) => {
@ -66,9 +75,9 @@ export const getNanoCreditDemandDetailAction = (idDemand) => {
if (error.response)
dispatch(fetchGetNanoCreditDemandDetailError(error.response));
else if (error.request)
dispatch(fetchGetNanoCreditDemandDetailError(error.request))
dispatch(fetchGetNanoCreditDemandDetailError(error.request));
else
dispatch(fetchGetNanoCreditDemandDetailError(error.message))
dispatch(fetchGetNanoCreditDemandDetailError(error.message));
});
}
}