Commit c86cbe97 by Giang Tran

update code

parent ab47b434
...@@ -13,6 +13,7 @@ import { ...@@ -13,6 +13,7 @@ import {
MYGROUP, MYGROUP,
AccountVerification, AccountVerification,
PROFILE, PROFILE,
EKYCSCREEN,
} from '../../routers/ScreenNames'; } from '../../routers/ScreenNames';
const AccountView = (props) => { const AccountView = (props) => {
...@@ -29,7 +30,7 @@ const AccountView = (props) => { ...@@ -29,7 +30,7 @@ const AccountView = (props) => {
<AppText i18nKey={'MyProfile'}> </AppText> <AppText i18nKey={'MyProfile'}> </AppText>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
onPress={() => navigate.navigate(AccountVerification)} onPress={() => navigate.navigate(EKYCSCREEN)}
style={styles.containerItem}> style={styles.containerItem}>
<Image source={R.images.iconUserAccuracy} style={styles.imgIcon} /> <Image source={R.images.iconUserAccuracy} style={styles.imgIcon} />
<AppText i18nKey={'VerifyAccount'}> </AppText> <AppText i18nKey={'VerifyAccount'}> </AppText>
......
...@@ -38,6 +38,7 @@ import { ...@@ -38,6 +38,7 @@ import {
CHOOSEMETHOD, CHOOSEMETHOD,
WALLETWITHDRAW, WALLETWITHDRAW,
SMARTOTPCONFIG, SMARTOTPCONFIG,
EKYCSCREEN,
} from '../../routers/ScreenNames'; } from '../../routers/ScreenNames';
import {useNavigation} from '@react-navigation/native'; import {useNavigation} from '@react-navigation/native';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
...@@ -63,7 +64,7 @@ const menus = [ ...@@ -63,7 +64,7 @@ const menus = [
id: '12', id: '12',
title: 'VerifyAccount', title: 'VerifyAccount',
icon: R.images.iconUserCheck, icon: R.images.iconUserCheck,
screen: AccountVerification, screen: EKYCSCREEN,
}, },
{ {
id: '15', id: '15',
......
...@@ -32,6 +32,7 @@ import { ...@@ -32,6 +32,7 @@ import {
AccountVerification, AccountVerification,
WALLETWITHDRAW, WALLETWITHDRAW,
PACKETCQG, PACKETCQG,
EKYCSCREEN,
} from '../../routers/ScreenNames'; } from '../../routers/ScreenNames';
import PickerAvtart from '../../components/Picker/PickerAvatart'; import PickerAvtart from '../../components/Picker/PickerAvatart';
import {showAlert, TYPE} from '../../components/DropdownAlert/index'; import {showAlert, TYPE} from '../../components/DropdownAlert/index';
...@@ -43,7 +44,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => { ...@@ -43,7 +44,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}> <View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<TouchableOpacity <TouchableOpacity
disabled={status == 2 ? true : false} disabled={status == 2 ? true : false}
onPress={() => navigate.navigate(AccountVerification)}> onPress={() => navigate.navigate(EKYCSCREEN)}>
<ImageBackground <ImageBackground
imageStyle={{borderRadius: 10}} imageStyle={{borderRadius: 10}}
style={{ style={{
...@@ -138,7 +139,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => { ...@@ -138,7 +139,7 @@ const renderWallet = (status, current_money, current_cqg_money, contract) => {
<View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}> <View style={{flex: 1, justifyContent: 'center', alignItems: 'center'}}>
<TouchableOpacity <TouchableOpacity
disabled={status == 2 ? true : false} disabled={status == 2 ? true : false}
onPress={() => navigate.navigate(AccountVerification)}> onPress={() => navigate.navigate(EKYCSCREEN)}>
<ImageBackground <ImageBackground
imageStyle={{borderRadius: 10}} imageStyle={{borderRadius: 10}}
style={{ style={{
......
...@@ -86,7 +86,7 @@ function MyStack(props) { ...@@ -86,7 +86,7 @@ function MyStack(props) {
headerStatusBarHeight: 0, headerStatusBarHeight: 0,
}} }}
headerMode={'none'} headerMode={'none'}
initialRouteName={ScreenName.EKYCSCREEN}> initialRouteName={ScreenName.AUTHEN}>
<Stack.Screen <Stack.Screen
name={ScreenName.CONFIRMCREATEOTP} name={ScreenName.CONFIRMCREATEOTP}
component={ConfirmCreate} component={ConfirmCreate}
......
...@@ -22,6 +22,7 @@ import { ...@@ -22,6 +22,7 @@ import {
PACKETCQG, PACKETCQG,
SETTINGOTP, SETTINGOTP,
CHANGESMARTOTP, CHANGESMARTOTP,
EKYCSCREEN,
} from '../routers/ScreenNames'; } from '../routers/ScreenNames';
import I18n, {setLocation} from '../helper/i18/i18n'; import I18n, {setLocation} from '../helper/i18/i18n';
import {changeLanguage} from '../actions/language'; import {changeLanguage} from '../actions/language';
...@@ -103,7 +104,7 @@ const TabNavigator = (props) => { ...@@ -103,7 +104,7 @@ const TabNavigator = (props) => {
const showPopUp = () => { const showPopUp = () => {
if (props.user.status == 1) { if (props.user.status == 1) {
return confirmAlert(I18n.t('PopupVerifyAccount'), () => { return confirmAlert(I18n.t('PopupVerifyAccount'), () => {
navigate.navigate(AccountVerification); navigate.navigate(EKYCSCREEN);
}); });
} else if (!props.user.smart_otp_status) { } else if (!props.user.smart_otp_status) {
return confirmAlert( return confirmAlert(
......
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