update code

android/app/build.gradle

@@ -132,8 +132,8 @@ android {
         applicationId "com.dcv.invest"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "2.4"
+        versionCode 23
+        versionName "2.7"
         vectorDrawables.useSupportLibrary = true
     }
     splits {

ios/Invest.xcodeproj/project.pbxproj

@@ -905,7 +905,7 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/InvestDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -914,7 +914,7 @@
 				);
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -939,11 +939,11 @@
 				CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 18;
 				DEVELOPMENT_TEAM = MXZ24GRH48;
 				INFOPLIST_FILE = Invest/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.3.2;
+				MARKETING_VERSION = 2.3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

ios/Invest/Info.plist

@@ -61,13 +61,13 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>Accect connect camera</string>
+	<string>Cho phép truy cập vào máy ảnh và thư viện để tải ảnh lên ứng dụng</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string></string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>To upload images</string>
+	<string>Upload ảnh lên ứng dụng</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>AntDesign.ttf</string>

src/Screens/Authen/Login.js

@@ -64,9 +64,10 @@ const Login = (props) => {
   const getLoginByBiometry = async () => {
     let loginByBiometry = await AsyncStorage.getItem(KEY.IS_LOGIN_BY_BIOMETRY);
     if (loginByBiometry) {
-            loginByBiometry = JSON.parse(loginByBiometry)
+      loginByBiometry = JSON.parse(loginByBiometry);
       setIsShowBiometryLogin(loginByBiometry.isLoginByBiometry);
-            loginByBiometry.isLoginByBiometry && Keychain.getSupportedBiometryType({}).then((biometryType) => {
+      loginByBiometry.isLoginByBiometry &&
+        Keychain.getSupportedBiometryType({}).then((biometryType) => {
           setBiometryType(biometryType);
         });
     }
@@ -100,21 +101,23 @@ const Login = (props) => {
       };
       const credentials = await Keychain.getGenericPassword(options);
       if (credentials) {
-                console.log(
-                    'Credentials successfully loaded for user ', credentials,
-                );
+        console.log('Credentials successfully loaded for user ', credentials);
         onSubmitLogin(credentials.username, credentials.password);
-
       } else {
         showAlert(
           TYPE.ERROR,
           I18n.t('Notification'),
-                    I18n.t('HaveNotCredential', {type: biometryType == 'FaceID' ? I18n.t('FaceId') : I18n.t('Fingerprint')}),
+          I18n.t('HaveNotCredential', {
+            type:
+              biometryType == 'FaceID'
+                ? I18n.t('FaceId')
+                : I18n.t('Fingerprint'),
+          }),
         );
         console.log('No credentials stored');
       }
     } catch (error) {
-            console.log('Keychain couldn\'t be accessed!', error);
+      console.log("Keychain couldn't be accessed!", error);
     }
   };
   const onSubmitLogin = async (email, pass) => {
@@ -188,7 +191,7 @@ const Login = (props) => {
       <TouchableOpacity
         onPress={() => navigate.navigate(CONFIRMEMAIL)}
         style={styles.forgotView}>
-                <AppText i18nKey={'ForgotPassword'} style={styles.txtTitle}/>
+        <AppText i18nKey={'ForgotPassword'} style={styles.txtTitle} />
       </TouchableOpacity>
 
       <View
@@ -199,41 +202,46 @@ const Login = (props) => {
         <TouchableOpacity
           onPress={() => onSubmitLogin(email, pass)}
           style={styles.wrapLogin}>
-                    <AppText i18nKey={'Login'} style={styles.txtLogin}/>
-                    <Image source={R.images.iconRight1} style={styles.imgIcon}/>
+          <AppText i18nKey={'Login'} style={styles.txtLogin} />
+          <Image source={R.images.iconRight1} style={styles.imgIcon} />
         </TouchableOpacity>
-                {isShowBiometryLogin ?
+        {isShowBiometryLogin ? (
           <View style={{flexDirection: 'row', marginTop: WIDTHXD(70)}}>
-                        {biometryType == 'FaceID' ?
+            {biometryType == 'FaceID' ? (
               <TouchableOpacity
                 onPress={() => {
                   getCredentialInfo();
                 }}>
-                                <Image source={R.images.iconFaceId} style={[styles.imgIconBiometry, {tintColor: R.colors.main}]}/>
+                <Image
+                  source={R.images.iconFaceId}
+                  style={[styles.imgIconBiometry, {tintColor: R.colors.main}]}
+                />
               </TouchableOpacity>
-                            :
+            ) : (
               <TouchableOpacity
                 onPress={() => {
                   getCredentialInfo();
                 }}>
-                                <Image source={R.images.fingerprint} style={styles.imgIconBiometry}/>
+                <Image
+                  source={R.images.fingerprint}
+                  style={styles.imgIconBiometry}
+                />
               </TouchableOpacity>
-
-                        }
+            )}
           </View>
-                    : null}
+        ) : null}
 
         <View style={styles.row}>
-                    <AppText i18nKey={'Have_account'} style={styles.txtTitle}/>
+          <AppText i18nKey={'Have_account'} style={styles.txtTitle} />
           <TouchableOpacity
             onPress={() => {
               navigation.navigate('REGISTOR');
             }}>
-                        <AppText i18nKey={'Register'} style={styles.txtRegistor}/>
+            <AppText i18nKey={'Register'} style={styles.txtRegistor} />
           </TouchableOpacity>
         </View>
       </View>
-            <View style={{height: 100}}/>
+      <View style={{height: 100}} />
     </View>
   );
 };

src/helper/FirebaseNotification.js

@@ -38,6 +38,7 @@ const FirebaseNotification = (props) => {
     const unsubscribe = messaging().onMessage(async (remoteMessage) => {
       console.log('A new FCM message arrived!', remoteMessage.data);
       const {action_type, body, title, record_id} = remoteMessage.data;
+      if (action_type == 'REDIRECT') {
         props.showNotificaton({
           title,
           content: body,
@@ -45,6 +46,15 @@ const FirebaseNotification = (props) => {
           id_record: record_id,
           link: remoteMessage.data?.redirect_to,
         });
+      } else {
+        props.showNotificaton({
+          title,
+          content: body,
+          screen: convertScreen(action_type),
+          id_record: record_id,
+          link: null,
+        });
+      }
 
       if (action_type != 'CUSTOMER_NEWS') refetchDataUser();
     });