Skip to content

✨ Add multiple expenses via bank transactions at the same time #477

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+582 −323
Open

✨ Add multiple expenses via bank transactions at the same time #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7fdbf4
Fix bug when adding expense
alexanderwassbjer Nov 8, 2025
ae91506
Add multiple transactions add with add one by one and add all
alexanderwassbjer Nov 8, 2025
e2be8b1
Fix add all bug
alexanderwassbjer Nov 8, 2025
7d0d7f6
Some small improvements
alexanderwassbjer Nov 8, 2025
c36a1c2
Add check
alexanderwassbjer Nov 8, 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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"i18next-http-backend": "^3.0.2",
"input-otp": "^1.2.3",
"lucide-react": "^0.544.0",
"motion": "^12.23.24",
Copy link
Collaborator

@krokosik krokosik Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh? Any reasoning behind this?

"nanoid": "^5.0.6",
"next": "15.4.7",
"next-auth": "^4.24.11",
Expand Down
60 changes: 60 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions public/locales/en/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,12 @@
"text": "This action cannot be undone. This will permanently delete your expense.",
"title": "Are you absolutely sure?"
},
"multiple_transactions": {
"title": "Add multiple transactions",
"description": "You have selected multiple transactions. How do you want to add them?",
"add_all": "Add all",
"add_one_by_one": "Add one by one"
},
"title": "Add expense",
"title_mobile": "Add",
"clear": "Clear",
Expand Down
257 changes: 123 additions & 134 deletions src/components/AddExpense/AddBankTransactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,151 +1,140 @@
import React, { useCallback } from 'react';
import { useAddExpenseStore } from '~/store/addStore';
import { calculateParticipantSplit, useAddExpenseStore } from '~/store/addStore';
import type { TransactionAddInputModel } from '~/types';
import { BankingTransactionList } from './BankTransactions/BankingTransactionList';
import { isCurrencyCode } from '~/lib/currency';
import { useRouter } from 'next/router';
import { api } from '~/utils/api';
import { type CreateExpense } from '~/types/expense.types';

