upgrade sdk 33 to 34 ,schedule alarm permission fix and app submit to store #995

deepakmali-dgsl · 2024-10-07T14:36:37Z

No description provided.

- fix article issue

- add null condition for id

android/build.gradle

app/components/growth/ChartHeightForAge.tsx

Akhror · 2024-10-17T18:08:00Z

app/components/growth/GrowthChart.tsx

@@ -131,7 +131,7 @@ const victoryStyles: VictoryStyles = {
 const GrowthChart = (props: any):any => {
  const {activeChild, chartType, bgObj,windowWidth,windowHeight} = props;
  const {t} = useTranslation();
-   const childBirthDate =activeChild?.taxonomyData.prematureTaxonomyId!=null && activeChild?.taxonomyData.prematureTaxonomyId!="" && activeChild?.taxonomyData.prematureTaxonomyId!=undefined?  activeChild.plannedTermDate: activeChild.birthDate; 
+   const childBirthDate =activeChild?.taxonomyData?.prematureTaxonomyId!=null && activeChild?.taxonomyData?.prematureTaxonomyId!="" && activeChild?.taxonomyData?.prematureTaxonomyId!=undefined?  activeChild.plannedTermDate: activeChild.birthDate; 


We can simplify this as:
const childBirthDate = activeChild?.taxonomyData?.prematureTaxonomyId ? activeChild.plannedTermDate : activeChild.birthDate;

It applies to similar conditions as well.

simplified the condition

app/components/homeScreen/ChildInfo.tsx

app/components/homeScreen/DailyReads.tsx

Akhror · 2024-10-17T18:09:58Z

app/screens/LoadingScreen.tsx

@@ -114,7 +114,7 @@ const LoadingScreen = ({ route, navigation }: Props): any => {
        const childAgedays = (DateTime.now()).diff((DateTime.fromISO(child.birthDate)), 'days').toObject().days;
        if (childAgedays) {
          if (childAgedays >= child.taxonomyData.days_to - child.taxonomyData.buffers_days) {
-            const i = childAge.findIndex((_item: any) => _item.id === child.taxonomyData.id);
+            const i = childAge.findIndex((_item: any) => _item?.id === child?.taxonomyData?.id);


"_item" can be renamed to "item"

app/screens/home/bottomTabs/Articles.tsx

Akhror · 2024-10-17T18:10:11Z

app/screens/home/bottomTabs/ChildDevelopment.tsx

@@ -100,7 +100,7 @@ const ChildDevelopment = ({ route, navigation }: any): any => {
  const [listLoading, setListLoading] = useState(false);
  const [modalVisible1, setModalVisible1] = useState(false);
  const flatListRef = useRef<any>();
-  const activityTaxonomyId = activeChild?.taxonomyData.prematureTaxonomyId != null && activeChild?.taxonomyData.prematureTaxonomyId != undefined && activeChild?.taxonomyData.prematureTaxonomyId != "" ? activeChild?.taxonomyData.prematureTaxonomyId : activeChild?.taxonomyData.id;
+  const activityTaxonomyId = activeChild?.taxonomyData?.prematureTaxonomyId != null && activeChild?.taxonomyData?.prematureTaxonomyId != undefined && activeChild?.taxonomyData?.prematureTaxonomyId != "" ? activeChild?.taxonomyData?.prematureTaxonomyId : activeChild?.taxonomyData.id;


This can be simplified as it was recommended above the review.

simplified the condition

Akhror · 2024-10-17T18:10:25Z

app/services/exactAlarmService.ts

+    console.log('Error requesting exact alarm permission:', error);
+    return false;
+  }
+};


Let's add some comments to document the method:

export const requestExactAlarmPermission = async (): Promise<boolean> => { try { // Request permission from the native module const permissionGranted = await ExactAlarmModule.requestExactAlarmPermission(); // Return true if permission is granted, otherwise false return permissionGranted; } catch (error) { console.error('Error requesting exact alarm permission:', error.message || error); // Return false to indicate failure in obtaining permission return false; } };

Akhror · 2024-10-17T18:10:31Z

app/services/interpretationService.ts

-    if(childTaxonomyData.prematureTaxonomyId!=null && childTaxonomyData.prematureTaxonomyId!="" && childTaxonomyData.prematureTaxonomyId!=undefined){
-        childAgeId=childTaxonomyData.prematureTaxonomyId;
+    if(childTaxonomyData?.prematureTaxonomyId!=null && childTaxonomyData?.prematureTaxonomyId!="" && childTaxonomyData?.prematureTaxonomyId!=undefined){
+        childAgeId=childTaxonomyData?.prematureTaxonomyId;


Let's please simplify the condition.

Akhror · 2024-10-17T18:10:34Z

app/services/interpretationService.ts

-    if(childTaxonomyData.prematureTaxonomyId!=null && childTaxonomyData.prematureTaxonomyId!="" && childTaxonomyData.prematureTaxonomyId!=undefined){
-    childAgeId=childTaxonomyData.prematureTaxonomyId;
+    if(childTaxonomyData?.prematureTaxonomyId!=null && childTaxonomyData?.prematureTaxonomyId!="" && childTaxonomyData?.prematureTaxonomyId!=undefined){
+    childAgeId=childTaxonomyData?.prematureTaxonomyId;


Let's please simplify the condition.

Akhror · 2024-10-17T18:10:37Z

app/services/notificationService.ts

-  const childBirthDatePlanned = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != "" && child?.taxonomyData.prematureTaxonomyId != undefined ? child.plannedTermDate : child.birthDate;
-  const activityTaxonomyId = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != undefined && child?.taxonomyData.prematureTaxonomyId != "" ? child?.taxonomyData.prematureTaxonomyId : child?.taxonomyData.id;
+  const childBirthDatePlanned = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != "" && child?.taxonomyData?.prematureTaxonomyId != undefined ? child.plannedTermDate : child.birthDate;
+  const activityTaxonomyId = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != undefined && child?.taxonomyData?.prematureTaxonomyId != "" ? child?.taxonomyData?.prematureTaxonomyId : child?.taxonomyData.id;


Let's please simplify the condition.

Akhror · 2024-10-17T18:10:40Z

app/services/notificationService.ts

@@ -307,14 +307,14 @@ export const getNextChildNotification = (gwperiodid: any, vcperiodid: any, hcper
  const childAgeInDays = getCurrentChildAgeInDays(
    DateTime.fromJSDate(new Date(child.birthDate)).toMillis(),
  );
-  const childBirthDatePlanned = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != "" && child?.taxonomyData.prematureTaxonomyId != undefined ? child.plannedTermDate : child.birthDate;
+  const childBirthDatePlanned = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != "" && child?.taxonomyData?.prematureTaxonomyId != undefined ? child.plannedTermDate : child.birthDate;


Let's please simplify the condition.

Akhror · 2024-10-17T18:10:43Z

app/services/notificationService.ts

  const childAgeInDaysForCD = getCurrentChildAgeInDays(
    DateTime.fromJSDate(new Date(childBirthDatePlanned)).toMillis(),
  );
  const childAgeObj = childAge.sort(
    (a: any, b: any) => a.days_from - b.days_from,
  );
-  const activityTaxonomyId = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != undefined && child?.taxonomyData.prematureTaxonomyId != "" ? child?.taxonomyData.prematureTaxonomyId : child?.taxonomyData.id;
+  const activityTaxonomyId = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != undefined && child?.taxonomyData?.prematureTaxonomyId != "" ? child?.taxonomyData?.prematureTaxonomyId : child?.taxonomyData.id;


Let's please simplify the condition.

I meant:

const activityTaxonomyId = child?.taxonomyData?.prematureTaxonomyId ? child.taxonomyData.prematureTaxonomyId : child?.taxonomyData?.id;

Akhror · 2024-10-17T18:10:46Z

app/services/notificationService.ts

-      const childDaysTo = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != undefined && child?.taxonomyData.prematureTaxonomyId != "" ? prematurechildgwperiod.days_to : childAgeObj[i].days_to;
-      const childDaysFrom = child?.taxonomyData.prematureTaxonomyId != null && child?.taxonomyData.prematureTaxonomyId != undefined && child?.taxonomyData.prematureTaxonomyId != "" ? prematurechildgwperiod.days_from : childAgeObj[i].days_from;
+      const childDaysTo = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != undefined && child?.taxonomyData?.prematureTaxonomyId != "" ? prematurechildgwperiod.days_to : childAgeObj[i].days_to;
+      const childDaysFrom = child?.taxonomyData?.prematureTaxonomyId != null && child?.taxonomyData?.prematureTaxonomyId != undefined && child?.taxonomyData?.prematureTaxonomyId != "" ? prematurechildgwperiod.days_from : childAgeObj[i].days_from;


Let's please simplify the condition.

I meant:

const childDaysTo = child?.taxonomyData?.prematureTaxonomyId ? prematurechildgwperiod.days_to : childAgeObj[i].days_to; const childDaysFrom = child?.taxonomyData?.prematureTaxonomyId ? prematurechildgwperiod.days_from : childAgeObj[i].days_from;

app/services/notificationService.ts

android/app/src/main/java/org/unicef/ecar/bebbo/ExactAlarmModule.java

android/app/src/main/java/org/unicef/ecar/bebbo/ExactAlarmPackage.java

android/build.gradle

app/components/FavActivities.tsx

Akhror · 2024-11-19T06:28:59Z

app/screens/home/bottomTabs/Activities.tsx

@@ -165,7 +165,7 @@ const Activities = ({ route, navigation }: any): any => {
    (state: any) =>
      state.utilsData.MileStonesData != '' ? JSON.parse(state.utilsData.MileStonesData) : [],
  );
-  const activityTaxonomyId = activeChild?.taxonomyData.prematureTaxonomyId != null && activeChild?.taxonomyData.prematureTaxonomyId != undefined && activeChild?.taxonomyData.prematureTaxonomyId != "" ? activeChild?.taxonomyData.prematureTaxonomyId : activeChild?.taxonomyData.id;
+  const activityTaxonomyId = activeChild?.taxonomyData?.prematureTaxonomyId != null && activeChild?.taxonomyData?.prematureTaxonomyId != undefined && activeChild?.taxonomyData?.prematureTaxonomyId != "" ? activeChild?.taxonomyData?.prematureTaxonomyId : activeChild?.taxonomyData.id;


This version looks more readable.

const activityTaxonomyId = activeChild?.taxonomyData?.prematureTaxonomyId ?? activeChild?.taxonomyData?.id;

Akhror · 2024-11-19T06:29:55Z

app/screens/home/bottomTabs/Articles.tsx

@@ -236,7 +236,7 @@ const Articles = ({ route, navigation }: any): any => {
      ? JSON.parse(state.childData.childDataSet.activeChild)
      : [],
  );
-  const activityTaxonomyId = activeChild?.taxonomyData.prematureTaxonomyId != null && activeChild?.taxonomyData.prematureTaxonomyId != undefined && activeChild?.taxonomyData.prematureTaxonomyId != "" ? activeChild?.taxonomyData.prematureTaxonomyId : activeChild?.taxonomyData.id;
+  const activityTaxonomyId = activeChild?.taxonomyData?.prematureTaxonomyId ?? activeChild?.taxonomyData.id;


activeChild?.taxonomyData?.id

ansariDataamanulla added 5 commits September 6, 2024 16:51

- change build version for store

33cf2a4

- fix article issue

- fixed production undefined and typeError issue

88c8785

- fixed add expected child edit issue

5f0132a

- add null condition for id

- upgrade the sdk 33 to 34

e432ad4

- fix the schedule exact alarm permission

f566d8e

deepakmali-dgsl requested a review from Akhror October 7, 2024 14:36

deepakmali-dgsl assigned ansariDataamanulla Oct 7, 2024