taxtank-core 0.21.9 → 0.21.12

package/bundles/taxtank-core.umd.js

@@ -3376,20 +3376,34 @@
          * check if bank account related to work tank
          */
         BankAccount.prototype.isWorkTank = function () {
-            return this.tankType === exports.TankTypeEnum.WORK;
+            return !this.isPropertyTank() && !this.isSoleTank();
         };
         /**
          * check if bank account related to work tank
          */
         BankAccount.prototype.isPropertyTank = function () {
-            return this.tankType === exports.TankTypeEnum.PROPERTY;
+            return !!this.bankAccountProperties.length;
         };
         /**
          * check if bank account related to sole tank
          */
         BankAccount.prototype.isSoleTank = function () {
-            return this.tankType === exports.TankTypeEnum.SOLE;
+            return !!this.businessAllocations.length;
         };
+        Object.defineProperty(BankAccount.prototype, "tankType", {
+            get: function () {
+                switch (true) {
+                    case this.isPropertyTank():
+                        return exports.TankTypeEnum.PROPERTY;
+                    case this.isSoleTank():
+                        return exports.TankTypeEnum.SOLE;
+                    default:
+                        return exports.TankTypeEnum.WORK;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Get Bank account property by id
          * @param id Id of property
@@ -7145,6 +7159,13 @@
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_RUNNING"] = 17] = "HOME_OFFICE_RUNNING";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TOOLS_EQUIPMENT"] = 18] = "TOOLS_EQUIPMENT";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["HOME_OFFICE_OCCUPANCY"] = 19] = "HOME_OFFICE_OCCUPANCY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE"] = 20] = "AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["NEWSPAPER"] = 21] = "NEWSPAPER";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PRINTING_POSTAGE_STATIONERY"] = 22] = "PRINTING_POSTAGE_STATIONERY";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["SEMINARS_ETC"] = 23] = "SEMINARS_ETC";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["TELEPHONE"] = 24] = "TELEPHONE";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["UNION_FEES"] = 25] = "UNION_FEES";
+        ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["OTHER"] = 26] = "OTHER";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["DONATIONS"] = 27] = "DONATIONS";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["PSI"] = 30] = "PSI";
         ChartAccountsHeadingListEnum[ChartAccountsHeadingListEnum["BONUSES"] = 34] = "BONUSES";
@@ -8742,11 +8763,18 @@
             return this.method === exports.VehicleClaimMethodEnum.KMS;
         };
         VehicleClaim.prototype.isWorkTank = function () {
-            return this.tankType === exports.TankTypeEnum.WORK;
+            return !this.business;
         };
         VehicleClaim.prototype.isSoleTank = function () {
-            return this.tankType === exports.TankTypeEnum.SOLE;
+            return !!this.business;
         };
+        Object.defineProperty(VehicleClaim.prototype, "tankType", {
+            get: function () {
+                return this.isSoleTank() ? exports.TankTypeEnum.SOLE : exports.TankTypeEnum.WORK;
+            },
+            enumerable: false,
+            configurable: true
+        });
         /**
          * Claim amount for KLMs method. Exists only for KLMs method.
          */
@@ -9337,14 +9365,20 @@
         workRelatedClothingExpenses: [
             exports.ChartAccountsHeadingListEnum.COMPULSORY_WORK_UNIFORM,
             exports.ChartAccountsHeadingListEnum.PROTECTION_CLOTHING,
-            exports.ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING,
-            exports.ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
+            exports.ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
         ],
         otherIncomeRelatedExpenses: [
             exports.ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
             exports.ChartAccountsHeadingListEnum.SUBSCRIPTIONS,
             exports.ChartAccountsHeadingListEnum.HOME_OFFICE_RUNNING,
-            exports.ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY
+            exports.ChartAccountsHeadingListEnum.HOME_OFFICE_OCCUPANCY,
+            exports.ChartAccountsHeadingListEnum.AWARD_OVERTIME_MEAL_ALLOWANCE_EXPENSE,
+            exports.ChartAccountsHeadingListEnum.NEWSPAPER,
+            exports.ChartAccountsHeadingListEnum.PRINTING_POSTAGE_STATIONERY,
+            exports.ChartAccountsHeadingListEnum.SEMINARS_ETC,
+            exports.ChartAccountsHeadingListEnum.TELEPHONE,
+            exports.ChartAccountsHeadingListEnum.UNION_FEES,
+            exports.ChartAccountsHeadingListEnum.OTHER
         ],
         workRelatedSelfEducationExpenses: [
             exports.ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
@@ -9420,45 +9454,45 @@
             this.workRelatedClothingExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedClothingExpenses);
             this.personalSuperContributions = this.transactions
