resolved conflcits

fylein · Dec 12, 2023 · 4db8d01 · 4db8d01
2 parents 1187464 + 2b6e7f3
commit 4db8d01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/appflow-release-branch.yml b/.github/workflows/appflow-release-branch.yml
@@ -2,8 +2,8 @@ name: Appflow Release Branch
 
 on:
   push:
-    branches: 
-      - 'mobile_release_.*'
+    branches:
+      - mobile_release_*
 
 jobs:
   build-app:
@@ -78,4 +78,3 @@ jobs:
           slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
           slack-channel: C029QPGHSQL
           slack-text: ${{github.event.sender.login}} pushed to ${{github.ref_name}}. \r\n \r\n APK Link ${{steps.diwaiAndroid.outputs.url}} \r\n IPA link ${{steps.diwaiIos.outputs.url}}
-
diff --git a/src/app/core/services/merge-expenses.service.ts b/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
           )
         )

diff --git a/src/app/fyle/merge-expense/merge-expense.page.ts b/src/app/fyle/merge-expense/merge-expense.page.ts
@@ -201,6 +201,12 @@ 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))
     );
@@ -314,12 +320,6 @@ 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>[][]);