Skip to content
Merged
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
12 changes: 9 additions & 3 deletions src/components/Employee/PaymentMethod/BankAccountsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import TrashCanSvg from '@/assets/icons/trashcan.svg?react'
import { DataView, useDataView } from '@/components/Common'
import useNumberFormatter from '@/hooks/useNumberFormatter'
import { HamburgerMenu } from '@/components/Common/HamburgerMenu'
import { SPLIT_BY } from '@/shared/constants'
import { centsToDollars } from '@/helpers/currencyHelpers'

export function BankAccountsList() {
const { bankAccounts, paymentMethod, mode, handleDelete, isPending } = usePaymentMethod()
Expand All @@ -20,9 +22,13 @@ export function BankAccountsList() {
key: 'splitAmount',
title: t('allocationColumn'),
render: bankAccount => {
return format(
paymentMethod.splits?.find(split => split.uuid === bankAccount.uuid)?.splitAmount ?? 0,
)
const splitAmount =
paymentMethod.splits?.find(split => split.uuid === bankAccount.uuid)?.splitAmount ?? 0
const displayValue =
paymentMethod.splitBy === SPLIT_BY.amount
? (centsToDollars(splitAmount) ?? 0)
: splitAmount
return format(displayValue)
},
},
],
Expand Down
23 changes: 17 additions & 6 deletions src/components/Employee/PaymentMethod/PaymentMethod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { useI18n } from '@/i18n'
import { componentEvents, PAYMENT_METHODS, SPLIT_BY } from '@/shared/constants'
import { useFlow } from '@/components/Flow/useFlow'
import { useComponentDictionary } from '@/i18n/I18n'
import { centsToDollars, dollarsToCents } from '@/helpers/currencyHelpers'

interface PaymentMethodProps extends CommonComponentInterface<'Employee.PaymentMethod'> {
employeeId: string
Expand Down Expand Up @@ -89,13 +90,17 @@ const Root = ({ employeeId, className, dictionary, isAdmin = false }: PaymentMet
}, [])

const defaultValues: CombinedSchemaOutputs = useMemo(() => {
const isAmountSplit = paymentMethod.splitBy === SPLIT_BY.amount
return {
...baseDefaultValues,
type: paymentMethod.type ?? 'Direct Deposit',
splitBy: paymentMethod.splitBy ?? undefined,
...paymentMethod.splits?.reduce(
(acc, { uuid, splitAmount, priority }) => ({
splitAmount: { ...acc.splitAmount, [uuid]: splitAmount ?? null },
splitAmount: {
...acc.splitAmount,
[uuid]: isAmountSplit ? centsToDollars(splitAmount ?? null) : (splitAmount ?? null),
},
priority: { ...acc.priority, [uuid]: Number(priority) },
}),
{ splitAmount: {}, priority: {} },
Expand Down Expand Up @@ -181,11 +186,17 @@ const Root = ({ employeeId, className, dictionary, isAdmin = false }: PaymentMet
: (paymentMethod.splitBy ?? SPLIT_BY.percentage),
splits:
payload.isSplit && paymentMethod.splits
? paymentMethod.splits.map(split => ({
...split,
splitAmount: payload.splitAmount[split.uuid],
priority: payload.priority[split.uuid],
}))
? paymentMethod.splits.map(split => {
const splitAmountValue = payload.splitAmount[split.uuid] ?? null
const isAmountSplit = payload.splitBy === SPLIT_BY.amount
return {
...split,
splitAmount: isAmountSplit
? dollarsToCents(splitAmountValue)
: splitAmountValue,
priority: payload.priority[split.uuid],
}
})
: (paymentMethod.splits ?? []),
}
const paymentMethodResponse = await paymentMethodMutation.mutateAsync({
Expand Down
9 changes: 9 additions & 0 deletions src/helpers/currencyHelpers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export const dollarsToCents = (dollars: number | null): number | null => {
if (dollars === null) return null
return Math.round(dollars * 100)
}

export const centsToDollars = (cents: number | null): number | null => {
if (cents === null) return null
return cents / 100
}