-                .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.personalSuperContributions);
+                .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.personalSuperContributions);
             this.workRelatedSelfEducationExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.workRelatedSelfEducationExpenses);
             this.vehicleExpensesTotalAmount = this.getVehicleExpensesTotalAmount();
             this.workRelatedTravelExpensesTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.WORK_RELATED_TRAVEL_EXPENSES)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.workRelatedClothingType = this.workRelatedClothingExpenses.length ? exports.DeductionClothingTypeEnum.COMPULSORY_C : null;
-            this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('amount');
+            this.workRelatedClothingTotalAmount = this.workRelatedClothingExpenses.sumBy('claimAmount');
             this.workRelatedSelfEducationType = this.workRelatedSelfEducationExpenses.length ?
                 exports.DeductionSelfEducationTypeEnum.IMPROVE_SKILLS_FOR_CURRENT_EARNINGS_K : null;
-            this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('amount');
+            this.workRelatedSelfEducationTotalAmount = this.workRelatedSelfEducationExpenses.sumBy('claimAmount');
             this.lowValuePoolDeductionTotalAmount = this.depreciations.getByTankType(exports.TankTypeEnum.WORK)
                 .getLowValuePoolDepreciations().sumBy('claimAmount');
             this.interestExpensesTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.interestExpenses)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.dividendExpensesTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.dividendExpenses)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.donationsTotalAmount = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.donations)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.interestsChargedByATOTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.interestsChargedByATO)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.litigationCostsTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.litigationCosts)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.otherManagingCostsTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherManagingCosts)
-                .sumBy('amount');
-            this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('amount');
+                .sumBy('claimAmount');
+            this.personalSuperContributionsTotalAmount = this.personalSuperContributions.sumBy('claimAmount');
             this.forestryManagedInvestmentSchemesDeductionsTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.forestryManagedInvestmentSchemesDeductions)
-                .sumBy('amount');
+                .sumBy('claimAmount');
             this.otherDeductionsTotalAmount = this.transactions
                 .filterBy('chartAccounts.id', DEDUCTION_CATEGORIES.otherDeductions)
-                .sumBy('amount');
+                .sumBy('claimAmount');
         }
         MyTaxDeductions.prototype.getVehicleExpensesTotalAmount = function () {
             var _a;
@@ -9477,7 +9511,7 @@
         MyTaxDeductions.prototype.setOtherWorkRelatedExpensesTotalAmount = function () {
             var otherIncomeRelatedExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-            this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('amount')) +
+            this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
                 this.depreciations.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
         };
         return MyTaxDeductions;
@@ -9536,8 +9570,8 @@
             var taxOffsetsReportItem = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_OFFSETS);
             var lowMiddleIncomeTaxOffsets = this.getLowMiddleIncomeTaxOffsets(taxOffsetsReportItem);
             var taxPayable = grossTaxPayableReportItem.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_ON_TAXABLE_INCOME).amount;
