fixing merge-expenses

src/app/core/services/merge-expenses.service.ts

@@ -588,10 +588,10 @@ export class MergeExpensesService {
     [fieldId: number]: Partial<CustomInput>[];
   } {
     const dependentFieldsMapping: DependentFieldsMapping = {};
-    expenses.forEach((expense) => {
+    expenses?.forEach((expense) => {
       const txDependentFields: Partial<CustomInput>[] = dependentFields
         ?.map((dependentField: TxnCustomProperties) =>
-          expense.tx_custom_properties.find(
+          expense.tx_custom_properties?.find(
             (txCustomProperty: Partial<CustomInput>) => dependentField.name === txCustomProperty.name
           )
         )

src/app/fyle/merge-expense/merge-expense.page.ts

@@ -201,12 +201,6 @@ export class MergeExpensePage implements OnInit, AfterViewChecked {
 
     this.systemCategories = this.categoriesService.getSystemCategories();
 
-    expenses$
-      .pipe(switchMap((expenses) => this.mergeExpensesService.generateReceiptOptions(expenses)))
-      .subscribe((receiptOptions) => {
-        this.receiptOptions = receiptOptions;
-      });
-
     this.amountOptionsData$ = expenses$.pipe(
       switchMap((expenses) => this.mergeExpensesService.generateAmountOptions(expenses))
     );
@@ -320,6 +314,12 @@ export class MergeExpensePage implements OnInit, AfterViewChecked {
       map((customProps) => (customProperties = customProps))
     );
 
+    expenses$
+      .pipe(switchMap((expenses) => this.mergeExpensesService.generateReceiptOptions(expenses)))
+      .subscribe((receiptOptions) => {
+        this.receiptOptions = receiptOptions;
+      });
+
     expenses$.subscribe((expenses) => (this.expenses = expenses));
 
     this.combinedCustomProperties = this.generateCustomInputOptions(customProperties as Partial<CustomInput>[][]);