Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(inheritance-report): Revert bank account parameter name change #17396

Open
wants to merge 2 commits into
base: release/33.2.0
Choose a base branch
from
+113 −91
Open

fix(inheritance-report): Revert bank account parameter name change #17396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6e29ca
fix(inheritance-report): Revert bank account name change (#17394)
juni-haukur Jan 3, 2025
60398bf
fix(inheritance-report): Account for enabled field on assets (#17399)
juni-haukur Jan 4, 2025
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
2 changes: 1 addition & 1 deletion ...cation/template-api-modules/src/lib/modules/templates/inheritance-report/utils/mappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export const expandAnswers = (
data: (answers.assets.bankAccounts?.data ?? []).map((account) => {
return {
assetNumber: account.assetNumber ?? '',
amount: account.amount ?? '',
propertyValuation: account.propertyValuation ?? '',
exchangeRateOrInterest: account.exchangeRateOrInterest ?? '',
foreignBankAccount: account?.foreignBankAccount ?? [],
deceasedShare: account.deceasedShare ?? '',
Expand Down
2 changes: 1 addition & 1 deletion libs/application/templates/inheritance-report/src/fields/CalculateShare/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const CalculateShare: FC<React.PropsWithChildren<FieldBaseProps>> = ({
const bankAccounts: CalcShared = (
(answers.assets as unknown as EstateAssets)?.bankAccounts?.data ?? []
).map((item) => {
const propertyValuation = valueToNumber(item.amount)
const propertyValuation = valueToNumber(item.propertyValuation)
const exchangeRateOrInterest = valueToNumber(item.exchangeRateOrInterest)
const deceasedShare = valueToNumber(item.deceasedShare)
const value = propertyValuation + exchangeRateOrInterest
Expand Down
2 changes: 1 addition & 1 deletion libs/application/templates/inheritance-report/src/fields/Overview/OverviewAssets/rows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const getBankAccountsDataRow = (answers: FormValue): RowType[] => {
)?.bankAccounts?.data.filter((item) => item.enabled)

const data = (values ?? []).map((item) => {
const propertyValuation = roundedValueToNumber(item.amount)
const propertyValuation = roundedValueToNumber(item.propertyValuation)

const isForeign = item.foreignBankAccount?.length

Expand Down
4 changes: 2 additions & 2 deletions libs/application/templates/inheritance-report/src/forms/sections/assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export const assets = buildSection({
[ESTATE_INHERITANCE]: m.bankAccountCapital,
[PREPAID_INHERITANCE]: m.bankAccountCapitalPrePaid,
},
id: 'amount',
id: 'propertyValuation',
required: true,
currency: true,
},
Expand Down Expand Up @@ -376,7 +376,7 @@ export const assets = buildSection({
fromExternalData: 'bankAccounts',
skipPushRight: true,
repeaterButtonText: m.bankAccountRepeaterButton,
sumField: 'amount',
sumField: 'propertyValuation',
sumField2: 'exchangeRateOrInterest',
},
),
Expand Down
2 changes: 1 addition & 1 deletion libs/application/templates/inheritance-report/src/lib/dataSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export const inheritanceReportSchema = z.object({
.object({
foreignBankAccount: z.array(z.enum([YES])).optional(),
assetNumber: z.string().refine((v) => v),
amount: z.string().refine((v) => v),
propertyValuation: z.string().refine((v) => v),
exchangeRateOrInterest: z.string().refine((v) => v),
enabled: z.boolean(),
...deceasedShare,
Expand Down
2 changes: 1 addition & 1 deletion libs/application/templates/inheritance-report/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export interface BankAccountsData extends DeceasedShare {
exchangeRateOrInterest: string
propertyNumber: string
assetNumber: string
amount: string
propertyValuation: string
foreignBankAccount?: ('yes' | 'no')[]
taxFreeInheritance: number
enabled?: boolean
Expand Down
Loading