-            var medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
-            var medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+            var medicareLevy = medicareReportItem.details.findBy('name', 'Medicare Levy (based on single)').amount;
+            var medicareLevySurcharge = medicareReportItem.details.findBy('name', 'Medicare Levy Surcharge').amount;
             var taxCredits = summarySection.items.findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.TAX_CREDITS).amount;
             var taxOffsets = this.getTaxOffsets(taxOffsetsReportItem.amount, lowMiddleIncomeTaxOffsets);
             return classTransformer.plainToClass(MyTaxEstimate, {
@@ -9645,7 +9679,7 @@
             this.interestPaidTransactions = transactions.filterBy('chartAccounts.id', exports.ChartAccountsListEnum.ATO_INTEREST_PAID);
             this.interestEarnedTotalAmount = this.interestEarnedTransactions.sumBy('amount');
             this.interestEarnedTotalTax = this.interestEarnedTransactions.sumBy('tax');
-            this.interestPaidTotalAmount = this.interestEarnedTransactions.sumBy('amount');
+            this.interestPaidTotalAmount = this.interestPaidTransactions.sumBy('amount');
         }
         return MyTaxInterest;
     }());
@@ -9744,26 +9778,49 @@
     }());
 
     var MyTaxRent = /** @class */ (function () {
-        function MyTaxRent(transactions, depreciations) {
+        function MyTaxRent(transactions, depreciations, taxSummary) {
             this.propertyExpenses = transactions.getPropertyTransactions().getExpenseTransactions();
+            this.taxSummaryPropertySection = taxSummary.property;
             this.grossRentAmount = transactions
+                .getPropertyTransactions()
                 .getIncomeTransactions()
                 .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.RENTAL_INCOME)
-                .sumBy('amount') +
-                transactions.
-                    getIncomeTransactions()
+                .sumBy('claimAmount') +
+                transactions
+                    .getPropertyTransactions()
+                    .getIncomeTransactions()
                     .filterBy('chartAccounts.id', exports.ChartAccountsListEnum.OTHER_RENTAL_INCOME)
-                    .sumBy('amount');
+                    .sumBy('claimAmount');
             this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('amount'));
             this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
-            this.otherRentalDeductionsAmount = Math.abs(depreciations.getAssets().sumBy('claimAmount') +
-                depreciations.getBorrowingExpenseDepreciations().sumBy('claimAmount') +
-                this.propertyExpenses.sumBy('amount'));
+            this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
+            /**
+             * @Todo Vik uncomment when task TT-2009 will be implemented
+             */
+            // this.otherRentalDeductionsAmount = depreciations.getByTankType(TankTypeEnum.PROPERTY).getAssets().claimAmount +
+            //   depreciations.getByTankType(TankTypeEnum.PROPERTY).getBorrowingExpenseDepreciations().claimAmount +
+            //   Math.abs(this.propertyExpenses.sumBy('claimAmount'));
             this.netRent = this.grossRentAmount -
                 this.interestDeductionsAmount -
                 this.capitalWorksDeductionsAmount -
                 this.otherRentalDeductionsAmount;
         }
+        /**
+         * @Todo Vik remove when TT-2009 will be implemented.
+         * We use tax summary data here because claim amount from depreciation is different
+         * from the claim amount that we get from tax summary (depreciation claim amount is not affected by property share,
+         * property contract date, e.t.c.). Details in the TT-2009 task
+         */
+        MyTaxRent.prototype.calculateOtherRentalDeductionsAmount = function () {
+            var _a, _b, _c;
+            var plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
+            var borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
+            var otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _c === void 0 ? void 0 : _c.amount) || 0);
+            return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
+        };
         return MyTaxRent;
     }());
 
