Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
InvestCustomer
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Giang Tran
InvestCustomer
Commits
75bb4dfc
Commit
75bb4dfc
authored
Jun 10, 2021
by
Giang Tran
Browse files
Options
Browse Files
Download
Plain Diff
edit moment
parents
da1c0218
5768ebe3
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
135 additions
and
21 deletions
+135
-21
ConfirmOTPSmart.js
src/Screens/SmartOTP/ConfirmOTPSmart.js
+2
-2
EnterPasswordSmartOTP.js
src/Screens/SmartOTP/EnterPasswordSmartOTP.js
+15
-10
ResetSmartOTP.js
src/Screens/SmartOTP/ResetSmartOTP.js
+19
-0
ResetSmartOTPView.js
src/Screens/SmartOTP/ResetSmartOTPView.js
+86
-0
en.js
src/helper/i18/locales/en.js
+5
-4
vn.js
src/helper/i18/locales/vn.js
+4
-0
ScreenNames.js
src/routers/ScreenNames.js
+1
-0
StackNavigation.js
src/routers/StackNavigation.js
+3
-5
No files found.
src/Screens/SmartOTP/ConfirmOTPSmart.js
View file @
75bb4dfc
...
...
@@ -28,7 +28,7 @@ import {showLoading, hideLoading} from '../../actions/loadingAction';
import
{
connect
}
from
'react-redux'
;
import
{
showAlert
,
TYPE
}
from
'../../components/DropdownAlert'
;
import
CountDown
from
'../../components/CountDown'
;
import
{
verify
Store
OTPApiSmart
}
from
'../../apis/Functions/users'
;
import
{
verifyOTPApiSmart
}
from
'../../apis/Functions/users'
;
const
CELL_COUNT
=
4
;
...
...
@@ -66,7 +66,7 @@ const ConfirmOTPSmart = (propsa) => {
showAlert
(
TYPE
.
WARN
,
I18n
.
t
(
'Notification'
),
I18n
.
t
(
'OTPInvalid'
));
}
else
{
propsa
.
showLoading
();
const
res
=
await
verify
Store
OTPApiSmart
({
const
res
=
await
verifyOTPApiSmart
({
platform
:
Platform
.
OS
,
password
:
propsa
.
route
.
params
.
password
,
password_confirmation
:
propsa
.
route
.
params
.
password_confirmation
,
...
...
src/Screens/SmartOTP/EnterPasswordSmartOTP.js
View file @
75bb4dfc
...
...
@@ -7,7 +7,7 @@ import {connect} from 'react-redux';
import
{
hideLoading
,
showLoading
}
from
'../../actions/loadingAction'
;
import
{
OTP_TYPE
}
from
'../../Config/constants'
;
import
{
useNavigation
}
from
'@react-navigation/native'
;
import
{
CHANGESMARTOTP
}
from
'../../routers/ScreenNames'
;
import
{
RESET_SMART_OTP
,
CHANGESMARTOTP
}
from
'../../routers/ScreenNames'
;
const
EnterPasswordSmartOTP
=
(
props
)
=>
{
const
navigation
=
useNavigation
();
...
...
@@ -43,12 +43,10 @@ const EnterPasswordSmartOTP = (props) => {
});
if
(
res
.
data
.
code
==
200
)
{
navigation
.
navigate
(
CHANGESMARTOTP
,
{
old_password
:
pinCode
});
clearPIN
()
}
else
{
showAlert
(
TYPE
.
ERROR
,
I18n
.
t
(
'Notification'
),
res
.
data
.
message
);
setFirstNumber
(
null
);
setSecondsNumber
(
null
);
setThirdNumber
(
null
);
setFourNumber
(
null
);
clearPIN
()
}
}
else
{
const
res
=
await
getOTPApiSmartOTP
({
...
...
@@ -65,14 +63,17 @@ const EnterPasswordSmartOTP = (props) => {
props
.
route
.
params
.
onGoToSmartOTP
(
pinCode
,
res
.
data
.
data
.
otp
);
}
else
{
showAlert
(
TYPE
.
ERROR
,
I18n
.
t
(
'Notification'
),
res
.
data
.
message
);
clearPIN
()
}
}
props
.
hideLoading
();
};
const
clearPIN
=
()
=>
{
setFirstNumber
(
null
);
setSecondsNumber
(
null
);
setThirdNumber
(
null
);
setFourNumber
(
null
);
}
}
props
.
hideLoading
();
};
const
onDeletePress
=
()
=>
{
if
(
fourNumber
)
{
setFourNumber
(
null
);
...
...
@@ -84,9 +85,13 @@ const EnterPasswordSmartOTP = (props) => {
setFirstNumber
(
null
);
}
};
const
onReactivationSmartOTP
=
()
=>
{};
const
onReactivationSmartOTP
=
()
=>
{
navigation
.
navigate
(
RESET_SMART_OTP
,
{
title
:
'ReactivationSmartOTP'
});
};
const
onForgotPINCode
=
()
=>
{};
const
onForgotPINCode
=
()
=>
{
navigation
.
navigate
(
RESET_SMART_OTP
,
{
title
:
'ForgotSmartOTP'
});
};
return
(
<
EnterPasswordSmartOTPView
firstNumber
=
{
firstNumber
}
...
...
src/Screens/SmartOTP/ResetSmartOTP.js
0 → 100644
View file @
75bb4dfc
import
React
from
'react'
;
import
ResetSmartOTPView
from
'./ResetSmartOTPView'
;
import
{
connect
}
from
'react-redux'
;
const
ResetSmartOTP
=
(
props
)
=>
{
return
<
ResetSmartOTPView
title
=
{
props
.
route
.
params
.
title
}
companyInfo
=
{
props
.
user
.
company_info
}
/>
;
};
const
mapStateToProps
=
(
state
)
=>
{
return
{
user
:
state
.
userReducer
,
};
};
export
default
connect
(
mapStateToProps
,
{})(
ResetSmartOTP
,
);
src/Screens/SmartOTP/ResetSmartOTPView.js
0 → 100644
View file @
75bb4dfc
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
Linking
,
StyleSheet
,
Text
,
TouchableOpacity
,
View
}
from
'react-native'
;
import
HeaderBack
from
'../../components/Header/HeaderBack'
;
import
AppText
from
'../../components/AppText'
;
import
{
getFontXD
,
HEIGHTXD
,
WIDTHXD
,
callNumber
}
from
'../../Config/Functions'
;
import
R
from
'../../assets/R'
;
import
I18n
from
'../../helper/i18/i18n'
;
const
ResetSmartOTPView
=
(
props
)
=>
{
const
[
reRender
,
setReRender
]
=
useState
(
false
);
useEffect
(()
=>
{
setReRender
(
!
reRender
);
},
[
props
.
companyInfo
]);
return
<
View
style
=
{{
flex
:
1
}}
>
<
HeaderBack
title
=
{
props
.
title
}
/
>
<
View
style
=
{{
flex
:
1
,
paddingHorizontal
:
WIDTHXD
(
50
),
paddingTop
:
HEIGHTXD
(
40
),
}}
>
<
Text
>
<
AppText
i18nKey
=
{
'ResetSmartOTP'
}
style
=
{
styles
.
title
}
/
>
<
Text
style
=
{[
styles
.
txtContent
,
{
color
:
R
.
colors
.
main
}]}
onPress
=
{()
=>
callNumber
(
props
.
companyInfo
?.
hotline_call
)}
>
{
props
.
companyInfo
?.
hotline
}
<
/Text
>
<
AppText
i18nKey
=
{
'ResetSmartOTP2'
}
style
=
{
styles
.
title
}
/
>
<
/Text
>
<
AppText
i18nKey
=
{
'HaNoiOffice'
}
style
=
{[
styles
.
title
,
{
color
:
R
.
colors
.
main
,
marginTop
:
HEIGHTXD
(
30
)}]}
/
>
<
Text
style
=
{
styles
.
txtContent
}
>
{
props
.
companyInfo
?.
name
}
<
/Text
>
<
Text
style
=
{
styles
.
txtContent
}
>
{
`
${
I18n
.
t
(
'Address'
)}
${
props
.
companyInfo
?.
address
}
`}</Text>
<View style={styles.row}>
<Text style={styles.title}>Email:</Text>
<TouchableOpacity
onPress={async () => {
const supported = await Linking.openURL(`
mailto
:
$
{
props
.
companyInfo
?.
email
}
`);
if (supported) {
Linking.openURL(`
mailto
:
$
{
props
.
companyInfo
?.
email
}
`);
}
}}>
<Text style={styles.txtLink}> {props.companyInfo?.email}</Text>
</TouchableOpacity>
</View>
<TouchableOpacity
onPress={async () => {
const supported = await Linking.canOpenURL(props.companyInfo?.website);
if (supported) {
Linking.openURL(props.companyInfo?.website);
}
}}>
<View style={styles.row}>
<Text style={styles.title}>Website: </Text>
<Text style={styles.txtLink}>{props.companyInfo?.website}</Text>
</View>
</TouchableOpacity>
</View>
</View>;
};
const styles = StyleSheet.create({
title: {
fontSize: getFontXD(42),
color: R.colors.black,
marginTop: 5,
},
txtContent: {
fontSize: getFontXD(42),
marginTop: 5,
},
txtLink: {
fontSize: getFontXD(42),
marginTop: 5,
textDecorationLine: 'underline',
color: R.colors.main,
},
row: {
flexDirection: 'row',
},
});
export default ResetSmartOTPView;
src/helper/i18/locales/en.js
View file @
75bb4dfc
...
...
@@ -291,12 +291,10 @@ export default {
LoginSessionEnd
:
'Login session end, please login again'
,
noteWithdrawMoney
:
'Infor CQG account'
,
SmartOTP
:
'Smart OTP'
,
SmartOTPWarning
:
'Please do not give the OTP to anyone under any circumstances.'
,
SmartOTPWarning
:
'Please do not give the OTP to anyone under any circumstances.'
,
ConfirmTransaction
:
'Confirm transaction'
,
OTPWillAutoUpdate
:
'OTP code will be automatically update after '
,
OTPWillAutoFill
:
'Select "Confirm transaction" code OTP will be filled automatically'
,
OTPWillAutoFill
:
'Select "Confirm transaction" code OTP will be filled automatically'
,
SmartOTPUsingFor
:
'OTP code using for:'
,
SmartOTPUsingForFirst
:
'• Withdrawal request'
,
SmartOTPUsingForSecond
:
'• Request an internal transfer'
,
...
...
@@ -321,4 +319,7 @@ export default {
ConfirmSmartOTP
:
'Confirm Smart OTP'
,
AddSmartOTP
:
'Add Smart OTP'
,
ResetSmartOTP
:
'To ensure safety during application use, please contact the operator: '
,
ResetSmartOTP2
:
' press 3 to meet technical support staff.'
,
ForgotSmartOTP
:
'Forgot Smart OTP'
,
};
src/helper/i18/locales/vn.js
View file @
75bb4dfc
...
...
@@ -318,4 +318,8 @@ export default {
ConfirmPassGetSmartOTP
:
'Xác nhận mật khẩu lấy Smart OTP '
,
ConfirmSmartOTP
:
'Xác nhận Smart OTP '
,
PopupSettingSmartOTP
:
'Bạn có muốn cài đặt Smart OTP?'
,
ResetSmartOTP
:
'Để đảm bảo an toàn trong quá trình sử dụng ứng dụng, bạn vui lòng liên hệ đến tổng đài: '
,
ResetSmartOTP2
:
' bấm phím 3 để gặp nhân viên hỗ trợ kỹ thuật.'
,
ForgotSmartOTP
:
'Quên Smart OTP'
,
};
src/routers/ScreenNames.js
View file @
75bb4dfc
...
...
@@ -84,6 +84,7 @@ export const SMARTOTPCONFIG = 'SMARTOTPCONFIG';
export
const
UPDATEOTP
=
'UPDATEOTP'
;
export
const
CONFIRMOTPSMART
=
'CONFIRMOTPSMART'
;
export
const
RESET_SMART_OTP
=
'RESET_SMART_OTP'
;
export
const
CHANGESMARTOTP
=
'CHANGESMARTOTP'
;
...
...
src/routers/StackNavigation.js
View file @
75bb4dfc
...
...
@@ -73,6 +73,7 @@ import * as ScreenName from './ScreenNames';
const
Stack
=
createStackNavigator
();
import
{
enableScreens
}
from
'react-native-screens'
;
import
ResetSmartOTP
from
'../Screens/SmartOTP/ResetSmartOTP'
;
enableScreens
();
...
...
@@ -171,16 +172,13 @@ function MyStack(props) {
<
Stack
.
Screen
name
=
{
ScreenName
.
NEWPASSWORD
}
component
=
{
NewPassWord
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
PRODUCTDETAIL
}
component
=
{
ProductDetail
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
SMARTOTP
}
component
=
{
SmartOTP
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
ENTER_PASSWORD_SMART_OTP
}
component
=
{
EnterPasswordSmartOTP
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
RESET_SMART_OTP
}
component
=
{
ResetSmartOTP
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
FAQSSMARTOTP
}
component
=
{
FAQs
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
RULESSMARTOTP
}
component
=
{
RulesSmartOTP
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
ENTER_PASSWORD_SMART_OTP
}
component
=
{
EnterPasswordSmartOTP
}
/
>
<
Stack
.
Screen
name
=
{
ScreenName
.
FORGOTPASSWORD
}
component
=
{
ForgotPassWord
}
/
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment