taxtank-core 0.28.23 → 0.28.26

package/fesm2015/taxtank-core.js

@@ -4351,6 +4351,12 @@ class BankAccount extends BankAccount$1 {
     get number() {
         return this.accountNumber.split(' ')[1];
     }
+    /**
+     * Get last digits of account number
+     */
+    get partialAccountNumber() {
+        return `xxxx${this.accountNumber.slice(-4, 0)}`;
+    }
     /**
      * Get current opening balance amount
      */
@@ -6623,16 +6629,13 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ANNUITIES_SUPER_INCOME_STREAMS"] = 3] = "ANNUITIES_SUPER_INCOME_STREAMS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_LUMP_SUM_PAYMENTS"] = 34] = "SUPERANNUATION_LUMP_SUM_PAYMENTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ATTRIBUTED_PSI_INCOME"] = 4] = "ATTRIBUTED_PSI_INCOME";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION"] = 11] = "DEPRECIATION";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_INTEREST"] = 5] = "GROSS_INTEREST";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DIVIDENDS"] = 6] = "DIVIDENDS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SHARE_SCHEMES"] = 35] = "SHARE_SCHEMES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_RENT"] = 8] = "GROSS_RENT";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS_TRUSTS"] = 13] = "PARTNERSHIPS_TRUSTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PARTNERSHIPS"] = 36] = "PARTNERSHIPS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TRUSTS"] = 37] = "TRUSTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PSI_SBE_INCOME"] = 14] = "PSI_SBE_INCOME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SOLE_TRADER_BUSINESS_INCOME"] = 38] = "SOLE_TRADER_BUSINESS_INCOME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_GAINS"] = 15] = "CAPITAL_GAINS";
@@ -6640,17 +6643,38 @@ var TaxReturnCategoryListEnum;
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BONUSES_FROM_LIFE_INSURANCE"] = 17] = "BONUSES_FROM_LIFE_INSURANCE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FORESTRY_MANAGED_INVESTMENT_SCHEMES"] = 39] = "FORESTRY_MANAGED_INVESTMENT_SCHEMES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_INCOME"] = 40] = "OTHER_INCOME";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
-    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_NO_ABN_GIVEN"] = 42] = "GROSS_PAYMENTS_NO_ABN_GIVEN";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_VOLUNTARY_AGREEMENT"] = 43] = "GROSS_PAYMENTS_VOLUNTARY_AGREEMENT";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER"] = 44] = "GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ASSESSABLE_GOVERNMENT_PAYMENTS"] = 45] = "ASSESSABLE_GOVERNMENT_PAYMENTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_BUSINESS_INCOME"] = 46] = "OTHER_BUSINESS_INCOME";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["WORK_EXPENSES"] = 7] = "WORK_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_DEDUCTIONS"] = 9] = "INTEREST_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CAPITAL_WORKS"] = 10] = "CAPITAL_WORKS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PLANT_AND_EQUIPMENT"] = 11] = "PLANT_AND_EQUIPMENT";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BORROWING_EXPENSES"] = 29] = "BORROWING_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_RENTAL_DEDUCTIONS"] = 12] = "OTHER_RENTAL_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["OTHER_DEDUCTIONS"] = 18] = "OTHER_DEDUCTIONS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["PURCHASES_AND_OTHER_COSTS"] = 48] = "PURCHASES_AND_OTHER_COSTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES"] = 49] = "CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["SUPERANNUATION_EXPENSES"] = 50] = "SUPERANNUATION_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["BAD_DEBTS"] = 51] = "BAD_DEBTS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["LEASE_EXPENSES"] = 52] = "LEASE_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["RENT_EXPENSES"] = 53] = "RENT_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_WITHIN_AUSTRALIA"] = 54] = "INTEREST_EXPENSES_WITHIN_AUSTRALIA";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["INTEREST_EXPENSES_OVERSEAS"] = 55] = "INTEREST_EXPENSES_OVERSEAS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["DEPRECIATION_EXPENSES"] = 56] = "DEPRECIATION_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MOTOR_VEHICLE_EXPENSES"] = 57] = "MOTOR_VEHICLE_EXPENSES";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["ALL_OTHER_EXPENSES"] = 58] = "ALL_OTHER_EXPENSES";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["GROSS_TAX_PAYABLE"] = 19] = "GROSS_TAX_PAYABLE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_ON_TAXABLE_INCOME"] = 20] = "TAX_ON_TAXABLE_INCOME";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["MEDICARE"] = 21] = "MEDICARE";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["STUDENT_LOAN_REPAYMENT"] = 22] = "STUDENT_LOAN_REPAYMENT";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_CREDITS"] = 23] = "TAX_CREDITS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_WITHHELD"] = 24] = "TAX_WITHHELD";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_INSTALMENTS"] = 25] = "TAX_INSTALMENTS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["FRANKING_CREDITS"] = 26] = "FRANKING_CREDITS";
+    TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_OFFSETS"] = 27] = "TAX_OFFSETS";
     TaxReturnCategoryListEnum[TaxReturnCategoryListEnum["TAX_PAYABLE"] = 28] = "TAX_PAYABLE";
 })(TaxReturnCategoryListEnum || (TaxReturnCategoryListEnum = {}));
 
@@ -6689,7 +6713,8 @@ const TAX_RETURN_CATEGORIES = {
         ],
         depreciation: [
             TaxReturnCategoryListEnum.CAPITAL_WORKS,
-            TaxReturnCategoryListEnum.DEPRECIATION
+            // @TODO Nik/Alex (it was TaxReturnCategoryListEnum.DEPRECIATION which doesn't exist)
+            TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT
         ]
     },
     other: {
@@ -6697,7 +6722,8 @@ const TAX_RETURN_CATEGORIES = {
             TaxReturnCategoryListEnum.GROSS_INTEREST,
             TaxReturnCategoryListEnum.DIVIDENDS,
             TaxReturnCategoryListEnum.SHARE_SCHEMES,
-            TaxReturnCategoryListEnum.PARTNERSHIPS_TRUSTS,
+            TaxReturnCategoryListEnum.PARTNERSHIPS,
+            TaxReturnCategoryListEnum.TRUSTS,
             TaxReturnCategoryListEnum.PSI_SBE_INCOME,
             TaxReturnCategoryListEnum.SOLE_TRADER_BUSINESS_INCOME,
             TaxReturnCategoryListEnum.CAPITAL_GAINS,
@@ -6715,7 +6741,29 @@ const TAX_RETURN_CATEGORIES = {
         taxOffsets: [
             TaxReturnCategoryListEnum.TAX_OFFSETS
         ]
-    }
+    },
+    sole: {
+        income: [
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_NO_ABN_GIVEN,
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_VOLUNTARY_AGREEMENT,
+            TaxReturnCategoryListEnum.GROSS_PAYMENTS_LABOUR_HIRE_OR_OTHER,
+            TaxReturnCategoryListEnum.ASSESSABLE_GOVERNMENT_PAYMENTS,
+            TaxReturnCategoryListEnum.OTHER_BUSINESS_INCOME
+        ],
+        expenses: [
+            TaxReturnCategoryListEnum.PURCHASES_AND_OTHER_COSTS,
+            TaxReturnCategoryListEnum.CONTRACTORS_SUBCONTRACTORS_COMMISSION_EXPENSES,
+            TaxReturnCategoryListEnum.SUPERANNUATION_EXPENSES,
+            TaxReturnCategoryListEnum.BAD_DEBTS,
+            TaxReturnCategoryListEnum.LEASE_EXPENSES,
+            TaxReturnCategoryListEnum.RENT_EXPENSES,
+            TaxReturnCategoryListEnum.INTEREST_EXPENSES_WITHIN_AUSTRALIA,
+            TaxReturnCategoryListEnum.INTEREST_EXPENSES_OVERSEAS,
+            TaxReturnCategoryListEnum.DEPRECIATION_EXPENSES,
+            TaxReturnCategoryListEnum.MOTOR_VEHICLE_EXPENSES,
+            TaxReturnCategoryListEnum.ALL_OTHER_EXPENSES
+        ]
+    },
 };
 
 /**
@@ -7157,7 +7205,8 @@ var TaxReturnCategorySectionEnum;
     TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
     TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
     TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
-    TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 4] = "SUMMARY";
+    TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
+    TaxReturnCategorySectionEnum[TaxReturnCategorySectionEnum["SUMMARY"] = 5] = "SUMMARY";
 })(TaxReturnCategorySectionEnum || (TaxReturnCategorySectionEnum = {}));
 
 var TaxReviewStatusEnum;
@@ -7194,8 +7243,9 @@ var TaxSummarySectionEnum;
 (function (TaxSummarySectionEnum) {
     TaxSummarySectionEnum[TaxSummarySectionEnum["WORK_TANK"] = 1] = "WORK_TANK";
     TaxSummarySectionEnum[TaxSummarySectionEnum["PROPERTY_TANK"] = 2] = "PROPERTY_TANK";
-    TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_INCOME"] = 3] = "OTHER_INCOME";
-    TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 4] = "SUMMARY";
+    TaxSummarySectionEnum[TaxSummarySectionEnum["OTHER_TANK"] = 3] = "OTHER_TANK";
+    TaxSummarySectionEnum[TaxSummarySectionEnum["SOLE_TANK"] = 4] = "SOLE_TANK";
+    TaxSummarySectionEnum[TaxSummarySectionEnum["SUMMARY"] = 5] = "SUMMARY";
 })(TaxSummarySectionEnum || (TaxSummarySectionEnum = {}));
 
 var TaxSummaryTaxSummaryEnum;
@@ -9050,7 +9100,7 @@ class MyTaxRent {
     calculateOtherRentalDeductionsAmount() {
         var _a, _b, _c;
         const plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
-            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
+            .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.PLANT_AND_EQUIPMENT)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
         const borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
             .findBy('taxReturnCategory.id', TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
         const otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
@@ -9246,8 +9296,10 @@ __decorate([
                 return 'taxSummaryWorkTank';
             case TaxSummarySectionEnum.PROPERTY_TANK:
                 return 'taxSummaryPropertyTank';
-            case TaxSummarySectionEnum.OTHER_INCOME:
+            case TaxSummarySectionEnum.OTHER_TANK:
                 return 'taxSummaryOtherIncome';
+            case TaxSummarySectionEnum.SOLE_TANK:
+                return 'taxSummarySoleTank';
             default:
                 return 'taxSummaryTotal';
         }
@@ -9260,7 +9312,7 @@ __decorate([
  */
 class TaxSummary {
     get sections() {
-        return [this.work, this.property, this.otherIncome, this.summary];
+        return [this.work, this.property, this.other, this.sole, this.summary];
     }
     get taxPercent() {
         // Check if netAmount is not 0 to avoid division by zero
@@ -9283,7 +9335,7 @@ class TaxSummary {
      */
     get workNetTotal() {
         const income = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.income, TaxSummarySectionEnum.WORK_TANK);
-        const expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, TaxSummarySectionEnum.WORK_TANK);
+        const expenses = this.work.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.expenses, TaxSummarySectionEnum.WORK_TANK);
         const interest = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.work.interest, TaxSummarySectionEnum.WORK_TANK);
         return income - Math.abs(expenses) - Math.abs(interest);
     }