@@ -11775,6 +11832,7 @@
 
     /**
      * server sent events service
+     * https://symfony.com/doc/current/mercure.html
      */
     var SseService = /** @class */ (function () {
         function SseService(zone, jwtService, environment) {
@@ -14967,6 +15025,7 @@
 
     /**
      * Abstract form class
+     * @TODO rename to AbstractFormGroup
      */
     var AbstractForm = /** @class */ (function (_super) {
         __extends(AbstractForm, _super);
@@ -14993,6 +15052,10 @@
             this.onSubmit.emit(model);
             return model;
         };
+        AbstractForm.prototype.addControl = function (name, control, options) {
+            _super.prototype.addControl.call(this, name, control, options);
+            return this;
+        };
         AbstractForm.prototype.createModelInstance = function (data) {
             if (data === void 0) { data = {}; }
             return classTransformer.plainToClass(this.modelClass, data);
@@ -15000,30 +15063,61 @@
         return AbstractForm;
     }(forms.FormGroup));
 
+    function conditionalValidator(condition, validator) {
+        return function (control) {
+            revalidateOnChanges(control);
+            if (control && control.parent) {
+                if (condition(control.parent)) {
+                    return validator(control);
+                }
+            }
+            return null;
+        };
+    }
     /**
-     * Form with bank account loan details
+     * Conditional validator depends on other fields and should be updated on each form value change
      */
-    var BankAccountLoanForm = /** @class */ (function (_super) {
-        __extends(BankAccountLoanForm, _super);
-        function BankAccountLoanForm(loan) {
-            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
-            return _super.call(this, {
-                type: new forms.FormControl(loan.type, forms.Validators.required),
-                amount: new forms.FormControl(loan.amount, forms.Validators.required),
-                repaymentType: new forms.FormControl(loan.repaymentType, forms.Validators.required),
-                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
-                interestType: new forms.FormControl(loan.interestType, forms.Validators.required),
-                availableRedraw: new forms.FormControl(loan.availableRedraw, forms.Validators.required),
-                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
-                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
-                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required)
-            }, loan) || this;
+    function revalidateOnChanges(control) {
+        if (control && control.parent && !control['_revalidateOnChanges']) {
+            control['_revalidateOnChanges'] = true;
+            control.parent.valueChanges.pipe(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
+                .subscribe(function () {
+                control.updateValueAndValidity({ emitEvent: false });
+            });
         }
-        return BankAccountLoanForm;
-    }(AbstractForm));
+        return;
+    }
+
+    /**
+     * Validator that check if sum amount of provided fields is greater than provided sum
+     * @param field to check in each formArray element
+     * @param summary to compare with fields sum
+     * @param fieldAlias to show it in error message
+     */
+    function fieldsSumValidator(field, summary, fieldAlias) {
+        if (summary === void 0) { summary = 100; }
+        return function (formArray) {
+            // calculate sum of desired fields in formArray control
+            var fieldsSum = formArray['controls']
+                .reduce(function (acc, group) { return acc += group.get(field).value; }, 0);
+            if (fieldsSum <= summary) {
+                return null;
+            }
+            else {
+                return {
+                    fieldsSum: {
+                        name: field,
+                        alias: fieldAlias,
+                        summary: summary
+                    }
+                };
+            }
+        };
+    }
 
     /**
      * Form array with bank account properties
+     * @TODO create AbstractFormArray
      */
     var BankAccountPropertiesForm = /** @class */ (function (_super) {
         __extends(BankAccountPropertiesForm, _super);
@@ -15031,20 +15125,37 @@
             if (bankAccountProperties === void 0) { bankAccountProperties = [classTransformer.plainToClass(BankAccountProperty, {})]; }
             return _super.call(this, bankAccountProperties.map(function (bankAccountProperty) {
                 return new forms.FormGroup({
-                    property: new forms.FormControl(bankAccountProperty.property, forms.Validators.required),
+                    property: new forms.FormControl(bankAccountProperty === null || bankAccountProperty === void 0 ? void 0 : bankAccountProperty.property, forms.Validators.required),
                     percent: new forms.FormControl(bankAccountProperty.percent, forms.Validators.required)
                 });
-            })) || this;
+            }), [
+                conditionalValidator(function (control) { return control.get('tankType').value === exports.TankTypeEnum.PROPERTY; }, forms.Validators.required),
+                fieldsSumValidator('percent', 100)
+            ]) || this;
         }
         BankAccountPropertiesForm.prototype.add = function () {
             this.push(new forms.FormGroup({
                 property: new forms.FormControl(null, forms.Validators.required),
-                percent: new forms.FormControl({
-                    value: 100,
-                    disabled: !this.at(0).contains('percent')
-                }, forms.Validators.required)
-            }));
-        };
+                // @TODO disable for loans
+                percent: new forms.FormControl({ value: 100, disabled: !this.at(0).contains('percent') }, forms.Validators.required),
+                // @TODO enable for loans
+                // amount: new FormControl(
+                //   {value: this.bankAccount.currentBalance * bankAccountProperty.percent / 100},
+                //   [Validators.required, Validators.max(Math.abs(this.bankAccount.currentBalance))]
+                // ),
+            }));
+        };
+        // @TODO enable for loans
+        // /**
+        //  * Recalculate property percentage for current property form group and round to no more than 3 decimal places
+        //  * @param amount: new control value
+        //  * @param currentPropertyGroup for which amount will be recalculated
+        //  */
+        // recalculatePropertyPercentage(amount: number, currentPropertyGroup: FormGroup): void {
+        //   currentPropertyGroup.get('percent').setValue(
+        //     roundTo(amount / this.bankAccount.currentBalance, 3)
+        //   );
+        // }
         BankAccountPropertiesForm.prototype.enablePercent = function () {
             this.controls.forEach(function (propertyFormGroup) {
                 propertyFormGroup.get('percent').enable();
@@ -15058,6 +15169,57 @@
         return BankAccountPropertiesForm;
     }(forms.FormArray));
 
+    var BankAccountAllocationForm = /** @class */ (function (_super) {
+        __extends(BankAccountAllocationForm, _super);
+        function BankAccountAllocationForm(bankAccount) {
+            var _this = _super.call(this, {
+                tankType: new forms.FormControl(bankAccount ? bankAccount.tankType : null, forms.Validators.required),
+            }, classTransformer.plainToClass(BankAccount, bankAccount || {})) || this;
+            _this.bankAccount = bankAccount;
+            if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isPropertyTank()) {
+                _this.addControl('bankAccountProperties', new BankAccountPropertiesForm(bankAccount.bankAccountProperties));
+            }
+            _this.watchTankType();
+            return _this;
+        }
+        BankAccountAllocationForm.prototype.watchTankType = function () {
+            var _this = this;
+            this.get('tankType').valueChanges.subscribe(function (tankType) {
+                var _a;
+                // @TODO vik add businessAllocation
+                if (tankType === exports.TankTypeEnum.PROPERTY) {
+                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm((_a = _this.bankAccount) === null || _a === void 0 ? void 0 : _a.bankAccountProperties));
+                }
+                else {
+                    _this.removeControl('bankAccountProperties');
+                }
+            });
+        };
+        return BankAccountAllocationForm;
+    }(AbstractForm));
+
+    /**
+     * Form with bank account loan details
+     */
+    var BankAccountLoanForm = /** @class */ (function (_super) {
+        __extends(BankAccountLoanForm, _super);
+        function BankAccountLoanForm(loan) {
+            if (loan === void 0) { loan = classTransformer.plainToClass(Loan, {}); }
+            return _super.call(this, {
+                type: new forms.FormControl(loan.type, forms.Validators.required),
+                amount: new forms.FormControl(loan.amount, forms.Validators.required),
+                repaymentType: new forms.FormControl(loan.repaymentType, forms.Validators.required),
+                interestRate: new forms.FormControl(loan.interestRate, [forms.Validators.required, forms.Validators.min(0), forms.Validators.max(100)]),
+                interestType: new forms.FormControl(loan.interestType, forms.Validators.required),
+                availableRedraw: new forms.FormControl(loan.availableRedraw, forms.Validators.required),
+                commencementDate: new forms.FormControl(loan.commencementDate, forms.Validators.required),
+                repaymentAmount: new forms.FormControl(loan.repaymentAmount, forms.Validators.required),
+                repaymentFrequency: new forms.FormControl(loan.repaymentFrequency, forms.Validators.required)
+            }, loan) || this;
+        }
+        return BankAccountLoanForm;
+    }(AbstractForm));
+
     /**
      * Form is using for import basiq bank accounts.
      * Basiq accounts has all data except tank type, properties and loan partially
@@ -15065,40 +15227,16 @@
     var BankAccountImportForm = /** @class */ (function (_super) {
         __extends(BankAccountImportForm, _super);
         function BankAccountImportForm(bankAccount) {
-            var _this = _super.call(this, {
-                tankType: new forms.FormControl(bankAccount.tankType, forms.Validators.required),
-            }, bankAccount) || this;
+            var _this = _super.call(this, bankAccount) || this;
             if (bankAccount.isLoan()) {
                 _this.addControl('loan', new BankAccountLoanForm(bankAccount.loan));
             }
             // basiq account import form should be disabled (unchecked) by default
             _this.disable();
-            _this.listenEvents();
             return _this;
         }
-        BankAccountImportForm.prototype.listenEvents = function () {
-            this.listenTankTypeChanges();
-        };
-        /**
-         * Add/Remove bank account properties form depends on selected tank type
-         */
-        BankAccountImportForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function (tankType) {
-                if (tankType === exports.TankTypeEnum.PROPERTY) {
-                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
-                    // property percent allowed only for loan bank accounts
-                    if (!_this.contains('loan')) {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-                else {
-                    _this.removeControl('bankAccountProperties');
-                }
-            });
-        };
         return BankAccountImportForm;
-    }(AbstractForm));
+    }(BankAccountAllocationForm));
 
     /**
      * Form is using for single manual bank account creation (not Basiq)
@@ -15106,20 +15244,18 @@
     var BankAccountAddManualForm = /** @class */ (function (_super) {
         __extends(BankAccountAddManualForm, _super);
         function BankAccountAddManualForm(connection) {
-            var _this = _super.call(this, {
-                type: new forms.FormControl(null, forms.Validators.required),
-                accountName: new forms.FormControl(null, forms.Validators.required),
-                currentBalance: new forms.FormControl(null, forms.Validators.required),
-                accountNumber: new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]),
-                tankType: new forms.FormControl(null, forms.Validators.required),
-            }, classTransformer.plainToClass(BankAccount, {})) || this;
+            var _this = _super.call(this) || this;
             _this.connection = connection;
+            _this
+                .addControl('type', new forms.FormControl(null, forms.Validators.required))
+                .addControl('accountName', new forms.FormControl(null, forms.Validators.required))
+                .addControl('currentBalance', new forms.FormControl(null, forms.Validators.required))
+                .addControl('accountNumber', new forms.FormControl(null, [forms.Validators.required, forms.Validators.pattern(BankAccountAddManualForm.accountNumberPattern)]));
             _this.listenEvents();
             return _this;
         }
         BankAccountAddManualForm.prototype.listenEvents = function () {
             this.listenTypeChanges();
-            this.listenTankTypeChanges();
         };
         /**
          * Add/Remove loan form depends on selected bank account type
@@ -15129,38 +15265,9 @@
             this.get('type').valueChanges.subscribe(function (type) {
                 if (BankAccount.loanTypes.includes(type)) {
                     _this.addControl('loan', new BankAccountLoanForm());
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('bankAccountProperties')) {
-                        _this.get('bankAccountProperties').enablePercent();
-                    }
                 }
                 else {
                     _this.removeControl('loan');
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('bankAccountProperties')) {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-            });
-        };
-        /**
-         * Add/Remove bank account properties form depends on selected tank type
-         */
-        BankAccountAddManualForm.prototype.listenTankTypeChanges = function () {
-            var _this = this;
-            this.get('tankType').valueChanges.subscribe(function (tankType) {
-                if (tankType === exports.TankTypeEnum.PROPERTY) {
-                    _this.addControl('bankAccountProperties', new BankAccountPropertiesForm());
-                    // property percent allowed only for loan bank accounts
-                    if (_this.contains('loan')) {
-                        _this.get('bankAccountProperties').enablePercent();
-                    }
-                    else {
-                        _this.get('bankAccountProperties').disablePercent();
-                    }
-                }
-                else {
-                    _this.removeControl('bankAccountProperties');
                 }
             });
         };
