401 fix back navigation (#423)

* Fix back navigation on each add button

* Add mechanism to keep adding expenses instead of going back to activity

Author: krokosik

src/components/AddExpense/AddExpensePage.tsx

@@ -120,8 +120,24 @@ export const AddOrEditExpensePage: React.FC<{
           onSuccess: (d) => {
             if (d) {
               const id = d?.id ?? expenseId;
-              router
-                .push(group?.id ? `/groups/${group.id}/expenses/${id}` : `/expenses/${id}`)
+
+              let navPromise: () => Promise<any> = () => Promise.resolve(true);
+
+              const { friendId, groupId } = router.query;
+
+              if (friendId && !groupId) {
+                navPromise = () => router.push(`/balances/${friendId as string}/expenses/${id}`);
+              } else if (groupId) {
+                navPromise = () => router.push(`/groups/${groupId as string}/expenses/${id}`);
+              } else {
+                navPromise = () => router.push(`/expenses/${id}?keepAdding=1`);
+              }
+
+              if (expenseId) {
+                navPromise = async () => router.back();
+              }
+
+              navPromise()
                 .then(() => resetState())
                 .catch(console.error);
             }
@@ -163,10 +179,14 @@ export const AddOrEditExpensePage: React.FC<{
     [setDescription],
   );
 
+  const onBackButtonPress = useCallback(() => {
+    router.back();
+  }, [router]);
+
   return (
     <div className="flex flex-col gap-4">
       <div className="flex items-center justify-between">
-        <Button variant="ghost" className="text-primary px-0" onClick={router.back}>
+        <Button variant="ghost" className="text-primary px-0" onClick={onBackButtonPress}>
           {t('ui.actions.cancel', { ns: 'common' })}
         </Button>
         <div className="text-center">

src/pages/expenses/[expenseId].tsx

@@ -21,6 +21,7 @@ const ExpensesPage: NextPageWithUser<{ storagePublicUrl?: string }> = ({
   const { t } = useTranslation('expense_details');
   const router = useRouter();
   const expenseId = router.query.expenseId as string;
+  const keepAdding = !!router.query.keepAdding;
 
   const expenseQuery = api.expense.getExpenseDetails.useQuery({ expenseId });
 
@@ -32,7 +33,7 @@ const ExpensesPage: NextPageWithUser<{ storagePublicUrl?: string }> = ({
       <MainLayout
         title={
           <div className="flex items-center gap-2">
-            <Link href="/activity">
+            <Link href={keepAdding ? '/add' : '/activity'}>
               <ChevronLeftIcon className="mr-1 h-6 w-6" />
             </Link>
             <p className="text-[16px] font-normal">{t('ui.expense_details', { ns: 'common' })}</p>