Merge remote-tracking branch 'origin/build_01_July' into build_01_July

android/app/build.gradle

@@ -132,8 +132,8 @@ android {
         applicationId "com.dcv.invest"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
-        versionName "2.2"
+        versionCode 19
+        versionName "2.3"
         vectorDrawables.useSupportLibrary = true
     }
     splits {

src/Screens/NewFeed/Calendar/Calendar.js

@@ -48,18 +48,19 @@ const NewFeed = (props) => {
           index = i;
           break;
         } else {
-          index = 30 - today.substring(8);
+          index = data.length - today.substring(8);
         }
       }
       setTimeout(() => {
+        if (index > 0) {
           ListDayRef.current.scrollToIndex({
             animated: true,
             index: index,
           });
+        }
       }, 200);
     }
   };
-
   const getItemLayout = (data, index) => ({
     length: 100,
     offset: 50 * index,