const AddBankTransactions: React.FC<{
// clearFields: () => void;
clearFields: () => void;
bankConnectionEnabled: boolean;
children: React.ReactNode;
}> = ({ bankConnectionEnabled, children }) => {
// const participants = useAddExpenseStore((s) => s.participants);
// const group = useAddExpenseStore((s) => s.group);
// const category = useAddExpenseStore((s) => s.category);
// const isExpenseSettled = useAddExpenseStore((s) => s.canSplitScreenClosed);
// const splitShares = useAddExpenseStore((s) => s.splitShares);
// const paidBy = useAddExpenseStore((s) => s.paidBy);
// const splitType = useAddExpenseStore((s) => s.splitType);
// const fileKey = useAddExpenseStore((s) => s.fileKey);
// const multipleTransactions = useAddExpenseStore((s) => s.multipleTransactions);
// const isTransactionLoading = useAddExpenseStore((s) => s.isTransactionLoading);

const {
setCurrency,
setDescription,
// resetState,
// setSplitScreenOpen,
setExpenseDate,
setTransactionId,
setAmountStr,
// setMultipleTransactions,
// setIsTransactionLoading,
} = useAddExpenseStore((s) => s.actions);

// const addExpenseMutation = api.expense.addOrEditExpense.useMutation();

// const router = useRouter();

// const addMultipleExpenses = useCallback(async () => {
// setIsTransactionLoading(true);

// if (!paidBy) {
// return;
// }

// if (!isExpenseSettled) {
// setSplitScreenOpen(true);
// return;
// }

// const seen = new Set();
// const deduplicated = multipleTransactions.filter((item) => {
// if (seen.has(item.transactionId)) {
// return false;
// }
// seen.add(item.transactionId);
// return true;
// });

// const expensePromises = deduplicated.map(async (tempItem) => {
// if (tempItem) {
// const normalizedAmount = tempItem.amount.replace(',', '.');
// const _amtBigInt = BigInt(Math.round(Number(normalizedAmount) * 100));

// const { participants: tempParticipants } = calculateParticipantSplit(
// _amtBigInt,
// participants,
// splitType,
// splitShares,
// paidBy,
// );

// return addExpenseMutation.mutateAsync({
// name: tempItem.description,
// currency: tempItem.currency,
// amount: _amtBigInt,
// groupId: group?.id ?? null,
// splitType,
// participants: tempParticipants.map((p) => ({
// userId: p.id,
// amount: p.amount ?? 0n,
// })),
// paidBy: paidBy.id,
// category,
// fileKey,
// expenseDate: tempItem.date,
// expenseId: tempItem.expenseId,
// transactionId: tempItem.transactionId,
// });
// }
// return Promise.resolve();
// });

// await Promise.all(expensePromises);

// setMultipleTransactions([]);
// setIsTransactionLoading(false);
// router.back();
// resetState();
// }, [
// setSplitScreenOpen,
// router,
// resetState,
// addExpenseMutation,
// group,
// paidBy,
// splitType,
// fileKey,
// isExpenseSettled,
// multipleTransactions,
// participants,
// category,
// setIsTransactionLoading,
// splitShares,
// setMultipleTransactions,
// ]);

const addViaBankTransaction = useCallback(
(obj: TransactionAddInputModel) => {
setExpenseDate(obj.date);
setDescription(obj.description);
if (isCurrencyCode(obj.currency)) {
setCurrency(obj.currency);
} else {
console.warn(`Invalid currency code: ${obj.currency}`);
}
setAmountStr(obj.amount);
setTransactionId(obj.transactionId);
addViaBankTransaction: (obj: TransactionAddInputModel) => void;
}> = ({ bankConnectionEnabled, children, clearFields, addViaBankTransaction }) => {
const participants = useAddExpenseStore((s) => s.participants);
const group = useAddExpenseStore((s) => s.group);
const category = useAddExpenseStore((s) => s.category);
const isExpenseSettled = useAddExpenseStore((s) => s.canSplitScreenClosed);
const splitShares = useAddExpenseStore((s) => s.splitShares);
const paidBy = useAddExpenseStore((s) => s.paidBy);
const splitType = useAddExpenseStore((s) => s.splitType);
const fileKey = useAddExpenseStore((s) => s.fileKey);
const multipleTransactions = useAddExpenseStore((s) => s.multipleTransactions);
const isTransactionLoading = useAddExpenseStore((s) => s.isTransactionLoading);

const { resetState, setSplitScreenOpen, setMultipleTransactions, setIsTransactionLoading } =
useAddExpenseStore((s) => s.actions);

const addExpenseMutation = api.expense.addOrEditExpense.useMutation();

const router = useRouter();

const addAllMultipleExpenses = useCallback(async () => {
setIsTransactionLoading(true);

if (!paidBy) {
return;
}

if (!isExpenseSettled) {
setSplitScreenOpen(true);
return;
}

const seen = new Set();

const expenses = multipleTransactions
.filter((item) => {
if (seen.has(item.transactionId)) {
return false;
}
seen.add(item.transactionId);
return true;
})
.map((tempItem) => {
const { participants: tempParticipants } = calculateParticipantSplit(
tempItem.amount,
participants,
splitType,
splitShares,
paidBy,
);

return {
name: tempItem.description,
currency: tempItem.currency,
amount: tempItem.amount,
groupId: group?.id ?? null,
splitType,
participants: tempParticipants.map((p) => ({
userId: p.id,
amount: p.amount ?? 0n,
})),
paidBy: paidBy.id,
category,
fileKey,
expenseDate: tempItem.date,
expenseId: tempItem.expenseId,
transactionId: tempItem.transactionId,
};
}) as CreateExpense[];

await addExpenseMutation.mutateAsync(expenses, {
onSuccess: () => {
setMultipleTransactions([]);
setIsTransactionLoading(false);
router.back();
resetState();
},
onError: () => {
setIsTransactionLoading(false);
},
});
}, [
setSplitScreenOpen,
router,
resetState,
addExpenseMutation,
group,
paidBy,
splitType,
fileKey,
isExpenseSettled,
multipleTransactions,
participants,
category,
setIsTransactionLoading,
splitShares,
setMultipleTransactions,
]);

const addOneByOneMultipleExpenses = useCallback(async () => {
const allTransactions = [...multipleTransactions];
const transactionToAdd = allTransactions.pop();
if (transactionToAdd) {
setMultipleTransactions(allTransactions);
addViaBankTransaction(transactionToAdd);
}
}, [multipleTransactions, setMultipleTransactions, addViaBankTransaction]);

const handleSetMultipleTransactions = useCallback(
(a: TransactionAddInputModel[]) => {
setMultipleTransactions(a);
},
[setExpenseDate, setDescription, setCurrency, setAmountStr, setTransactionId],
[setMultipleTransactions],
);

// const handleSetMultipleTransactions = useCallback(
// (a: TransactionAddInputModel[]) => {
// setMultipleTransactions(a);
// },
// [setMultipleTransactions],
// );

return (
<BankingTransactionList
add={addViaBankTransaction}
// addMultipleExpenses={addMultipleExpenses}
// multipleTransactions={multipleTransactions}
// setMultipleTransactions={handleSetMultipleTransactions}
// isTransactionLoading={isTransactionLoading}
addAllMultipleExpenses={addAllMultipleExpenses}
addOneByOneMultipleExpenses={addOneByOneMultipleExpenses}
multipleTransactions={multipleTransactions}
setMultipleTransactions={handleSetMultipleTransactions}
isTransactionLoading={isTransactionLoading}
bankConnectionEnabled={bankConnectionEnabled}
// clearFields={clearFields}
clearFields={clearFields}
>
{children}
</BankingTransactionList>
Comment on lines 128 to 140
Copy link
Collaborator

@krokosik krokosik Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really get the point of this component. It's just prop drilling with no UI added? Why not merge it with BankTransactionList?

Expand Down
Loading