@@ -15171,7 +15278,7 @@
             return _super.prototype.submit.call(this, { bankConnection: this.connection });
         };
         return BankAccountAddManualForm;
-    }(AbstractForm));
+    }(BankAccountAllocationForm));
     BankAccountAddManualForm.accountNumberPattern = '^[0-9]{6}[ ]{1}[0-9]{1,}$';
 
     /**
@@ -15304,31 +15411,6 @@
         };
     }
 
-    function conditionalValidator(condition, validator) {
-        return function (control) {
-            revalidateOnChanges(control);
-            if (control && control.parent) {
-                if (condition(control.parent)) {
-                    return validator(control);
-                }
-            }
-            return null;
-        };
-    }
-    /**
-     * Conditional validator depends on other fields and should be updated on each form value change
-     */
-    function revalidateOnChanges(control) {
-        if (control && control.parent && !control['_revalidateOnChanges']) {
-            control['_revalidateOnChanges'] = true;
-            control.parent.valueChanges.pipe(operators.distinctUntilChanged(function (a, b) { return JSON.stringify(a) === JSON.stringify(b); }))
-                .subscribe(function () {
-                control.updateValueAndValidity({ emitEvent: false });
-            });
-        }
-        return;
-    }
-
     /**
      * Regular expressions that are used to check password strength and valid values
      */
