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/helper/FirebaseNotification.js

@@ -38,13 +38,23 @@ 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;
-      props.showNotificaton({
-        title,
-        content: body,
-        screen: convertScreen(action_type),
-        id_record: record_id,
-        link: remoteMessage.data?.redirect_to,
-      });
+      if (action_type == 'REDIRECT') {
+        props.showNotificaton({
+          title,
+          content: body,
+          screen: convertScreen(action_type),
+          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();
     });