Skip to content

I
InvestCustomer
Commit 689868b4 by Giang Tran
Options

update create otp

parent ddec860b
Showing with 466 additions and 285 deletions
src/Screens/Action/Wallet/WalletDeposit.js
import React, {useState} from 'react'; import React, {useState} from 'react';
import { import {
DeviceEventEmitter, DeviceEventEmitter,
Dimensions, Dimensions,
Keyboard, Keyboard,
KeyboardAvoidingView, KeyboardAvoidingView,
Platform, Platform,
ScrollView, ScrollView,
StyleSheet, StyleSheet,
Text, Text,
TouchableOpacity, TouchableOpacity,
TouchableWithoutFeedback, TouchableWithoutFeedback,
View, View,
} from 'react-native'; } from 'react-native';
import R from '../../../assets/R'; import R from '../../../assets/R';
import HeaderBack from '../../../components/Header/HeaderBack'; import HeaderBack from '../../../components/Header/HeaderBack';
import TextMulti from '../../../components/Input/TextMulti'; import TextMulti from '../../../components/Input/TextMulti';
import {useNavigation} from '@react-navigation/native'; import {useNavigation} from '@react-navigation/native';
import {checkFormatArray, getFontXD, HEIGHTXD, toPriceVnd, WIDTHXD} from '../../../Config/Functions'; import {
checkFormatArray,
getFontXD,
HEIGHTXD,
toPriceVnd,
WIDTHXD,
} from '../../../Config/Functions';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {hideLoading, showLoading} from '../../../actions/loadingAction'; import {hideLoading, showLoading} from '../../../actions/loadingAction';
import TextMoney from '../../../components/Input/InputMoney'; import TextMoney from '../../../components/Input/InputMoney';
import I18n from '../../../helper/i18/i18n'; import I18n from '../../../helper/i18/i18n';
import {ENTER_PASSWORD_SMART_OTP, SETTINGOTP, SMARTOTP} from '../../../routers/ScreenNames'; import {
ENTER_PASSWORD_SMART_OTP,
SETTINGOTP,
SMARTOTP,
CHANGESMARTOTP,
} from '../../../routers/ScreenNames';
import {showAlert, TYPE} from '../../../components/DropdownAlert'; import {showAlert, TYPE} from '../../../components/DropdownAlert';
import {confirmAlert} from '../../../components/Aleart'; import {confirmAlert} from '../../../components/Aleart';
const WalletDeposit = (props) => { const WalletDeposit = (props) => {
const [amount, setAmount] = useState(); const [amount, setAmount] = useState();
const [notes, setNotes] = useState(); const [notes, setNotes] = useState();
const navigate = useNavigation(); const navigate = useNavigation();
const onClick = async () => { const onClick = async () => {
const titles = [ const titles = [
I18n.t('AmountOfMoney').toLowerCase(), I18n.t('AmountOfMoney').toLowerCase(),
I18n.t('Note').toLowerCase(), I18n.t('Note').toLowerCase(),
]; ];
const index = checkFormatArray([amount]); const index = checkFormatArray([amount]);
if (index === true) { if (index === true) {
if (!props.user.smart_otp_status) { if (!props.user.smart_otp_status) {
confirmAlert( confirmAlert(
`${I18n.t('YouHaveNotSettingSmartOTP')}`, `${I18n.t('YouHaveNotSettingSmartOTP')}`,
() => { () => {
navigate.navigate(SETTINGOTP, { navigate.navigate(CHANGESMARTOTP, {
isFromTransaction: true, TYPE: 'CREATE_SMART_OTP',
setupSmartOTPSuccess: () => { old_password: null,
navigate.goBack() isFromTransaction: true,
navigate.goBack() setupSmartOTPSuccess: () => {
navigate.navigate(ENTER_PASSWORD_SMART_OTP, { navigate.goBack();
onGoToSmartOTP: (pinCode, otp) => onGoToSmartOTP(pinCode, otp), navigate.goBack();
});
DeviceEventEmitter.emit('reloadUserInfo');
},
});
},
`${I18n.t('setting')}`,
);
} else {
navigate.navigate(ENTER_PASSWORD_SMART_OTP, { navigate.navigate(ENTER_PASSWORD_SMART_OTP, {
onGoToSmartOTP: (pinCode, otp) => onGoToSmartOTP(pinCode, otp), onGoToSmartOTP: (pinCode, otp) =>
onGoToSmartOTP(pinCode, otp),
}); });
} DeviceEventEmitter.emit('reloadUserInfo');
} else { },
showAlert( });
TYPE.WARN, },
I18n.t('Notification'), `${I18n.t('setting')}`,
I18n.t('Please_fill_in') + titles[index], );
); } else {
} navigate.navigate(ENTER_PASSWORD_SMART_OTP, {
}; onGoToSmartOTP: (pinCode, otp) => onGoToSmartOTP(pinCode, otp),
const onGoToSmartOTP = (pinCode, otp) => {
navigate.goBack();
navigate.navigate(SMARTOTP, {
type: 'DEPOSIT',
amount,
notes,
pinCode,
otp,
}); });
}; }
return ( } else {
<KeyboardAvoidingView showAlert(
behavior={Platform.Os === 'ios' ? 'padding' : 'height'} TYPE.WARN,
style={{flex: 1, backgroundColor: 'white'}} I18n.t('Notification'),
keyboardVerticalOffset={-50}> I18n.t('Please_fill_in') + titles[index],
<TouchableWithoutFeedback onPress={Keyboard.dismiss}> );
<View style={{flex: 1}}> }
<HeaderBack title={'InvestmentDeposit'}/> };
<ScrollView showsVerticalScrollIndicator={false}> const onGoToSmartOTP = (pinCode, otp) => {
<View style={styles.container}> navigate.goBack();
<View style={styles.wrapTop}> navigate.navigate(SMARTOTP, {
<View style={styles.itemTop}> type: 'DEPOSIT',
<Text style={styles.txtTitle}>{I18n.t('Wallet')}</Text> amount,
<Text style={styles.txtMoney}> notes,
{' '} pinCode,
{props.user.current_money != 0 otp,
? toPriceVnd(props.user.current_money) });
: 0}{' '} };
</Text> return (
</View> <KeyboardAvoidingView
<View style={{width: 1, backgroundColor: '#DBDBDB'}}/> behavior={Platform.Os === 'ios' ? 'padding' : 'height'}
<View style={styles.itemTop}> style={{flex: 1, backgroundColor: 'white'}}
<Text style={styles.txtTitle}>CQG</Text> keyboardVerticalOffset={-50}>
<Text style={styles.txtMoney}> <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
{' '} <View style={{flex: 1}}>
{props.user.current_cqg_money != 0 <HeaderBack title={'InvestmentDeposit'} />
? toPriceVnd(props.user.current_cqg_money) <ScrollView showsVerticalScrollIndicator={false}>
: 0}{' '} <View style={styles.container}>
đ <View style={styles.wrapTop}>
</Text> <View style={styles.itemTop}>
</View> <Text style={styles.txtTitle}>{I18n.t('Wallet')}</Text>
</View> <Text style={styles.txtMoney}>
<View style={styles.wrapBody}> {' '}
{/* <TextDisable value={'10010101'} title={'Số tài khoản CQG'} /> */} {props.user.current_money != 0
<TextMoney ? toPriceVnd(props.user.current_money)
onChangeText={(val) => setAmount(val)} : 0}{' '}
title={I18n.t('AmountOfMoney')} </Text>
value={amount} </View>
/> <View style={{width: 1, backgroundColor: '#DBDBDB'}} />
<TextMulti <View style={styles.itemTop}>
onChangeText={(val) => setNotes(val)} <Text style={styles.txtTitle}>CQG</Text>
title={I18n.t('Note')} <Text style={styles.txtMoney}>
placeholder={I18n.t('noteWithdrawMoney')} {' '}
/> {props.user.current_cqg_money != 0
</View> ? toPriceVnd(props.user.current_cqg_money)
</View> : 0}{' '}
</ScrollView> đ
<View </Text>
style={{
paddingVertical: 10,
justifyContent: 'center',
alignItems: 'center',
}}>
<TouchableOpacity onPress={onClick} style={styles.btnSend}>
<Text style={styles.txtSend}>{I18n.t('Deposit')}</Text>
</TouchableOpacity>
</View>
</View> </View>
</TouchableWithoutFeedback> </View>
</KeyboardAvoidingView> <View style={styles.wrapBody}>
); {/* <TextDisable value={'10010101'} title={'Số tài khoản CQG'} /> */}
<TextMoney
onChangeText={(val) => setAmount(val)}
title={I18n.t('AmountOfMoney')}
value={amount}
/>
<TextMulti
onChangeText={(val) => setNotes(val)}
title={I18n.t('Note')}
placeholder={I18n.t('noteWithdrawMoney')}
/>
</View>
</View>
</ScrollView>
<View
style={{
paddingVertical: 10,
justifyContent: 'center',
alignItems: 'center',
}}>
<TouchableOpacity onPress={onClick} style={styles.btnSend}>
<Text style={styles.txtSend}>{I18n.t('Deposit')}</Text>
</TouchableOpacity>
</View>
</View>
</TouchableWithoutFeedback>
</KeyboardAvoidingView>
);
}; };
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: { container: {
backgroundColor: R.colors.white, backgroundColor: R.colors.white,
marginVertical: 10, marginVertical: 10,
shadowColor: '#AFA9A9', shadowColor: '#AFA9A9',
shadowOffset: { shadowOffset: {
width: 0, width: 0,
height: 1, height: 1,
},
shadowOpacity: 0.25,
shadowRadius: 1.84,
elevation: 1,
},
wrapTop: {
flexDirection: 'row',
borderBottomWidth: 1,
borderBottomColor: '#DBDBDB',
},
itemTop: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
paddingVertical: 20,
},
wrapBody: {
paddingHorizontal: 10,
paddingVertical: 20,
},
txtMoney: {
color: '#1C6AF6',
fontSize: getFontXD(52),
},
txtTitle: {
color: R.colors.black,
fontSize: getFontXD(42),
},
txtSend: {
fontSize: getFontXD(42),
color: R.colors.white,
fontWeight: 'bold',
},
btnSend: {
width: WIDTHXD(400),
height: HEIGHTXD(100),
backgroundColor: R.colors.main,
borderRadius: 10,
justifyContent: 'center',
alignItems: 'center',
}, },
shadowOpacity: 0.25,
shadowRadius: 1.84,
elevation: 1,
},
wrapTop: {
flexDirection: 'row',
borderBottomWidth: 1,
borderBottomColor: '#DBDBDB',
},
itemTop: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
paddingVertical: 20,
},
wrapBody: {
paddingHorizontal: 10,
paddingVertical: 20,
},
txtMoney: {
color: '#1C6AF6',
fontSize: getFontXD(52),
},
txtTitle: {
color: R.colors.black,
fontSize: getFontXD(42),
},
txtSend: {
fontSize: getFontXD(42),
color: R.colors.white,
fontWeight: 'bold',
},
btnSend: {
width: WIDTHXD(400),
height: HEIGHTXD(100),
backgroundColor: R.colors.main,
borderRadius: 10,
justifyContent: 'center',
alignItems: 'center',
},
}); });
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
user: state.userReducer, user: state.userReducer,
}; };
}; };
export default connect(mapStateToProps, {showLoading, hideLoading})( export default connect(mapStateToProps, {showLoading, hideLoading})(
WalletDeposit, WalletDeposit,
); );
src/Screens/Action/Wallet/WalletWithdraw.js
...@@ -9,7 +9,8 @@ import { ...@@ -9,7 +9,8 @@ import {
TouchableWithoutFeedback, TouchableWithoutFeedback,
Keyboard, Keyboard,
KeyboardAvoidingView, KeyboardAvoidingView,
ScrollView, DeviceEventEmitter, ScrollView,
DeviceEventEmitter,
} from 'react-native'; } from 'react-native';
import R from '../../../assets/R'; import R from '../../../assets/R';
import HeaderBack from '../../../components/Header/HeaderBack'; import HeaderBack from '../../../components/Header/HeaderBack';
...@@ -31,7 +32,9 @@ import {saveUserToRedux} from '../../../actions/users'; ...@@ -31,7 +32,9 @@ import {saveUserToRedux} from '../../../actions/users';
import {confirmAlert} from '../../../components/Aleart'; import {confirmAlert} from '../../../components/Aleart';
import { import {
ADDMETHODPAY, ADDMETHODPAY,
ENTER_PASSWORD_SMART_OTP, SETTINGOTP, ENTER_PASSWORD_SMART_OTP,
SETTINGOTP,
CHANGESMARTOTP,
} from '../../../routers/ScreenNames'; } from '../../../routers/ScreenNames';
import TextMoney from '../../../components/Input/InputMoney'; import TextMoney from '../../../components/Input/InputMoney';
import I18n from '../../../helper/i18/i18n'; import I18n from '../../../helper/i18/i18n';
...@@ -116,21 +119,24 @@ const WalletWithdraw = (props) => { ...@@ -116,21 +119,24 @@ const WalletWithdraw = (props) => {
} else { } else {
if (!props.user.smart_otp_status) { if (!props.user.smart_otp_status) {
confirmAlert( confirmAlert(
`${I18n.t('YouHaveNotSettingSmartOTP')}`, `${I18n.t('YouHaveNotSettingSmartOTP')}`,
() => { () => {
navigate.navigate(SETTINGOTP, { navigate.navigate(CHANGESMARTOTP, {
isFromTransaction: true, TYPE: 'CREATE_SMART_OTP',
setupSmartOTPSuccess: () => { old_password: null,
navigate.goBack() isFromTransaction: true,
navigate.goBack() setupSmartOTPSuccess: () => {
navigate.navigate(ENTER_PASSWORD_SMART_OTP, { navigate.goBack();
onGoToSmartOTP: (pinCode, otp) => onGoToSmartOTP(pinCode, otp), navigate.goBack();
}); navigate.navigate(ENTER_PASSWORD_SMART_OTP, {
DeviceEventEmitter.emit('reloadUserInfo'); onGoToSmartOTP: (pinCode, otp) =>
}, onGoToSmartOTP(pinCode, otp),
}); });
}, DeviceEventEmitter.emit('reloadUserInfo');
`${I18n.t('setting')}`, },
});
},
`${I18n.t('setting')}`,
); );
} else { } else {
navigate.navigate(ENTER_PASSWORD_SMART_OTP, { navigate.navigate(ENTER_PASSWORD_SMART_OTP, {
...@@ -334,5 +340,5 @@ const mapStateToProps = (state) => { ...@@ -334,5 +340,5 @@ const mapStateToProps = (state) => {
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
showLoading, showLoading,
hideLoading, hideLoading,
saveUserToRedux saveUserToRedux,
})(WalletWithdraw); })(WalletWithdraw);
src/Screens/Home/Home.js
...@@ -51,10 +51,13 @@ const Home = (props) => { ...@@ -51,10 +51,13 @@ const Home = (props) => {
useEffect(() => { useEffect(() => {
getData(); getData();
initSocket(); initSocket();
let reloadUserInfoListener = DeviceEventEmitter.addListener('reloadUserInfo', (e) => { let reloadUserInfoListener = DeviceEventEmitter.addListener(
console.log('run in to reloadUserInfo'); 'reloadUserInfo',
onRefresh(); (e) => {
}); console.log('run in to reloadUserInfo');
onRefresh();
},
);
return () => { return () => {
reloadUserInfoListener.remove(); reloadUserInfoListener.remove();
}; };
......
src/Screens/SmartOTP/ChangeSmartOTP/ChangeSmartOTP.js
...@@ -40,11 +40,22 @@ const EnterPasswordSmartOTP = (props) => { ...@@ -40,11 +40,22 @@ const EnterPasswordSmartOTP = (props) => {
setSecondsNumber(null); setSecondsNumber(null);
setThirdNumber(null); setThirdNumber(null);
setFourNumber(null); setFourNumber(null);
navigation.navigate(CONFIRMCHANGESMARTOTP, {
pre_otp: pinCode, if (props.route.params.isFromTransaction) {
old_password: props.route.params.old_password, navigation.navigate(CONFIRMCHANGESMARTOTP, {
TYPE: props.route.params.TYPE, pre_otp: pinCode,
}); old_password: props.route.params.old_password,
isFromTransaction: props.route.params.isFromTransaction,
TYPE: props.route.params.TYPE,
setupSmartOTPSuccess: props.route.params.setupSmartOTPSuccess,
});
} else {
navigation.navigate(CONFIRMCHANGESMARTOTP, {
pre_otp: pinCode,
old_password: props.route.params.old_password,
TYPE: props.route.params.TYPE,
});
}
}; };
const onDeletePress = () => { const onDeletePress = () => {
if (fourNumber) { if (fourNumber) {
......
src/Screens/SmartOTP/ChangeSmartOTP/ConfirmChangeSmartOTP.js
...@@ -74,13 +74,25 @@ const ConfirmChangeSmartOTP = (props) => { ...@@ -74,13 +74,25 @@ const ConfirmChangeSmartOTP = (props) => {
otp_password: '1234', otp_password: '1234',
type: 'CREATE_OTP_PASSWORD', type: 'CREATE_OTP_PASSWORD',
}); });
props.hideLoading(); props.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
showAlert(TYPE.SUCCESS, I18n.t('Notification'), res.data.message); showAlert(TYPE.SUCCESS, I18n.t('Notification'), res.data.message);
navigation.navigate(CONFIRMCREATEOTP, {
password: props.route.params.pre_otp, if (props.route.params.isFromTransaction) {
password_confirmation: pinCode, navigation.navigate(CONFIRMCREATEOTP, {
}); password: props.route.params.pre_otp,
password_confirmation: pinCode,
isFromTransaction: props.route.params.isFromTransaction,
setupSmartOTPSuccess: props.route.params.setupSmartOTPSuccess,
});
} else {
navigation.navigate(CONFIRMCREATEOTP, {
password: props.route.params.pre_otp,
password_confirmation: pinCode,
});
}
} else { } else {
showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message); showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message);
} }
......
src/Screens/SmartOTP/ConfirmCreate/ConfirmCreate.js
import React, {useState, useEffect} from 'react'; import React, {Component, useEffect, useState} from 'react';
import ConfirmCreateView from './ConfirmCreateView'; import {
import {verifyStoreOTPApiSmart} from '../../../apis/Functions/users'; View,
Text,
TextInput,
StyleSheet,
TouchableOpacity,
Platform,
Alert,
} from 'react-native';
import HeaderBack from '../../../components/Header/HeaderBack';
import {showAlert, TYPE} from '../../../components/DropdownAlert';
import {connect} from 'react-redux';
import {hideLoading, showLoading} from '../../../actions/loadingAction';
import I18n from '../../../helper/i18/i18n';
import {useNavigation} from '@react-navigation/native';
import { import {
CONFIRMCHANGESMARTOTP, CodeField,
TABNAVIGATOR, Cursor,
} from '../../../routers/ScreenNames'; useBlurOnFulfill,
useClearByFocusCell,
const EnterPasswordSmartOTP = (props) => { } from 'react-native-confirmation-code-field';
const navigation = useNavigation(); import {getFontXD, HEIGHTXD, WIDTHXD} from '../../../Config/Functions';
const [firstNumber, setFirstNumber] = useState(null); import R from '../../../assets/R';
const [secondsNumber, setSecondsNumber] = useState(null); import {NEWPASSWORD, TABNAVIGATOR} from '../../../routers/ScreenNames';
const [thirdNumber, setThirdNumber] = useState(null); import {
const [fourNumber, setFourNumber] = useState(null); verifyOTPApi,
useEffect(() => { verifyStoreOTPApiSmart,
if (fourNumber) { getOTPApiSmartOTP,
onCheckPINSmartOTPPin(); } from '../../../apis/Functions/users';
} import {useNavigation} from '@react-navigation/native';
}, [fourNumber]); import I18n from '../../../helper/i18/i18n';
const onNumberPress = (number) => { import AppText from '../../../components/AppText';
if (!firstNumber) {
setFirstNumber(number.toString()); import {showLoading, hideLoading} from '../../../actions/loadingAction';
} else if (!secondsNumber) { import {connect} from 'react-redux';
setSecondsNumber(number.toString()); import {showAlert, TYPE} from '../../../components/DropdownAlert';
} else if (!thirdNumber) { import CountDown from '../../../components/CountDown';
setThirdNumber(number.toString()); import {getOTPApi} from '../../../apis/Functions/users';
} else if (!fourNumber) {
setFourNumber(number.toString());
}
};
const onCheckPINSmartOTPPin = async () => { const CELL_COUNT = 4;
let pinCode = `${firstNumber}${secondsNumber}${thirdNumber}${fourNumber}`;
setFirstNumber(null); const ConfirmOTP = (propsa) => {
setSecondsNumber(null); const [value, setValue] = useState('');
setThirdNumber(null); const [isReset, setReset] = useState(false);
setFourNumber(null);
props.showLoading(); const navigate = useNavigation();
const res = await verifyStoreOTPApiSmart({
const ref = useBlurOnFulfill({value, cellCount: CELL_COUNT});
const [props, getCellOnLayoutHandler] = useClearByFocusCell({
value,
setValue,
});
const getOTP = async () => {
propsa.showLoading();
const res = await getOTPApiSmartOTP({
platform: Platform.OS, platform: Platform.OS,
password: props.route.params.password, otp_by: propsa.user.email,
password_confirmation: props.route.params.password_confirmation, otp_password: '1234',
otp: pinCode,
type: 'CREATE_OTP_PASSWORD', type: 'CREATE_OTP_PASSWORD',
}); });
props.hideLoading(); propsa.hideLoading();
if (res.data.code == 200) { if (res.data.code == 200) {
setReset(!isReset);
showAlert(TYPE.SUCCESS, I18n.t('Notification'), res.data.message); showAlert(TYPE.SUCCESS, I18n.t('Notification'), res.data.message);
navigation.navigate(TABNAVIGATOR);
} else { } else {
showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message); showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message);
} }
}; };
const onDeletePress = () => {
if (fourNumber) { const confirm = async () => {
setFourNumber(null); console.log(propsa.route.params);
} else if (thirdNumber) { if (!value) {
setThirdNumber(null); showAlert(TYPE.WARN, I18n.t('Notification'), I18n.t('EnterOTPRequest'));
} else if (secondsNumber) { } else if (value.length != 4) {
setSecondsNumber(null); showAlert(TYPE.WARN, I18n.t('Notification'), I18n.t('OTPInvalid'));
} else if (firstNumber) { } else {
setFirstNumber(null); propsa.showLoading();
const res = await verifyStoreOTPApiSmart({
platform: Platform.OS,
password: propsa.route.params.password,
password_confirmation: propsa.route.params.password_confirmation,
otp: value,
type: 'CREATE_OTP_PASSWORD',
});
propsa.hideLoading();
if (res.data.code == 200) {
showAlert(TYPE.SUCCESS, I18n.t('Notification'), res.data.message);
if (propsa.route.params.isFromTransaction) {
propsa.route.params.setupSmartOTPSuccess();
} else {
navigate.navigate(TABNAVIGATOR);
}
} else {
showAlert(TYPE.ERROR, I18n.t('Notification'), res.data.message);
}
} }
}; };
return ( return (
<ConfirmCreateView <View style={{flex: 1}}>
firstNumber={firstNumber} <HeaderBack title={'VerifyOTP'} />
secondsNumber={secondsNumber}
thirdNumber={thirdNumber} <View style={styles.container}>
fourNumber={fourNumber} <View style={{height: 20}} />
onNumberPress={onNumberPress}
onDeletePress={onDeletePress} <View style={styles.wrap}>
/> <AppText i18nKey={'Verify_code'} style={styles.txtTitle} />
<View style={styles.containerCode}>
<CodeField
ref={ref}
{...props}
value={value}
onChangeText={setValue}
cellCount={CELL_COUNT}
rootStyle={styles.codeFieldRoot}
keyboardType="number-pad"
textContentType="oneTimeCode"
renderCell={({index, symbol, isFocused}) => (
<View
onLayout={getCellOnLayoutHandler(index)}
key={index}
style={[styles.cellRoot, isFocused && styles.focusCell]}>
<Text style={styles.cellText}>
{symbol || (isFocused ? <Cursor /> : null)}
</Text>
</View>
)}
/>
</View>
</View>
</View>
<View style={styles.footer}>
<TouchableOpacity onPress={confirm} style={styles.btn}>
<AppText i18nKey={'Continue'} style={styles.txtBtn} />
</TouchableOpacity>
<TouchableOpacity style={styles.wrapFooter} onPress={getOTP}>
<Text style={styles.txtNote}>{I18n.t('OTPValidFiveMinute')}</Text>
<AppText i18nKey={'Re_send'} style={styles.txtSend} />
</TouchableOpacity>
<CountDown isReset={isReset} />
</View>
</View>
); );
}; };
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
paddingVertical: 20,
},
footer: {
height: 200,
justifyContent: 'center',
alignItems: 'center',
},
wrap: {
flex: 1,
paddingTop: 30,
alignItems: 'center',
width: '100%',
paddingHorizontal: 50,
},
containerCode: {
height: 50,
width: '100%',
marginTop: 30,
},
codeFieldRoot: {
marginTop: 20,
},
focusCell: {
borderColor: '#000',
},
cellRoot: {
width: 40,
height: 40,
justifyContent: 'center',
alignItems: 'center',
borderBottomColor: '#ccc',
borderBottomWidth: 1,
},
cellText: {
color: '#000',
fontSize: 36,
textAlign: 'center',
},
focusCell: {
borderBottomColor: '#007AFF',
borderBottomWidth: 2,
},
txtTitle: {
fontSize: getFontXD(52),
color: '#979797',
},
btn: {
width: WIDTHXD(521),
height: HEIGHTXD(120),
borderRadius: 15,
backgroundColor: '#1C6AF6',
justifyContent: 'center',
alignItems: 'center',
},
txtBtn: {
color: R.colors.white,
fontSize: getFontXD(52),
textTransform: 'uppercase',
},
txtSend: {
fontSize: getFontXD(42),
color: '#1C6AF6',
},
wrapFooter: {
marginTop: 30,
flexDirection: 'row',
alignItems: 'center',
},
txtNote: {
color: '#A2A2A2',
fontSize: getFontXD(42),
fontStyle: 'italic',
},
});
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {user: state.userReducer};
user: state.userReducer,
};
}; };
export default connect(mapStateToProps, {showLoading, hideLoading})( export default connect(mapStateToProps, {showLoading, hideLoading})(ConfirmOTP);
EnterPasswordSmartOTP,
);
src/Screens/SmartOTP/ConfirmCreate/ConfirmCreateView.js
...@@ -9,7 +9,7 @@ import Icon from 'react-native-vector-icons/FontAwesome5'; ...@@ -9,7 +9,7 @@ import Icon from 'react-native-vector-icons/FontAwesome5';
const ChangeSmartOTPView = (props) => { const ChangeSmartOTPView = (props) => {
return ( return (
<View style={{flex: 1, colorBackground: R.colors.white}}> <View style={{flex: 1, colorBackground: R.colors.white}}>
<HeaderBack title={'ChangeSmartOTP'} /> <HeaderBack title={'OTP'} />
<Text style={[styles.textNormal, {marginTop: HEIGHTXD(40)}]}> <Text style={[styles.textNormal, {marginTop: HEIGHTXD(40)}]}>
{I18n.t('EnterOTPRequest')} {I18n.t('EnterOTPRequest')}
</Text> </Text>
......
src/Screens/SmartOTP/ConfirmOTPSmart.js
import React, {useState} from 'react'; import React, {useState} from 'react';
import { import {View, Text, StyleSheet, TouchableOpacity, Platform} from 'react-native';
View,
Text,
StyleSheet,
TouchableOpacity,
Platform,
} from 'react-native';
import HeaderBack from '../../components/Header/HeaderBack'; import HeaderBack from '../../components/Header/HeaderBack';
import { import {
...@@ -30,7 +24,6 @@ import { ...@@ -30,7 +24,6 @@ import {
getOTPApiSmartOTP, getOTPApiSmartOTP,
} from '../../apis/Functions/users'; } from '../../apis/Functions/users';
const CELL_COUNT = 4; const CELL_COUNT = 4;
const ConfirmOTPSmart = (propsa) => { const ConfirmOTPSmart = (propsa) => {
......
src/helper/i18/locales/en.js
...@@ -308,7 +308,7 @@ export default { ...@@ -308,7 +308,7 @@ export default {
SettingOTP: 'Setting Smart OTP', SettingOTP: 'Setting Smart OTP',
SettingGeneral: 'Setting general', SettingGeneral: 'Setting general',
ChangeSmartOTP: 'Change smart OTP', ChangeSmartOTP: 'Smart OTP',
Rules: 'Rules', Rules: 'Rules',
FAQs: 'FAQs', FAQs: 'FAQs',
...@@ -327,4 +327,5 @@ export default { ...@@ -327,4 +327,5 @@ export default {
ForgotSmartOTP: 'Forgot Smart OTP', ForgotSmartOTP: 'Forgot Smart OTP',
WarnMaxReqestWithdraw: 'Invalid withdrawal amount', WarnMaxReqestWithdraw: 'Invalid withdrawal amount',
YouHaveNotSettingSmartOTP: 'You have not installed Smart OTP', YouHaveNotSettingSmartOTP: 'You have not installed Smart OTP',
OTP: 'Enter OTP',
}; };
src/helper/i18/locales/vn.js
...@@ -311,7 +311,7 @@ export default { ...@@ -311,7 +311,7 @@ export default {
EnterSmartOTPPINNEW: 'Vui lòng nhập mã PIN Smart OTP mới', EnterSmartOTPPINNEW: 'Vui lòng nhập mã PIN Smart OTP mới',
AddSmartOTP: 'Thêm Smart OTP', AddSmartOTP: 'Thêm Smart OTP',
ChangeSmartOTP: 'Đổi mã PIN Smart OTP', ChangeSmartOTP: 'Mã PIN Smart OTP',
Rules: 'Điều khoản và điều kiện', Rules: 'Điều khoản và điều kiện',
FAQs: 'FAQs', FAQs: 'FAQs',
...@@ -324,4 +324,5 @@ export default { ...@@ -324,4 +324,5 @@ export default {
ResetSmartOTP2: ' bấm phím 3 để gặp nhân viên hỗ trợ kỹ thuật.', ResetSmartOTP2: ' bấm phím 3 để gặp nhân viên hỗ trợ kỹ thuật.',
ForgotSmartOTP: 'Quên Smart OTP', ForgotSmartOTP: 'Quên Smart OTP',
YouHaveNotSettingSmartOTP: 'Bạn chưa cài đặt Smart OTP', YouHaveNotSettingSmartOTP: 'Bạn chưa cài đặt Smart OTP',
OTP: 'Nhập OTP',
}; };
src/routers/TabNavigation.js
...@@ -105,7 +105,7 @@ const TabNavigator = (props) => { ...@@ -105,7 +105,7 @@ const TabNavigator = (props) => {
return confirmAlert(I18n.t('PopupVerifyAccount'), () => { return confirmAlert(I18n.t('PopupVerifyAccount'), () => {
navigate.navigate(AccountVerification); navigate.navigate(AccountVerification);
}); });
} else if (props.user.smart_otp_status) { } else if (!props.user.smart_otp_status) {
return confirmAlert( return confirmAlert(
props.language.language == 'vi' props.language.language == 'vi'
? 'Bạn có muốn cài đặt Smart OTP?' ? 'Bạn có muốn cài đặt Smart OTP?'
......
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