diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js index f0b2b82d4..41988443e 100644 --- a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js +++ b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js @@ -10,7 +10,6 @@ import { updateMinEntriesLines, updateAutoAddNewLine, updateRemoveLineByIndex, - orderingLinesIndexes, } from 'utils'; /** @@ -75,7 +74,6 @@ export default function ExpenseFormEntriesTable({ autoFocus: ['expense_account_id', 0], currencyCode }} - footer={true} /> ); } \ No newline at end of file diff --git a/src/containers/Expenses/ExpenseForm/components.js b/src/containers/Expenses/ExpenseForm/components.js index 1763e9269..25ffd9a32 100644 --- a/src/containers/Expenses/ExpenseForm/components.js +++ b/src/containers/Expenses/ExpenseForm/components.js @@ -62,14 +62,6 @@ const LandedCostHeaderCell = () => { ); }; -/** - * Amount footer cell. - */ -function AmountFooterCell({ payload: { currencyCode }, rows }) { - const total = safeSumBy(rows, 'original.amount'); - return {formattedAmount(total, currencyCode)}; -} - /** * Expense amount header cell. */ @@ -77,34 +69,17 @@ export function ExpenseAmountHeaderCell({ payload: { currencyCode } }) { return intl.get('amount_currency', { currency: currencyCode }); } -/** - * Expense account footer cell. - */ -function ExpenseAccountFooterCell() { - return ; -} - /** * Retrieve expense form table entries columns. */ export function useExpenseFormTableColumns({ landedCost }) { return React.useMemo( () => [ - { - Header: '#', - accessor: 'index', - Cell: ({ row: { index } }) => {index + 1}, - className: 'index', - width: 40, - disableResizing: true, - disableSortBy: true, - }, { Header: ExpenseCategoryHeaderCell, id: 'expense_account_id', accessor: 'expense_account_id', Cell: AccountsListFieldCell, - Footer: ExpenseAccountFooterCell, className: 'expense_account_id', disableSortBy: true, width: 40, @@ -115,7 +90,6 @@ export function useExpenseFormTableColumns({ landedCost }) { Header: ExpenseAmountHeaderCell, accessor: 'amount', Cell: MoneyFieldCell, - Footer: AmountFooterCell, disableSortBy: true, width: 40, className: 'amount', diff --git a/src/containers/Expenses/ExpenseForm/utils.js b/src/containers/Expenses/ExpenseForm/utils.js index 6c9c492f5..0f8dc0c5a 100644 --- a/src/containers/Expenses/ExpenseForm/utils.js +++ b/src/containers/Expenses/ExpenseForm/utils.js @@ -22,28 +22,7 @@ const ERROR = { 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', }; -// Transform API errors in toasts messages. -export const transformErrors = (errors, { setErrors }) => { - const hasError = (errorType) => errors.some((e) => e.type === errorType); - - if (hasError(ERROR.EXPENSE_ALREADY_PUBLISHED)) { - setErrors( - AppToaster.show({ - message: intl.get('the_expense_is_already_published'), - }), - ); - } - if (hasError(ERROR.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED)) { - setErrors( - AppToaster.show({ - intent: Intent.DANGER, - message: 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', - }), - ); - } -}; - -export const MIN_LINES_NUMBER = 4; +export const MIN_LINES_NUMBER = 1; export const defaultExpenseEntry = { amount: '', @@ -65,6 +44,29 @@ export const defaultExpense = { categories: [...repeatValue(defaultExpenseEntry, MIN_LINES_NUMBER)], }; +/** + * Transform API errors in toasts messages. + */ +export const transformErrors = (errors, { setErrors }) => { + const hasError = (errorType) => errors.some((e) => e.type === errorType); + + if (hasError(ERROR.EXPENSE_ALREADY_PUBLISHED)) { + setErrors( + AppToaster.show({ + message: intl.get('the_expense_is_already_published'), + }), + ); + } + if (hasError(ERROR.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED)) { + setErrors( + AppToaster.show({ + intent: Intent.DANGER, + message: 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', + }), + ); + } +}; + /** * Transformes the expense to form initial values in edit mode. */