Merge branch 'master' into set-EMAIL_TLS-true

backend/src/graphql/resolver/ContributionResolver.test.ts

@@ -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',
             }),

backend/src/graphql/resolver/util/findContributions.ts

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