Merge branch 'master' into 2613-Answer-moderator-question-clickable

This commit is contained in:
Alexander Friedland 2023-03-01 10:51:22 +01:00 committed by GitHub
commit 37a2dcb6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -2888,11 +2888,11 @@ describe('ContributionResolver', () => {
state: 'PENDING',
}),
expect.objectContaining({
amount: '200',
firstName: 'Bibi',
amount: '100',
firstName: 'Peter',
id: expect.any(Number),
lastName: 'Bloxberg',
memo: 'Aktives Grundeinkommen',
lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
state: 'PENDING',
}),

View File

@ -17,6 +17,7 @@ export const findContributions = async (
withDeleted: withDeleted,
order: {
createdAt: order,
id: order,
},
relations: ['user'],
skip: (currentPage - 1) * pageSize,