Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/app/fyle/add-edit-expense/add-edit-expense.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2868,12 +2868,15 @@ export class AddEditExpensePage implements OnInit {
this.autoCodedData.vendor_name = etxn.tx.extracted_data.vendor;
}

this.isReconciledExpense.set(expense.is_reconciled);

if (this.isReconciledExpense()) {
this.fg.controls.dateOfSpend.disable();
this.fg.controls.currencyObj.disable();
}
this.launchDarklyService.getVariation('reconciliation_beta', false).subscribe((isReconciliationEnabled) => {
if (isReconciliationEnabled) {
this.isReconciledExpense.set(expense.is_reconciled);
if (this.isReconciledExpense()) {
this.fg.controls.dateOfSpend?.disable();
this.fg.controls.currencyObj?.disable();
}
}
});

this.isIncompleteExpense = etxn.tx.state === 'DRAFT';
this.source = etxn.tx.source || 'MOBILE';
Expand Down
15 changes: 14 additions & 1 deletion src/app/shared/components/fy-number/fy-number.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AfterViewInit, Component, forwardRef, Injector, Input, OnInit, inject, input } from '@angular/core';
import { AfterViewInit, Component, forwardRef, Injector, Input, OnInit, inject, input, effect } from '@angular/core';
import {
ControlValueAccessor,
UntypedFormControl,
Expand Down Expand Up @@ -145,6 +145,19 @@ export class FyNumberComponent implements ControlValueAccessor, OnInit, AfterVie
this.fc = new UntypedFormControl(null, Validators.pattern(/^\d*(\.\d+)?$/));
}

// Set up effect to watch disabled signal after form control is created
effect(() => {
const isDisabled = this.disabled();
if (isDisabled !== undefined) {
this.isDisabled = isDisabled;
if (isDisabled) {
this.fc.disable();
} else if (this.fc.disabled) {
this.fc.enable();
}
}
});

this.fc.valueChanges.subscribe((value) => {
if (typeof value === 'string' && this.fc.valid) {
this.value = value && parseFloat(value);
Expand Down
Loading