merge func_smart_otp

ios/Invest.xcodeproj/project.pbxproj

@@ -18,7 +18,7 @@
 		2DCD954D1E0B4F2C00145EB5 /* InvestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* InvestTests.m */; };
 		2FCC6749524E697FC9323F22 /* libPods-Invest-InvestTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABCEBFE5646F1EF68E7C87AB /* libPods-Invest-InvestTests.a */; };
 		48E6A9A75AE9C55476F21D2D /* libPods-Invest-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ECD31835B4784D2DC719E76 /* libPods-Invest-tvOSTests.a */; };
-		52B7A0A425F722CF00CEDA09 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+		52B7A0A425F722CF00CEDA09 /* (null) in Resources */ = {isa = PBXBuildFile; };
 		52F3AE2D26257DEC00F77114 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52F3AE2C26257DEB00F77114 /* GoogleService-Info.plist */; };
 		52FB2B09262400D400DD7983 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52FB2B08262400D400DD7983 /* BootSplash.storyboard */; };
 		52FB2B0A262400D400DD7983 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52FB2B08262400D400DD7983 /* BootSplash.storyboard */; };
@@ -406,7 +406,7 @@
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 				52F3AE2D26257DEC00F77114 /* GoogleService-Info.plist in Resources */,
-				52B7A0A425F722CF00CEDA09 /* BuildFile in Resources */,
+				52B7A0A425F722CF00CEDA09 /* (null) in Resources */,
 				52FB2B09262400D400DD7983 /* BootSplash.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -903,7 +903,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -912,7 +912,7 @@
 				);
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -937,11 +937,11 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.1;
+				MARKETING_VERSION = 2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

src/Screens/Action/Wallet/WalletDeposit.js

 import React, {useState} from 'react';
 import {
-  View,
-  Text,
-  StyleSheet,
   Dimensions,
-  TouchableOpacity,
-  Alert,
-  TouchableWithoutFeedback,
   Keyboard,
   KeyboardAvoidingView,
   Platform,
   ScrollView,
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  View,
 } from 'react-native';
 import R from '../../../assets/R';
 import HeaderBack from '../../../components/Header/HeaderBack';
-import TextField from '../../../components/Input/TextField';
 import TextMulti from '../../../components/Input/TextMulti';
-import TextDisable from '../../../components/Input/TextDisable';
 import {useNavigation} from '@react-navigation/native';
-import {
-  getFontXD,
-  toPriceVnd,
-  checkFormatArray,
-  WIDTHXD,
-  HEIGHTXD,
-} from '../../../Config/Functions';
+import {checkFormatArray, getFontXD, HEIGHTXD, toPriceVnd, WIDTHXD} from '../../../Config/Functions';
 import {connect} from 'react-redux';
-import {showLoading, hideLoading} from '../../../actions/loadingAction';
-import {walletDeposit} from '../../../apis/Functions/Deposit';
+import {hideLoading, showLoading} from '../../../actions/loadingAction';
 import TextMoney from '../../../components/Input/InputMoney';
 import I18n from '../../../helper/i18/i18n';
-import {ENTER_PASSWORD_SMART_OTP, OTPWALLET, SMARTOTP} from '../../../routers/ScreenNames';
-
-import {getOTPApi} from '../../../apis/Functions/users';
+import {ENTER_PASSWORD_SMART_OTP, SMARTOTP} from '../../../routers/ScreenNames';
 import {showAlert, TYPE} from '../../../components/DropdownAlert';
-import EnterPasswordSmartOTP from '../../SmartOTP/EnterPasswordSmartOTP';
 
 const {width} = Dimensions.get('window');
 
@@ -49,11 +36,17 @@ const WalletDeposit = (props) => {
       I18n.t('Note').toLowerCase(),
     ];
 
-    const index = checkFormatArray([amount, notes]);
+    const index = checkFormatArray([amount]);
     if (index === true) {
       navigate.navigate(ENTER_PASSWORD_SMART_OTP, {
         onGoToSmartOTP: (pinCode, otp) => onGoToSmartOTP(pinCode, otp)
       });
+    } else {
+      showAlert(
+          TYPE.WARN,
+          I18n.t('Notification'),
+          I18n.t('Please_fill_in') + titles[index],
+      );
     }
   };
   const onGoToSmartOTP = (pinCode, otp) => {

src/Screens/Home/Home.js

@@ -218,7 +218,6 @@ const Home = (props) => {
     />
   );
 };
-<VersionChecker />;
 const mapStateToProps = (state) => {
   return {
     user: state.userReducer,

src/Screens/Home/PriceListView.js

@@ -40,7 +40,7 @@ const PriceListView = (props) => {
             </View>
             <FlatList
                 style={{paddingBottom: HEIGHTXD(15), backgroundColor: R.colors.white}}
-                keyExtractor={(item) => item.id}
+                keyExtractor={(item) => item.id.toString()}
                 data={dataPrice}
                 ListHeaderComponent={() =>
                     <View style={[styles.container]}>