Fix destructive color in dark mode (Fixes #268 )

Fix group export when name contains non-ASCII characters
Fix UTC timezone used in activity tracker (#265 )
2026-02-14 11:36:13 +01:00 · 2024-12-07 12:14:08 -05:00 · 2024-12-07 12:03:32 -05:00 · 2024-12-07 11:55:02 -05:00 · 2024-12-07 11:53:14 -05:00 · 2024-12-07 11:37:39 -05:00
92 changed files with 3455 additions and 1075 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,4 @@
 POSTGRES_PRISMA_URL=postgresql://postgres:1234@localhost
-POSTGRES_URL_NON_POOLING=postgresql://postgres:1234@localhost
+POSTGRES_URL_NON_POOLING=postgresql://postgres:1234@localhost
+
+NEXT_PUBLIC_DEFAULT_CURRENCY_SYMBOL=""
--- a/13
+++ b/13
@@ -1,9 +1,9 @@
-FROM node:21-alpine as base
+FROM node:21-alpine AS base

 WORKDIR /usr/app
 COPY ./package.json \
     ./package-lock.json \
-     ./next.config.js \
+     ./next.config.mjs \
     ./tsconfig.json \
     ./reset.d.ts \
     ./tailwind.config.js \
@@ -16,6 +16,7 @@ RUN apk add --no-cache openssl && \
    npx prisma generate

 COPY ./src ./src
+COPY ./messages ./messages

 ENV NEXT_TELEMETRY_DISABLED=1

@@ -24,21 +25,21 @@ RUN npm run build

 RUN rm -r .next/cache

-FROM node:21-alpine as runtime-deps
+FROM node:21-alpine AS runtime-deps

 WORKDIR /usr/app
-COPY --from=base /usr/app/package.json /usr/app/package-lock.json /usr/app/next.config.js ./
+COPY --from=base /usr/app/package.json /usr/app/package-lock.json /usr/app/next.config.mjs ./
 COPY --from=base /usr/app/prisma ./prisma

 RUN npm ci --omit=dev --omit=optional --ignore-scripts && \
    npx prisma generate

-FROM node:21-alpine as runner
+FROM node:21-alpine AS runner

 EXPOSE 3000/tcp
 WORKDIR /usr/app

-COPY --from=base /usr/app/package.json /usr/app/package-lock.json /usr/app/next.config.js ./
+COPY --from=base /usr/app/package.json /usr/app/package-lock.json /usr/app/next.config.mjs ./
 COPY --from=runtime-deps /usr/app/node_modules ./node_modules
 COPY ./public ./public
 COPY ./scripts ./scripts
--- a/messages/de-DE.json
+++ b/messages/de-DE.json
@@ -203,7 +203,8 @@
    "creating": "Erstellt…",
    "save": "Speichern",
    "saving": "Speichert…",
-    "cancel": "Abbrechen"
+    "cancel": "Abbrechen",
+    "reimbursement": "Rückzahlung"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Einstellungen"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Teilen",
    "description": "Teile die URL, damit andere Mitglieder die Gruppe sehen und Ausgaben hinzufügen können.",
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -203,7 +203,8 @@
    "creating": "Creating…",
    "save": "Save",
    "saving": "Saving…",
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "reimbursement": "Reimbursement"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Settings"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Share",
    "description": "For other participants to see the group and add expenses, share its URL with them.",
--- a/messages/es.json
+++ b/messages/es.json
@@ -203,7 +203,8 @@
    "creating": "Creando",
    "save": "Guardar",
    "saving": "Guardando",
-    "cancel": "Cancelar"
+    "cancel": "Cancelar",
+    "reimbursement": "Reembolso"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Ajustes"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Compartir",
    "description": "Para que otros participantes puedan ver el grupo y añadir gastos, compárteles su URL.",
--- a/messages/fi.json
+++ b/messages/fi.json
@@ -203,7 +203,8 @@
    "creating": "Luodaan kulua…",
    "save": "Tallenna",
    "saving": "Tallennetaan…",
-    "cancel": "Peruuta"
+    "cancel": "Peruuta",
+    "reimbursement": "Velanmaksu"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Asetukset"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Jaa",
    "description": "Jaa ryhmän URL muille jäsenille, jotta he voivat nähdä sen ja lisätä kuluja.",
--- a/messages/fr-FR.json
+++ b/messages/fr-FR.json
@@ -203,7 +203,8 @@
    "creating": "Création…",
    "save": "Sauvegarder",
    "saving": "Sauvegarde…",
-    "cancel": "Annuler"
+    "cancel": "Annuler",
+    "reimbursement": "Remboursement"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Paramètres"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Partager",
    "description": "Pour que d'autres participants puissent voir le groupe et ajouter des dépenses, partagez son URL avec eux.",
--- a/messages/it-IT.json
+++ b/messages/it-IT.json
@@ -4,7 +4,7 @@
    "description": "Benvenuto nella tua nuova instanza di <strong>Spliit</strong>!",
    "button": {
      "groups": "Vai ai gruppi",
-      "github": "GitHub" 
+      "github": "GitHub"
    }
  },
  "Header": {
@@ -42,7 +42,7 @@
  "ExpenseCard": {
    "paidBy": "Pagato da <strong>{paidBy}</strong> per <paidFor></paidFor>",
    "receivedBy": "Ricevuto da <strong>{paidBy}</strong> per <paidFor></paidFor>",
-    "yourBalance": "Il to bilancio:"
+    "yourBalance": "Il tuo bilancio:"
  },
  "Groups": {
    "myGroups": "I miei gruppi",
@@ -57,7 +57,7 @@
    "starred": "Gruppi speciali",
    "archived": "Gruppi archiviati",
    "archive": "Archivia gruppo",
-    "unarchive": "Rimuovi dall'archivio il gruppo",
+    "unarchive": "Rimuovi il gruppo dall'archivio",
    "removeRecent": "Rimuovi dai gruppi recenti",
    "RecentRemovedToast": {
      "title": "Il gruppo è stato rimosso",
@@ -168,7 +168,7 @@
      "attachDescription": "Vedi allegati spesa."
    },
    "amountField": {
-      "label": "Quantità"
+      "label": "Importo"
    },
    "isReimbursementField": {
      "label": "Questo è un rimborso"
@@ -186,10 +186,10 @@
    "SplitModeField": {
      "label": "Modalità split",
      "evenly": "Uniforme",
-      "byShares": "Non uniforme – Per scelta",
+      "byShares": "Non uniforme – Per quote",
      "byPercentage": "Non uniforme – Per percentuale",
-      "byAmount": "Non uniforme – Per quantità",
-      "saveAsDefault": "Salva come opzioni di suddivisione predefinite"
+      "byAmount": "Non uniforme – Per importo",
+      "saveAsDefault": "Salva come opzione di suddivisione predefinita"
    },
    "DeletePopup": {
      "label": "Rimuovi",
@@ -203,7 +203,8 @@
    "creating": "Sto creando…",
    "save": "Salva",
    "saving": "Sto salvando…",
-    "cancel": "Annulla"
+    "cancel": "Annulla",
+    "reimbursement": "Rimborso"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -225,7 +226,7 @@
      "selectImage": "Seleziona immagine…",
      "titleLabel": "Titolo:",
      "categoryLabel": "Categoria:",
-      "amountLabel": "Quantità:",
+      "amountLabel": "Importo:",
      "dateLabel": "Data:",
      "editNext": "Successivamente potrai modificare le informazioni sulle spese.",
      "continue": "Continua"
@@ -243,13 +244,13 @@
  },
  "Balances": {
    "title": "Bilanci",
-    "description": "Questo è l'importo che ciascun partecipante ha pagato o è stato pagato.",
+    "description": "Questo è l'importo che ciascun partecipante ha pagato o deve pagare.",
    "Reimbursements": {
      "title": "Rimborsi suggeriti",
      "description": "Ecco alcuni suggerimenti per ottimizzare i rimborsi tra i partecipanti.",
      "noImbursements": "Sembra che il tuo gruppo non abbia bisogno di alcun rimborso 😁",
      "owes": "<strong>{from}</strong> deve <strong>{to}</strong>",
-      "markAsPaid": "Marca come pagato"
+      "markAsPaid": "Segna come pagato"
    }
  },
  "Stats": {
@@ -288,21 +289,11 @@
  "Information": {
    "title": "Informazioni",
    "description": "Utilizza questo posto per aggiungere qualsiasi informazione che possa essere rilevante per i partecipanti al gruppo.",
-    "empty": "Nessuna informazione sul gruppo ancora."
+    "empty": "Ancora nessuna informazione sul gruppo."
  },
  "Settings": {
    "title": "Impostazioni"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Condividi",
    "description": "Per consentire agli altri partecipanti di vedere il gruppo e aggiungere spese, condividi il suo URL con loro.",
@@ -317,12 +308,12 @@
    "duplicateParticipantName": "Un altro partecipante ha già questo nome.",
    "titleRequired": "Inserisci un titolo.",
    "invalidNumber": "Numero invalido.",
-    "amountRequired": "Devi inserire una quanttà",
-    "amountNotZero": "La quantità non deve essere zero.",
+    "amountRequired": "Devi inserire un importo",
+    "amountNotZero": "L'importo non deve essere zero.",
    "amountTenMillion": "L'importo deve essere inferiore a 10.000.000.",
    "paidByRequired": "È necessario selezionare un partecipante.",
-    "paidForMin1": "La spesa dovrà essere sostenuta per almeno un partecipante.",
-    "noZeroShares": "Tutte le condivisioni devono essere superiori a 0.",
+    "paidForMin1": "La spesa deve essere pagata per almeno un partecipante.",
+    "noZeroShares": "Tutti gli importi devono essere superiori a 0.",
    "amountSum": "La somma degli importi deve essere uguale all'importo della spesa.",
    "percentageSum": "La somma delle percentuali deve essere uguale a 100."
  },
--- a/messages/pl-PL.json
+++ b/messages/pl-PL.json
@@ -0,0 +1,387 @@
+{
+  "Homepage": {
+    "title": "Podziel <strong>Wydatki</strong> z <strong>Rodziną i Przyjaciółmi</strong>",
+    "description": "Witaj na twojej nowej instancji <strong>Spliita</strong> !",
+    "button": {
+      "groups": "Przejdź do grup",
+      "github": "GitHub"
+    }
+  },
+  "Header": {
+    "groups": "Grupy"
+  },
+  "Footer": {
+    "madeIn": "Stworzone Montréalu, Québec 🇨🇦",
+    "builtBy": "Napisane przez <author>Sebastien Castiela</author> i <source>kontrybutorów</source>"
+  },
+  "Expenses": {
+    "title": "Wydatki",
+    "description": "Tutaj są wydatki, które utworzyłeś dla twojej grupy.",
+    "create": "Dodaj wydatek",
+    "createFirst": "Stwórz swój pierwszy",
+    "noExpenses": "Twoja grupa nie ma jeszcze żadnych wydatków.",
+    "exportJson": "Eksportuj do JSONa",
+    "searchPlaceholder": "Szukaj wydatku...",
+    "ActiveUserModal": {
+      "title": "Kim jesteś?",
+      "description": "Podaj, którym uczestnikiem jesteś aby pozwolić nam określić jakie informacje mają być wyświetlane.",
+      "nobody": "Nie chcę wybierać nikogo",
+      "save": "Zapisz zmiany",
+      "footer": "To ustawienie może być potem zmienione w ustawieniach grupy."
+    },
+    "Groups": {
+      "upcoming": "Nadchodzące",
+      "thisWeek": "Ten tydzień",
+      "earlierThisMonth": "Wcześniej w tym miesiącu",
+      "lastMonth": "Ostatni miesiąc",
+      "earlierThisYear": "Wcześniej w tym roku",
+      "lastYera": "Poprzedni rok",
+      "older": "Starsze"
+    }
+  },
+  "ExpenseCard": {
+    "paidBy": "Opłacone przez <strong>{paidBy}</strong> dla <paidFor></paidFor>",
+    "receivedBy": "Otrzymane przez <strong>{paidBy}</strong> od <paidFor></paidFor>",
+    "yourBalance": "Twjoje saldo:"
+  },
+  "Groups": {
+    "myGroups": "Moje grupy",
+    "create": "Stwórz",
+    "loadingRecent": "Wczytywanie ostatnich grup...",
+    "NoRecent": {
+      "description": "Nie odwiedzałeś ostatnio żadnych grup.",
+      "create": "Stwórz",
+      "orAsk": "albo poproś przyjaciela, aby ci wysłał link do już istniejącej."
+    },
+    "recent": "Ostatnie grupy",
+    "starred": "Ogwiazdkowane grupy",
+    "archived": "Zarchiwizowane grupy",
+    "archive": "Zarchiwizuj grupę",
+    "unarchive": "Odarchwiruj grupę",
+    "removeRecent": "Usuń z ostatnich grup",
+    "RecentRemovedToast": {
+      "title": "Grupa została usunięta",
+      "description": "Grupa została usunięta z listy twoich ostatnich grup.",
+      "undoAlt": "Cofnij usunięcie grupy",
+      "undo": "Cofnij"
+    },
+    "AddByURL": {
+      "button": "Dodaj poprzez link URL",
+      "title": "Dodaj grupę poprzez link URL",
+      "description": "Jeśli grupa została ci udostępniona możesz wkleić jej link tutaj, aby dodać ją do twojej listy.",
+      "error": "Ups, nie możemy znaleźć grupy z podanego linka..."
+    },
+    "NotFound": {
+      "text": "Ta grupa nie istnieje.",
+      "link": "Idź do ostatnio odwiedzanych grup"
+    }
+  },
+  "GroupForm": {
+    "title": "Informacje o grupie",
+    "NameField": {
+      "label": "Nazwa grupy",
+      "placeholder": "Letni wyjazd",
+      "description": "Podaj nazwę dla twojej grupy."
+    },
+    "InformationField": {
+      "label": "Informacje o grupie",
+      "placeholder": "Jakie informacje mogą być ważne dla członków grupy?"
+    },
+    "CurrencyField": {
+      "label": "Symbol waluty",
+      "placeholder": "PLN, zł, $, €, £…",
+      "description": "Użyjemy go do wyświetlania ilości."
+    },
+    "Participants": {
+      "title": "Członkowie",
+      "description": "Podaj nazwę dla każdego członka.",
+      "protectedParticipant": "Ten członek wciąż bierze udział w rozliczeniach i nie może być usunięty.",
+      "new": "Nowy",
+      "add": "Dodaj członka",
+      "John": "Jan",
+      "Jane": "Joanna",
+      "Jack": "Jacek"
+    },
+    "Settings": {
+      "title": "Ustawienia lokalne",
+      "description": "Te ustawienia są ustawiane dla konkretnego urządzenia i służą do dostosowania twoich doświadczeń z aplikacją.",
+      "ActiveUserField": {
+        "label": "Aktywny użytkownik",
+        "placeholder": "Wybierz członka",
+        "none": "Brak",
+        "description": "Użytkownik używany domyślnie do wprowadzania wydatków."
+      },
+      "save": "Zapisz",
+      "saving": "Zapisywanie…",
+      "create": "Stwórz",
+      "creating": "Tworzenie…",
+      "cancel": "Anuluj"
+    }
+  },
+  "ExpenseForm": {
+    "Income": {
+      "create": "Dodaj wpływ",
+      "edit": "Edytuj wpływ",
+      "TitleField": {
+        "label": "Tytuł wpływu",
+        "placeholder": "Zwrot kaucji",
+        "description": "Podaj opis wpływu."
+      },
+      "DateField": {
+        "label": "Data wpływu",
+        "description": "Podaj datę otrzymania wpływu."
+      },
+      "categoryFieldDescription": "Wybierz typ wpływu.",
+      "paidByField": {
+        "label": "Otrzymane przez",
+        "description": "Wybierz członka, który otrzymał wpływ."
+      },
+      "paidFor": {
+        "title": "Otrzymany dla",
+        "description": "Podaj dla kogo wpływ był przeznaczony."
+      },
+      "splitModeDescription": "Wybierz jak podzielić wpływ.",
+      "attachDescription": "Zobacz i załącz rachunki do wpływu."
+    },
+    "Expense": {
+      "create": "Stwórz wydatek",
+      "edit": "Edytuj wydatek",
+      "TitleField": {
+        "label": "Tytuł wydatku",
+        "placeholder": "Poniedziałkowe wyjście do restauracji",
+        "description": "Podaj opis wydatku."
+      },
+      "DateField": {
+        "label": "Data wydatku",
+        "description": "Podaj datę opłacenia wydatku."
+      },
+      "categoryFieldDescription": "Podaj kategorię wydatku.",
+      "paidByField": {
+        "label": "Opłacone przez",
+        "description": "Wybierz członka, który zapłacił."
+      },
+      "paidFor": {
+        "title": "Opłacone dla",
+        "description": "Wybierz kogo dotyczył wydatek."
+      },
+      "splitModeDescription": "Wybierz jak podzielić wydatek.",
+      "attachDescription": "Zobacz i załącz rachunki do wydatku."
+    },
+    "amountField": {
+      "label": "Ilość"
+    },
+    "isReimbursementField": {
+      "label": "To jest zwrot kosztów"
+    },
+    "categoryField": {
+      "label": "Kategoria"
+    },
+    "notesField": {
+      "label": "Notatki"
+    },
+    "selectNone": "Nie wybieraj żadnego",
+    "selectAll": "Wybierz wszystkie",
+    "shares": "udział(y)",
+    "advancedOptions": "Zaawansowane opcje podziału...",
+    "SplitModeField": {
+      "label": "Typ podziału",
+      "evenly": "Równy",
+      "byShares": "Nierówny – Poprzez udziały",
+      "byPercentage": "Nierówny – Procentowo",
+      "byAmount": "Nierówny – Na konkretne sumy",
+      "saveAsDefault": "Wybierz jako domyślny typ podziału"
+    },
+    "DeletePopup": {
+      "label": "Usuń",
+      "title": "Usunąć ten wydatek?",
+      "description": "Czy na pewno chcesz usunąć ten wydatek? Ta akcja jest nieodwracalna.",
+      "yes": "Tak",
+      "cancel": "Anuluj"
+    },
+    "attachDocuments": "Załącz dokumenty",
+    "create": "Stwórz",
+    "creating": "Tworzenie…",
+    "save": "Zapisz",
+    "saving": "Zapisywanie…",
+    "cancel": "Anuluj"
+  },
+  "ExpenseDocumentsInput": {
+    "TooBigToast": {
+      "title": "Ten plik jest zbyt duży",
+      "description": "Maksymalny rozmiar pliku to: {maxSize}. Twój plik ma: ${size}."
+    },
+    "ErrorToast": {
+      "title": "Błąd podczas wysyłania dokumentu",
+      "description": "Coś poszło nie tak podczas wysyłania dokumentu. Proszę spróbuj ponownie później, albo wybierz inny plik.",
+      "retry": "Ponów"
+    }
+  },
+  "CreateFromReceipt": {
+    "Dialog": {
+      "triggerTitle": "Utwórz wydatek z paragonu",
+      "title": "Utwórz z paragonu",
+      "description": "Wyodrębnianie informacji o wydatkach ze zdjęcia paragonu.",
+      "body": "Prześlij zdjęcie paragonu, a my zeskanujemy je, aby wyodrębnić informacje o wydatkach, jeśli to możliwe.",
+      "selectImage": "Wybierz obraz...",
+      "titleLabel": "Tytuł:",
+      "categoryLabel": "Kategoria:",
+      "amountLabel": "Ilość:",
+      "dateLabel": "Data:",
+      "editNext": "Następnie będziesz mógł edytować informacje o wydatkach.",
+      "continue": "Kontynuuj"
+    },
+    "unknown": "Nieznany",
+    "TooBigToast": {
+      "title": "Ten plik jest zbyt duży",
+      "description": "Maksymalny rozmiar pliku to: {maxSize}. Twój plik ma: ${size}."
+    },
+    "ErrorToast": {
+      "title": "Błąd podczas wysyłania dokumentu",
+      "description": "Coś poszło nie tak podczas wysyłania dokumentu. Proszę spróbuj ponownie później, albo wybierz inny plik.",
+      "retry": "Ponów"
+    }
+  },
+  "Balances": {
+    "title": "Salda",
+    "description": "Jest to kwota, którą każdy członek zapłacił lub za którą otrzymał zapłatę.",
+    "Reimbursements": {
+      "title": "Sugerowane zwroty",
+      "description": "Oto sugestie dotyczące optymalizacji zwrotów między uczestnikami.",
+      "noImbursements": "Wygląda na to, że w twojej grupie nie ma potrzeby żadnych zwrotów 😁",
+      "owes": "<strong>{from}</strong> jest winny dla <strong>{to}</strong>",
+      "markAsPaid": "Zaznacz jako opłacone"
+    }
+  },
+  "Stats": {
+    "title": "Statystyki",
+    "Totals": {
+      "title": "Podsumowanie",
+      "description": "Podsumowanie wydatków dla całej grupy.",
+      "groupSpendings": "Wydatki grupy",
+      "groupEarnings": "Wpływy grupy",
+      "yourSpendings": "Twoje wydatki",
+      "yourEarnings": "Twoje wpływy",
+      "yourShare": "Twoje udziały"
+    }
+  },
+  "Activity": {
+    "title": "Aktywność",
+    "description": "Przegląd wszystkich działań w tej grupie.",
+    "noActivity": "W grupie nie ma jeszcze żadnej aktywności.",
+    "someone": "Ktoś",
+    "settingsModified": "Ustawienia grupy zostały zmienione przez <strong>{participant}</strong>.",
+    "expenseCreated": "Wydatek <em>{expense}</em> stworzony przez <strong>{participant}</strong>.",
+    "expenseUpdated": "Wydatek <em>{expense}</em> zaktualizowany przez <strong>{participant}</strong>.",
+    "expenseDeleted": "Wydatek <em>{expense}</em> usunięty przez <strong>{participant}</strong>.",
+    "Groups": {
+      "today": "Dzisiaj",
+      "yesterday": "Wczoraj",
+      "earlierThisWeek": "Wcześniej w tym tygodniu",
+      "lastWeek": "W zeszłym tygodniu",
+      "earlierThisMonth": "Wcześniej w tym miesiącu",
+      "lastMonth": "Ostatni miesiąc",
+      "earlierThisYear": "Wcześniej w tym roku",
+      "lastYera": "Poprzedni rok",
+      "older": "Starsze"
+    }
+  },
+  "Information": {
+    "title": "Informacje",
+    "description": "Użyj tego miejsca, aby dodać wszelkie informacje, które mogą być istotne dla uczestników grupy..",
+    "empty": "Jeszcze nic tu nie ma."
+  },
+  "Settings": {
+    "title": "Ustawienia"
+  },
+  "Share": {
+    "title": "Udostępnij",
+    "description": "Aby inni uczestnicy mogli zobaczyć grupę i dodać wydatki, udostępnij im jej adres URL.",
+    "warning": "Uwaga!",
+    "warningHelp": "Każda osoba posiadająca adres URL grupy będzie mogła przeglądać i edytować wydatki. Udostępniaj ostrożnie!"
+  },
+  "SchemaErrors": {
+    "min1": "Wprowadź co najmniej jeden znak.",
+    "min2": "Wprowadź co najmniej dwa znaki.",
+    "max5": "Wprowadź maksymalnie pięć znaków.",
+    "max50": "Wprowadź maksymalnie 50 znaków.",
+    "duplicateParticipantName": "Ta nazwa jest już zajęta.",
+    "titleRequired": "Podaj tytuł.",
+    "invalidNumber": "Niewłaściwa liczba.",
+    "amountRequired": "Należy wprowadzić kwotę.",
+    "amountNotZero": "Kwota nie może być zerem.",
+    "amountTenMillion": "Kwota musi być niższa niż 10,000,000.",
+    "paidByRequired": "Musisz wybrać członka.",
+    "paidForMin1": "Wydatek musi zostać opłacony za co najmniej jednego uczestnika.",
+    "noZeroShares": "Wszystkie udziały muszą być większe niż 0.",
+    "amountSum": "Suma udziałów musi być równa wydatkowi.",
+    "percentageSum": "Suma procentów musi być równa 100."
+  },
+  "Categories": {
+    "search": "Szukaj kategorii...",
+    "noCategory": "Nie znaleziono kategorii.",
+    "Uncategorized": {
+      "heading": "Bez kategorii",
+      "General": "Ogólne",
+      "Payment": "Płatność"
+    },
+    "Entertainment": {
+      "heading": "Rozrywka",
+      "Entertainment": "Rozrywka",
+      "Games": "Gry",
+      "Movies": "Filmy",
+      "Music": "Muzyka",
+      "Sports": "Sporty"
+    },
+    "Food and Drink": {
+      "heading": "Jedzenie i Napoje",
+      "Food and Drink": "Jedzenie i Napoje",
+      "Dining Out": "Jedzenie na mieście",
+      "Groceries": "Zakupy",
+      "Liquor": "Alkohole"
+    },
+    "Home": {
+      "heading": "Dom",
+      "Home": "Dom",
+      "Electronics": "Elektronika",
+      "Furniture": "Meble",
+      "Household Supplies": "Artykuły gospodarstwa domowego",
+      "Maintenance": "Utrzymanie",
+      "Mortgage": "Czynsz",
+      "Pets": "Zwierzaki",
+      "Rent": "Czynsz",
+      "Services": "Usługi"
+    },
+    "Life": {
+      "heading": "Życie",
+      "Childcare": "Opieka nad dzieckiem",
+      "Clothing": "Ubrania",
+      "Education": "Edukacja",
+      "Gifts": "Prezenty",
+      "Insurance": "Ubezpieczenie",
+      "Medical Expenses": "Wydatki medyczne",
+      "Taxes": "Podatki"
+    },
+    "Transportation": {
+      "heading": "Transport",
+      "Transportation": "Transport",
+      "Bicycle": "Rower",
+      "Bus/Train": "Bus/Pociąg",
+      "Car": "Samochód",
+      "Gas/Fuel": "Paliwo",
+      "Hotel": "Hotel",
+      "Parking": "Parking",
+      "Plane": "Pociąg",
+      "Taxi": "Taxi"
+    },
+    "Utilities": {
+      "heading": "Media",
+      "Utilities": "Media",
+      "Cleaning": "Sprzątanie",
+      "Electricity": "Prąg",
+      "Heat/Gas": "Ogrzewanie",
+      "Trash": "Śmieci",
+      "TV/Phone/Internet": "TV/Telefon/Internet",
+      "Water": "Woda"
+    }
+  }
+}
--- a/messages/ro.json
+++ b/messages/ro.json
@@ -0,0 +1,388 @@
+{
+  "Homepage": {
+    "title": "Distribuie <strong>Cheltuielile</strong> cu <strong>Prietenii & Familia</strong>",
+    "description": "Bine ai venit pe noua ta instanță de <strong>Spliit</strong> !",
+    "button": {
+      "groups": "Mergi la grupuri",
+      "github": "GitHub"
+    }
+  },
+  "Header": {
+    "groups": "Grupuri"
+  },
+  "Footer": {
+    "madeIn": "Dezvoltat în Montréal, Québec 🇨🇦",
+    "builtBy": "Dezvoltat de către <author>Sebastien Castiel</author> și <source>contribuitori</source>"
+  },
+  "Expenses": {
+    "title": "Cheltuieli",
+    "description": "Aici sunt cheltuielile pe care le-ai creat pentru grupul tău.",
+    "create": "Adaugă o cheltuială",
+    "createFirst": "Adaug-o pe prima",
+    "noExpenses": "Grupul tău nu conține nicio cheltuială încă.",
+    "exportJson": "Salvează în JSON",
+    "searchPlaceholder": "Caută o cheltuială…",
+    "ActiveUserModal": {
+      "title": "Cum te numești?",
+      "description": "Spune-ne cine ești ca să putem îți afișăm informațiile relevante.",
+      "nobody": "Nu doresc să aleg pe nimeni",
+      "save": "Salvează",
+      "footer": "Această setare se poate schimba mai târziu din setările grupului."
+    },
+    "Groups": {
+      "upcoming": "Urmează",
+      "thisWeek": "În această săptămână",
+      "earlierThisMonth": "La începutul lunii",
+      "lastMonth": "Luna trecută",
+      "earlierThisYear": "La începutul anului",
+      "lastYera": "Anul trecut",
+      "older": "Mai vechi"
+    }
+  },
+  "ExpenseCard": {
+    "paidBy": "Plătit de <strong>{paidBy}</strong> pentru <paidFor></paidFor>",
+    "receivedBy": "Primit de <strong>{paidBy}</strong> pentru <paidFor></paidFor>",
+    "yourBalance": "Soldul tău:"
+  },
+  "Groups": {
+    "myGroups": "Grupurile mele",
+    "create": "Adaugă",
+    "loadingRecent": "Se încarcă ultimele tale grupuri…",
+    "NoRecent": {
+      "description": "Nu ai accesat niciun grup recent.",
+      "create": "Adaugă unul",
+      "orAsk": "sau roagă un prieten să îți trimită un link către unul deja existent."
+    },
+    "recent": "Ultimele grupuri",
+    "starred": "Grupuri favorite",
+    "archived": "Grupuri arhivate",
+    "archive": "Arhivează grupul",
+    "unarchive": "Dezarhivează grupul",
+    "removeRecent": "Șterge din ultimele grupuri",
+    "RecentRemovedToast": {
+      "title": "Grupul a fost șters.",
+      "description": "Grupul a fost șters din lista ta de grupuri recente.",
+      "undoAlt": "Anulează ștergerea grupului",
+      "undo": "Anulează"
+    },
+    "AddByURL": {
+      "button": "Adaugă folosind un URL",
+      "title": "Adaugă un grup folosind un URL",
+      "description": "Dacă un grup a fost distribuit cu tine, poți atașa URL-ul acestuia aici pentru a-l adăuga în listă.",
+      "error": "Ups, nu am găsit grupul folosind URL-ul primit de la tine…"
+    },
+    "NotFound": {
+      "text": "Acest grup nu există.",
+      "link": "Mergi la ultimele grupuri vizitate"
+    }
+  },
+  "GroupForm": {
+    "title": "Informații despre grup",
+    "NameField": {
+      "label": "Numele grupului",
+      "placeholder": "Vacanță de vară",
+      "description": "Adaugă un nume pentru grupul tău."
+    },
+    "InformationField": {
+      "label": "Informații despre grup",
+      "placeholder": "Ce informație este relevantă pentru membrii grupului?"
+    },
+    "CurrencyField": {
+      "label": "Monedă",
+      "placeholder": "$, €, £, RON …",
+      "description": "O vom folosi pentru a afișa sume."
+    },
+    "Participants": {
+      "title": "Membri",
+      "description": "Adaugă numele fiecărui membru.",
+      "protectedParticipant": "Acest membru a luat parte la cheltuieli și nu poate să fie șters.",
+      "new": "Nou",
+      "add": "Adaugă membru",
+      "John": "John",
+      "Jane": "Jane",
+      "Jack": "Jack"
+    },
+    "Settings": {
+      "title": "Setări locale",
+      "description": "Aceste setări sunt făcute pentru fiecare dispozitiv și sunt folosite pentru a-ți personaliza experiența.",
+      "ActiveUserField": {
+        "label": "Utilizator activ",
+        "placeholder": "Selectează un membru",
+        "none": "Niciunul",
+        "description": "Utilizatorul implicit pentru plata cheltuielilor."
+      },
+      "save": "Salvează",
+      "saving": "Se salvează…",
+      "create": "Adaugă",
+      "creating": "Se adaugă…",
+      "cancel": "Anulează"
+    }
+  },
+  "ExpenseForm": {
+    "Income": {
+      "create": "Adaugă un venit",
+      "edit": "Modifică venitul",
+      "TitleField": {
+        "label": "Titlul venitului",
+        "placeholder": "Cina de luni seară",
+        "description": "Adaugă o descriere pentru venit."
+      },
+      "DateField": {
+        "label": "Data venitului",
+        "description": "Adaugă data la care venitul a fost primit."
+      },
+      "categoryFieldDescription": "Selectează categoria venitului.",
+      "paidByField": {
+        "label": "Primit de către",
+        "description": "Selectează membrul care a primit venitul."
+      },
+      "paidFor": {
+        "title": "Primit pentru",
+        "description": "Selectează pentru cine a fost primit venitul."
+      },
+      "splitModeDescription": "Selectează cum să fie împărțit venitul.",
+      "attachDescription": "Vizualizează și atașează bonul pentru venit."
+    },
+    "Expense": {
+      "create": "Adaugă o cheltuială",
+      "edit": "Modifică cheltuiala",
+      "TitleField": {
+        "label": "Titlul cheltuielii",
+        "placeholder": "Cina de luni seară",
+        "description": "Adaugă o descriere pentru cheltuială."
+      },
+      "DateField": {
+        "label": "Data cheltuielii",
+        "description": "Adaugă data la care cheltuiala a fost facută."
+      },
+      "categoryFieldDescription": "Selectează categoria cheltuielii.",
+      "paidByField": {
+        "label": "Plătit de către",
+        "description": "Selectează membrul care a plătit cheltuiala."
+      },
+      "paidFor": {
+        "title": "Plătit pentru",
+        "description": "Selectează pentru cine a fost platită cheltuiala."
+      },
+      "splitModeDescription": "Selectează cum să fie împărțită cheltuiala.",
+      "attachDescription": "Vizualizează și atașează bonul pentru cheltuială."
+    },
+    "amountField": {
+      "label": "Sumă"
+    },
+    "isReimbursementField": {
+      "label": "Aceasta este o rambursare."
+    },
+    "categoryField": {
+      "label": "Categorie"
+    },
+    "notesField": {
+      "label": "Notițe"
+    },
+    "selectNone": "Nu selectez nimic",
+    "selectAll": "Selectez tot",
+    "shares": "distribuiri",
+    "advancedOptions": "Opțiuni avansate de împărțire…",
+    "SplitModeField": {
+      "label": "Împărțire",
+      "evenly": "Egal",
+      "byShares": "Inegal – În funcție de parte",
+      "byPercentage": "Inegal – În funcție de procentaj",
+      "byAmount": "Inegal – În funcție de sumă",
+      "saveAsDefault": "Salvează ca și implicite opțiunile de împărțire"
+    },
+    "DeletePopup": {
+      "label": "Șterge",
+      "title": "Ștergi această cheltuială?",
+      "description": "Ești sigur că vrei să ștergi această cheltuială? Această acțiune este ireversibilă.",
+      "yes": "Da",
+      "cancel": "Anulează"
+    },
+    "attachDocuments": "Atașează documente",
+    "create": "Adaugă",
+    "creating": "Se adaugă…",
+    "save": "Salvează",
+    "saving": "Se salvează…",
+    "cancel": "Anulează",
+    "reimbursement": "Rambursare"
+  },
+  "ExpenseDocumentsInput": {
+    "TooBigToast": {
+      "title": "Fișierul este prea mare",
+      "description": "Dimensiunea maximă a fișierului pe care îl poți atașa este {maxSize}. Fișierul tău are ${size}."
+    },
+    "ErrorToast": {
+      "title": "Eroare la adăugarea documentului.",
+      "description": "Ceva a mers greșit la adăugarea fișierului. Încearcă mai târziu sau cum un alt fișier.",
+      "retry": "Reîncearcă"
+    }
+  },
+  "CreateFromReceipt": {
+    "Dialog": {
+      "triggerTitle": "Adaugă o cheltuială dintr-un bon",
+      "title": "Adaugă din bon",
+      "description": "Extrage informații despre cheltuială dintr-o poză cu bonul.",
+      "body": "Adaugă o poză cu bonul și vom încerca să o scanăm pentru a extrage informații despre cheltuială.",
+      "selectImage": "Selectează o imagine…",
+      "titleLabel": "Titlu:",
+      "categoryLabel": "Categorie:",
+      "amountLabel": "Sumă:",
+      "dateLabel": "Data:",
+      "editNext": "Vei putea sa modifici informațiile despre cheltuială în continuare.",
+      "continue": "Continuă"
+    },
+    "unknown": "Necunoscut",
+    "TooBigToast": {
+      "title": "Fișierul este prea mare",
+      "description": "Dimensiunea maximă a fișierului pe care il poți atașa este {maxSize}. Fișierul tău are ${size}."
+    },
+    "ErrorToast": {
+      "title": "Eroare la adăugarea documentului.",
+      "description": "Ceva a mers greșit la adăugarea fișierului. Încearcă mai târziu sau cum un alt fișier.",
+      "retry": "Reîncearcă"
+    }
+  },
+  "Balances": {
+    "title": "Solduri",
+    "description": "Aceasta este suma pe care fiecare membru a plătit-o sau cu care a fost plătit.",
+    "Reimbursements": {
+      "title": "Rambursări sugerate",
+      "description": "Acestea sunt sugestiile pentru rambursări optimizate între membrii.",
+      "noImbursements": "Se pare că grupul tău nu are nevoie de rambursări 😁",
+      "owes": "<strong>{from}</strong> datorează <strong>{to}</strong>",
+      "markAsPaid": "Bifează ca plătit"
+    }
+  },
+  "Stats": {
+    "title": "Statistici",
+    "Totals": {
+      "title": "Totaluri",
+      "description": "Sumarul cheltuielior pentru întregul grup.",
+      "groupSpendings": "Totalul cheltuielilor din grup",
+      "groupEarnings": "Totalul veniturilor din grup",
+      "yourSpendings": "Totalul cheltuielilor tale",
+      "yourEarnings": "Totalul veniturilor tale",
+      "yourShare": "Partea ta"
+    }
+  },
+  "Activity": {
+    "title": "Activități",
+    "description": "Rezumatul întregii activități a grupului.",
+    "noActivity": "Nu este nicio activitate în grupul tău încă.",
+    "someone": "Cineva",
+    "settingsModified": "Setările grupului au fost modificate de <strong>{participant}</strong>.",
+    "expenseCreated": "Cheltuială <em>{expense}</em> adăugată de <strong>{participant}</strong>.",
+    "expenseUpdated": "Cheltuială <em>{expense}</em> modificată de <strong>{participant}</strong>.",
+    "expenseDeleted": "Cheltuială <em>{expense}</em> ștearsă de <strong>{participant}</strong>.",
+    "Groups": {
+      "today": "Azi",
+      "yesterday": "Ieri",
+      "earlierThisWeek": "La începutul săptămânii",
+      "lastWeek": "Săptămâna trecută",
+      "earlierThisMonth": "La începutul lunii",
+      "lastMonth": "Luna trecuta",
+      "earlierThisYear": "La începutul anului",
+      "lastYear": "Anul trecut",
+      "older": "Mai vechi"
+    }
+  },
+  "Information": {
+    "title": "Informații",
+    "description": "Adaugă aici orice informație care poate să fie relevantă pentru membrii grupului.",
+    "empty": "Nicio informație de grup încă."
+  },
+  "Settings": {
+    "title": "Setări"
+  },
+  "Share": {
+    "title": "Distribuie",
+    "description": "Pentru ca ceilalți participanți să poată vedea grupul și cheltuielile adăugate, distribuie URL-ul acestuia cu ei.",
+    "warning": "Avertisment!",
+    "warningHelp": "Oricine are URL-ul grupului va putea să vadă și să editeze cheltuielile. Distribuie cu grijă!"
+  },
+  "SchemaErrors": {
+    "min1": "Introduceți cel puțin un caracter.",
+    "min2": "Introduceți cel puțin două caractere.",
+    "max5": "Introduceți cel mult cinci caractere.",
+    "max50": "Introduceți cel mult 50 de caractere.",
+    "duplicateParticipantName": "Un alt membru are deja acest nume.",
+    "titleRequired": "Vă rugăm să introduceți un titlu.",
+    "invalidNumber": "Număr invalid.",
+    "amountRequired": "Trebuie să introduceți o sumă.",
+    "amountNotZero": "Suma nu trebuie să fie zero.",
+    "amountTenMillion": "Suma trebuie să fie mai mică de 10,000,000.",
+    "paidByRequired": "Trebuie să selectați un membru.",
+    "paidForMin1": "Cheltuiala trebuie plătită pentru cel puțin un membru.",
+    "noZeroShares": "Toate părțile trebuie să fie mai mari de 0.",
+    "amountSum": "Suma valorilor trebuie să fie egală cu suma cheltuielilor.",
+    "percentageSum": "Suma procentajelor trebuie să fie egală cu 100."
+  },
+  "Categories": {
+    "search": "Căutați categorie…",
+    "noCategory": "Nicio categorie găsită.",
+    "Uncategorized": {
+      "heading": "Fără categorie",
+      "General": "General",
+      "Payment": "Plată"
+    },
+    "Entertainment": {
+      "heading": "Divertisment",
+      "Entertainment": "Divertisment",
+      "Games": "Jocuri",
+      "Movies": "Filme",
+      "Music": "Muzică",
+      "Sports": "Sporturi"
+    },
+    "Food and Drink": {
+      "heading": "Mâncare și Băutură",
+      "Food and Drink": "Mâncare și Băutură",
+      "Dining Out": "Cină în oraș",
+      "Groceries": "Alimente",
+      "Liquor": "Băuturi alcoolice"
+    },
+    "Home": {
+      "heading": "Acasă",
+      "Home": "Acasă",
+      "Electronics": "Electronice",
+      "Furniture": "Mobilier",
+      "Household Supplies": "Produse de uz casnic",
+      "Maintenance": "Întreținere",
+      "Mortgage": "Ipotecă",
+      "Pets": "Animale de companie",
+      "Rent": "Chirie",
+      "Services": "Servicii"
+    },
+    "Life": {
+      "heading": "Viață",
+      "Childcare": "Îngrijirea copiilor",
+      "Clothing": "Îmbrăcăminte",
+      "Education": "Educație",
+      "Gifts": "Cadouri",
+      "Insurance": "Asigurare",
+      "Medical Expenses": "Cheltuieli medicale",
+      "Taxes": "Impozite"
+    },
+    "Transportation": {
+      "heading": "Transport",
+      "Transportation": "Transport",
+      "Bicycle": "Bicicletă",
+      "Bus/Train": "Autobuz/Tren",
+      "Car": "Mașină",
+      "Gas/Fuel": "Gaz/Combustibil",
+      "Hotel": "Hotel",
+      "Parking": "Parcare",
+      "Plane": "Avion",
+      "Taxi": "Taxi"
+    },
+    "Utilities": {
+      "heading": "Utilități",
+      "Utilities": "Utilități",
+      "Cleaning": "Curățenie",
+      "Electricity": "Electricitate",
+      "Heat/Gas": "Încălzire/Gaz",
+      "Trash": "Gunoi",
+      "TV/Phone/Internet": "TV/Telefon/Internet",
+      "Water": "Apă"
+    }
+  }
+}
--- a/messages/ru-RU.json
+++ b/messages/ru-RU.json
@@ -203,7 +203,8 @@
    "creating": "Создание…",
    "save": "Сохранить",
    "saving": "Сохранение…",
-    "cancel": "Отмена"
+    "cancel": "Отмена",
+    "reimbursement": "Возмещение"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "Настройки"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "Поделиться",
    "description": "Чтобы другие участники получили доступ к этой группе и смогли добавлять расходы, отправьте им этот URL.",
--- a/messages/ua-UA.json
+++ b/messages/ua-UA.json
@@ -0,0 +1,388 @@
+{
+  "Homepage": {
+    "title": "Ділися <strong>витратами</strong> з <strong>друзями та родиною</strong>",
+    "description": "Ласкаво просимо у ваш новий <strong>Spliit</strong>!",
+    "button": {
+      "groups": "Перейти до груп",
+      "github": "GitHub"
+    }
+  },
+  "Header": {
+    "groups": "Групи"
+  },
+  "Footer": {
+    "madeIn": "Зроблено в Монреалі, Квебек 🇨🇦",
+    "builtBy": "Створено <author>Себастіаном Кастіелем</author> та <source>учасниками</source>"
+  },
+  "Expenses": {
+    "title": "Витрати",
+    "description": "Тут знаходяться витрати вашої групи",
+    "create": "Створити витрату",
+    "createFirst": "Створіть першу витрату",
+    "noExpenses": "У вашій групі ще немає витрат",
+    "exportJson": "Експортувати у JSON",
+    "searchPlaceholder": "Пошук витрат...",
+    "ActiveUserModal": {
+      "title": "Хто ви?",
+      "description": "Скажіть нам, хто ви серед учасників, щоб ми могли налаштувати відображення інформації під вас",
+      "nobody": "Я не хочу нікого обирати",
+      "save": "Зберегти зміни",
+      "footer": "Це налаштування можна змінити пізніше в налаштуваннях групи"
+    },
+    "Groups": {
+      "upcoming": "Майбутні",
+      "thisWeek": "Цього тижня",
+      "earlierThisMonth": "Раніше цього місяця",
+      "lastMonth": "Минулого місяця",
+      "earlierThisYear": "Раніше цього року",
+      "lastYera": "Минулого року",
+      "older": "Старіші"
+    }
+  },
+  "ExpenseCard": {
+    "paidBy": "Сплачено <strong>{paidBy}</strong> за <paidFor></paidFor>",
+    "receivedBy": "Отримано <strong>{paidBy}</strong> за <paidFor></paidFor>",
+    "yourBalance": "Ваш баланс:"
+  },
+  "Groups": {
+    "myGroups": "Мої групи",
+    "create": "Створити",
+    "loadingRecent": "Завантаження нещодавніх груп...",
+    "NoRecent": {
+      "description": "Ви не відвідували жодних груп останнім часом",
+      "create": "Створіть групу",
+      "orAsk": "або попросіть друга надіслати вам посилання на існуючу"
+    },
+    "recent": "Нещодавні групи",
+    "starred": "Обрані групи",
+    "archived": "Архівовані групи",
+    "archive": "Архівувати групу",
+    "unarchive": "Розархівувати групу",
+    "removeRecent": "Видалити з останніх груп",
+    "RecentRemovedToast": {
+      "title": "Група була видалена",
+      "description": "Група видалена зі списку ваших нещодавніх груп",
+      "undoAlt": "Скасувати видалення групи",
+      "undo": "Скасувати"
+    },
+    "AddByURL": {
+      "button": "Додати за URL",
+      "title": "Додати групу за URL",
+      "description": "Якщо з вами поділились групою, ви можете вставити її URL тут, щоб додати до свого списку",
+      "error": "На жаль, ми не змогли знайти групу за наданим URL"
+    },
+    "NotFound": {
+      "text": "Цієї групи не існує",
+      "link": "Перейти до нещодавно відвіданих груп"
+    }
+  },
+  "GroupForm": {
+    "title": "Інформація про групу",
+    "NameField": {
+      "label": "Назва групи",
+      "placeholder": "Літні канікули",
+      "description": "Введіть назву для вашої групи"
+    },
+    "InformationField": {
+      "label": "Інформація про групу",
+      "placeholder": "Яка інформація важлива для учасників групи?"
+    },
+    "CurrencyField": {
+      "label": "Символ валюти",
+      "placeholder": "₴, $, €, £..",
+      "description": "Ми будемо використовувати його для відображення сум"
+    },
+    "Participants": {
+      "title": "Учасники",
+      "description": "Введіть ім'я кожного учасника",
+      "protectedParticipant": "Цей учасник бере участь у витратах і не може бути видалений",
+      "new": "Новий",
+      "add": "Додати учасника",
+      "John": "Андрій",
+      "Jane": "Оксана",
+      "Jack": "Василь"
+    },
+    "Settings": {
+      "title": "Локальні налаштування",
+      "description": "Ці налаштування встановлюються на кожному пристрої окремо і використовуються для налаштування інтерфейсу під вас",
+      "ActiveUserField": {
+        "label": "Активний користувач",
+        "placeholder": "Обрати учасника",
+        "none": "Ніхто",
+        "description": "Користувач використовується за замовчуванням для оплати витрат"
+      },
+      "save": "Зберегти",
+      "saving": "Збереження...",
+      "create": "Створити",
+      "creating": "Створення...",
+      "cancel": "Скасувати"
+    }
+  },
+  "ExpenseForm": {
+    "Income": {
+      "create": "Створити дохід",
+      "edit": "Редагувати дохід",
+      "TitleField": {
+        "label": "Назва доходу",
+        "placeholder": "Ресторан в понеділок ввечері",
+        "description": "Введіть опис для доходу"
+      },
+      "DateField": {
+        "label": "Дата доходу",
+        "description": "Введіть дату, коли було отримано дохід"
+      },
+      "categoryFieldDescription": "Оберіть категорію доходу",
+      "paidByField": {
+        "label": "Отримав",
+        "description": "Оберіть учасника, який отримав дохід"
+      },
+      "paidFor": {
+        "title": "Учасники",
+        "description": "Виберіть тих, між ким цей дохід буде розподілено"
+      },
+      "splitModeDescription": "Оберіть, як розділити дохід між учасниками",
+      "attachDescription": "Перегляньте та прикріпіть чеки до доходу"
+    },
+    "Expense": {
+      "create": "Створити витрату",
+      "edit": "Редагувати витрату",
+      "TitleField": {
+        "label": "Назва витрати",
+        "placeholder": "Ресторан в понеділок ввечері",
+        "description": "Введіть опис для витрати"
+      },
+      "DateField": {
+        "label": "Дата витрати",
+        "description": "Введіть дату, коли було сплачено"
+      },
+      "categoryFieldDescription": "Оберіть категорію витрати",
+      "paidByField": {
+        "label": "Сплатив",
+        "description": "Оберіть учасника, який сплатив"
+      },
+      "paidFor": {
+        "title": "Учасники",
+        "description": "Оберіть тих, між ким цю витрату буде розподілено. Якщо ця витрата - відшкодування учаснику (учасникам), виберіть тільки його (їх)."
+      },
+      "splitModeDescription": "Оберіть, як розділити витрату",
+      "attachDescription": "Перегляньте та прикріпіть чеки до витрати"
+    },
+    "amountField": {
+      "label": "Сума"
+    },
+    "isReimbursementField": {
+      "label": "Це відшкодування"
+    },
+    "categoryField": {
+      "label": "Категорія"
+    },
+    "notesField": {
+      "label": "Примітки"
+    },
+    "selectNone": "Обрати жодного",
+    "selectAll": "Обрати всіх",
+    "shares": "частка(и)",
+    "advancedOptions": "Розширені опції поділу..",
+    "SplitModeField": {
+      "label": "Режим поділу",
+      "evenly": "Рівномірно",
+      "byShares": "Нерівномірно – за частками",
+      "byPercentage": "Нерівномірно – за відсотками",
+      "byAmount": "Нерівномірно – за сумами",
+      "saveAsDefault": "Зберегти як параметри поділу за замовчуванням"
+    },
+    "DeletePopup": {
+      "label": "Видалити",
+      "title": "Видалити цю витрату?",
+      "description": "Ви дійсно хочете видалити цю витрату? Ця дія не може бути скасована",
+      "yes": "Так",
+      "cancel": "Скасувати"
+    },
+    "attachDocuments": "Прикріпити документи",
+    "create": "Створити",
+    "creating": "Створення..",
+    "save": "Зберегти",
+    "saving": "Збереження..",
+    "cancel": "Скасувати",
+    "reimbursement": "Відшкодування"
+  },
+  "ExpenseDocumentsInput": {
+    "TooBigToast": {
+      "title": "Файл занадто великий",
+      "description": "Максимальний розмір файлу, який можна завантажити, становить {maxSize}. Ваш файл {size}"
+    },
+    "ErrorToast": {
+      "title": "Помилка під час завантаження документа",
+      "description": "Виникла помилка під час завантаження документа. Будь ласка, спробуйте ще раз пізніше або виберіть інший файл",
+      "retry": "Спробувати ще раз"
+    }
+  },
+  "CreateFromReceipt": {
+    "Dialog": {
+      "triggerTitle": "Створити витрату з чека",
+      "title": "Створити з чека",
+      "description": "Отримайте інформацію про витрати з фото чека",
+      "body": "Завантажте фото чека, і ми спробуємо витягнути інформацію про витрати, якщо це можливо",
+      "selectImage": "Вибрати зображення..",
+      "titleLabel": "Назва:",
+      "categoryLabel": "Категорія:",
+      "amountLabel": "Сума:",
+      "dateLabel": "Дата:",
+      "editNext": "Ви зможете відредагувати інформацію про витрати пізніше",
+      "continue": "Продовжити"
+    },
+    "unknown": "Невідомо",
+    "TooBigToast": {
+      "title": "Файл занадто великий",
+      "description": "Максимальний розмір файлу, який можна завантажити, становить {maxSize}. Ваш файл {size}"
+    },
+    "ErrorToast": {
+      "title": "Помилка під час завантаження документа",
+      "description": "Виникла помилка під час завантаження документа. Будь ласка, спробуйте ще раз пізніше або виберіть інший файл",
+      "retry": "Спробувати ще раз"
+    }
+  },
+  "Balances": {
+    "title": "Баланси",
+    "description": "Це список балансів всіх учасників групи. Баланс збільшується у тих, хто слачує витрату, і зменшується в тих, між ким вона була розподілена",
+    "Reimbursements": {
+      "title": "Запропоновані відшкодування",
+      "description": "Ось пропозиції для оптимізованих відшкодувань між учасниками",
+      "noImbursements": "Схоже, ніхто нікому не винен 😁",
+      "owes": "<strong>{from}</strong> винен <strong>{to}</strong>",
+      "markAsPaid": "Позначити як сплачене"
+    }
+  },
+  "Stats": {
+    "title": "Статистика",
+    "Totals": {
+      "title": "Загальні дані",
+      "description": "Загальний огляд витрат групи",
+      "groupSpendings": "Загальні витрати групи",
+      "groupEarnings": "Загальні доходи групи",
+      "yourSpendings": "Ваші загальні витрати",
+      "yourEarnings": "Ваші загальні доходи",
+      "yourShare": "Ваша частка"
+    }
+  },
+  "Activity": {
+    "title": "Активність",
+    "description": "Огляд усієї активності в цій групі",
+    "noActivity": "У вашій групі ще немає активності",
+    "someone": "Хтось",
+    "settingsModified": "Налаштування групи змінені <strong>{participant}</strong>",
+    "expenseCreated": "Витрата <em>{expense}</em> створена <strong>{participant}</strong>",
+    "expenseUpdated": "Витрата <em>{expense}</em> оновлена <strong>{participant}</strong>",
+    "expenseDeleted": "Витрата <em>{expense}</em> видалена <strong>{participant}</strong>",
+    "Groups": {
+      "today": "Сьогодні",
+      "yesterday": "Вчора",
+      "earlierThisWeek": "Раніше цього тижня",
+      "lastWeek": "Минулого тижня",
+      "earlierThisMonth": "Раніше цього місяця",
+      "lastMonth": "Минулого місяця",
+      "earlierThisYear": "Раніше цього року",
+      "lastYear": "Минулого року",
+      "older": "Старіші"
+    }
+  },
+  "Information": {
+    "title": "Інформація",
+    "description": "Використовуйте це місце, щоб додати будь-яку інформацію, яка може бути корисною для учасників групи",
+    "empty": "Ще немає інформації про групу"
+  },
+  "Settings": {
+    "title": "Налаштування"
+  },
+  "Share": {
+    "title": "Поділитися",
+    "description": "Щоб інші учасники могли побачити групу і додати витрати, поділіться з ними її URL",
+    "warning": "Попередження!",
+    "warningHelp": "Кожна людина з URL групи зможе переглядати та редагувати витрати. Діліться з обережністю!"
+  },
+  "SchemaErrors": {
+    "min1": "Введіть принаймні один символ",
+    "min2": "Введіть принаймні два символи",
+    "max5": "Введіть не більше п'яти символів",
+    "max50": "Введіть не більше 50 символів",
+    "duplicateParticipantName": "Інший учасник уже має це ім'я",
+    "titleRequired": "Будь ласка, введіть назву",
+    "invalidNumber": "Невірний номер",
+    "amountRequired": "Необхідно ввести суму",
+    "amountNotZero": "Сума не повинна дорівнювати нулю",
+    "amountTenMillion": "Сума повинна бути меншою за 10,000,000",
+    "paidByRequired": "Ви повинні обрати учасника",
+    "paidForMin1": "Витрата повинна бути сплачена принаймні для одного учасника",
+    "noZeroShares": "Усі частки повинні бути більшими за 0",
+    "amountSum": "Сума повинна відповідати витраті",
+    "percentageSum": "Сума відсотків повинна дорівнювати 100"
+  },
+  "Categories": {
+    "search": "Шукати категорію..",
+    "noCategory": "Категорії не знайдено",
+    "Uncategorized": {
+      "heading": "Без категорії",
+      "General": "Загальне",
+      "Payment": "Оплата"
+    },
+    "Entertainment": {
+      "heading": "Розваги",
+      "Entertainment": "Розваги",
+      "Games": "Ігри",
+      "Movies": "Фільми",
+      "Music": "Музика",
+      "Sports": "Спорт"
+    },
+    "Food and Drink": {
+      "heading": "Їжа та напої",
+      "Food and Drink": "Їжа та напої",
+      "Dining Out": "Ресторани",
+      "Groceries": "Продукти",
+      "Liquor": "Алкоголь"
+    },
+    "Home": {
+      "heading": "Дім",
+      "Home": "Дім",
+      "Electronics": "Електроніка",
+      "Furniture": "Меблі",
+      "Household Supplies": "Домашні потреби",
+      "Maintenance": "Обслуговування",
+      "Mortgage": "Іпотека",
+      "Pets": "Домашні тварини",
+      "Rent": "Оренда",
+      "Services": "Послуги"
+    },
+    "Life": {
+      "heading": "Життя",
+      "Childcare": "Догляд за дітьми",
+      "Clothing": "Одяг",
+      "Education": "Освіта",
+      "Gifts": "Подарунки",
+      "Insurance": "Страхування",
+      "Medical Expenses": "Медичні витрати",
+      "Taxes": "Податки"
+    },
+    "Transportation": {
+      "heading": "Транспорт",
+      "Transportation": "Транспорт",
+      "Bicycle": "Велосипед",
+      "Bus/Train": "Автобус/Поїзд",
+      "Car": "Автомобіль",
+      "Gas/Fuel": "Паливо",
+      "Hotel": "Готель",
+      "Parking": "Паркінг",
+      "Plane": "Літак",
+      "Taxi": "Таксі"
+    },
+    "Utilities": {
+      "heading": "Комунальні послуги",
+      "Utilities": "Комунальні послуги",
+      "Cleaning": "Прибирання",
+      "Electricity": "Електроенергія",
+      "Heat/Gas": "Опалення/Газ",
+      "Trash": "Сміття",
+      "TV/Phone/Internet": "ТБ/Телефон/Інтернет",
+      "Water": "Вода"
+    }
+  }
+}
--- a/messages/zh-CN.json
+++ b/messages/zh-CN.json
@@ -203,7 +203,8 @@
    "creating": "创建中……",
    "save": "保存",
    "saving": "保存中……",
-    "cancel": "取消"
+    "cancel": "取消",
+    "reimbursement": "报销"
  },
  "ExpenseDocumentsInput": {
    "TooBigToast": {
@@ -293,16 +294,6 @@
  "Settings": {
    "title": "设定"
  },
-  "Locale": {
-    "en-US": "English",
-    "fi": "Suomi",
-    "fr-FR": "Français",
-    "es": "Español",
-    "de-DE": "Deutsch",
-    "zh-CN": "Chinese (Simplified)",
-    "ru-RU": "Русский",
-    "it-IT": "Italiano"
-  },
  "Share": {
    "title": "分享",
    "description": "请将此URL分享给其他群组成员，以使其可以查看群组并添加消费。",
--- a/messages/zh-TW.json
+++ b/messages/zh-TW.json
@@ -0,0 +1,388 @@
+{
+  "Homepage": {
+    "title": "跟<strong>朋友和家人</strong>一起共享<strong>消費紀錄</strong>",
+    "description": "歡迎開始全新的<strong>Spliit</strong>",
+    "button": {
+      "groups": "前往群組",
+      "github": "GitHub"
+    }
+  },
+  "Header": {
+    "groups": "群組"
+  },
+  "Footer": {
+    "madeIn": "來自 🇨🇦 加拿大魁北克蒙特婁",
+    "builtBy": "由 <author>Sebastien Castiel</author> 以及 <source>社群貢獻者</source> 共同創建維護"
+  },
+  "Expenses": {
+    "title": "消費",
+    "description": "這裡是您為群組建立的消費。",
+    "create": "新增消費紀錄",
+    "createFirst": "新增第一筆消費紀錄",
+    "noExpenses": "你的群組內目前沒有任何消費紀錄。",
+    "exportJson": "匯出為 JSON",
+    "searchPlaceholder": "搜尋消費紀錄……",
+    "ActiveUserModal": {
+      "title": "你是誰？",
+      "description": "告訴我們您在群組中的身份，以調整我們顯示資訊的方式。",
+      "nobody": "我不想選擇任何人",
+      "save": "儲存更改",
+      "footer": "此設定可稍後在群組設定中更改。"
+    },
+    "Groups": {
+      "upcoming": "即將到來",
+      "thisWeek": "本週",
+      "earlierThisMonth": "本月稍早",
+      "lastMonth": "上個月",
+      "earlierThisYear": "今年稍早",
+      "lastYera": "去年",
+      "older": "更早"
+    }
+  },
+  "ExpenseCard": {
+    "paidBy": "由 <strong>{paidBy}</strong> 支付 <paidFor></paidFor>。",
+    "receivedBy": "由 <strong>{paidBy}</strong> 收取 <paidFor></paidFor>。",
+    "yourBalance": "你的餘額："
+  },
+  "Groups": {
+    "myGroups": "我的群組",
+    "create": "建立",
+    "loadingRecent": "讀取最近的群組……",
+    "NoRecent": {
+      "description": "你最近沒有訪問過任何群組。",
+      "create": "建立一個新群組",
+      "orAsk": "或請朋友發送已建立的群組鏈接。"
+    },
+    "recent": "最近的群組",
+    "starred": "已加星標的群組",
+    "archived": "已封存的群組",
+    "archive": "將群組封存",
+    "unarchive": "取消封存群組",
+    "removeRecent": "從最近的群組中移除",
+    "RecentRemovedToast": {
+      "title": "群組已被移除",
+      "description": "該群組已從您的最近群組列表中移除。",
+      "undoAlt": "撤銷移除群組",
+      "undo": "取消操作"
+    },
+    "AddByURL": {
+      "button": "透過連結加入",
+      "title": "透過連結加入群組",
+      "description": "如果某個群組已與您分享，您可以在此處貼上其網址以添加到群組列表中。",
+      "error": "哇哇，我們無法從您提供的網址中找到有效群組……"
+    },
+    "NotFound": {
+      "text": "該群組不存在。",
+      "link": "前往最近訪問的群組"
+    }
+  },
+  "GroupForm": {
+    "title": "群組資訊",
+    "NameField": {
+      "label": "群組名稱",
+      "placeholder": "暑假出遊",
+      "description": "輸入群組的名稱。"
+    },
+    "InformationField": {
+      "label": "群組資訊",
+      "placeholder": "對群組成員有關的資訊是什麼？"
+    },
+    "CurrencyField": {
+      "label": "貨幣符號",
+      "placeholder": "$, €, £…",
+      "description": "我們根據它來顯示相應的金額。"
+    },
+    "Participants": {
+      "title": "群組成員",
+      "description": "輸入每位成員的名稱。",
+      "protectedParticipant": "此成員已有登記支出，無法刪除。",
+      "new": "新增",
+      "add": "新增群組成員",
+      "John": "林俊凱",
+      "Jane": "陳怡婷",
+      "Jack": "張文傑"
+    },
+    "Settings": {
+      "title": "客製化設定",
+      "description": "這些設定是針對每台設備設置的，用於客製化您的體驗。",
+      "ActiveUserField": {
+        "label": "當前使用者",
+        "placeholder": "選擇一位群組成員",
+        "none": "無",
+        "description": "用於支付消費的預設用戶"
+      },
+      "save": "保存",
+      "saving": "保存中……",
+      "create": "建立",
+      "creating": "建立中……",
+      "cancel": "取消"
+    }
+  },
+  "ExpenseForm": {
+    "Income": {
+      "create": "新增收入",
+      "edit": "編輯收入",
+      "TitleField": {
+        "label": "收入標題",
+        "placeholder": "禮拜一晚餐",
+        "description": "輸入此筆收入的描述。"
+      },
+      "DateField": {
+        "label": "收入日期",
+        "description": "輸入收到這筆收入的日期。"
+      },
+      "categoryFieldDescription": "選擇收入類別。",
+      "paidByField": {
+        "label": "接收人",
+        "description": "選擇接收這筆收入的成員。"
+      },
+      "paidFor": {
+        "title": "應接收人",
+        "description": "選擇應參與此筆收入的成員。"
+      },
+      "splitModeDescription": "選擇如何分配此筆收入。",
+      "attachDescription": "查看／附上此筆收入的收據。"
+    },
+    "Expense": {
+      "create": "新增消費紀錄",
+      "edit": "編輯消費紀錄",
+      "TitleField": {
+        "label": "支出標題",
+        "placeholder": "週一晚餐",
+        "description": "輸入此筆消費的描述。"
+      },
+      "DateField": {
+        "label": "消費日期",
+        "description": "輸入支付此消費的日期。"
+      },
+      "categoryFieldDescription": "選擇消費類別。",
+      "paidByField": {
+        "label": "支付人",
+        "description": "选择支付这笔消费的群组成员。"
+      },
+      "paidFor": {
+        "title": "應支付人",
+        "description": "選擇需參與此筆消費的成員。"
+      },
+      "splitModeDescription": "選擇如何分配此筆消費。",
+      "attachDescription": "查看／附上此筆消費的收據。"
+    },
+    "amountField": {
+      "label": "金額"
+    },
+    "isReimbursementField": {
+      "label": "這是一筆報銷款"
+    },
+    "categoryField": {
+      "label": "類別"
+    },
+    "notesField": {
+      "label": "備註"
+    },
+    "selectNone": "取消全選",
+    "selectAll": "全選",
+    "shares": "份額",
+    "advancedOptions": "進階分帳選項……",
+    "SplitModeField": {
+      "label": "分帳方式",
+      "evenly": "平均分配",
+      "byShares": "自訂份額",
+      "byPercentage": "自訂百分比",
+      "byAmount": "自訂金額",
+      "saveAsDefault": "儲存為預設分帳方式"
+    },
+    "DeletePopup": {
+      "label": "刪除",
+      "title": "要刪除這筆消費嗎？",
+      "description": "確定要刪除這筆消費嗎？刪除後無法回復哦。",
+      "yes": "確定",
+      "cancel": "取消"
+    },
+    "attachDocuments": "附件",
+    "create": "新增",
+    "creating": "新增中……",
+    "save": "儲存",
+    "saving": "儲存中……",
+    "cancel": "取消",
+    "reimbursement": "報銷"
+  },
+  "ExpenseDocumentsInput": {
+    "TooBigToast": {
+      "title": "文件過大",
+      "description": "可以上傳的最大文件大小為 {maxSize}。這份文件大小為 ${size}。"
+    },
+    "ErrorToast": {
+      "title": "上傳文件時發生錯誤",
+      "description": "上傳文件時發生錯誤，請再試一次或更換文件。",
+      "retry": "重試"
+    }
+  },
+  "CreateFromReceipt": {
+    "Dialog": {
+      "triggerTitle": "從收據中新增消費紀錄",
+      "title": "從收據中新增消費紀錄",
+      "description": "從收據照片上抓取消費明細。",
+      "body": "上傳收據的圖片，我們會試圖解析其中的支出",
+      "selectImage": "選擇圖片……",
+      "titleLabel": "標題：",
+      "categoryLabel": "類別：",
+      "amountLabel": "金額：",
+      "dateLabel": "日期：",
+      "editNext": "可於後續編輯消費明細。",
+      "continue": "繼續"
+    },
+    "unknown": "未知",
+    "TooBigToast": {
+      "title": "文件過大",
+      "description": "可以上傳的最大文件大小為 {maxSize}。這份文件大小為 ${size}。"
+    },
+    "ErrorToast": {
+      "title": "上傳文件時發生錯誤",
+      "description": "上傳文件時發生錯誤，請再試一次或更換文件。",
+      "retry": "重試"
+    }
+  },
+  "Balances": {
+    "title": "總覽",
+    "description": "這是每個成員已支付及需支付的金額",
+    "Reimbursements": {
+      "title": "建議核銷",
+      "description": "這是建議的銷帳方式",
+      "noImbursements": "看起來你的群組目前不需要銷帳😁",
+      "owes": "<strong>{from}</strong> 欠 <strong>{to}</strong>",
+      "markAsPaid": "標記為已支付"
+    }
+  },
+  "Stats": {
+    "title": "統計",
+    "Totals": {
+      "title": "總計",
+      "description": "整個群組的花費總計。",
+      "groupSpendings": "群組總開銷",
+      "groupEarnings": "群組總收入",
+      "yourSpendings": "你的總開銷",
+      "yourEarnings": "你的總收入",
+      "yourShare": "你的總計份額"
+    }
+  },
+  "Activity": {
+    "title": "明細",
+    "description": "群組所有活動總覽",
+    "noActivity": "你的全組目前沒有任何活動",
+    "someone": "某人",
+    "settingsModified": "群組設定已被<strong>{participant}</strong>更改。",
+    "expenseCreated": "消費 <em>{expense}</em> 由 <strong>{participant}</strong> 新增。",
+    "expenseUpdated": "消費 <em>{expense}</em> 由 <strong>{participant}</strong> 更新。",
+    "expenseDeleted": "消費 <em>{expense}</em> 由 <strong>{participant}</strong> 刪除。",
+    "Groups": {
+      "today": "今天",
+      "yesterday": "昨天",
+      "earlierThisWeek": "本週稍早",
+      "lastWeek": "上週",
+      "earlierThisMonth": "本月稍早",
+      "lastMonth": "上個月",
+      "earlierThisYear": "今年稍早",
+      "lastYear": "去年",
+      "older": "更早"
+    }
+  },
+  "Information": {
+    "title": "資訊",
+    "description": "可在此添加群組相關資訊、公告及說明等。",
+    "empty": "目前沒有群組資訊。"
+  },
+  "Settings": {
+    "title": "設定"
+  },
+  "Share": {
+    "title": "分享",
+    "description": "將此網址分享給其他人以加入群組並查看及新增消費紀錄",
+    "warning": "警告！",
+    "warningHelp": "任何有此連結的人都可以看到及編輯消費紀錄。請小心使用！"
+  },
+  "SchemaErrors": {
+    "min1": "請輸入至少 1 個字。",
+    "min2": "請輸入至少 2 個字。",
+    "max5": "請輸入至少 5 個字。",
+    "max50": "請輸入至少 50 個字。",
+    "duplicateParticipantName": "此名稱已被使用",
+    "titleRequired": "請輸入標題。",
+    "invalidNumber": "數值無效。",
+    "amountRequired": "必須輸入一個金額。",
+    "amountNotZero": "金額不可為 0。",
+    "amountTenMillion": "金額需小於 10,000,000。",
+    "paidByRequired": "必須選擇一個成員。",
+    "paidForMin1": "這筆消費必須包含至少一個成員。",
+    "noZeroShares": "份額需大於 0。",
+    "amountSum": "金額總計必須等於消費金額。",
+    "percentageSum": "百分比加總必須等於 100。"
+  },
+  "Categories": {
+    "search": "搜尋類別……",
+    "noCategory": "未找到類別。",
+    "Uncategorized": {
+      "heading": "未分類",
+      "General": "一般",
+      "Payment": "支付"
+    },
+    "Entertainment": {
+      "heading": "娛樂",
+      "Entertainment": "娛樂",
+      "Games": "遊戲",
+      "Movies": "電影",
+      "Music": "音樂",
+      "Sports": "運動"
+    },
+    "Food and Drink": {
+      "heading": "飲食",
+      "Food and Drink": "飲食",
+      "Dining Out": "外食",
+      "Groceries": "食材",
+      "Liquor": "酒水"
+    },
+    "Home": {
+      "heading": "居家",
+      "Home": "居家",
+      "Electronics": "電子產品",
+      "Furniture": "家具",
+      "Household Supplies": "日用品",
+      "Maintenance": "維護",
+      "Mortgage": "貸款",
+      "Pets": "寵物",
+      "Rent": "租金",
+      "Services": "服務"
+    },
+    "Life": {
+      "heading": "生活",
+      "Childcare": "育兒",
+      "Clothing": "衣服",
+      "Education": "教育",
+      "Gifts": "禮物",
+      "Insurance": "保險",
+      "Medical Expenses": "醫療支出",
+      "Taxes": "稅"
+    },
+    "Transportation": {
+      "heading": "交通",
+      "Transportation": "交通",
+      "Bicycle": "自行車",
+      "Bus/Train": "公車/火車",
+      "Car": "汽車",
+      "Gas/Fuel": "油錢/燃料",
+      "Hotel": "旅館/住宿",
+      "Parking": "停車",
+      "Plane": "飛機",
+      "Taxi": "計程車"
+    },
+    "Utilities": {
+      "heading": "日常帳單",
+      "Utilities": "日常帳單",
+      "Cleaning": "清潔費",
+      "Electricity": "電費",
+      "Heat/Gas": "暖氣/瓦斯",
+      "Trash": "垃圾費",
+      "TV/Phone/Internet": "電視/電話/網路",
+      "Water": "水費"
+    }
+  }
+}
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,12 @@
        "@radix-ui/react-tabs": "^1.0.4",
        "@radix-ui/react-toast": "^1.1.5",
        "@tailwindcss/typography": "^0.5.10",
+        "@tanstack/react-query": "^5.59.15",
+        "@trpc/client": "^11.0.0-rc.586",
+        "@trpc/react-query": "^11.0.0-rc.586",
+        "@trpc/server": "^11.0.0-rc.586",
        "class-variance-authority": "^0.7.0",
+        "client-only": "^0.0.1",
        "clsx": "^2.0.0",
        "cmdk": "^0.2.0",
        "content-disposition": "^0.5.4",
@@ -47,13 +52,16 @@
        "react-dom": "^18.3.1",
        "react-hook-form": "^7.47.0",
        "react-intersection-observer": "^9.8.0",
+        "server-only": "^0.0.1",
        "sharp": "^0.33.2",
+        "superjson": "^2.2.1",
        "tailwind-merge": "^1.14.0",
        "tailwindcss-animate": "^1.0.7",
        "ts-pattern": "^5.0.6",
+        "use-debounce": "^10.0.4",
        "uuid": "^9.0.1",
        "vaul": "^0.8.0",
-        "zod": "^3.22.4"
+        "zod": "^3.23.8"
      },
      "devDependencies": {
        "@testing-library/dom": "^10.4.0",
@@ -8962,6 +8970,32 @@
        "node": ">=4"
      }
    },
+    "node_modules/@tanstack/query-core": {
+      "version": "5.59.13",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.59.13.tgz",
+      "integrity": "sha512-Oou0bBu/P8+oYjXsJQ11j+gcpLAMpqW42UlokQYEz4dE7+hOtVO9rVuolJKgEccqzvyFzqX4/zZWY+R/v1wVsQ==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "5.59.15",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.59.15.tgz",
+      "integrity": "sha512-QbVlAkTI78wB4Mqgf2RDmgC0AOiJqer2c5k9STOOSXGv1S6ZkY37r/6UpE8DbQ2Du0ohsdoXgFNEyv+4eDoPEw==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-core": "5.59.13"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19"
+      }
+    },
    "node_modules/@testing-library/dom": {
      "version": "10.4.0",
      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -9063,6 +9097,43 @@
      "integrity": "sha512-AqlrT8YA1o7Ff5wPfMOL0pvL+1X+sw60NN6CcOCqs658emD6RfiXhF7Gu9QcfKBH7ELY2nInLhKSCWVoNL70MQ==",
      "dev": true
    },
+    "node_modules/@trpc/client": {
+      "version": "11.0.0-rc.586",
+      "resolved": "https://registry.npmjs.org/@trpc/client/-/client-11.0.0-rc.586.tgz",
+      "integrity": "sha512-shCIpBzT+SzEbVXbCdpbSrPogG4c9J6hXh+xh5pidY1MTYcBHkeZVBLjy/fVSX+fB9wRoZXNaaoXO+ijYAZBcQ==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "@trpc/server": "11.0.0-rc.586+3388c9691"
+      }
+    },
+    "node_modules/@trpc/react-query": {
+      "version": "11.0.0-rc.586",
+      "resolved": "https://registry.npmjs.org/@trpc/react-query/-/react-query-11.0.0-rc.586.tgz",
+      "integrity": "sha512-fYIo9Y9lM2tqTBY9NBT5ZPX4R++SaauOl6qjvnSwmIBupboiueLMMWfMh+cmJiAVim1Hg0OvgoS6WRFIYMlFYg==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "@tanstack/react-query": "^5.59.15",
+        "@trpc/client": "11.0.0-rc.586+3388c9691",
+        "@trpc/server": "11.0.0-rc.586+3388c9691",
+        "react": ">=18.2.0",
+        "react-dom": ">=18.2.0"
+      }
+    },
+    "node_modules/@trpc/server": {
+      "version": "11.0.0-rc.586",
+      "resolved": "https://registry.npmjs.org/@trpc/server/-/server-11.0.0-rc.586.tgz",
+      "integrity": "sha512-G0713HRFYyBLjN58DYq88hTH4kfKNZt9GXR0/TkVD7rENpOUBk6LKorqSDQ0y0/8aqu11HdDHsn6vBTWK3D44Q==",
+      "funding": [
+        "https://trpc.io/sponsor"
+      ],
+      "license": "MIT"
+    },
    "node_modules/@tsconfig/node10": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -10788,6 +10859,21 @@
      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
      "dev": true
    },
+    "node_modules/copy-anything": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+      "license": "MIT",
+      "dependencies": {
+        "is-what": "^4.1.8"
+      },
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
    "node_modules/create-jest": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
@@ -13155,6 +13241,18 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/is-what": {
+      "version": "4.1.16",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
+      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.13"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mesqueeb"
+      }
+    },
    "node_modules/isarray": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -16298,6 +16396,12 @@
        "semver": "bin/semver.js"
      }
    },