@@ -15617,12 +15699,12 @@
                     value: deductions.workRelatedTravelExpensesTotalAmount,
                     disabled: true
                 }),
-                workRelatedClothingType: new forms.FormControl(deductions.workRelatedClothingType, forms.Validators.required),
+                workRelatedClothingType: new forms.FormControl(deductions.workRelatedClothingType, conditionalValidator(function () { return !!deductions.workRelatedClothingTotalAmount; }, forms.Validators.required)),
                 workRelatedClothingTotalAmount: new forms.FormControl({
                     value: deductions.workRelatedClothingTotalAmount,
                     disabled: true
                 }),
-                workRelatedSelfEducationType: new forms.FormControl(deductions.workRelatedSelfEducationType, forms.Validators.required),
+                workRelatedSelfEducationType: new forms.FormControl(deductions.workRelatedSelfEducationType, conditionalValidator(function () { return !!deductions.workRelatedSelfEducationTotalAmount; }, forms.Validators.required)),
                 workRelatedSelfEducationTotalAmount: new forms.FormControl({
                     value: deductions.workRelatedSelfEducationTotalAmount,
                     disabled: true
@@ -15659,6 +15741,11 @@
                     value: deductions.otherManagingCostsTotalAmount,
                     disabled: true
                 }),
+                fundName: new forms.FormControl(''),
+                hasFund: new forms.FormControl(true),
+                fundABN: new forms.FormControl(''),
+                fundTFN: new forms.FormControl(''),
+                fundAccountNumber: new forms.FormControl(''),
                 personalSuperContributionsTotalAmount: new forms.FormControl({
                     value: deductions.personalSuperContributionsTotalAmount,
                     disabled: true
@@ -15995,6 +16082,7 @@
     exports.Bank = Bank;
     exports.BankAccount = BankAccount;
     exports.BankAccountAddManualForm = BankAccountAddManualForm;
+    exports.BankAccountAllocationForm = BankAccountAllocationForm;
     exports.BankAccountCalculationService = BankAccountCalculationService;
     exports.BankAccountChartData = BankAccountChartData;
     exports.BankAccountCollection = BankAccountCollection;