Merge branch 'feature/cash-flow-presentation'

# Conflicts:
#	myteamwallet_frontend_modern/src/app/features/team/cashbox/cashbox.ts
#	myteamwallet_frontend_modern/src/app/features/team/overview/overview.spec.ts
#	myteamwallet_frontend_modern/src/app/features/team/overview/overview.ts
This commit is contained in:
Bastian Wagner
2026-08-02 09:49:30 +02:00
23 changed files with 546 additions and 109 deletions

View File

@@ -176,7 +176,13 @@
<small>{{ activity.note }}</small>
}
</div>
<strong class="amount">{{ displayAmount(activity) | currency: 'EUR' }}</strong>
<strong>
<app-transaction-amount
[amount]="activity.amount"
[type]="activity.type"
[context]="activity.isTeamWalletTransaction ? 'team' : 'player'"
/>
</strong>
@if (canReverse(activity)) {
<button
mat-icon-button