+    "node_modules/server-only": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/server-only/-/server-only-0.0.1.tgz",
+      "integrity": "sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==",
+      "license": "MIT"
+    },
    "node_modules/set-function-length": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
@@ -16811,6 +16915,18 @@
        "node": ">=8"
      }
    },
+    "node_modules/superjson": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.1.tgz",
+      "integrity": "sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==",
+      "license": "MIT",
+      "dependencies": {
+        "copy-anything": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
    "node_modules/supports-color": {
      "version": "7.2.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -17319,6 +17435,18 @@
        }
      }
    },
+    "node_modules/use-debounce": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-10.0.4.tgz",
+      "integrity": "sha512-6Cf7Yr7Wk7Kdv77nnJMf6de4HuDE4dTxKij+RqE9rufDsI6zsbjyAxcH5y2ueJCQAnfgKbzXbZHYlkFwmBlWkw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "peerDependencies": {
+        "react": "*"
+      }
+    },
    "node_modules/use-intl": {
      "version": "3.17.2",
      "resolved": "https://registry.npmjs.org/use-intl/-/use-intl-3.17.2.tgz",
@@ -17819,9 +17947,9 @@
      }
    },
    "node_modules/zod": {
-      "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
+      "version": "3.23.8",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+      "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
--- a/package.json
+++ b/package.json
@@ -33,7 +33,12 @@
    "@radix-ui/react-tabs": "^1.0.4",
    "@radix-ui/react-toast": "^1.1.5",
    "@tailwindcss/typography": "^0.5.10",
+    "@tanstack/react-query": "^5.59.15",
+    "@trpc/client": "^11.0.0-rc.586",
+    "@trpc/react-query": "^11.0.0-rc.586",
+    "@trpc/server": "^11.0.0-rc.586",
    "class-variance-authority": "^0.7.0",
+    "client-only": "^0.0.1",
    "clsx": "^2.0.0",
    "cmdk": "^0.2.0",
    "content-disposition": "^0.5.4",
@@ -54,13 +59,16 @@
    "react-dom": "^18.3.1",
    "react-hook-form": "^7.47.0",
    "react-intersection-observer": "^9.8.0",
+    "server-only": "^0.0.1",
    "sharp": "^0.33.2",
+    "superjson": "^2.2.1",
    "tailwind-merge": "^1.14.0",
    "tailwindcss-animate": "^1.0.7",
    "ts-pattern": "^5.0.6",
+    "use-debounce": "^10.0.4",
    "uuid": "^9.0.1",
    "vaul": "^0.8.0",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
  },
  "devDependencies": {
    "@testing-library/dom": "^10.4.0",
--- a/src/app/api/trpc/[trpc]/route.ts
+++ b/src/app/api/trpc/[trpc]/route.ts
@@ -0,0 +1,13 @@
+import { createTRPCContext } from '@/trpc/init'
+import { appRouter } from '@/trpc/routers/_app'
+import { fetchRequestHandler } from '@trpc/server/adapters/fetch'
+
+const handler = (req: Request) =>
+  fetchRequestHandler({
+    endpoint: '/api/trpc',
+    req,
+    router: appRouter,
+    createContext: createTRPCContext,
+  })
+
+export { handler as GET, handler as POST }
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -41,7 +41,8 @@
    --muted-foreground: 240 5% 64.9%;
    --accent: 12 6.5% 15.1%;
    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
+    /* --destructive: 0 62.8% 30.6%; */
+    --destructive: 0 87% 47%;
    --destructive-foreground: 0 85.7% 97.3%;
    --border: 240 3.7% 15.9%;
    --input: 240 3.7% 15.9%;
--- a/src/app/groups/[groupId]/activity/activity-item.tsx
+++ b/src/app/groups/[groupId]/activity/activity-item.tsx
@@ -1,18 +1,20 @@
 'use client'
 import { Button } from '@/components/ui/button'
-import { getGroupExpenses } from '@/lib/api'
 import { DateTimeStyle, cn, formatDate } from '@/lib/utils'
-import { Activity, ActivityType, Participant } from '@prisma/client'
+import { AppRouterOutput } from '@/trpc/routers/_app'
+import { ActivityType, Participant } from '@prisma/client'
 import { ChevronRight } from 'lucide-react'
 import { useLocale, useTranslations } from 'next-intl'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'

+export type Activity =
+  AppRouterOutput['groups']['activities']['list']['activities'][number]
+
 type Props = {
  groupId: string
  activity: Activity
  participant?: Participant
-  expense?: Awaited<ReturnType<typeof getGroupExpenses>>[number]
  dateStyle: DateTimeStyle
 }

@@ -44,13 +46,12 @@ export function ActivityItem({
  groupId,
  activity,
  participant,
-  expense,
  dateStyle,
 }: Props) {
  const router = useRouter()
  const locale = useLocale()

-  const expenseExists = expense !== undefined
+  const expenseExists = activity.expense !== undefined
  const summary = useSummary(activity, participant?.name)

  return (
--- a/src/app/groups/[groupId]/activity/activity-list.tsx
+++ b/src/app/groups/[groupId]/activity/activity-list.tsx
@@ -1,15 +1,17 @@
-import { ActivityItem } from '@/app/groups/[groupId]/activity/activity-item'
-import { getGroupExpenses } from '@/lib/api'
-import { Activity, Participant } from '@prisma/client'
+'use client'
+import {
+  Activity,
+  ActivityItem,
+} from '@/app/groups/[groupId]/activity/activity-item'
+import { Skeleton } from '@/components/ui/skeleton'
+import { trpc } from '@/trpc/client'
 import dayjs, { type Dayjs } from 'dayjs'
 import { useTranslations } from 'next-intl'
+import { forwardRef, useEffect } from 'react'
+import { useInView } from 'react-intersection-observer'
+import { useCurrentGroup } from '../current-group-context'

-type Props = {
-  groupId: string
-  participants: Participant[]
-  expenses: Awaited<ReturnType<typeof getGroupExpenses>>
-  activities: Activity[]
-}
+const PAGE_SIZE = 20

 const DATE_GROUPS = {
  TODAY: 'today',
@@ -48,23 +50,62 @@ function getDateGroup(date: Dayjs, today: Dayjs) {
 function getGroupedActivitiesByDate(activities: Activity[]) {
  const today = dayjs()
  return activities.reduce(
-    (result: { [key: string]: Activity[] }, activity: Activity) => {
+    (result, activity) => {
      const activityGroup = getDateGroup(dayjs(activity.time), today)
      result[activityGroup] = result[activityGroup] ?? []
      result[activityGroup].push(activity)
      return result
    },
-    {},
+    {} as {
+      [key: string]: Activity[]
+    },
  )
 }

-export function ActivityList({
-  groupId,
-  participants,
-  expenses,
-  activities,
-}: Props) {
+const ActivitiesLoading = forwardRef<HTMLDivElement>((_, ref) => {
+  return (
+    <div ref={ref} className="flex flex-col gap-4">
+      <Skeleton className="mt-2 h-3 w-24" />
+      {Array(5)
+        .fill(undefined)
+        .map((_, index) => (
+          <div key={index} className="flex gap-2 p-2">
+            <div className="flex-0">
+              <Skeleton className="h-3 w-12" />
+            </div>
+            <div className="flex-1">
+              <Skeleton className="h-3 w-48" />
+            </div>
+          </div>
+        ))}
+    </div>
+  )
+})
+ActivitiesLoading.displayName = 'ActivitiesLoading'
+
+export function ActivityList() {
  const t = useTranslations('Activity')
+  const { group, groupId } = useCurrentGroup()
+
+  const {
+    data: activitiesData,
+    isLoading,
+    fetchNextPage,
+  } = trpc.groups.activities.list.useInfiniteQuery(
+    { groupId, limit: PAGE_SIZE },
+    { getNextPageParam: ({ nextCursor }) => nextCursor },
+  )
+  const { ref: loadingRef, inView } = useInView()
+
+  const activities = activitiesData?.pages.flatMap((page) => page.activities)
+  const hasMore = activitiesData?.pages.at(-1)?.hasMore ?? false
+
+  useEffect(() => {
+    if (inView && hasMore && !isLoading) fetchNextPage()
+  }, [fetchNextPage, hasMore, inView, isLoading])
+
+  if (isLoading || !activities || !group) return <ActivitiesLoading />
+
  const groupedActivitiesByDate = getGroupedActivitiesByDate(activities)

  return activities.length > 0 ? (
@@ -86,27 +127,29 @@ export function ActivityList({
            >
              {t(`Groups.${dateGroup}`)}
            </div>
-            {groupActivities.map((activity: Activity) => {
+            {groupActivities.map((activity) => {
              const participant =
                activity.participantId !== null
-                  ? participants.find((p) => p.id === activity.participantId)
-                  : undefined
-              const expense =
-                activity.expenseId !== null
-                  ? expenses.find((e) => e.id === activity.expenseId)
+                  ? group.participants.find(
+                      (p) => p.id === activity.participantId,
+                    )
                  : undefined
              return (
                <ActivityItem
                  key={activity.id}
-                  {...{ groupId, activity, participant, expense, dateStyle }}
+                  groupId={groupId}
+                  activity={activity}
+                  participant={participant}
+                  dateStyle={dateStyle}
                />
              )
            })}
          </div>
        )
      })}
+      {hasMore && <ActivitiesLoading ref={loadingRef} />}
    </>
  ) : (
-    <p className="px-6 text-sm py-6">{t('noActivity')}</p>
+    <p className="text-sm py-6">{t('noActivity')}</p>
  )
 }
--- a/src/app/groups/[groupId]/activity/page.client.tsx
+++ b/src/app/groups/[groupId]/activity/page.client.tsx
@@ -0,0 +1,32 @@
+import { ActivityList } from '@/app/groups/[groupId]/activity/activity-list'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { Metadata } from 'next'
+import { useTranslations } from 'next-intl'
+
+export const metadata: Metadata = {
+  title: 'Activity',
+}
+
+export function ActivityPageClient() {
+  const t = useTranslations('Activity')
+
+  return (
+    <>
+      <Card className="mb-4">
+        <CardHeader>
+          <CardTitle>{t('title')}</CardTitle>
+          <CardDescription>{t('description')}</CardDescription>
+        </CardHeader>
+        <CardContent className="flex flex-col space-y-4">
+          <ActivityList />
+        </CardContent>
+      </Card>
+    </>
+  )
+}
--- a/src/app/groups/[groupId]/activity/page.tsx
+++ b/src/app/groups/[groupId]/activity/page.tsx
@@ -1,51 +1,10 @@
-import { cached } from '@/app/cached-functions'
-import { ActivityList } from '@/app/groups/[groupId]/activity/activity-list'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { getActivities, getGroupExpenses } from '@/lib/api'
+import { ActivityPageClient } from '@/app/groups/[groupId]/activity/page.client'
 import { Metadata } from 'next'
-import { getTranslations } from 'next-intl/server'
-import { notFound } from 'next/navigation'

 export const metadata: Metadata = {
  title: 'Activity',
 }

-export default async function ActivityPage({
-  params: { groupId },
-}: {
-  params: { groupId: string }
-}) {
-  const t = await getTranslations('Activity')
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  const expenses = await getGroupExpenses(groupId)
-  const activities = await getActivities(groupId)
-
-  return (
-    <>
-      <Card className="mb-4">
-        <CardHeader>
-          <CardTitle>{t('title')}</CardTitle>
-          <CardDescription>{t('description')}</CardDescription>
-        </CardHeader>
-        <CardContent className="flex flex-col space-y-4">
-          <ActivityList
-            {...{
-              groupId,
-              participants: group.participants,
-              expenses,
-              activities,
-            }}
-          />
-        </CardContent>
-      </Card>
-    </>
-  )
+export default async function ActivityPage() {
+  return <ActivityPageClient />
 }
--- a/src/app/groups/[groupId]/balances/balances-and-reimbursements.tsx
+++ b/src/app/groups/[groupId]/balances/balances-and-reimbursements.tsx
@@ -0,0 +1,139 @@
+'use client'
+
+import { BalancesList } from '@/app/groups/[groupId]/balances-list'
+import { ReimbursementList } from '@/app/groups/[groupId]/reimbursement-list'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { Skeleton } from '@/components/ui/skeleton'
+import { trpc } from '@/trpc/client'
+import { useTranslations } from 'next-intl'
+import { Fragment, useEffect } from 'react'
+import { match } from 'ts-pattern'
+import { useCurrentGroup } from '../current-group-context'
+
+export default function BalancesAndReimbursements() {
+  const utils = trpc.useUtils()
+  const { groupId, group } = useCurrentGroup()
+  const { data: balancesData, isLoading: balancesAreLoading } =
+    trpc.groups.balances.list.useQuery({
+      groupId,
+    })
+  const t = useTranslations('Balances')
+
+  useEffect(() => {
+    // Until we use tRPC more widely and can invalidate the cache on expense
+    // update, it's easier and safer to invalidate the cache on page load.
+    utils.groups.balances.invalidate()
+  }, [utils])
+
+  const isLoading = balancesAreLoading || !balancesData || !group
+
+  return (
+    <>
+      <Card className="mb-4">
+        <CardHeader>
+          <CardTitle>{t('title')}</CardTitle>
+          <CardDescription>{t('description')}</CardDescription>
+        </CardHeader>
+        <CardContent>
+          {isLoading ? (
+            <BalancesLoading participantCount={group?.participants.length} />
+          ) : (
+            <BalancesList
+              balances={balancesData.balances}
+              participants={group?.participants}
+              currency={group?.currency}
+            />
+          )}
+        </CardContent>
+      </Card>
+      <Card className="mb-4">
+        <CardHeader>
+          <CardTitle>{t('Reimbursements.title')}</CardTitle>
+          <CardDescription>{t('Reimbursements.description')}</CardDescription>
+        </CardHeader>
+        <CardContent>
+          {isLoading ? (
+            <ReimbursementsLoading
+              participantCount={group?.participants.length}
+            />
+          ) : (
+            <ReimbursementList
+              reimbursements={balancesData.reimbursements}
+              participants={group?.participants}
+              currency={group?.currency}
+              groupId={groupId}
+            />
+          )}
+        </CardContent>
+      </Card>
+    </>
+  )
+}
+
+const ReimbursementsLoading = ({
+  participantCount = 3,
+}: {
+  participantCount?: number
+}) => {
+  return (
+    <div className="flex flex-col">
+      {Array(participantCount - 1)
+        .fill(undefined)
+        .map((_, index) => (
+          <div key={index} className="flex justify-between py-5">
+            <div className="flex flex-col sm:flex-row gap-3 sm:gap-4">
+              <Skeleton className="h-3 w-32" />
+              <Skeleton className="h-3 w-24" />
+            </div>
+            <Skeleton className="h-3 w-16" />
+          </div>
+        ))}
+    </div>
+  )
+}
+
+const BalancesLoading = ({
+  participantCount = 3,
+}: {
+  participantCount?: number
+}) => {
+  const barWidth = (index: number) =>
+    match(index % 3)
+      .with(0, () => 'w-1/3')
+      .with(1, () => 'w-2/3')
+      .otherwise(() => 'w-full')
+
+  return (
+    <div className="grid grid-cols-2 py-1 gap-y-2">
+      {Array(participantCount)
+        .fill(undefined)
+        .map((_, index) =>
+          index % 2 === 0 ? (
+            <Fragment key={index}>
+              <div className="flex items-center justify-end pr-2">
+                <Skeleton className="h-3 w-16" />
+              </div>
+              <div className="self-start">
+                <Skeleton className={`h-7 ${barWidth(index)} rounded-l-none`} />
+              </div>
+            </Fragment>
+          ) : (
+            <Fragment key={index}>
+              <div className="flex items-center justify-end">
+                <Skeleton className={`h-7 ${barWidth(index)} rounded-r-none`} />
+              </div>
+              <div className="flex items-center pl-2">
+                <Skeleton className="h-3 w-16" />
+              </div>
+            </Fragment>
+          ),
+        )}
+    </div>
+  )
+}
--- a/src/app/groups/[groupId]/balances/page.tsx
+++ b/src/app/groups/[groupId]/balances/page.tsx
@@ -1,70 +1,10 @@
-import { cached } from '@/app/cached-functions'
-import { BalancesList } from '@/app/groups/[groupId]/balances-list'
-import { ReimbursementList } from '@/app/groups/[groupId]/reimbursement-list'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { getGroupExpenses } from '@/lib/api'
-import {
-  getBalances,
-  getPublicBalances,
-  getSuggestedReimbursements,
-} from '@/lib/balances'
+import BalancesAndReimbursements from '@/app/groups/[groupId]/balances/balances-and-reimbursements'
 import { Metadata } from 'next'
-import { getTranslations } from 'next-intl/server'
-import { notFound } from 'next/navigation'

 export const metadata: Metadata = {
  title: 'Balances',
 }

-export default async function GroupPage({
-  params: { groupId },
-}: {
-  params: { groupId: string }
-}) {
-  const t = await getTranslations('Balances')
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  const expenses = await getGroupExpenses(groupId)
-  const balances = getBalances(expenses)
-  const reimbursements = getSuggestedReimbursements(balances)
-  const publicBalances = getPublicBalances(reimbursements)
-
-  return (
-    <>
-      <Card className="mb-4">
-        <CardHeader>
-          <CardTitle>{t('title')}</CardTitle>
-          <CardDescription>{t('description')}</CardDescription>
-        </CardHeader>
-        <CardContent>
-          <BalancesList
-            balances={publicBalances}
-            participants={group.participants}
-            currency={group.currency}
-          />
-        </CardContent>
-      </Card>
-      <Card className="mb-4">
-        <CardHeader>
-          <CardTitle>{t('Reimbursements.title')}</CardTitle>
-          <CardDescription>{t('Reimbursements.description')}</CardDescription>
-        </CardHeader>
-        <CardContent className="p-0">
-          <ReimbursementList
-            reimbursements={reimbursements}
-            participants={group.participants}
-            currency={group.currency}
-            groupId={groupId}
-          />
-        </CardContent>
-      </Card>
-    </>
-  )
+export default async function GroupPage() {
+  return <BalancesAndReimbursements />
 }
--- a/src/app/groups/[groupId]/current-group-context.tsx
+++ b/src/app/groups/[groupId]/current-group-context.tsx
@@ -0,0 +1,30 @@
+import { AppRouterOutput } from '@/trpc/routers/_app'
+import { PropsWithChildren, createContext, useContext } from 'react'
+
+type Group = NonNullable<AppRouterOutput['groups']['get']['group']>
+
+type GroupContext =
+  | { isLoading: false; groupId: string; group: Group }
+  | { isLoading: true; groupId: string; group: undefined }
+
+const CurrentGroupContext = createContext<GroupContext | null>(null)
+
+export const useCurrentGroup = () => {
+  const context = useContext(CurrentGroupContext)
+  if (!context)
+    throw new Error(
+      'Missing context. Should be called inside a CurrentGroupProvider.',
+    )
+  return context
+}
+
+export const CurrentGroupProvider = ({
+  children,
+  ...props
+}: PropsWithChildren<GroupContext>) => {
+  return (
+    <CurrentGroupContext.Provider value={props}>
+      {children}
+    </CurrentGroupContext.Provider>
+  )
+}
--- a/src/app/groups/[groupId]/edit/edit-group.tsx
+++ b/src/app/groups/[groupId]/edit/edit-group.tsx
@@ -0,0 +1,25 @@
+'use client'
+
+import { GroupForm } from '@/components/group-form'
+import { trpc } from '@/trpc/client'
+import { useCurrentGroup } from '../current-group-context'
+
+export const EditGroup = () => {
+  const { groupId } = useCurrentGroup()
+  const { data, isLoading } = trpc.groups.getDetails.useQuery({ groupId })
+  const { mutateAsync } = trpc.groups.update.useMutation()
+  const utils = trpc.useUtils()
+
+  if (isLoading) return <></>
+
+  return (
+    <GroupForm
+      group={data?.group}
+      onSubmit={async (groupFormValues, participantId) => {
+        await mutateAsync({ groupId, participantId, groupFormValues })
+        await utils.groups.invalidate()
+      }}
+      protectedParticipantIds={data?.participantsWithExpenses}
+    />
+  )
+}
--- a/src/app/groups/[groupId]/edit/page.tsx
+++ b/src/app/groups/[groupId]/edit/page.tsx
@@ -1,35 +1,10 @@
-import { cached } from '@/app/cached-functions'
-import { GroupForm } from '@/components/group-form'
-import { getGroupExpensesParticipants, updateGroup } from '@/lib/api'
-import { groupFormSchema } from '@/lib/schemas'
+import { EditGroup } from '@/app/groups/[groupId]/edit/edit-group'
 import { Metadata } from 'next'
-import { notFound, redirect } from 'next/navigation'

 export const metadata: Metadata = {
  title: 'Settings',
 }

-export default async function EditGroupPage({
-  params: { groupId },
-}: {
-  params: { groupId: string }
-}) {
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  async function updateGroupAction(values: unknown, participantId?: string) {
-    'use server'
-    const groupFormValues = groupFormSchema.parse(values)
-    const group = await updateGroup(groupId, groupFormValues, participantId)
-    redirect(`/groups/${group.id}`)
-  }
-
-  const protectedParticipantIds = await getGroupExpensesParticipants(groupId)
-  return (
-    <GroupForm
-      group={group}
-      onSubmit={updateGroupAction}
-      protectedParticipantIds={protectedParticipantIds}
-    />
-  )
+export default async function EditGroupPage() {
+  return <EditGroup />
 }
--- a/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx
+++ b/src/app/groups/[groupId]/expenses/[expenseId]/edit/page.tsx
@@ -1,19 +1,9 @@
-import { cached } from '@/app/cached-functions'
-import { ExpenseForm } from '@/components/expense-form'
-import {
-  deleteExpense,
-  getCategories,
-  getExpense,
-  updateExpense,
-} from '@/lib/api'
+import { EditExpenseForm } from '@/app/groups/[groupId]/expenses/edit-expense-form'
 import { getRuntimeFeatureFlags } from '@/lib/featureFlags'
-import { expenseFormSchema } from '@/lib/schemas'
 import { Metadata } from 'next'
-import { notFound, redirect } from 'next/navigation'
-import { Suspense } from 'react'

 export const metadata: Metadata = {
-  title: 'Edit expense',
+  title: 'Edit Expense',
 }

 export default async function EditExpensePage({
@@ -21,35 +11,11 @@ export default async function EditExpensePage({
 }: {
  params: { groupId: string; expenseId: string }
 }) {
-  const categories = await getCategories()
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-  const expense = await getExpense(groupId, expenseId)
-  if (!expense) notFound()
-
-  async function updateExpenseAction(values: unknown, participantId?: string) {
-    'use server'
-    const expenseFormValues = expenseFormSchema.parse(values)
-    await updateExpense(groupId, expenseId, expenseFormValues, participantId)
-    redirect(`/groups/${groupId}`)
-  }
-
-  async function deleteExpenseAction(participantId?: string) {
-    'use server'
-    await deleteExpense(groupId, expenseId, participantId)
-    redirect(`/groups/${groupId}`)
-  }
-
  return (
-    <Suspense>
-      <ExpenseForm
-        group={group}
-        expense={expense}
-        categories={categories}
-        onSubmit={updateExpenseAction}
-        onDelete={deleteExpenseAction}
-        runtimeFeatureFlags={await getRuntimeFeatureFlags()}
-      />
-    </Suspense>
+    <EditExpenseForm
+      groupId={groupId}
+      expenseId={expenseId}
+      runtimeFeatureFlags={await getRuntimeFeatureFlags()}
+    />
  )
 }
--- a/src/app/groups/[groupId]/expenses/active-user-modal.tsx
+++ b/src/app/groups/[groupId]/expenses/active-user-modal.tsx
@@ -18,22 +18,24 @@ import {
 } from '@/components/ui/drawer'
 import { Label } from '@/components/ui/label'
 import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
-import { getGroup } from '@/lib/api'
 import { useMediaQuery } from '@/lib/hooks'
 import { cn } from '@/lib/utils'
+import { trpc } from '@/trpc/client'
+import { AppRouterOutput } from '@/trpc/routers/_app'
 import { useTranslations } from 'next-intl'
 import { ComponentProps, useEffect, useState } from 'react'

-type Props = {
-  group: NonNullable<Awaited<ReturnType<typeof getGroup>>>
-}
-
-export function ActiveUserModal({ group }: Props) {
+export function ActiveUserModal({ groupId }: { groupId: string }) {
  const t = useTranslations('Expenses.ActiveUserModal')
  const [open, setOpen] = useState(false)
  const isDesktop = useMediaQuery('(min-width: 768px)')
+  const { data: groupData } = trpc.groups.get.useQuery({ groupId })
+
+  const group = groupData?.group

  useEffect(() => {
+    if (!group) return
+
    const tempUser = localStorage.getItem(`newGroup-activeUser`)
    const activeUser = localStorage.getItem(`${group.id}-activeUser`)
    if (!tempUser && !activeUser) {
@@ -42,6 +44,8 @@ export function ActiveUserModal({ group }: Props) {
  }, [group])

  function updateOpen(open: boolean) {
+    if (!group) return
+
    if (!open && !localStorage.getItem(`${group.id}-activeUser`)) {
      localStorage.setItem(`${group.id}-activeUser`, 'None')
    }
@@ -93,7 +97,10 @@ function ActiveUserForm({
  group,
  close,
  className,
-}: ComponentProps<'form'> & { group: Props['group']; close: () => void }) {
+}: ComponentProps<'form'> & {
+  group?: AppRouterOutput['groups']['get']['group']
+  close: () => void
+}) {
  const t = useTranslations('Expenses.ActiveUserModal')
  const [selected, setSelected] = useState('None')

@@ -101,6 +108,8 @@ function ActiveUserForm({
    <form
      className={cn('grid items-start gap-4', className)}
      onSubmit={(event) => {
+        if (!group) return
+
        event.preventDefault()
        localStorage.setItem(`${group.id}-activeUser`, selected)
        close()
@@ -114,7 +123,7 @@ function ActiveUserForm({
              {t('nobody')}
            </Label>
          </div>
-          {group.participants.map((participant) => (
+          {group?.participants.map((participant) => (
            <div key={participant.id} className="flex items-center space-x-2">
              <RadioGroupItem value={participant.id} id={participant.id} />
              <Label htmlFor={participant.id} className="flex-1">
--- a/src/app/groups/[groupId]/expenses/create-expense-form.tsx
+++ b/src/app/groups/[groupId]/expenses/create-expense-form.tsx
@@ -0,0 +1,45 @@
+'use client'
+import { RuntimeFeatureFlags } from '@/lib/featureFlags'
+import { trpc } from '@/trpc/client'
+import { useRouter } from 'next/navigation'
+import { ExpenseForm } from './expense-form'
+
+export function CreateExpenseForm({
+  groupId,
+  runtimeFeatureFlags,
+}: {
+  groupId: string
+  expenseId?: string
+  runtimeFeatureFlags: RuntimeFeatureFlags
+}) {
+  const { data: groupData } = trpc.groups.get.useQuery({ groupId })
+  const group = groupData?.group
+
+  const { data: categoriesData } = trpc.categories.list.useQuery()
+  const categories = categoriesData?.categories
+
+  const { mutateAsync: createExpenseMutateAsync } =
+    trpc.groups.expenses.create.useMutation()
+
+  const utils = trpc.useUtils()
+  const router = useRouter()
+
+  if (!group || !categories) return null
+
+  return (
+    <ExpenseForm
+      group={group}
+      categories={categories}
+      onSubmit={async (expenseFormValues, participantId) => {
+        await createExpenseMutateAsync({
+          groupId,
+          expenseFormValues,
+          participantId,
+        })
+        utils.groups.expenses.invalidate()
+        router.push(`/groups/${group.id}`)
+      }}
+      runtimeFeatureFlags={runtimeFeatureFlags}
+    />
+  )
+}
--- a/src/app/groups/[groupId]/expenses/create-from-receipt-button.tsx
+++ b/src/app/groups/[groupId]/expenses/create-from-receipt-button.tsx
@@ -27,27 +27,56 @@ import { ToastAction } from '@/components/ui/toast'
 import { useToast } from '@/components/ui/use-toast'
 import { useMediaQuery } from '@/lib/hooks'
 import { formatCurrency, formatDate, formatFileSize } from '@/lib/utils'
-import { Category } from '@prisma/client'
+import { trpc } from '@/trpc/client'
 import { ChevronRight, FileQuestion, Loader2, Receipt } from 'lucide-react'
 import { useLocale, useTranslations } from 'next-intl'
 import { getImageData, usePresignedUpload } from 'next-s3-upload'
 import Image from 'next/image'
 import { useRouter } from 'next/navigation'
 import { PropsWithChildren, ReactNode, useState } from 'react'
-
-type Props = {
-  groupId: string
-  groupCurrency: string
-  categories: Category[]
-}
+import { useCurrentGroup } from '../current-group-context'

 const MAX_FILE_SIZE = 5 * 1024 ** 2

-export function CreateFromReceiptButton({
-  groupId,
-  groupCurrency,
-  categories,
-}: Props) {
+export function CreateFromReceiptButton() {
+  const t = useTranslations('CreateFromReceipt')
+  const isDesktop = useMediaQuery('(min-width: 640px)')
+
+  const DialogOrDrawer = isDesktop
+    ? CreateFromReceiptDialog
+    : CreateFromReceiptDrawer
+
+  return (
+    <DialogOrDrawer
+      trigger={
+        <Button
+          size="icon"
+          variant="secondary"
+          title={t('Dialog.triggerTitle')}
+        >
+          <Receipt className="w-4 h-4" />
+        </Button>
+      }
+      title={
+        <>
+          <span>{t('Dialog.title')}</span>
+          <Badge className="bg-pink-700 hover:bg-pink-600 dark:bg-pink-500 dark:hover:bg-pink-600">
+            Beta
+          </Badge>
+        </>
+      }
+      description={<>{t('Dialog.description')}</>}
+    >
+      <ReceiptDialogContent />
+    </DialogOrDrawer>
+  )
+}
+
+function ReceiptDialogContent() {
+  const { group } = useCurrentGroup()
+  const { data: categoriesData } = trpc.categories.list.useQuery()
+  const categories = categoriesData?.categories
+
  const locale = useLocale()
  const t = useTranslations('CreateFromReceipt')
  const [pending, setPending] = useState(false)
@@ -58,7 +87,6 @@ export function CreateFromReceiptButton({
    | null
    | (ReceiptExtractedInfo & { url: string; width?: number; height?: number })
  >(null)
-  const isDesktop = useMediaQuery('(min-width: 640px)')

  const handleFileChange = async (file: File) => {
    if (file.size > MAX_FILE_SIZE) {
@@ -107,160 +135,130 @@ export function CreateFromReceiptButton({

  const receiptInfoCategory =
    (receiptInfo?.categoryId &&
-      categories.find((c) => String(c.id) === receiptInfo.categoryId)) ||
+      categories?.find((c) => String(c.id) === receiptInfo.categoryId)) ||
    null

-  const DialogOrDrawer = isDesktop
-    ? CreateFromReceiptDialog
-    : CreateFromReceiptDrawer
-
  return (
-    <DialogOrDrawer
-      trigger={
-        <Button
-          size="icon"
-          variant="secondary"
-          title={t('Dialog.triggerTitle')}
-        >
-          <Receipt className="w-4 h-4" />
-        </Button>
-      }
-      title={
-        <>
-          <span>{t('Dialog.title')}</span>
-          <Badge className="bg-pink-700 hover:bg-pink-600 dark:bg-pink-500 dark:hover:bg-pink-600">
-            Beta
-          </Badge>
-        </>
-      }
-      description={<>{t('Dialog.description')}</>}
-    >
-      <div className="prose prose-sm dark:prose-invert">
-        <p>{t('Dialog.body')}</p>
-        <div>
-          <FileInput
-            onChange={handleFileChange}
-            accept="image/jpeg,image/png"
-          />
-          <div className="grid gap-x-4 gap-y-2 grid-cols-3">
-            <Button
-              variant="secondary"
-              className="row-span-3 w-full h-full relative"
-              title="Create expense from receipt"
-              onClick={openFileDialog}
-              disabled={pending}
-            >
-              {pending ? (
-                <Loader2 className="w-8 h-8 animate-spin" />
-              ) : receiptInfo ? (
-                <div className="absolute top-2 left-2 bottom-2 right-2">
-                  <Image
-                    src={receiptInfo.url}
-                    width={receiptInfo.width}
-                    height={receiptInfo.height}
-                    className="w-full h-full m-0 object-contain drop-shadow-lg"
-                    alt="Scanned receipt"
-                  />
-                </div>
+    <div className="prose prose-sm dark:prose-invert">
+      <p>{t('Dialog.body')}</p>
+      <div>
+        <FileInput onChange={handleFileChange} accept="image/jpeg,image/png" />
+        <div className="grid gap-x-4 gap-y-2 grid-cols-3">
+          <Button
+            variant="secondary"
+            className="row-span-3 w-full h-full relative"
+            title="Create expense from receipt"
+            onClick={openFileDialog}
+            disabled={pending}
+          >
+            {pending ? (
+              <Loader2 className="w-8 h-8 animate-spin" />
+            ) : receiptInfo ? (
+              <div className="absolute top-2 left-2 bottom-2 right-2">
+                <Image
+                  src={receiptInfo.url}
+                  width={receiptInfo.width}
+                  height={receiptInfo.height}
+                  className="w-full h-full m-0 object-contain drop-shadow-lg"
+                  alt="Scanned receipt"
+                />
+              </div>
+            ) : (
+              <span className="text-xs sm:text-sm text-muted-foreground">
+                {t('Dialog.selectImage')}
+              </span>
+            )}
+          </Button>
+          <div className="col-span-2">
+            <strong>{t('Dialog.titleLabel')}</strong>
+            <div>{receiptInfo ? receiptInfo.title ?? <Unknown /> : '…'}</div>
+          </div>
+          <div className="col-span-2">
+            <strong>{t('Dialog.categoryLabel')}</strong>
+            <div>
+              {receiptInfo ? (
+                receiptInfoCategory ? (
+                  <div className="flex items-center">
+                    <CategoryIcon
+                      category={receiptInfoCategory}
+                      className="inline w-4 h-4 mr-2"
+                    />
+                    <span className="mr-1">{receiptInfoCategory.grouping}</span>
+                    <ChevronRight className="inline w-3 h-3 mr-1" />
+                    <span>{receiptInfoCategory.name}</span>
+                  </div>
+                ) : (
+                  <Unknown />
+                )
              ) : (
-                <span className="text-xs sm:text-sm text-muted-foreground">
-                  {t('Dialog.selectImage')}
-                </span>
+                '' || '…'
              )}
-            </Button>
-            <div className="col-span-2">
-              <strong>{t('Dialog.titleLabel')}</strong>
-              <div>{receiptInfo ? receiptInfo.title ?? <Unknown /> : '…'}</div>
-            </div>
-            <div className="col-span-2">
-              <strong>{t('Dialog.categoryLabel')}</strong>
-              <div>
-                {receiptInfo ? (
-                  receiptInfoCategory ? (
-                    <div className="flex items-center">
-                      <CategoryIcon
-                        category={receiptInfoCategory}
-                        className="inline w-4 h-4 mr-2"
-                      />
-                      <span className="mr-1">
-                        {receiptInfoCategory.grouping}
-                      </span>
-                      <ChevronRight className="inline w-3 h-3 mr-1" />
-                      <span>{receiptInfoCategory.name}</span>
-                    </div>
-                  ) : (
-                    <Unknown />
-                  )
-                ) : (
-                  '' || '…'
-                )}
-              </div>
            </div>
+          </div>
+          <div>
+            <strong>{t('Dialog.amountLabel')}</strong>
            <div>
-              <strong>{t('Dialog.amountLabel')}</strong>
-              <div>
-                {receiptInfo ? (
-                  receiptInfo.amount ? (
-                    <>
-                      {formatCurrency(
-                        groupCurrency,
-                        receiptInfo.amount,
-                        locale,
-                        true,
-                      )}
-                    </>
-                  ) : (
-                    <Unknown />
-                  )
-                ) : (
-                  '…'
-                )}
-              </div>
-            </div>
-            <div>
-              <strong>{t('Dialog.dateLabel')}</strong>
-              <div>
-                {receiptInfo ? (
-                  receiptInfo.date ? (
-                    formatDate(
-                      new Date(`${receiptInfo?.date}T12:00:00.000Z`),
+              {receiptInfo && group ? (
+                receiptInfo.amount ? (
+                  <>
+                    {formatCurrency(
+                      group.currency,
+                      receiptInfo.amount,
                      locale,
-                      { dateStyle: 'medium' },
-                    )
-                  ) : (
-                    <Unknown />
+                      true,
+                    )}
+                  </>
+                ) : (
+                  <Unknown />
+                )
+              ) : (
+                '…'
+              )}
+            </div>
+          </div>
+          <div>
+            <strong>{t('Dialog.dateLabel')}</strong>
+            <div>
+              {receiptInfo ? (
+                receiptInfo.date ? (
+                  formatDate(
+                    new Date(`${receiptInfo?.date}T12:00:00.000Z`),
+                    locale,
+                    { dateStyle: 'medium' },
                  )
                ) : (
-                  '…'
-                )}
-              </div>
+                  <Unknown />
+                )
+              ) : (
+                '…'
+              )}
            </div>
          </div>
        </div>
-        <p>{t('Dialog.editNext')}</p>
-        <div className="text-center">
-          <Button
-            disabled={pending || !receiptInfo}
-            onClick={() => {
-              if (!receiptInfo) return
-              router.push(
-                `/groups/${groupId}/expenses/create?amount=${
-                  receiptInfo.amount
-                }&categoryId=${receiptInfo.categoryId}&date=${
-                  receiptInfo.date
-                }&title=${encodeURIComponent(
-                  receiptInfo.title ?? '',
-                )}&imageUrl=${encodeURIComponent(receiptInfo.url)}&imageWidth=${
-                  receiptInfo.width
-                }&imageHeight=${receiptInfo.height}`,
-              )
-            }}
-          >
-            {t('Dialog.continue')}
-          </Button>
-        </div>
      </div>
-    </DialogOrDrawer>
+      <p>{t('Dialog.editNext')}</p>
+      <div className="text-center">
+        <Button
+          disabled={pending || !receiptInfo}
+          onClick={() => {
+            if (!receiptInfo || !group) return
+            router.push(
+              `/groups/${group.id}/expenses/create?amount=${
+                receiptInfo.amount
+              }&categoryId=${receiptInfo.categoryId}&date=${
+                receiptInfo.date
+              }&title=${encodeURIComponent(
+                receiptInfo.title ?? '',
+              )}&imageUrl=${encodeURIComponent(receiptInfo.url)}&imageWidth=${
+                receiptInfo.width
+              }&imageHeight=${receiptInfo.height}`,
+            )
+          }}
+        >
+          {t('Dialog.continue')}
+        </Button>
+      </div>
+    </div>
  )
 }

--- a/src/app/groups/[groupId]/expenses/create/page.tsx
+++ b/src/app/groups/[groupId]/expenses/create/page.tsx
@@ -1,14 +1,9 @@
-import { cached } from '@/app/cached-functions'
-import { ExpenseForm } from '@/components/expense-form'
-import { createExpense, getCategories } from '@/lib/api'
+import { CreateExpenseForm } from '@/app/groups/[groupId]/expenses/create-expense-form'
 import { getRuntimeFeatureFlags } from '@/lib/featureFlags'
-import { expenseFormSchema } from '@/lib/schemas'
 import { Metadata } from 'next'
-import { notFound, redirect } from 'next/navigation'
-import { Suspense } from 'react'

 export const metadata: Metadata = {
-  title: 'Create expense',
+  title: 'Create Expense',
 }

 export default async function ExpensePage({
@@ -16,25 +11,10 @@ export default async function ExpensePage({
 }: {
  params: { groupId: string }
 }) {
-  const categories = await getCategories()
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  async function createExpenseAction(values: unknown, participantId?: string) {
-    'use server'
-    const expenseFormValues = expenseFormSchema.parse(values)
-    await createExpense(expenseFormValues, groupId, participantId)
-    redirect(`/groups/${groupId}`)
-  }
-
  return (
-    <Suspense>
-      <ExpenseForm
-        group={group}
-        categories={categories}
-        onSubmit={createExpenseAction}
-        runtimeFeatureFlags={await getRuntimeFeatureFlags()}
-      />
-    </Suspense>
+    <CreateExpenseForm
+      groupId={groupId}
+      runtimeFeatureFlags={await getRuntimeFeatureFlags()}
+    />
  )
 }
--- a/src/app/groups/[groupId]/expenses/documents-count.tsx
+++ b/src/app/groups/[groupId]/expenses/documents-count.tsx
@@ -0,0 +1,11 @@
+import { Paperclip } from 'lucide-react'
+
+export function DocumentsCount({ count }: { count: number }) {
+  if (count === 0) return <></>
+  return (
+    <div className="flex items-center">
+      <Paperclip className="w-3.5 h-3.5 mr-1 mt-0.5 text-muted-foreground" />
+      <span>{count}</span>
+    </div>
+  )
+}
--- a/src/app/groups/[groupId]/expenses/edit-expense-form.tsx
+++ b/src/app/groups/[groupId]/expenses/edit-expense-form.tsx
@@ -0,0 +1,65 @@
+'use client'
+import { RuntimeFeatureFlags } from '@/lib/featureFlags'
+import { trpc } from '@/trpc/client'
+import { useRouter } from 'next/navigation'
+import { ExpenseForm } from './expense-form'
+
+export function EditExpenseForm({
+  groupId,
+  expenseId,
+  runtimeFeatureFlags,
+}: {
+  groupId: string
+  expenseId: string
+  runtimeFeatureFlags: RuntimeFeatureFlags
+}) {
+  const { data: groupData } = trpc.groups.get.useQuery({ groupId })
+  const group = groupData?.group
+
+  const { data: categoriesData } = trpc.categories.list.useQuery()
+  const categories = categoriesData?.categories
+
+  const { data: expenseData } = trpc.groups.expenses.get.useQuery({
+    groupId,
+    expenseId,
+  })
+  const expense = expenseData?.expense
+
+  const { mutateAsync: updateExpenseMutateAsync } =
+    trpc.groups.expenses.update.useMutation()
+  const { mutateAsync: deleteExpenseMutateAsync } =
+    trpc.groups.expenses.delete.useMutation()
+
+  const utils = trpc.useUtils()
+  const router = useRouter()
+
+  if (!group || !categories || !expense) return null
+
+  return (
+    <ExpenseForm
+      group={group}
+      expense={expense}
+      categories={categories}
+      onSubmit={async (expenseFormValues, participantId) => {
+        await updateExpenseMutateAsync({
+          expenseId,
+          groupId,
+          expenseFormValues,
+          participantId,
+        })
+        utils.groups.expenses.invalidate()
+        router.push(`/groups/${group.id}`)
+      }}
+      onDelete={async (participantId) => {
+        await deleteExpenseMutateAsync({
+          expenseId,
+          groupId,
+          participantId,
+        })
+        utils.groups.expenses.invalidate()
+        router.push(`/groups/${group.id}`)
+      }}
+      runtimeFeatureFlags={runtimeFeatureFlags}
+    />
+  )
+}
--- a/src/app/groups/[groupId]/expenses/expense-card.tsx
+++ b/src/app/groups/[groupId]/expenses/expense-card.tsx
@@ -1,6 +1,7 @@
 'use client'
 import { ActiveUserBalance } from '@/app/groups/[groupId]/expenses/active-user-balance'
 import { CategoryIcon } from '@/app/groups/[groupId]/expenses/category-icon'
+import { DocumentsCount } from '@/app/groups/[groupId]/expenses/documents-count'
 import { Button } from '@/components/ui/button'
 import { getGroupExpenses } from '@/lib/api'
 import { cn, formatCurrency, formatDate } from '@/lib/utils'
@@ -75,6 +76,9 @@ export function ExpenseCard({ expense, currency, groupId }: Props) {
        >
          {formatCurrency(currency, expense.amount, locale)}
        </div>
+        <div className="text-xs text-muted-foreground">
+          <DocumentsCount count={expense._count.documents} />
+        </div>
        <div className="text-xs text-muted-foreground">
          {formatDate(expense.expenseDate, locale, { dateStyle: 'medium' })}
        </div>
--- a/src/app/groups/[groupId]/expenses/expense-form.tsx
+++ b/src/app/groups/[groupId]/expenses/expense-form.tsx
@@ -1,4 +1,3 @@
-'use client'
 import { CategorySelector } from '@/components/category-selector'
 import { ExpenseDocumentsInput } from '@/components/expense-documents-input'
 import { SubmitButton } from '@/components/submit-button'
@@ -33,7 +32,7 @@ import {
  SelectTrigger,
  SelectValue,
 } from '@/components/ui/select'
-import { getCategories, getExpense, getGroup, randomId } from '@/lib/api'
+import { randomId } from '@/lib/api'
 import { RuntimeFeatureFlags } from '@/lib/featureFlags'
 import { useActiveUser } from '@/lib/hooks'
 import {
@@ -42,6 +41,7 @@ import {
  expenseFormSchema,
 } from '@/lib/schemas'
 import { cn } from '@/lib/utils'
+import { AppRouterOutput } from '@/trpc/routers/_app'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { Save } from 'lucide-react'
 import { useTranslations } from 'next-intl'
@@ -50,18 +50,9 @@ import { useSearchParams } from 'next/navigation'
 import { useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { match } from 'ts-pattern'
-import { DeletePopup } from './delete-popup'
-import { extractCategoryFromTitle } from './expense-form-actions'
-import { Textarea } from './ui/textarea'
-
-export type Props = {
-  group: NonNullable<Awaited<ReturnType<typeof getGroup>>>
-  expense?: NonNullable<Awaited<ReturnType<typeof getExpense>>>
-  categories: NonNullable<Awaited<ReturnType<typeof getCategories>>>
-  onSubmit: (values: ExpenseFormValues, participantId?: string) => Promise<void>
-  onDelete?: (participantId?: string) => Promise<void>
-  runtimeFeatureFlags: RuntimeFeatureFlags
-}
+import { DeletePopup } from '../../../../components/delete-popup'
+import { extractCategoryFromTitle } from '../../../../components/expense-form-actions'
+import { Textarea } from '../../../../components/ui/textarea'

 const enforceCurrencyPattern = (value: string) =>
  value
@@ -72,7 +63,9 @@ const enforceCurrencyPattern = (value: string) =>
    .replace(/#/, '.') // change back # to dot
    .replace(/[^-\d.]/g, '') // remove all non-numeric characters

-const getDefaultSplittingOptions = (group: Props['group']) => {
+const getDefaultSplittingOptions = (
+  group: NonNullable<AppRouterOutput['groups']['get']['group']>,
+) => {
  const defaultValue = {
    splitMode: 'EVENLY' as const,
    paidFor: group.participants.map(({ id }) => ({
@@ -146,15 +139,23 @@ async function persistDefaultSplittingOptions(

 export function ExpenseForm({
  group,
-  expense,
  categories,
+  expense,
  onSubmit,
  onDelete,
  runtimeFeatureFlags,
-}: Props) {
+}: {
+  group: NonNullable<AppRouterOutput['groups']['get']['group']>
+  categories: AppRouterOutput['categories']['list']['categories']
+  expense?: AppRouterOutput['groups']['expenses']['get']['expense']
+  onSubmit: (value: ExpenseFormValues, participantId?: string) => Promise<void>
+  onDelete?: (participantId?: string) => Promise<void>
+  runtimeFeatureFlags: RuntimeFeatureFlags
+}) {
  const t = useTranslations('ExpenseForm')
  const isCreate = expense === undefined
  const searchParams = useSearchParams()
+
  const getSelectedPayer = (field?: { value: string }) => {
    if (isCreate && typeof window !== 'undefined') {
      const activeUser = localStorage.getItem(`${group.id}-activeUser`)
@@ -186,7 +187,7 @@ export function ExpenseForm({
        }
      : searchParams.get('reimbursement')
      ? {
-          title: 'Reimbursement',
+          title: t('reimbursement'),
          expenseDate: new Date(),
          amount: String(
            (Number(searchParams.get('amount')) || 0) / 100,
@@ -249,7 +250,6 @@ export function ExpenseForm({
  >(new Set())

  const sExpense = isIncome ? 'Income' : 'Expense'
-  const sPaid = isIncome ? 'received' : 'paid'

  useEffect(() => {
    setManuallyEditedParticipants(new Set())
--- a/src/app/groups/[groupId]/expenses/expense-list.tsx
+++ b/src/app/groups/[groupId]/expenses/expense-list.tsx
@@ -4,26 +4,21 @@ import { getGroupExpensesAction } from '@/app/groups/[groupId]/expenses/expense-
 import { Button } from '@/components/ui/button'
 import { SearchBar } from '@/components/ui/search-bar'
 import { Skeleton } from '@/components/ui/skeleton'
-import { normalizeString } from '@/lib/utils'
-import { Participant } from '@prisma/client'
+import { trpc } from '@/trpc/client'
 import dayjs, { type Dayjs } from 'dayjs'
 import { useTranslations } from 'next-intl'
 import Link from 'next/link'
-import { useEffect, useMemo, useState } from 'react'
+import { forwardRef, useEffect, useMemo, useState } from 'react'
 import { useInView } from 'react-intersection-observer'
+import { useDebounce } from 'use-debounce'
+import { useCurrentGroup } from '../current-group-context'
+
+const PAGE_SIZE = 20

 type ExpensesType = NonNullable<
  Awaited<ReturnType<typeof getGroupExpensesAction>>
 >

-type Props = {
-  expensesFirstPage: ExpensesType
-  expenseCount: number
-  participants: Participant[]
-  currency: string
-  groupId: string
-}
-
 const EXPENSE_GROUPS = {
  UPCOMING: 'upcoming',
  THIS_WEEK: 'thisWeek',
@@ -62,24 +57,16 @@ function getGroupedExpensesByDate(expenses: ExpensesType) {
  }, {})
 }

-export function ExpenseList({
-  expensesFirstPage,
-  expenseCount,
-  currency,
-  participants,
-  groupId,
-}: Props) {
-  const firstLen = expensesFirstPage.length
+export function ExpenseList() {
+  const { groupId, group } = useCurrentGroup()
  const [searchText, setSearchText] = useState('')
-  const [dataIndex, setDataIndex] = useState(firstLen)
-  const [dataLen, setDataLen] = useState(firstLen)
-  const [hasMoreData, setHasMoreData] = useState(expenseCount > firstLen)
-  const [isFetching, setIsFetching] = useState(false)
-  const [expenses, setExpenses] = useState(expensesFirstPage)
-  const { ref, inView } = useInView()
-  const t = useTranslations('Expenses')
+  const [debouncedSearchText] = useDebounce(searchText, 300)
+
+  const participants = group?.participants

  useEffect(() => {
+    if (!participants) return
+
    const activeUser = localStorage.getItem('newGroup-activeUser')
    const newUser = localStorage.getItem(`${groupId}-newUser`)
    if (activeUser || newUser) {
@@ -98,57 +85,77 @@ export function ExpenseList({
    }
  }, [groupId, participants])

+  return (
+    <>
+      <SearchBar onValueChange={(value) => setSearchText(value)} />
+      <ExpenseListForSearch
+        groupId={groupId}
+        searchText={debouncedSearchText}
+      />
+    </>
+  )
+}
+
+const ExpenseListForSearch = ({
+  groupId,
+  searchText,
+}: {
+  groupId: string
+  searchText: string
+}) => {
+  const utils = trpc.useUtils()
+  const { group } = useCurrentGroup()
+
  useEffect(() => {
-    const fetchNextPage = async () => {
-      setIsFetching(true)
+    // Until we use tRPC more widely and can invalidate the cache on expense
+    // update, it's easier and safer to invalidate the cache on page load.
+    utils.groups.expenses.invalidate()
+  }, [utils])

-      const newExpenses = await getGroupExpensesAction(groupId, {
-        offset: dataIndex,
-        length: dataLen,
-      })
+  const t = useTranslations('Expenses')
+  const { ref: loadingRef, inView } = useInView()

-      if (newExpenses !== null) {
-        const exp = expenses.concat(newExpenses)
-        setExpenses(exp)
-        setHasMoreData(exp.length < expenseCount)
-        setDataIndex(dataIndex + dataLen)
-        setDataLen(Math.ceil(1.5 * dataLen))
-      }
+  const {
+    data,
+    isLoading: expensesAreLoading,
+    fetchNextPage,
+  } = trpc.groups.expenses.list.useInfiniteQuery(
+    { groupId, limit: PAGE_SIZE, filter: searchText },
+    { getNextPageParam: ({ nextCursor }) => nextCursor },
+  )
+  const expenses = data?.pages.flatMap((page) => page.expenses)
+  const hasMore = data?.pages.at(-1)?.hasMore ?? false

-      setTimeout(() => setIsFetching(false), 500)
-    }
+  const isLoading = expensesAreLoading || !expenses || !group

-    if (inView && hasMoreData && !isFetching) fetchNextPage()
-  }, [
-    dataIndex,
-    dataLen,
-    expenseCount,
-    expenses,
-    groupId,
-    hasMoreData,
-    inView,
-    isFetching,
-  ])
+  useEffect(() => {
+    if (inView && hasMore && !isLoading) fetchNextPage()
+  }, [fetchNextPage, hasMore, inView, isLoading])

  const groupedExpensesByDate = useMemo(
-    () => getGroupedExpensesByDate(expenses),
+    () => (expenses ? getGroupedExpensesByDate(expenses) : {}),
    [expenses],
  )

-  return expenses.length > 0 ? (
+  if (isLoading) return <ExpensesLoading />
+
+  if (expenses.length === 0)
+    return (
+      <p className="px-6 text-sm py-6">
+        {t('noExpenses')}{' '}
+        <Button variant="link" asChild className="-m-4">
+          <Link href={`/groups/${groupId}/expenses/create`}>
+            {t('createFirst')}
+          </Link>
+        </Button>
+      </p>
+    )
+
+  return (
    <>
-      <SearchBar
-        onValueChange={(value) => setSearchText(normalizeString(value))}
-      />
      {Object.values(EXPENSE_GROUPS).map((expenseGroup: string) => {
        let groupExpenses = groupedExpensesByDate[expenseGroup]
-        if (!groupExpenses) return null
-
-        groupExpenses = groupExpenses.filter(({ title }) =>
-          normalizeString(title).includes(searchText),
-        )
-
-        if (groupExpenses.length === 0) return null
+        if (!groupExpenses || groupExpenses.length === 0) return null

        return (
          <div key={expenseGroup}>
@@ -163,38 +170,41 @@ export function ExpenseList({
              <ExpenseCard
                key={expense.id}
                expense={expense}
-                currency={currency}
+                currency={group.currency}
                groupId={groupId}
              />
            ))}
          </div>
        )
      })}
-      {expenses.length < expenseCount &&
-        [0, 1, 2].map((i) => (
-          <div
-            key={i}
-            className="border-t flex justify-between items-center px-6 py-4 text-sm"
-            ref={i === 0 ? ref : undefined}
-          >
-            <div className="flex flex-col gap-2">
-              <Skeleton className="h-4 w-16 rounded-full" />
-              <Skeleton className="h-4 w-32 rounded-full" />
-            </div>
-            <div>
-              <Skeleton className="h-4 w-16 rounded-full" />
-            </div>
-          </div>
-        ))}
+      {hasMore && <ExpensesLoading ref={loadingRef} />}
    </>
-  ) : (
-    <p className="px-6 text-sm py-6">
-      {t('noExpenses')}{' '}
-      <Button variant="link" asChild className="-m-4">
-        <Link href={`/groups/${groupId}/expenses/create`}>
-          {t('createFirst')}
-        </Link>
-      </Button>
-    </p>
  )
 }
+
+const ExpensesLoading = forwardRef<HTMLDivElement>((_, ref) => {
+  return (
+    <div ref={ref}>
+      <Skeleton className="mx-4 sm:mx-6 mt-1 mb-2 h-3 w-32 rounded-full" />
+      {[0, 1, 2].map((i) => (
+        <div
+          key={i}
+          className="flex justify-between items-start px-2 sm:px-6 py-4 text-sm gap-2"
+        >
+          <div className="flex-0 pl-2 pr-1">
+            <Skeleton className="h-4 w-4 rounded-full" />
+          </div>
+          <div className="flex-1 flex flex-col gap-2">
+            <Skeleton className="h-4 w-16 rounded-full" />
+            <Skeleton className="h-4 w-32 rounded-full" />
+          </div>
+          <div className="flex-0 flex flex-col gap-2 items-end mr-2 sm:mr-12">
+            <Skeleton className="h-4 w-16 rounded-full" />
+            <Skeleton className="h-4 w-20 rounded-full" />
+          </div>
+        </div>
+      ))}
+    </div>
+  )
+})
+ExpensesLoading.displayName = 'ExpensesLoading'
--- a/src/app/groups/[groupId]/expenses/export/json/route.ts
+++ b/src/app/groups/[groupId]/expenses/export/json/route.ts
@@ -31,7 +31,7 @@ export async function GET(
    return NextResponse.json({ error: 'Invalid group ID' }, { status: 404 })

  const date = new Date().toISOString().split('T')[0]
-  const filename = `Spliit Export - ${group.name} - ${date}`
+  const filename = `Spliit Export - ${date}`
  return NextResponse.json(group, {
    headers: {
      'content-type': 'application/json',
--- a/src/app/groups/[groupId]/expenses/page.client.tsx
+++ b/src/app/groups/[groupId]/expenses/page.client.tsx
@@ -0,0 +1,73 @@
+'use client'
+
+import { ActiveUserModal } from '@/app/groups/[groupId]/expenses/active-user-modal'
+import { CreateFromReceiptButton } from '@/app/groups/[groupId]/expenses/create-from-receipt-button'
+import { ExpenseList } from '@/app/groups/[groupId]/expenses/expense-list'
+import { Button } from '@/components/ui/button'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { Download, Plus } from 'lucide-react'
+import { Metadata } from 'next'
+import { useTranslations } from 'next-intl'
+import Link from 'next/link'
+import { useCurrentGroup } from '../current-group-context'
+
+export const revalidate = 3600
+
+export const metadata: Metadata = {
+  title: 'Expenses',
+}
+
+export default function GroupExpensesPageClient({
+  enableReceiptExtract,
+}: {
+  enableReceiptExtract: boolean
+}) {
+  const t = useTranslations('Expenses')
+  const { groupId } = useCurrentGroup()
+
+  return (
+    <>
+      <Card className="mb-4 rounded-none -mx-4 border-x-0 sm:border-x sm:rounded-lg sm:mx-0">
+        <div className="flex flex-1">
+          <CardHeader className="flex-1 p-4 sm:p-6">
+            <CardTitle>{t('title')}</CardTitle>
+            <CardDescription>{t('description')}</CardDescription>
+          </CardHeader>
+          <CardHeader className="p-4 sm:p-6 flex flex-row space-y-0 gap-2">
+            <Button variant="secondary" size="icon" asChild>
+              <Link
+                prefetch={false}
+                href={`/groups/${groupId}/expenses/export/json`}
+                target="_blank"
+                title={t('exportJson')}
+              >
+                <Download className="w-4 h-4" />
+              </Link>
+            </Button>
+            {enableReceiptExtract && <CreateFromReceiptButton />}
+            <Button asChild size="icon">
+              <Link
+                href={`/groups/${groupId}/expenses/create`}
+                title={t('create')}
+              >
+                <Plus className="w-4 h-4" />
+              </Link>
+            </Button>
+          </CardHeader>
+        </div>
+
+        <CardContent className="p-0 pt-2 pb-4 sm:pb-6 flex flex-col gap-4 relative">
+          <ExpenseList />
+        </CardContent>
+      </Card>
+
+      <ActiveUserModal groupId={groupId} />
+    </>
+  )
+}
--- a/src/app/groups/[groupId]/expenses/page.tsx
+++ b/src/app/groups/[groupId]/expenses/page.tsx
@@ -1,28 +1,6 @@
-import { cached } from '@/app/cached-functions'
-import { ActiveUserModal } from '@/app/groups/[groupId]/expenses/active-user-modal'
-import { CreateFromReceiptButton } from '@/app/groups/[groupId]/expenses/create-from-receipt-button'
-import { ExpenseList } from '@/app/groups/[groupId]/expenses/expense-list'
-import { Button } from '@/components/ui/button'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { Skeleton } from '@/components/ui/skeleton'
-import {
-  getCategories,
-  getGroupExpenseCount,
-  getGroupExpenses,
-} from '@/lib/api'
+import GroupExpensesPageClient from '@/app/groups/[groupId]/expenses/page.client'
 import { env } from '@/lib/env'
-import { Download, Plus } from 'lucide-react'
 import { Metadata } from 'next'
-import { getTranslations } from 'next-intl/server'
-import Link from 'next/link'
-import { notFound } from 'next/navigation'
-import { Suspense } from 'react'

 export const revalidate = 3600

@@ -30,100 +8,10 @@ export const metadata: Metadata = {
  title: 'Expenses',
 }

-export default async function GroupExpensesPage({
-  params: { groupId },
-}: {
-  params: { groupId: string }
-}) {
-  const t = await getTranslations('Expenses')
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  const categories = await getCategories()
-
+export default async function GroupExpensesPage() {
  return (
-    <>
-      <Card className="mb-4 rounded-none -mx-4 border-x-0 sm:border-x sm:rounded-lg sm:mx-0">
-        <div className="flex flex-1">
-          <CardHeader className="flex-1 p-4 sm:p-6">
-            <CardTitle>{t('title')}</CardTitle>
-            <CardDescription>{t('description')}</CardDescription>
-          </CardHeader>
-          <CardHeader className="p-4 sm:p-6 flex flex-row space-y-0 gap-2">
-            <Button variant="secondary" size="icon" asChild>
-              <Link
-                prefetch={false}
-                href={`/groups/${groupId}/expenses/export/json`}
-                target="_blank"
-                title={t('exportJson')}
-              >
-                <Download className="w-4 h-4" />
-              </Link>
-            </Button>
-            {env.NEXT_PUBLIC_ENABLE_RECEIPT_EXTRACT && (
-              <CreateFromReceiptButton
-                groupId={groupId}
-                groupCurrency={group.currency}
-                categories={categories}
-              />
-            )}
-            <Button asChild size="icon">
-              <Link
-                href={`/groups/${groupId}/expenses/create`}
-                title={t('create')}
-              >
-                <Plus className="w-4 h-4" />
-              </Link>
-            </Button>
-          </CardHeader>
-        </div>
-
-        <CardContent className="p-0 pt-2 pb-4 sm:pb-6 flex flex-col gap-4 relative">
-          <Suspense
-            fallback={[0, 1, 2].map((i) => (
-              <div
-                key={i}
-                className="border-t flex justify-between items-center px-6 py-4 text-sm"
-              >
-                <div className="flex flex-col gap-2">
-                  <Skeleton className="h-4 w-16 rounded-full" />
-                  <Skeleton className="h-4 w-32 rounded-full" />
-                </div>
-                <div>
-                  <Skeleton className="h-4 w-16 rounded-full" />
-                </div>
-              </div>
-            ))}
-          >
-            <Expenses group={group} />
-          </Suspense>
-        </CardContent>
-      </Card>
-
-      <ActiveUserModal group={group} />
-    </>
-  )
-}
-
-type Props = {
-  group: NonNullable<Awaited<ReturnType<typeof cached.getGroup>>>
-}
-
-async function Expenses({ group }: Props) {
-  const expenseCount = await getGroupExpenseCount(group.id)
-
-  const expenses = await getGroupExpenses(group.id, {
-    offset: 0,
-    length: 200,
-  })
-
-  return (
-    <ExpenseList
-      expensesFirstPage={expenses}
-      expenseCount={expenseCount}
-      groupId={group.id}
-      currency={group.currency}
-      participants={group.participants}
+    <GroupExpensesPageClient
+      enableReceiptExtract={env.NEXT_PUBLIC_ENABLE_RECEIPT_EXTRACT}
    />
  )
 }
--- a/src/app/groups/[groupId]/group-header.tsx
+++ b/src/app/groups/[groupId]/group-header.tsx
@@ -0,0 +1,30 @@
+'use client'
+
+import { GroupTabs } from '@/app/groups/[groupId]/group-tabs'
+import { ShareButton } from '@/app/groups/[groupId]/share-button'
+import { Skeleton } from '@/components/ui/skeleton'
+import Link from 'next/link'
+import { useCurrentGroup } from './current-group-context'
+
+export const GroupHeader = () => {
+  const { isLoading, groupId, group } = useCurrentGroup()
+
+  return (
+    <div className="flex flex-col justify-between gap-3">
+      <h1 className="font-bold text-2xl">
+        <Link href={`/groups/${groupId}`}>
+          {isLoading ? (
+            <Skeleton className="mt-1.5 mb-1.5 h-5 w-32" />
+          ) : (
+            <div className="flex">{group.name}</div>
+          )}
+        </Link>
+      </h1>
+
+      <div className="flex gap-2 justify-between">
+        <GroupTabs groupId={groupId} />
+        {group && <ShareButton group={group} />}
+      </div>
+    </div>
+  )
+}
--- a/src/app/groups/[groupId]/information/group-information.tsx
+++ b/src/app/groups/[groupId]/information/group-information.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import { Button } from '@/components/ui/button'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { Skeleton } from '@/components/ui/skeleton'
+import { Pencil } from 'lucide-react'
+import { useTranslations } from 'next-intl'
+import Link from 'next/link'
+import { useCurrentGroup } from '../current-group-context'
+
+export default function GroupInformation({ groupId }: { groupId: string }) {
+  const t = useTranslations('Information')
+  const { isLoading, group } = useCurrentGroup()
+
+  return (
+    <>
+      <Card className="mb-4">
+        <CardHeader>
+          <CardTitle className="flex justify-between">
+            <span>{t('title')}</span>
+            <Button size="icon" asChild className="-mb-12">
+              <Link href={`/groups/${groupId}/edit`}>
+                <Pencil className="w-4 h-4" />
+              </Link>
+            </Button>
+          </CardTitle>
+          <CardDescription className="mr-12">
+            {t('description')}
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="prose prose-sm sm:prose-base max-w-full whitespace-break-spaces">
+          {isLoading ? (
+            <div className="py-1 flex flex-col gap-2">
+              <Skeleton className="h-3 w-3/4" />
+              <Skeleton className="h-3 w-1/2" />
+            </div>
+          ) : group.information ? (
+            <p className="text-foreground">{group.information}</p>
+          ) : (
+            <p className="text-muted-foreground text-sm">{t('empty')}</p>
+          )}
+        </CardContent>
+      </Card>
+    </>
+  )
+}
--- a/src/app/groups/[groupId]/information/page.tsx
+++ b/src/app/groups/[groupId]/information/page.tsx
@@ -1,54 +1,14 @@
-import { cached } from '@/app/cached-functions'
-import { Button } from '@/components/ui/button'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { Pencil } from 'lucide-react'
+import GroupInformation from '@/app/groups/[groupId]/information/group-information'
 import { Metadata } from 'next'
-import { getTranslations } from 'next-intl/server'
-import Link from 'next/link'
-import { notFound } from 'next/navigation'

 export const metadata: Metadata = {
-  title: 'Totals',
+  title: 'Group Information',
 }

-export default async function InformationPage({
+export default function InformationPage({
  params: { groupId },
 }: {
  params: { groupId: string }
 }) {
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  const t = await getTranslations('Information')
-
-  return (
-    <>
-      <Card className="mb-4">
-        <CardHeader>
-          <CardTitle className="flex justify-between">
-            <span>{t('title')}</span>
-            <Button size="icon" asChild className="-mb-12">
-              <Link href={`/groups/${groupId}/edit`}>
-                <Pencil className="w-4 h-4" />
-              </Link>
-            </Button>
-          </CardTitle>
-          <CardDescription className="mr-12">
-            {t('description')}
-          </CardDescription>
-        </CardHeader>
-        <CardContent className="prose prose-sm sm:prose-base max-w-full whitespace-break-spaces">
-          {group.information || (
-            <p className="text-muted-foreground italic">{t('empty')}</p>
-          )}
-        </CardContent>
-      </Card>
-    </>
-  )
+  return <GroupInformation groupId={groupId} />
 }
--- a/src/app/groups/[groupId]/layout.client.tsx
+++ b/src/app/groups/[groupId]/layout.client.tsx
@@ -0,0 +1,49 @@
+'use client'
+
+import { useToast } from '@/components/ui/use-toast'
+import { trpc } from '@/trpc/client'
+import { useTranslations } from 'next-intl'
+import { PropsWithChildren, useEffect } from 'react'
+import { CurrentGroupProvider } from './current-group-context'
+import { GroupHeader } from './group-header'
+import { SaveGroupLocally } from './save-recent-group'
+
+export function GroupLayoutClient({
+  groupId,
+  children,
+}: PropsWithChildren<{ groupId: string }>) {
+  const { data, isLoading } = trpc.groups.get.useQuery({ groupId })
+  const t = useTranslations('Groups.NotFound')
+  const { toast } = useToast()
+
+  useEffect(() => {
+    if (data && !data.group) {
+      toast({
+        description: t('text'),
+        variant: 'destructive',
+      })
+    }
+  }, [data])
+
+  const props =
+    isLoading || !data?.group
+      ? { isLoading: true as const, groupId, group: undefined }
+      : { isLoading: false as const, groupId, group: data.group }
+
+  if (isLoading) {
+    return (
+      <CurrentGroupProvider {...props}>
+        <GroupHeader />
+        {children}
+      </CurrentGroupProvider>
+    )
+  }
+
+  return (
+    <CurrentGroupProvider {...props}>
+      <GroupHeader />
+      {children}
+      <SaveGroupLocally />
+    </CurrentGroupProvider>
+  )
+}
--- a/src/app/groups/[groupId]/layout.tsx
+++ b/src/app/groups/[groupId]/layout.tsx
@@ -1,11 +1,7 @@
 import { cached } from '@/app/cached-functions'
-import { GroupTabs } from '@/app/groups/[groupId]/group-tabs'
-import { SaveGroupLocally } from '@/app/groups/[groupId]/save-recent-group'
-import { ShareButton } from '@/app/groups/[groupId]/share-button'
 import { Metadata } from 'next'
-import Link from 'next/link'
-import { notFound } from 'next/navigation'
-import { PropsWithChildren, Suspense } from 'react'
+import { PropsWithChildren } from 'react'
+import { GroupLayoutClient } from './layout.client'

 type Props = {
  params: {
@@ -26,31 +22,9 @@ export async function generateMetadata({
  }
 }

-export default async function GroupLayout({
+export default function GroupLayout({
  children,
  params: { groupId },
 }: PropsWithChildren<Props>) {
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  return (
-    <>
-      <div className="flex flex-col justify-between gap-3">
-        <h1 className="font-bold text-2xl">
-          <Link href={`/groups/${groupId}`}>{group.name}</Link>
-        </h1>
-
-        <div className="flex gap-2 justify-between">
-          <Suspense>
-            <GroupTabs groupId={groupId} />
-          </Suspense>
-          <ShareButton group={group} />
-        </div>
-      </div>
-
-      {children}
-
-      <SaveGroupLocally group={{ id: group.id, name: group.name }} />
-    </>
-  )
+  return <GroupLayoutClient groupId={groupId}>{children}</GroupLayoutClient>
 }
--- a/src/app/groups/[groupId]/reimbursement-list.tsx
+++ b/src/app/groups/[groupId]/reimbursement-list.tsx
@@ -21,14 +21,14 @@ export function ReimbursementList({
  const locale = useLocale()
  const t = useTranslations('Balances.Reimbursements')
  if (reimbursements.length === 0) {
-    return <p className="px-6 text-sm pb-6">{t('noImbursements')}</p>
+    return <p className="text-sm pb-6">{t('noImbursements')}</p>
  }

  const getParticipant = (id: string) => participants.find((p) => p.id === id)
  return (
    <div className="text-sm">
      {reimbursements.map((reimbursement, index) => (
-        <div className="border-t px-6 py-4 flex justify-between" key={index}>
+        <div className="py-4 flex justify-between" key={index}>
          <div className="flex flex-col gap-1 items-start sm:flex-row sm:items-baseline sm:gap-4">
            <div>
              {t.rich('owes', {
--- a/src/app/groups/[groupId]/save-recent-group.tsx
+++ b/src/app/groups/[groupId]/save-recent-group.tsx
@@ -1,17 +1,13 @@
 'use client'
-import {
-  RecentGroup,
-  saveRecentGroup,
-} from '@/app/groups/recent-groups-helpers'
+import { saveRecentGroup } from '@/app/groups/recent-groups-helpers'
 import { useEffect } from 'react'
+import { useCurrentGroup } from './current-group-context'

-type Props = {
-  group: RecentGroup
-}
+export function SaveGroupLocally() {
+  const { group } = useCurrentGroup()

-export function SaveGroupLocally({ group }: Props) {
  useEffect(() => {
-    saveRecentGroup(group)
+    if (group) saveRecentGroup({ id: group.id, name: group.name })
  }, [group])

  return null
--- a/src/app/groups/[groupId]/stats/page.client.tsx
+++ b/src/app/groups/[groupId]/stats/page.client.tsx
@@ -0,0 +1,27 @@
+import { Totals } from '@/app/groups/[groupId]/stats/totals'
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@/components/ui/card'
+import { useTranslations } from 'next-intl'
+
+export function TotalsPageClient() {
+  const t = useTranslations('Stats')
+
+  return (
+    <>
+      <Card className="mb-4">
+        <CardHeader>
+          <CardTitle>{t('Totals.title')}</CardTitle>
+          <CardDescription>{t('Totals.description')}</CardDescription>
+        </CardHeader>
+        <CardContent className="flex flex-col space-y-4">
+          <Totals />
+        </CardContent>
+      </Card>
+    </>
+  )
+}
--- a/src/app/groups/[groupId]/stats/page.tsx
+++ b/src/app/groups/[groupId]/stats/page.tsx
@@ -1,49 +1,10 @@
-import { cached } from '@/app/cached-functions'
-import { Totals } from '@/app/groups/[groupId]/stats/totals'
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card'
-import { getGroupExpenses } from '@/lib/api'
-import { getTotalGroupSpending } from '@/lib/totals'
+import { TotalsPageClient } from '@/app/groups/[groupId]/stats/page.client'
 import { Metadata } from 'next'
-import { getTranslations } from 'next-intl/server'
-import { notFound } from 'next/navigation'

 export const metadata: Metadata = {
  title: 'Totals',
 }

-export default async function TotalsPage({
-  params: { groupId },
-}: {
-  params: { groupId: string }
-}) {
-  const t = await getTranslations('Stats')
-  const group = await cached.getGroup(groupId)
-  if (!group) notFound()
-
-  const expenses = await getGroupExpenses(groupId)
-  const totalGroupSpendings = getTotalGroupSpending(expenses)
-
-  return (
-    <>
-      <Card className="mb-4">
-        <CardHeader>
-          <CardTitle>{t('Totals.title')}</CardTitle>
-          <CardDescription>{t('Totals.description')}</CardDescription>
-        </CardHeader>
-        <CardContent className="flex flex-col space-y-4">
-          <Totals
-            group={group}
-            expenses={expenses}
-            totalGroupSpendings={totalGroupSpendings}
-          />
-        </CardContent>
-      </Card>
-    </>
-  )
+export default async function TotalsPage() {
+  return <TotalsPageClient />
 }
--- a/src/app/groups/[groupId]/stats/totals-your-share.tsx
+++ b/src/app/groups/[groupId]/stats/totals-your-share.tsx
@@ -1,30 +1,16 @@
 'use client'
-import { getGroup, getGroupExpenses } from '@/lib/api'
-import { getTotalActiveUserShare } from '@/lib/totals'
 import { cn, formatCurrency } from '@/lib/utils'
 import { useLocale, useTranslations } from 'next-intl'
-import { useEffect, useState } from 'react'

-type Props = {
-  group: NonNullable<Awaited<ReturnType<typeof getGroup>>>
-  expenses: NonNullable<Awaited<ReturnType<typeof getGroupExpenses>>>
-}
-
-export function TotalsYourShare({ group, expenses }: Props) {
+export function TotalsYourShare({
+  totalParticipantShare = 0,
+  currency,
+}: {
+  totalParticipantShare?: number
+  currency: string
+}) {
  const locale = useLocale()
  const t = useTranslations('Stats.Totals')
-  const [activeUser, setActiveUser] = useState('')
-
-  useEffect(() => {
-    const activeUser = localStorage.getItem(`${group.id}-activeUser`)
-    if (activeUser) setActiveUser(activeUser)
-  }, [group, expenses])
-
-  const totalActiveUserShare =
-    activeUser === '' || activeUser === 'None'
-      ? 0
-      : getTotalActiveUserShare(activeUser, expenses)
-  const currency = group.currency

  return (
    <div>
@@ -32,10 +18,10 @@ export function TotalsYourShare({ group, expenses }: Props) {
      <div
        className={cn(
          'text-lg',
-          totalActiveUserShare < 0 ? 'text-green-600' : 'text-red-600',
+          totalParticipantShare < 0 ? 'text-green-600' : 'text-red-600',
        )}
      >
-        {formatCurrency(currency, Math.abs(totalActiveUserShare), locale)}
+        {formatCurrency(currency, Math.abs(totalParticipantShare), locale)}
      </div>
    </div>
  )
--- a/src/app/groups/[groupId]/stats/totals-your-spending.tsx
+++ b/src/app/groups/[groupId]/stats/totals-your-spending.tsx
@@ -1,26 +1,19 @@
 'use client'
-import { getGroup, getGroupExpenses } from '@/lib/api'
-import { useActiveUser } from '@/lib/hooks'
-import { getTotalActiveUserPaidFor } from '@/lib/totals'
 import { cn, formatCurrency } from '@/lib/utils'
 import { useLocale, useTranslations } from 'next-intl'

-type Props = {
-  group: NonNullable<Awaited<ReturnType<typeof getGroup>>>
-  expenses: NonNullable<Awaited<ReturnType<typeof getGroupExpenses>>>
-}
-
-export function TotalsYourSpendings({ group, expenses }: Props) {
+export function TotalsYourSpendings({
+  totalParticipantSpendings = 0,
+  currency,
+}: {
+  totalParticipantSpendings?: number
+  currency: string
+}) {
  const locale = useLocale()
  const t = useTranslations('Stats.Totals')
-  const activeUser = useActiveUser(group.id)

-  const totalYourSpendings =
-    activeUser === '' || activeUser === 'None'
-      ? 0
-      : getTotalActiveUserPaidFor(activeUser, expenses)
-  const currency = group.currency
-  const balance = totalYourSpendings < 0 ? 'yourEarnings' : 'yourSpendings'
+  const balance =
+    totalParticipantSpendings < 0 ? 'yourEarnings' : 'yourSpendings'

  return (
    <div>
@@ -29,10 +22,10 @@ export function TotalsYourSpendings({ group, expenses }: Props) {
      <div
        className={cn(
          'text-lg',
-          totalYourSpendings < 0 ? 'text-green-600' : 'text-red-600',
+          totalParticipantSpendings < 0 ? 'text-green-600' : 'text-red-600',
        )}
      >
-        {formatCurrency(currency, Math.abs(totalYourSpendings), locale)}
+        {formatCurrency(currency, Math.abs(totalParticipantSpendings), locale)}
      </div>
    </div>
  )
--- a/src/app/groups/[groupId]/stats/totals.tsx
+++ b/src/app/groups/[groupId]/stats/totals.tsx
@@ -2,20 +2,36 @@
 import { TotalsGroupSpending } from '@/app/groups/[groupId]/stats/totals-group-spending'
 import { TotalsYourShare } from '@/app/groups/[groupId]/stats/totals-your-share'
 import { TotalsYourSpendings } from '@/app/groups/[groupId]/stats/totals-your-spending'
-import { getGroup, getGroupExpenses } from '@/lib/api'
+import { Skeleton } from '@/components/ui/skeleton'
 import { useActiveUser } from '@/lib/hooks'
+import { trpc } from '@/trpc/client'
+import { useCurrentGroup } from '../current-group-context'

-export function Totals({
-  group,
-  expenses,
-  totalGroupSpendings,
-}: {
-  group: NonNullable<Awaited<ReturnType<typeof getGroup>>>
-  expenses: NonNullable<Awaited<ReturnType<typeof getGroupExpenses>>>
-  totalGroupSpendings: number
-}) {
-  const activeUser = useActiveUser(group.id)
-  console.log('activeUser', activeUser)
+export function Totals() {
+  const { groupId, group } = useCurrentGroup()
+  const activeUser = useActiveUser(groupId)
+
+  const participantId =
+    activeUser && activeUser !== 'None' ? activeUser : undefined
+  const { data } = trpc.groups.stats.get.useQuery({ groupId, participantId })
+
+  if (!data || !group)
+    return (
+      <div className="flex flex-col gap-7">
+        {[0, 1, 2].map((index) => (
+          <div key={index}>
+            <Skeleton className="mt-1 h-3 w-48" />
+            <Skeleton className="mt-3 h-4 w-20" />
+          </div>
+        ))}
+      </div>
+    )
+
+  const {
+    totalGroupSpendings,
+    totalParticipantShare,
+    totalParticipantSpendings,
+  } = data

  return (
    <>
@@ -23,10 +39,16 @@ export function Totals({
        totalGroupSpendings={totalGroupSpendings}
        currency={group.currency}
      />
-      {activeUser && activeUser !== 'None' && (
+      {participantId && (
        <>
-          <TotalsYourSpendings group={group} expenses={expenses} />
-          <TotalsYourShare group={group} expenses={expenses} />
+          <TotalsYourSpendings
+            totalParticipantSpendings={totalParticipantSpendings}
+            currency={group.currency}
+          />
+          <TotalsYourShare
+            totalParticipantShare={totalParticipantShare}
+            currency={group.currency}
+          />
        </>
      )}
    </>
--- a/src/app/groups/actions.ts
+++ b/src/app/groups/actions.ts
@@ -1,7 +0,0 @@
-'use server'
-import { getGroups } from '@/lib/api'
-
-export async function getGroupsAction(groupIds: string[]) {
-  'use server'
-  return getGroups(groupIds)
-}
--- a/src/app/groups/add-group-by-url-button-actions.ts
+++ b/src/app/groups/add-group-by-url-button-actions.ts
@@ -1,8 +0,0 @@
-'use server'
-
-import { getGroup } from '@/lib/api'
-
-export async function getGroupInfoAction(groupId: string) {
-  'use server'
-  return getGroup(groupId)
-}
--- a/src/app/groups/add-group-by-url-button.tsx
+++ b/src/app/groups/add-group-by-url-button.tsx
@@ -1,4 +1,3 @@
-import { getGroupInfoAction } from '@/app/groups/add-group-by-url-button-actions'
 import { saveRecentGroup } from '@/app/groups/recent-groups-helpers'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -8,6 +7,7 @@ import {
  PopoverTrigger,
 } from '@/components/ui/popover'
 import { useMediaQuery } from '@/lib/hooks'
+import { trpc } from '@/trpc/client'
 import { Loader2, Plus } from 'lucide-react'
 import { useTranslations } from 'next-intl'
 import { useState } from 'react'
@@ -23,14 +23,12 @@ export function AddGroupByUrlButton({ reload }: Props) {
  const [error, setError] = useState(false)
  const [open, setOpen] = useState(false)
  const [pending, setPending] = useState(false)
+  const utils = trpc.useUtils()

  return (
    <Popover open={open} onOpenChange={setOpen}>
      <PopoverTrigger asChild>
-        <Button variant="secondary">
-          {/* <Plus className="w-4 h-4 mr-2" /> */}
-          {t('button')}
-        </Button>
+        <Button variant="secondary">{t('button')}</Button>
      </PopoverTrigger>
      <PopoverContent
        align={isDesktop ? 'end' : 'start'}
@@ -47,15 +45,17 @@ export function AddGroupByUrlButton({ reload }: Props) {
                new RegExp(`${window.location.origin}/groups/([^/]+)`),
              ) ?? []
            setPending(true)
-            const group = groupId ? await getGroupInfoAction(groupId) : null
-            setPending(false)
-            if (!group) {
-              setError(true)
-            } else {
+            const { group } = await utils.groups.get.fetch({
+              groupId: groupId,
+            })
+            if (group) {
              saveRecentGroup({ id: group.id, name: group.name })
              reload()
              setUrl('')
              setOpen(false)
+            } else {
+              setError(true)
+              setPending(false)
            }
          }}
        >
--- a/src/app/groups/create/create-group.tsx
+++ b/src/app/groups/create/create-group.tsx
@@ -0,0 +1,21 @@
+'use client'
+
+import { GroupForm } from '@/components/group-form'
+import { trpc } from '@/trpc/client'
+import { useRouter } from 'next/navigation'
+
+export const CreateGroup = () => {
+  const { mutateAsync } = trpc.groups.create.useMutation()
+  const utils = trpc.useUtils()
+  const router = useRouter()
+
+  return (
+    <GroupForm
+      onSubmit={async (groupFormValues) => {
+        const { groupId } = await mutateAsync({ groupFormValues })
+        await utils.groups.invalidate()
+        router.push(`/groups/${groupId}`)
+      }}
+    />
+  )
+}
--- a/src/app/groups/create/page.tsx
+++ b/src/app/groups/create/page.tsx
@@ -1,15 +1,10 @@
-import { GroupForm } from '@/components/group-form'
-import { createGroup } from '@/lib/api'
-import { groupFormSchema } from '@/lib/schemas'
-import { redirect } from 'next/navigation'
+import { CreateGroup } from '@/app/groups/create/create-group'
+import { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'Create Group',
+}

 export default function CreateGroupPage() {
-  async function createGroupAction(values: unknown) {
-    'use server'
-    const groupFormValues = groupFormSchema.parse(values)
-    const group = await createGroup(groupFormValues)
-    redirect(`/groups/${group.id}`)
-  }
-
-  return <GroupForm onSubmit={createGroupAction} />
+  return <CreateGroup />
 }
--- a/src/app/groups/recent-group-list-card.tsx
+++ b/src/app/groups/recent-group-list-card.tsx
@@ -1,12 +1,7 @@
-'use client'
-import { RecentGroupsState } from '@/app/groups/recent-group-list'
 import {
  RecentGroup,
  archiveGroup,
  deleteRecentGroup,
-  getArchivedGroups,
-  getStarredGroups,
-  saveRecentGroup,
  starGroup,
  unarchiveGroup,
  unstarGroup,
@@ -19,46 +14,32 @@ import {
  DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
 import { Skeleton } from '@/components/ui/skeleton'
-import { ToastAction } from '@/components/ui/toast'
 import { useToast } from '@/components/ui/use-toast'
+import { AppRouterOutput } from '@/trpc/routers/_app'
 import { StarFilledIcon } from '@radix-ui/react-icons'
 import { Calendar, MoreHorizontal, Star, Users } from 'lucide-react'
 import { useLocale, useTranslations } from 'next-intl'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
-import { SetStateAction } from 'react'

 export function RecentGroupListCard({
  group,
-  state,
-  setState,
+  groupDetail,
+  isStarred,
+  isArchived,
+  refreshGroupsFromStorage,
 }: {
  group: RecentGroup
-  state: RecentGroupsState
-  setState: (state: SetStateAction<RecentGroupsState>) => void
+  groupDetail?: AppRouterOutput['groups']['list']['groups'][number]
+  isStarred: boolean
+  isArchived: boolean
+  refreshGroupsFromStorage: () => void
 }) {
  const router = useRouter()
  const locale = useLocale()
  const toast = useToast()
  const t = useTranslations('Groups')

-  const details =
-    state.status === 'complete'
-      ? state.groupsDetails.find((d) => d.id === group.id)
-      : null
-
-  if (state.status === 'pending') return null
-
-  const refreshGroupsFromStorage = () =>
-    setState({
-      ...state,
-      starredGroups: getStarredGroups(),
-      archivedGroups: getArchivedGroups(),
-    })
-
-  const isStarred = state.starredGroups.includes(group.id)
-  const isArchived = state.archivedGroups.includes(group.id)
-
  return (
    <li key={group.id}>
      <Button
@@ -116,27 +97,11 @@ export function RecentGroupListCard({
                      onClick={(event) => {
                        event.stopPropagation()
                        deleteRecentGroup(group)
-                        setState({
-                          ...state,
-                          groups: state.groups.filter((g) => g.id !== group.id),
-                        })
+                        refreshGroupsFromStorage()
+
                        toast.toast({
                          title: t('RecentRemovedToast.title'),
                          description: t('RecentRemovedToast.description'),
-                          action: (
-                            <ToastAction
-                              altText={t('RecentRemovedToast.undoAlt')}
-                              onClick={() => {
-                                saveRecentGroup(group)
-                                setState({
-                                  ...state,
-                                  groups: state.groups,
-                                })
-                              }}
-                            >
-                              {t('RecentRemovedToast.undo')}
-                            </ToastAction>
-                          ),
                        })
                      }}
                    >
@@ -161,18 +126,21 @@ export function RecentGroupListCard({
              </span>
            </div>
            <div className="text-muted-foreground font-normal text-xs">
-              {details ? (
+              {groupDetail ? (
                <div className="w-full flex items-center justify-between">
                  <div className="flex items-center">
                    <Users className="w-3 h-3 inline mr-1" />
-                    <span>{details._count.participants}</span>
+                    <span>{groupDetail._count.participants}</span>
                  </div>
                  <div className="flex items-center">
                    <Calendar className="w-3 h-3 inline mx-1" />
                    <span>
-                      {new Date(details.createdAt).toLocaleDateString(locale, {
-                        dateStyle: 'medium',
-                      })}
+                      {new Date(groupDetail.createdAt).toLocaleDateString(
+                        locale,
+                        {
+                          dateStyle: 'medium',
+                        },
+                      )}
                    </span>
                  </div>
                </div>
--- a/src/app/groups/recent-group-list.tsx
+++ b/src/app/groups/recent-group-list.tsx
@@ -1,5 +1,4 @@
 'use client'
-import { getGroupsAction } from '@/app/groups/actions'
 import { AddGroupByUrlButton } from '@/app/groups/add-group-by-url-button'
 import {
  RecentGroups,
@@ -9,10 +8,12 @@ import {
 } from '@/app/groups/recent-groups-helpers'
 import { Button } from '@/components/ui/button'
 import { getGroups } from '@/lib/api'
+import { trpc } from '@/trpc/client'
+import { AppRouterOutput } from '@/trpc/routers/_app'
 import { Loader2 } from 'lucide-react'
 import { useTranslations } from 'next-intl'
 import Link from 'next/link'
-import { PropsWithChildren, SetStateAction, useEffect, useState } from 'react'
+import { PropsWithChildren, useEffect, useState } from 'react'
 import { RecentGroupListCard } from './recent-group-list-card'

 export type RecentGroupsState =
@@ -31,16 +32,22 @@ export type RecentGroupsState =
      archivedGroups: string[]
    }

-function sortGroups(
-  state: RecentGroupsState & { status: 'complete' | 'partial' },
-) {
+function sortGroups({
+  groups,
+  starredGroups,
+  archivedGroups,
+}: {
+  groups: RecentGroups
+  starredGroups: string[]
+  archivedGroups: string[]
+}) {
  const starredGroupInfo = []
  const groupInfo = []
  const archivedGroupInfo = []
-  for (const group of state.groups) {
-    if (state.starredGroups.includes(group.id)) {
+  for (const group of groups) {
+    if (starredGroups.includes(group.id)) {
      starredGroupInfo.push(group)
-    } else if (state.archivedGroups.includes(group.id)) {
+    } else if (archivedGroups.includes(group.id)) {
      archivedGroupInfo.push(group)
    } else {
      groupInfo.push(group)
@@ -54,7 +61,6 @@ function sortGroups(
 }

 export function RecentGroupList() {
-  const t = useTranslations('Groups')
  const [state, setState] = useState<RecentGroupsState>({ status: 'pending' })

  function loadGroups() {
@@ -67,24 +73,43 @@ export function RecentGroupList() {
      starredGroups,
      archivedGroups,
    })
-    getGroupsAction(groupsInStorage.map((g) => g.id)).then((groupsDetails) => {
-      setState({
-        status: 'complete',
-        groups: groupsInStorage,
-        groupsDetails,
-        starredGroups,
-        archivedGroups,
-      })
-    })
  }

  useEffect(() => {
    loadGroups()
  }, [])

-  if (state.status === 'pending') {
+  if (state.status === 'pending') return null
+
+  return (
+    <RecentGroupList_
+      groups={state.groups}
+      starredGroups={state.starredGroups}
+      archivedGroups={state.archivedGroups}
+      refreshGroupsFromStorage={() => loadGroups()}
+    />
+  )
+}
+
+function RecentGroupList_({
+  groups,
+  starredGroups,
+  archivedGroups,
+  refreshGroupsFromStorage,
+}: {
+  groups: RecentGroups
+  starredGroups: string[]
+  archivedGroups: string[]
+  refreshGroupsFromStorage: () => void
+}) {
+  const t = useTranslations('Groups')
+  const { data, isLoading } = trpc.groups.list.useQuery({
+    groupIds: groups.map((group) => group.id),
+  })
+
+  if (isLoading || !data) {
    return (
-      <GroupsPage reload={loadGroups}>
+      <GroupsPage reload={refreshGroupsFromStorage}>
        <p>
          <Loader2 className="w-4 m-4 mr-2 inline animate-spin" />{' '}
          {t('loadingRecent')}
@@ -93,9 +118,9 @@ export function RecentGroupList() {
    )
  }

-  if (state.groups.length === 0) {
+  if (data.groups.length === 0) {
    return (
-      <GroupsPage reload={loadGroups}>
+      <GroupsPage reload={refreshGroupsFromStorage}>
        <div className="text-sm space-y-2">
          <p>{t('NoRecent.description')}</p>
          <p>
@@ -109,17 +134,23 @@ export function RecentGroupList() {
    )
  }

-  const { starredGroupInfo, groupInfo, archivedGroupInfo } = sortGroups(state)
+  const { starredGroupInfo, groupInfo, archivedGroupInfo } = sortGroups({
+    groups,
+    starredGroups,
+    archivedGroups,
+  })

  return (
-    <GroupsPage reload={loadGroups}>
+    <GroupsPage reload={refreshGroupsFromStorage}>
      {starredGroupInfo.length > 0 && (
        <>
          <h2 className="mb-2">{t('starred')}</h2>
          <GroupList
            groups={starredGroupInfo}
-            state={state}
-            setState={setState}
+            groupDetails={data.groups}
+            archivedGroups={archivedGroups}
+            starredGroups={starredGroups}
+            refreshGroupsFromStorage={refreshGroupsFromStorage}
          />
        </>
      )}
@@ -127,7 +158,13 @@ export function RecentGroupList() {
      {groupInfo.length > 0 && (
        <>
          <h2 className="mt-6 mb-2">{t('recent')}</h2>
-          <GroupList groups={groupInfo} state={state} setState={setState} />
+          <GroupList
+            groups={groupInfo}
+            groupDetails={data.groups}
+            archivedGroups={archivedGroups}
+            starredGroups={starredGroups}
+            refreshGroupsFromStorage={refreshGroupsFromStorage}
+          />
        </>
      )}

@@ -137,8 +174,10 @@ export function RecentGroupList() {
          <div className="opacity-50">
            <GroupList
              groups={archivedGroupInfo}
-              state={state}
-              setState={setState}
+              groupDetails={data.groups}
+              archivedGroups={archivedGroups}
+              starredGroups={starredGroups}
+              refreshGroupsFromStorage={refreshGroupsFromStorage}
            />
          </div>
        </>
@@ -149,12 +188,16 @@ export function RecentGroupList() {

 function GroupList({
  groups,
-  state,
-  setState,
+  groupDetails,
+  starredGroups,
+  archivedGroups,
+  refreshGroupsFromStorage,
 }: {
  groups: RecentGroups
-  state: RecentGroupsState
-  setState: (state: SetStateAction<RecentGroupsState>) => void
+  groupDetails?: AppRouterOutput['groups']['list']['groups']
+  starredGroups: string[]
+  archivedGroups: string[]
+  refreshGroupsFromStorage: () => void
 }) {
  return (
    <ul className="grid gap-2 sm:grid-cols-2">
@@ -162,8 +205,12 @@ function GroupList({
        <RecentGroupListCard
          key={group.id}
          group={group}
-          state={state}
-          setState={setState}
+          groupDetail={groupDetails?.find(
+            (groupDetail) => groupDetail.id === group.id,
+          )}
+          isStarred={starredGroups.includes(group.id)}
+          isArchived={archivedGroups.includes(group.id)}
+          refreshGroupsFromStorage={refreshGroupsFromStorage}
        />
      ))}
    </ul>
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,7 @@ import { ThemeToggle } from '@/components/theme-toggle'
 import { Button } from '@/components/ui/button'
 import { Toaster } from '@/components/ui/toaster'
 import { env } from '@/lib/env'
+import { TRPCProvider } from '@/trpc/client'
 import type { Metadata, Viewport } from 'next'
 import { NextIntlClientProvider, useTranslations } from 'next-intl'
 import { getLocale, getMessages } from 'next-intl/server'
@@ -65,7 +66,7 @@ export const viewport: Viewport = {
 function Content({ children }: { children: React.ReactNode }) {
  const t = useTranslations()
  return (
-    <>
+    <TRPCProvider>
      <header className="fixed top-0 left-0 right-0 h-16 flex justify-between bg-white dark:bg-gray-950 bg-opacity-50 dark:bg-opacity-50 p-2 border-b backdrop-blur-sm z-50">
        <Link
          className="flex items-center gap-2 hover:scale-105 transition-transform"
@@ -142,7 +143,7 @@ function Content({ children }: { children: React.ReactNode }) {
        </div>
      </footer>
      <Toaster />
-    </>
+    </TRPCProvider>
  )
 }

--- a/src/components/delete-popup.tsx
+++ b/src/components/delete-popup.tsx
@@ -1,5 +1,3 @@
-'use client'
-
 import { Trash2 } from 'lucide-react'
 import { useTranslations } from 'next-intl'
 import { AsyncButton } from './async-button'
--- a/src/components/group-form.tsx
+++ b/src/components/group-form.tsx
@@ -1,4 +1,3 @@
-'use client'
 import { SubmitButton } from '@/components/submit-button'
 import { Button } from '@/components/ui/button'
 import {
@@ -68,7 +67,7 @@ export function GroupForm({
      : {
          name: '',
          information: '',
-          currency: '',
+          currency: process.env.NEXT_PUBLIC_DEFAULT_CURRENCY_SYMBOL || '',
          participants: [
            { name: t('Participants.John') },
            { name: t('Participants.Jane') },
@@ -175,7 +174,7 @@ export function GroupForm({
                    <FormLabel>{t('InformationField.label')}</FormLabel>
                    <FormControl>
                      <Textarea
-                        rows={10}
+                        rows={2}
                        className="text-base"
                        {...field}
                        placeholder={t('InformationField.placeholder')}
--- a/src/components/locale-switcher.tsx
+++ b/src/components/locale-switcher.tsx
@@ -7,24 +7,26 @@ import {
  DropdownMenuItem,
  DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
-import { locales } from '@/i18n'
+import { Locale, localeLabels } from '@/i18n'
 import { setUserLocale } from '@/lib/locale'
-import { useLocale, useTranslations } from 'next-intl'
+import { useLocale } from 'next-intl'

 export function LocaleSwitcher() {
-  const t = useTranslations('Locale')
-  const locale = useLocale()
+  const locale = useLocale() as Locale
  return (
    <DropdownMenu>
      <DropdownMenuTrigger asChild>
        <Button variant="ghost" size="sm" className="-my-3 text-primary">
-          <span>{t(locale)}</span>
+          <span>{localeLabels[locale]}</span>
        </Button>
      </DropdownMenuTrigger>
      <DropdownMenuContent>
-        {locales.map((locale) => (
-          <DropdownMenuItem key={locale} onClick={() => setUserLocale(locale)}>
-            {t(locale)}
+        {Object.entries(localeLabels).map(([locale, label]) => (
+          <DropdownMenuItem
+            key={locale}
+            onClick={() => setUserLocale(locale as Locale)}
+          >
+            {label}
          </DropdownMenuItem>
        ))}
      </DropdownMenuContent>
--- a/src/i18n.ts
+++ b/src/i18n.ts
@@ -1,17 +1,25 @@
 import { getRequestConfig } from 'next-intl/server'
 import { getUserLocale } from './lib/locale'

-export const locales = [
-  'en-US',
-  'fi',
-  'fr-FR',
-  'es',
-  'de-DE',
-  'zh-CN',
-  'ru-RU',
-  'it-IT',
-] as const
-export type Locale = (typeof locales)[number]
+export const localeLabels = {
+  'en-US': 'English',
+  fi: 'Suomi',
+  'fr-FR': 'Français',
+  es: 'Español',
+  'de-DE': 'Deutsch',
+  'zh-CN': '简体中文',
+  'zh-TW': '正體中文',
+  'pl-PL': 'Polski',
+  'ru-RU': 'Русский',
+  'it-IT': 'Italiano',
+  'ua-UA': 'Українська',
+  ro: 'Română',
+} as const
+
+export const locales: (keyof typeof localeLabels)[] = Object.keys(
+  localeLabels,
+) as any
+export type Locale = keyof typeof localeLabels
 export type Locales = ReadonlyArray<Locale>
 export const defaultLocale: Locale = 'en-US'

--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -267,7 +267,7 @@ export async function getCategories() {

 export async function getGroupExpenses(
  groupId: string,
-  options?: { offset: number; length: number },
+  options?: { offset?: number; length?: number; filter?: string },
 ) {
  return prisma.expense.findMany({
    select: {
@@ -286,8 +286,14 @@ export async function getGroupExpenses(
      },
      splitMode: true,
      title: true,
+      _count: { select: { documents: true } },
+    },
+    where: {
+      groupId,
+      title: options?.filter
+        ? { contains: options.filter, mode: 'insensitive' }
+        : undefined,
    },
-    where: { groupId },
    orderBy: [{ expenseDate: 'desc' }, { createdAt: 'desc' }],
    skip: options && options.offset,
    take: options && options.length,
@@ -305,11 +311,34 @@ export async function getExpense(groupId: string, expenseId: string) {
  })
 }

-export async function getActivities(groupId: string) {
-  return prisma.activity.findMany({
+export async function getActivities(
+  groupId: string,
+  options?: { offset?: number; length?: number },
+) {
+  const activities = await prisma.activity.findMany({
    where: { groupId },
    orderBy: [{ time: 'desc' }],
+    skip: options?.offset,
+    take: options?.length,
  })
+
+  const expenseIds = activities
+    .map((activity) => activity.expenseId)
+    .filter(Boolean)
+  const expenses = await prisma.expense.findMany({
+    where: {
+      groupId,
+      id: { in: expenseIds },
+    },
+  })
+
+  return activities.map((activity) => ({
+    ...activity,
+    expense:
+      activity.expenseId !== null
+        ? expenses.find((expense) => expense.id === activity.expenseId)
+        : undefined,
+  }))
 }

 export async function logActivity(
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -21,6 +21,7 @@ const envSchema = z
      interpretEnvVarAsBool,
      z.boolean().default(false),
    ),
+    NEXT_PUBLIC_DEFAULT_CURRENCY_SYMBOL: z.string().optional(),
    S3_UPLOAD_KEY: z.string().optional(),
    S3_UPLOAD_SECRET: z.string().optional(),
    S3_UPLOAD_BUCKET: z.string().optional(),
--- a/src/lib/hooks.ts
+++ b/src/lib/hooks.ts
@@ -52,12 +52,14 @@ export function useBaseUrl() {
 /**
 * @returns The active user, or `null` until it is fetched from local storage
 */
-export function useActiveUser(groupId: string) {
+export function useActiveUser(groupId?: string) {
  const [activeUser, setActiveUser] = useState<string | null>(null)

  useEffect(() => {
-    const activeUser = localStorage.getItem(`${groupId}-activeUser`)
-    if (activeUser) setActiveUser(activeUser)
+    if (groupId) {
+      const activeUser = localStorage.getItem(`${groupId}-activeUser`)
+      if (activeUser) setActiveUser(activeUser)
+    }
  }, [groupId])

  return activeUser
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -20,7 +20,6 @@ export function formatDate(
 ) {
  return date.toLocaleString(locale, {
    ...options,
-    timeZone: 'UTC',
  })
 }

--- a/src/trpc/client.tsx
+++ b/src/trpc/client.tsx
@@ -0,0 +1,62 @@
+'use client' // <-- to make sure we can mount the Provider from a server component
+import type { QueryClient } from '@tanstack/react-query'
+import { QueryClientProvider } from '@tanstack/react-query'
+import { httpBatchLink } from '@trpc/client'
+import { createTRPCReact } from '@trpc/react-query'
+import { useState } from 'react'
+import superjson from 'superjson'
+import { makeQueryClient } from './query-client'
+import type { AppRouter } from './routers/_app'
+
+export const trpc = createTRPCReact<AppRouter>()
+
+let clientQueryClientSingleton: QueryClient
+
+function getQueryClient() {
+  if (typeof window === 'undefined') {
+    // Server: always make a new query client
+    return makeQueryClient()
+  }
+  // Browser: use singleton pattern to keep the same query client
+  return (clientQueryClientSingleton ??= makeQueryClient())
+}
+
+export const trpcClient = getQueryClient()
+
+function getUrl() {
+  const base = (() => {
+    if (typeof window !== 'undefined') return ''
+    if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`
+    return 'http://localhost:3000'
+  })()
+  return `${base}/api/trpc`
+}
+
+export function TRPCProvider(
+  props: Readonly<{
+    children: React.ReactNode
+  }>,
+) {
+  // NOTE: Avoid useState when initializing the query client if you don't
+  //       have a suspense boundary between this and the code that may
+  //       suspend because React will throw away the client on the initial
+  //       render if it suspends and there is no boundary
+  const queryClient = getQueryClient()
+  const [trpcClient] = useState(() =>
+    trpc.createClient({
+      links: [
+        httpBatchLink({
+          transformer: superjson,
+          url: getUrl(),
+        }),
+      ],
+    }),
+  )
+  return (
+    <trpc.Provider client={trpcClient} queryClient={queryClient}>
+      <QueryClientProvider client={queryClient}>
+        {props.children}
+      </QueryClientProvider>
+    </trpc.Provider>
+  )
+}
--- a/src/trpc/init.ts
+++ b/src/trpc/init.ts
@@ -0,0 +1,25 @@
+import { initTRPC } from '@trpc/server'
+import { cache } from 'react'
+import superjson from 'superjson'
+
+export const createTRPCContext = cache(async () => {
+  /**
+   * @see: https://trpc.io/docs/server/context
+   */
+  return {}
+})
+
+// Avoid exporting the entire t-object
+// since it's not very descriptive.
+// For instance, the use of a t variable
+// is common in i18n libraries.
+const t = initTRPC.create({
+  /**
+   * @see https://trpc.io/docs/server/data-transformers
+   */
+  transformer: superjson,
+})
+
+// Base router and procedure helpers
+export const createTRPCRouter = t.router
+export const baseProcedure = t.procedure
--- a/src/trpc/query-client.ts
+++ b/src/trpc/query-client.ts
@@ -0,0 +1,21 @@
+import { defaultShouldDehydrateQuery, QueryClient } from '@tanstack/react-query'
+import superjson from 'superjson'
+
+export function makeQueryClient() {
+  return new QueryClient({
+    defaultOptions: {
+      queries: {
+        staleTime: 30 * 1000,
+      },
+      dehydrate: {
+        serializeData: superjson.serialize,
+        shouldDehydrateQuery: (query) =>
+          defaultShouldDehydrateQuery(query) ||
+          query.state.status === 'pending',
+      },
+      hydrate: {
+        deserializeData: superjson.deserialize,
+      },
+    },
+  })
+}
--- a/src/trpc/routers/_app.ts
+++ b/src/trpc/routers/_app.ts
@@ -0,0 +1,12 @@
+import { categoriesRouter } from '@/trpc/routers/categories'
+import { groupsRouter } from '@/trpc/routers/groups'
+import { inferRouterOutputs } from '@trpc/server'
+import { createTRPCRouter } from '../init'
+
+export const appRouter = createTRPCRouter({
+  groups: groupsRouter,
+  categories: categoriesRouter,
+})
+
+export type AppRouter = typeof appRouter
+export type AppRouterOutput = inferRouterOutputs<AppRouter>
--- a/src/trpc/routers/categories/index.ts
+++ b/src/trpc/routers/categories/index.ts
@@ -0,0 +1,6 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { listCategoriesProcedure } from '@/trpc/routers/categories/list.procedure'
+
+export const categoriesRouter = createTRPCRouter({
+  list: listCategoriesProcedure,
+})
--- a/src/trpc/routers/categories/list.procedure.ts
+++ b/src/trpc/routers/categories/list.procedure.ts
@@ -0,0 +1,6 @@
+import { getCategories } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+
+export const listCategoriesProcedure = baseProcedure.query(async () => {
+  return { categories: await getCategories() }
+})
--- a/src/trpc/routers/groups/activities/index.ts
+++ b/src/trpc/routers/groups/activities/index.ts
@@ -0,0 +1,6 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { listGroupActivitiesProcedure } from '@/trpc/routers/groups/activities/list.procedure'
+
+export const activitiesRouter = createTRPCRouter({
+  list: listGroupActivitiesProcedure,
+})
--- a/src/trpc/routers/groups/activities/list.procedure.ts
+++ b/src/trpc/routers/groups/activities/list.procedure.ts
@@ -0,0 +1,23 @@
+import { getActivities } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const listGroupActivitiesProcedure = baseProcedure
+  .input(
+    z.object({
+      groupId: z.string(),
+      cursor: z.number().optional().default(0),
+      limit: z.number().optional().default(5),
+    }),
+  )
+  .query(async ({ input: { groupId, cursor, limit } }) => {
+    const activities = await getActivities(groupId, {
+      offset: cursor,
+      length: limit + 1,
+    })
+    return {
+      activities: activities.slice(0, limit),
+      hasMore: !!activities[limit],
+      nextCursor: cursor + limit,
+    }
+  })
--- a/src/trpc/routers/groups/balances/index.ts
+++ b/src/trpc/routers/groups/balances/index.ts
@@ -0,0 +1,6 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { listGroupBalancesProcedure } from '@/trpc/routers/groups/balances/list.procedure'
+
+export const groupBalancesRouter = createTRPCRouter({
+  list: listGroupBalancesProcedure,
+})
--- a/src/trpc/routers/groups/balances/list.procedure.ts
+++ b/src/trpc/routers/groups/balances/list.procedure.ts
@@ -0,0 +1,19 @@
+import { getGroupExpenses } from '@/lib/api'
+import {
+  getBalances,
+  getPublicBalances,
+  getSuggestedReimbursements,
+} from '@/lib/balances'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const listGroupBalancesProcedure = baseProcedure
+  .input(z.object({ groupId: z.string().min(1) }))
+  .query(async ({ input: { groupId } }) => {
+    const expenses = await getGroupExpenses(groupId)
+    const balances = getBalances(expenses)
+    const reimbursements = getSuggestedReimbursements(balances)
+    const publicBalances = getPublicBalances(reimbursements)
+
+    return { balances: publicBalances, reimbursements }
+  })
--- a/src/trpc/routers/groups/create.procedure.ts
+++ b/src/trpc/routers/groups/create.procedure.ts
@@ -0,0 +1,15 @@
+import { createGroup } from '@/lib/api'
+import { groupFormSchema } from '@/lib/schemas'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const createGroupProcedure = baseProcedure
+  .input(
+    z.object({
+      groupFormValues: groupFormSchema,
+    }),
+  )
+  .mutation(async ({ input: { groupFormValues } }) => {
+    const group = await createGroup(groupFormValues)
+    return { groupId: group.id }
+  })
--- a/src/trpc/routers/groups/expenses/create.procedure.ts
+++ b/src/trpc/routers/groups/expenses/create.procedure.ts
@@ -0,0 +1,23 @@
+import { createExpense } from '@/lib/api'
+import { expenseFormSchema } from '@/lib/schemas'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const createGroupExpenseProcedure = baseProcedure
+  .input(
+    z.object({
+      groupId: z.string().min(1),
+      expenseFormValues: expenseFormSchema,
+      participantId: z.string().optional(),
+    }),
+  )
+  .mutation(
+    async ({ input: { groupId, expenseFormValues, participantId } }) => {
+      const expense = await createExpense(
+        expenseFormValues,
+        groupId,
+        participantId,
+      )
+      return { expenseId: expense.id }
+    },
+  )
--- a/src/trpc/routers/groups/expenses/delete.procedure.ts
+++ b/src/trpc/routers/groups/expenses/delete.procedure.ts
@@ -0,0 +1,16 @@
+import { deleteExpense } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const deleteGroupExpenseProcedure = baseProcedure
+  .input(
+    z.object({
+      expenseId: z.string().min(1),
+      groupId: z.string().min(1),
+      participantId: z.string().optional(),
+    }),
+  )
+  .mutation(async ({ input: { expenseId, groupId, participantId } }) => {
+    await deleteExpense(groupId, expenseId, participantId)
+    return {}
+  })
--- a/src/trpc/routers/groups/expenses/get.procedure.ts
+++ b/src/trpc/routers/groups/expenses/get.procedure.ts
@@ -0,0 +1,17 @@
+import { getExpense } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+
+export const getGroupExpenseProcedure = baseProcedure
+  .input(z.object({ groupId: z.string().min(1), expenseId: z.string().min(1) }))
+  .query(async ({ input: { groupId, expenseId } }) => {
+    const expense = await getExpense(groupId, expenseId)
+    if (!expense) {
+      throw new TRPCError({
+        code: 'NOT_FOUND',
+        message: 'Expense not found',
+      })
+    }
+    return { expense }
+  })
--- a/src/trpc/routers/groups/expenses/index.ts
+++ b/src/trpc/routers/groups/expenses/index.ts
@@ -0,0 +1,14 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { createGroupExpenseProcedure } from '@/trpc/routers/groups/expenses/create.procedure'
+import { deleteGroupExpenseProcedure } from '@/trpc/routers/groups/expenses/delete.procedure'
+import { getGroupExpenseProcedure } from '@/trpc/routers/groups/expenses/get.procedure'
+import { listGroupExpensesProcedure } from '@/trpc/routers/groups/expenses/list.procedure'
+import { updateGroupExpenseProcedure } from '@/trpc/routers/groups/expenses/update.procedure'
+
+export const groupExpensesRouter = createTRPCRouter({
+  list: listGroupExpensesProcedure,
+  get: getGroupExpenseProcedure,
+  create: createGroupExpenseProcedure,
+  update: updateGroupExpenseProcedure,
+  delete: deleteGroupExpenseProcedure,
+})
--- a/src/trpc/routers/groups/expenses/list.procedure.ts
+++ b/src/trpc/routers/groups/expenses/list.procedure.ts
@@ -0,0 +1,29 @@
+import { getGroupExpenses } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const listGroupExpensesProcedure = baseProcedure
+  .input(
+    z.object({
+      groupId: z.string().min(1),
+      cursor: z.number().optional(),
+      limit: z.number().optional(),
+      filter: z.string().optional(),
+    }),
+  )
+  .query(async ({ input: { groupId, cursor = 0, limit = 10, filter } }) => {
+    const expenses = await getGroupExpenses(groupId, {
+      offset: cursor,
+      length: limit + 1,
+      filter,
+    })
+    return {
+      expenses: expenses.slice(0, limit).map((expense) => ({
+        ...expense,
+        createdAt: new Date(expense.createdAt),
+        expenseDate: new Date(expense.expenseDate),
+      })),
+      hasMore: !!expenses[limit],
+      nextCursor: cursor + limit,
+    }
+  })
--- a/src/trpc/routers/groups/expenses/update.procedure.ts
+++ b/src/trpc/routers/groups/expenses/update.procedure.ts
@@ -0,0 +1,27 @@
+import { updateExpense } from '@/lib/api'
+import { expenseFormSchema } from '@/lib/schemas'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const updateGroupExpenseProcedure = baseProcedure
+  .input(
+    z.object({
+      expenseId: z.string().min(1),
+      groupId: z.string().min(1),
+      expenseFormValues: expenseFormSchema,
+      participantId: z.string().optional(),
+    }),
+  )
+  .mutation(
+    async ({
+      input: { expenseId, groupId, expenseFormValues, participantId },
+    }) => {
+      const expense = await updateExpense(
+        groupId,
+        expenseId,
+        expenseFormValues,
+        participantId,
+      )
+      return { expenseId: expense.id }
+    },
+  )
--- a/src/trpc/routers/groups/get.procedure.ts
+++ b/src/trpc/routers/groups/get.procedure.ts
@@ -0,0 +1,10 @@
+import { getGroup } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const getGroupProcedure = baseProcedure
+  .input(z.object({ groupId: z.string().min(1) }))
+  .query(async ({ input: { groupId } }) => {
+    const group = await getGroup(groupId)
+    return { group }
+  })
--- a/src/trpc/routers/groups/getDetails.procedure.ts
+++ b/src/trpc/routers/groups/getDetails.procedure.ts
@@ -0,0 +1,19 @@
+import { getGroup, getGroupExpensesParticipants } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { TRPCError } from '@trpc/server'
+import { z } from 'zod'
+
+export const getGroupDetailsProcedure = baseProcedure
+  .input(z.object({ groupId: z.string().min(1) }))
+  .query(async ({ input: { groupId } }) => {
+    const group = await getGroup(groupId)
+    if (!group) {
+      throw new TRPCError({
+        code: 'NOT_FOUND',
+        message: 'Group not found.',
+      })
+    }
+
+    const participantsWithExpenses = await getGroupExpensesParticipants(groupId)
+    return { group, participantsWithExpenses }
+  })
--- a/src/trpc/routers/groups/index.ts
+++ b/src/trpc/routers/groups/index.ts
@@ -0,0 +1,23 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { activitiesRouter } from '@/trpc/routers/groups/activities'
+import { groupBalancesRouter } from '@/trpc/routers/groups/balances'
+import { createGroupProcedure } from '@/trpc/routers/groups/create.procedure'
+import { groupExpensesRouter } from '@/trpc/routers/groups/expenses'
+import { getGroupProcedure } from '@/trpc/routers/groups/get.procedure'
+import { groupStatsRouter } from '@/trpc/routers/groups/stats'
+import { updateGroupProcedure } from '@/trpc/routers/groups/update.procedure'
+import { getGroupDetailsProcedure } from './getDetails.procedure'
+import { listGroupsProcedure } from './list.procedure'
+
+export const groupsRouter = createTRPCRouter({
+  expenses: groupExpensesRouter,
+  balances: groupBalancesRouter,
+  stats: groupStatsRouter,
+  activities: activitiesRouter,
+
+  get: getGroupProcedure,
+  getDetails: getGroupDetailsProcedure,
+  list: listGroupsProcedure,
+  create: createGroupProcedure,
+  update: updateGroupProcedure,
+})
--- a/src/trpc/routers/groups/list.procedure.ts
+++ b/src/trpc/routers/groups/list.procedure.ts
@@ -0,0 +1,14 @@
+import { getGroups } from '@/lib/api'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const listGroupsProcedure = baseProcedure
+  .input(
+    z.object({
+      groupIds: z.array(z.string().min(1)),
+    }),
+  )
+  .query(async ({ input: { groupIds } }) => {
+    const groups = await getGroups(groupIds)
+    return { groups }
+  })
--- a/src/trpc/routers/groups/stats/get.procedure.ts
+++ b/src/trpc/routers/groups/stats/get.procedure.ts
@@ -0,0 +1,35 @@
+import { getGroupExpenses } from '@/lib/api'
+import {
+  getTotalActiveUserPaidFor,
+  getTotalActiveUserShare,
+  getTotalGroupSpending,
+} from '@/lib/totals'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const getGroupStatsProcedure = baseProcedure
+  .input(
+    z.object({
+      groupId: z.string().min(1),
+      participantId: z.string().optional(),
+    }),
+  )
+  .query(async ({ input: { groupId, participantId } }) => {
+    const expenses = await getGroupExpenses(groupId)
+    const totalGroupSpendings = getTotalGroupSpending(expenses)
+
+    const totalParticipantSpendings =
+      participantId !== undefined
+        ? getTotalActiveUserPaidFor(participantId, expenses)
+        : undefined
+    const totalParticipantShare =
+      participantId !== undefined
+        ? getTotalActiveUserShare(participantId, expenses)
+        : undefined
+
+    return {
+      totalGroupSpendings,
+      totalParticipantSpendings,
+      totalParticipantShare,
+    }
+  })
--- a/src/trpc/routers/groups/stats/index.ts
+++ b/src/trpc/routers/groups/stats/index.ts
@@ -0,0 +1,6 @@
+import { createTRPCRouter } from '@/trpc/init'
+import { getGroupStatsProcedure } from '@/trpc/routers/groups/stats/get.procedure'
+
+export const groupStatsRouter = createTRPCRouter({
+  get: getGroupStatsProcedure,
+})
--- a/src/trpc/routers/groups/update.procedure.ts
+++ b/src/trpc/routers/groups/update.procedure.ts
@@ -0,0 +1,16 @@
+import { updateGroup } from '@/lib/api'
+import { groupFormSchema } from '@/lib/schemas'
+import { baseProcedure } from '@/trpc/init'
+import { z } from 'zod'
+
+export const updateGroupProcedure = baseProcedure
+  .input(
+    z.object({
+      groupId: z.string().min(1),
+      groupFormValues: groupFormSchema,
+      participantId: z.string().optional(),
+    }),
+  )
+  .mutation(async ({ input: { groupId, groupFormValues, participantId } }) => {
+    await updateGroup(groupId, groupFormValues, participantId)
+  })
Author	SHA1	Message	Date
Sebastien Castiel	9302a32f4c	Fix destructive color in dark mode (Fixes #268 )	2024-12-07 12:14:08 -05:00
Sebastien Castiel	98e2345bb9	Fix group export when name contains non-ASCII characters	2024-12-07 12:03:32 -05:00
Sébastien Beaury	5732f78e80	Fix UTC timezone used in activity tracker (#265 )	2024-12-07 11:55:02 -05:00
Yuvaraj Sai	72ad0a4c90	feat(expense-list): Display the attachment count only when the expense includes attachments (#267 ) * feat(expense-list): Display the attachment count only when the expense includes attachments * handle attachments - singular & plural * move documents count between amount and date * Remove label * Use document count only instead of whole document list --------- Co-authored-by: Sebastien Castiel <sebastien@castiel.me>	2024-12-07 11:53:14 -05:00
Sebastien Castiel	2c973f976f	Put locale labels outside of translations	2024-12-07 11:37:39 -05:00
icarusxxy	5374d9e9c7	[Translation] Add Traditional Chinese (zh-TW) (#260 ) * Add zh-TW translation file * Add zh-TW to other translations Co-authored-by: Yutung Chung <yutung.chung@d8ai.com>	2024-12-07 11:36:48 -05:00
Sebastian Goscinski	5111f3574f	Feature: Default currency symbol (#259 ) * Added a env parameter to define a default currency symbol * Fixed prettier formatting	2024-12-07 11:07:54 -05:00
Sebastien Castiel	4db788680e	Use tRPC for recent groups page (#253 ) * Use tRPC for recent groups page * Use tRPC for adding group by URL * Use tRPC for saving visited group * Group context	2024-10-20 17:50:52 -04:00
Sebastien Castiel	39c1a2ffc6	Fix languages in Romanian translation	2024-10-20 11:51:04 -04:00
stefansn	f5154393e2	Add Romanian translations (#248 ) * Add Romanian translations Create ro.json. * Add ro option. Add ro option. * Update ro.json * Prettier --------- Co-authored-by: Sebastien Castiel <sebastien@castiel.me>	2024-10-19 23:10:58 -04:00
Marco Sciuto	e9d583113a	Update it-IT.json (#245 )	2024-10-19 23:09:07 -04:00
Sebastien Castiel	21d0c02687	Use tRPC for expense form (#251 )	2024-10-19 22:59:47 -04:00
Sebastien Castiel	2281316d58	Use tRPC for group create form (#250 )	2024-10-19 21:48:17 -04:00
Sebastien Castiel	210c12b7ef	Use tRPC in other group pages (#249 ) * Use tRPC in group edition + group layout * Use tRPC in group modals * Use tRPC in group stats * Use tRPC in group activity	2024-10-19 21:29:53 -04:00
Sebastien Castiel	66e15e419e	Add tRPC, use it for group expenses, balances and information page (#246 ) * Add tRPC, use it for group expense list * Use tRPC for balances * Use tRPC in group information + better loading states	2024-10-19 17:42:11 -04:00
Paweł Kotiuk	727803ea5c	[translation] Add Polish language (#243 ) * Add polish translation file * Add polish to other translations	2024-10-14 19:19:59 -04:00
Thorsten Herfurtner	7add7efea2	Fix missing translation for expense title in expense-form when making a reinbursement (#244 )	2024-10-14 19:13:10 -04:00
bitgroestl	a7c80f65c3	fix Dockerfile (#206 ) Co-authored-by: samuel <samuel@t460.localdomain>	2024-10-14 19:11:50 -04:00
Serge D.	1e4edf7504	add ua-UA (#241 )	2024-10-11 17:10:04 -04:00
Maxco10	24053ca5ab	Update it-IT.json (#237 )	2024-10-11 17:07:28 -04:00