@@ -9310,10 +9362,10 @@ class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get otherNetCash() {
-        const income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_INCOME);
-        const expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_INCOME);
-        const taxWithheld = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.OTHER_INCOME);
-        const taxInstalments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_INCOME);
+        const income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);
+        const expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);
+        const taxWithheld = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_WITHHELD], TaxSummarySectionEnum.OTHER_TANK);
+        const taxInstalments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);
         return income - Math.abs(expenses) - Math.abs(taxWithheld) - Math.abs(taxInstalments);
     }
     /**
@@ -9321,13 +9373,33 @@ class TaxSummary {
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
      */
     get otherNetTotal() {
-        const income = this.otherIncome.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_INCOME);
-        const expenses = this.summary.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_INCOME);
+        const income = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.income, TaxSummarySectionEnum.OTHER_TANK);
+        const expenses = this.other.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.other.expenses, TaxSummarySectionEnum.OTHER_TANK);
         const taxOffsets = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_OFFSETS], TaxSummarySectionEnum.SUMMARY);
-        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_INCOME);
-        const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.OTHER_INCOME);
+        const taxInstallments = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.TAX_INSTALMENTS], TaxSummarySectionEnum.OTHER_TANK);
+        const frankingCredits = this.summary.items.sumByCategoriesAndSection([TaxReturnCategoryListEnum.FRANKING_CREDITS], TaxSummarySectionEnum.OTHER_TANK);
         return income - Math.abs(expenses) + Math.abs(taxOffsets) + Math.abs(taxInstallments) + Math.abs(frankingCredits);
     }
+    /**
+     * @TODO Nicole update documentation + check calculations
+     * Sole Net Cash = gross income – expenses
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
+     */
+    get soleNetCash() {
+        const income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, TaxSummarySectionEnum.SOLE_TANK);
+        const expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, TaxSummarySectionEnum.SOLE_TANK);
+        return income - Math.abs(expenses);
+    }
+    /**
+     * @TODO Nicole update documentation + check calculations
+     * Sole Net Total = Gross income - expenses
+     * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/217677990/Dashboard+Main
+     */
+    get soleNetTotal() {
+        const income = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.income, TaxSummarySectionEnum.SOLE_TANK);
+        const expenses = this.sole.items.sumByCategoriesAndSection(TAX_RETURN_CATEGORIES.sole.expenses, TaxSummarySectionEnum.SOLE_TANK);
+        return income - Math.abs(expenses);
+    }
 }
 __decorate([
     Type(() => TaxSummarySection)
@@ -9337,7 +9409,10 @@ __decorate([
 ], TaxSummary.prototype, "property", void 0);
 __decorate([
     Type(() => TaxSummarySection)
-], TaxSummary.prototype, "otherIncome", void 0);
+], TaxSummary.prototype, "other", void 0);
+__decorate([
+    Type(() => TaxSummarySection)
+], TaxSummary.prototype, "sole", void 0);
 __decorate([
     Type(() => TaxSummarySection)
 ], TaxSummary.prototype, "summary", void 0);
@@ -15123,6 +15198,8 @@ class BankAccountImportForm extends BankAccountAllocationForm {
             const loan = plainToClass(Loan, Object.assign(bankAccount.loan, { bankAccount: { accountId: bankAccount.accountId } }));
             this.addControl('loan', new LoanForm(loan));
         }
+        // don't preselect tank type by default
+        this.get('tankType').setValue(null);
         // basiq account import form should be disabled (unchecked) by default
         this.disable();
     }