Skip to content

Commit 6898f9f

Browse files
committed
#1448: fixed a merge conflict
1 parent d4ef909 commit 6898f9f

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/backend/src/utils/reimbursement-requests.utils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,6 @@ export const isAuthUserHeadOfFinance = (user: Prisma.UserGetPayload<typeof authU
230230
return user.teamAsHead?.teamId === process.env.FINANCE_TEAM_ID;
231231
};
232232

233-
const isTeamIdInList = (teamId: string, teamsList: Team[]) => {
234-
return teamsList.map((team) => team.teamId).includes(teamId);
235-
};
236-
237233
export const isUserAdminOrOnFinance = async (submitter: User) => {
238234
try {
239235
await validateUserIsPartOfFinanceTeam(submitter);
@@ -243,3 +239,7 @@ export const isUserAdminOrOnFinance = async (submitter: User) => {
243239
}
244240
}
245241
};
242+
243+
const isTeamIdInList = (teamId: string, teamsList: Team[]) => {
244+
return teamsList.map((team) => team.teamId).includes(teamId);
245+
};

0 commit comments

Comments
 (0)