From 6419efb521f8114a1a2bb4d09c0a46f97963838a Mon Sep 17 00:00:00 2001 From: Novic-Djef Date: Tue, 14 Nov 2023 14:59:34 +0100 Subject: [PATCH] correction des erreur de traduction --- AppIos.js | 8 +++- .../nano-sante/paymentCard/AutreCarteN.js | 2 +- .../PaymentCarteVersAutreWalletNanosante.js | 7 +-- .../nano-sante/paymentCard/carteLierN.js | 43 +++++++++---------- .../wallet/user/MobileMoneyNanoSante.js | 10 ++--- app/screens/wallet/user/WalletNanosante.js | 10 ++--- app/utils/i18n/en.json | 6 +++ 7 files changed, 49 insertions(+), 37 deletions(-) diff --git a/AppIos.js b/AppIos.js index 9a47f055..ee453454 100755 --- a/AppIos.js +++ b/AppIos.js @@ -40,7 +40,7 @@ import AddNetwork from "./screens/account/AddNetwork"; import MyHistory from "./screens/history-request/MyHistory"; import Icon from "react-native-vector-icons/FontAwesome5"; import I18n from "react-native-i18n"; - +import WalletNanosante from './app/screens/wallet/user/WalletNanosante'; import WalletDetail from './screens/wallet/WalletDetail'; import WalletSelect from './screens/wallet/WalletSelect'; import {PersistGate} from 'redux-persist/integration/react'; @@ -57,6 +57,7 @@ import AutreCarteN from './screens/nano-sante/paymentCard/AutreCarteN'; import CarteLierN from './screens/nano-sante/paymentCard/carteLierN'; import AutreCarte from './screens/wallet/user/AutreCarte'; import CarteLier from './screens/wallet/user/CarteLier' +import MobileMoneyNanoSante from './app/screens/wallet/user/MobileMoneyNanoSante'; './s' import ValidateIdentification from './screens/identification/validateIdentification'; import CreateIdentificationUser from './screens/identification/CreateIdentificationUser'; import OperateurOptionSelect from './screens/wallet/OperateurOptionSelect'; @@ -137,6 +138,7 @@ const AppStack = createDrawerNavigator({ paymentCarteVersAutreWalletNanosante: PaymentCarteVersAutreWalletNanosante, autreCarteN: AutreCarteN, carteLierN: CarteLierN, + mobileMoneyNanoSante: MobileMoneyNanoSante, operateurOptionSelect: OperateurOptionSelect, paiementFacture: PaiementFacture, envoieWalletToWalletUser: EnvoieWalletToWalletUser, @@ -269,6 +271,10 @@ const AppAgentStack = createDrawerNavigator({ walletOptionSelect: WalletOptionSelect, CarteLier: CarteLier, AutreCarte: AutreCarte, + AutreCarteN: AutreCarteN, + CarteLierN: CarteLierN, + MobileMoneyNanoSante: MobileMoneyNanoSante, + WalletNanosante: WalletNanosante, operateurOptionSelect: OperateurOptionSelect, paiementFacture: PaiementFacture, retraitEnCashAgent: RetraitEnCashAgent, diff --git a/app/screens/nano-sante/paymentCard/AutreCarteN.js b/app/screens/nano-sante/paymentCard/AutreCarteN.js index 879733af..02cac405 100644 --- a/app/screens/nano-sante/paymentCard/AutreCarteN.js +++ b/app/screens/nano-sante/paymentCard/AutreCarteN.js @@ -82,7 +82,7 @@ class AutreCarteN extends Component { headerTintColor: 'white', headerStyle: { backgroundColor: Color.primaryColor, - marginTop: 30, + marginTop: 0, color: 'white', }, headerTitleStyle: { diff --git a/app/screens/nano-sante/paymentCard/PaymentCarteVersAutreWalletNanosante.js b/app/screens/nano-sante/paymentCard/PaymentCarteVersAutreWalletNanosante.js index cd2ea727..0dd724eb 100644 --- a/app/screens/nano-sante/paymentCard/PaymentCarteVersAutreWalletNanosante.js +++ b/app/screens/nano-sante/paymentCard/PaymentCarteVersAutreWalletNanosante.js @@ -34,7 +34,7 @@ class PaymentCard extends Component { headerTintColor: 'white', headerStyle: { backgroundColor: Color.primaryColor, - marginTop: 30, + marginTop: 0, color: 'white' }, headerTitleStyle: { @@ -121,7 +121,6 @@ class PaymentCard extends Component { { this.props.navigation.push(route.carteLierN, { - optionSelect: optionenvoieautrewalletNanoSanteScreen, with_linked_card : true, onGoBack: () => this.refresh(), @@ -324,7 +323,9 @@ const styles = StyleSheet.create({ flex: 1, }, contentTitle: { - paddingTop: 5, + display: 'flex', + marginTop: 22, + textAlign: 'center', } }); diff --git a/app/screens/nano-sante/paymentCard/carteLierN.js b/app/screens/nano-sante/paymentCard/carteLierN.js index 2a3232c7..b5e06753 100644 --- a/app/screens/nano-sante/paymentCard/carteLierN.js +++ b/app/screens/nano-sante/paymentCard/carteLierN.js @@ -22,7 +22,6 @@ 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'; import {Fumi} from 'react-native-textinput-effects'; @@ -59,24 +58,9 @@ const navigatorStyle = { navBarTextColor: '#FFFFFF', navBarButtonColor: '#FFFFFF' -}; + }; + -const navigationOptions = () => { - return { - drawerLabel: () => null, - headerTitle: I18n.t('PAIEMENT_FACTURE'), - headerTintColor: 'white', - headerStyle: { - backgroundColor: Color.primaryColor, - marginTop: 0, - color: 'white' - }, - headerTitleStyle: { - color: "white" - }, - title: I18n.t('PAIEMENT_FACTURE') - } -}; const CarteLierN = ({ @@ -93,7 +77,22 @@ const CarteLierN = ({ const [subscription, setSubscription] = useState(null); - + const navigationOptions = () => { + return { + drawerLabel: () => null, + headerTitle: I18n.t('PAIEMENT_FACTURE'), + headerTintColor: 'white', + headerStyle: { + backgroundColor: Color.primaryColor, + marginTop: 0, + color: 'white' + }, + headerTitleStyle: { + color: "white" + }, + title: I18n.t('PAIEMENT_FACTURE') + } + }; const dispatch = useDispatch(); let dropDownAlertRef: any = null; @@ -242,8 +241,8 @@ const CarteLierN = ({ }); return ( - - (dropDownAlertRef = ref)}/> + // + // (dropDownAlertRef = ref)}/> @@ -358,7 +357,7 @@ const CarteLierN = ({ - + // ); }; diff --git a/app/screens/wallet/user/MobileMoneyNanoSante.js b/app/screens/wallet/user/MobileMoneyNanoSante.js index fe0bddca..4c463776 100644 --- a/app/screens/wallet/user/MobileMoneyNanoSante.js +++ b/app/screens/wallet/user/MobileMoneyNanoSante.js @@ -25,7 +25,7 @@ import { optionenvoieautrewalletNanoSanteScreen} from '../../../utils/UtilsFunct import {Color} from "../../../config/Color"; import I18n from 'react-native-i18n'; import {Fumi} from 'react-native-textinput-effects'; -import {ScreenComponent} from "../../../components/ScreenComponent"; +// import {ScreenComponent} from "../../../components/ScreenComponent"; import PasswordInput from '../../../components/PasswordInput'; import Button from "../../../components/Button"; import FontAwesome from "react-native-vector-icons/FontAwesome"; @@ -35,7 +35,7 @@ import { fetchGetSubscriptionList, fetchGetSubscriptionListReset } from "../../../redux/insurance/insurance.actions"; -import DropdownAlert from "react-native-dropdownalert"; +// import DropdownAlert from "react-native-dropdownalert"; import {readUser} from "../../../webservice/AuthApi"; import * as Animatable from 'react-native-animatable'; import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome'; @@ -388,8 +388,8 @@ const MobileMoneyNanoSante = ({ ) return ( - - (dropDownAlertRef = ref)}/> + // + // (dropDownAlertRef = ref)}/> @@ -492,7 +492,7 @@ const MobileMoneyNanoSante = ({ - + // ); }; diff --git a/app/screens/wallet/user/WalletNanosante.js b/app/screens/wallet/user/WalletNanosante.js index d09f3705..70eb41fe 100644 --- a/app/screens/wallet/user/WalletNanosante.js +++ b/app/screens/wallet/user/WalletNanosante.js @@ -34,7 +34,7 @@ import { fetchGetSubscriptionList, fetchGetSubscriptionListReset } from "../../../redux/insurance/insurance.actions"; -import DropdownAlert from "react-native-dropdownalert"; +// import DropdownAlert from "react-native-dropdownalert"; import {readUser} from "../../../webservice/AuthApi"; import * as Animatable from 'react-native-animatable'; import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome'; @@ -259,7 +259,7 @@ const WalletNanoSante = ({ const dispatch = useDispatch(); - let dropDownAlertRef: any = null; + // let dropDownAlertRef: any = null; let subscriptionRef = null; let amountPerMonthRef = null; const [wallet] = useState(store.getState().walletDetailReducer.result.response); @@ -522,8 +522,8 @@ const WalletNanoSante = ({ // ) return ( - - (dropDownAlertRef = ref)}/> + // + // (dropDownAlertRef = ref)}/> @@ -629,7 +629,7 @@ const WalletNanoSante = ({ - + // ); }; diff --git a/app/utils/i18n/en.json b/app/utils/i18n/en.json index b255e6b8..d36bcbf5 100755 --- a/app/utils/i18n/en.json +++ b/app/utils/i18n/en.json @@ -22,6 +22,12 @@ "TAKE_MY_PLACE": "Take my position", "MAP": "The map", "BSR": "Good evening", + "ZIP_CODE": "Postal Code", + "ETAT_STATE": "Etat or State", + "REATTACH__MY_CARD": "Rattach my Card", + "CARD_LINK": "Linked Card", + "OTHER_CARD": "Other Card", + "CHOUSE_PAYEMENT_MODE": "Chouse Payement Mode", "ACCOUNT_CREATED_SUCCESS": "Account created successfully.\nYou will receive in a few minutes an email and an SMS with your informations.\nWe will redirect you to the login page", "OR_BIG": "OR", "FOR_NUMB": "For the ",