Develop into Main (#284)

* Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Bump http-cache-semantics from 4.1.0 to 4.1.1 (#278) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump mongoose from 5.13.14 to 5.13.15 (#277) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump mongoose from 5.13.14 to 5.13.15 Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.14 to 5.13.15. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](Automattic/mongoose@5.13.14...5.13.15) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump cookiejar from 2.1.3 to 2.1.4 (#276) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump cookiejar from 2.1.3 to 2.1.4 Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump decode-uri-component from 0.2.0 to 0.2.2 (#269) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](SamVerschueren/decode-uri-component@v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Main back into develop (#280) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Sync dev with main (#281) * Develop into Main (#279) * Bump cross-fetch from 2.2.5 to 2.2.6 Bumps [cross-fetch](https://github.com/lquixada/cross-fetch) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Commits](lquixada/cross-fetch@v2.2.5...v2.2.6) --- updated-dependencies: - dependency-name: cross-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump next from 11.1.2 to 12.1.0 Bumps [next](https://github.com/vercel/next.js) from 11.1.2 to 12.1.0. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](vercel/next.js@v11.1.2...v12.1.0) --- updated-dependencies: - dependency-name: next dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump jose from 1.28.1 to 1.28.2 Bumps [jose](https://github.com/panva/jose) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/panva/jose/releases) - [Changelog](https://github.com/panva/jose/blob/v1.28.2/CHANGELOG.md) - [Commits](panva/jose@v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: jose dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Added bCard currency * Fix leftover merge conflict in yarn.lock * Update node for Vercel compatibility * Updated tagging functionality on web (#271) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export --------- Co-authored-by: Mofejesu1 <[email protected]> * Submit Notes Display (#272) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Display submission notes on bounty card * Remove Submission Notes ffrom Claim action --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> * Feature/improved mark paid (#275) * feat: bounty tagging * fix: remove db indexing to pass integration test * fix: tags display * feat: multiselect tag filter * chore: limit displayable tags * fix: renaming and duplicate removal * chore: center text in tooltip * Interim * Fix tag search bugs and add tag search test * Interim * Finish tag edit, fixing bugs * Defaulkt due date to 3-months to match bot * Fix saved search and URL bugs * Change default sort to Bounty Status and fix URL ascending/descending bug * Fix modal swapping bounties when rerender happens * Cleanup * Add tags to CSV export * Initial commit * Show errors in more detail, better refreshing * Refresh after bounties paid, allow 0 for reward amount * Refactor index, add mark paid/unpaid button, and fix rerendering bugs * Fix display of bounties to mark between exports * Fix refresh after mark paid and claim, and allow 0 on max reward * Add tests * Cleaning up * Fix failing test * Fix tests and merge issues --------- Signed-off-by: tescher <[email protected]> Co-authored-by: Mofejesu1 <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Bump json5 from 1.0.1 to 1.0.2 (#274) Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump express from 4.17.2 to 4.18.2 (#270) Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]> * Feature/repeating bounties (#283) * Remove templates from lsiting * Add repeats in the display * Update package.json with Node ^18.x.0 To get Vercel to work Signed-off-by: tescher <[email protected]> * Fixes for dependency version issues (#285) --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: tescher <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mofejesu1 <[email protected]>
BanklessDAO · Jun 20, 2023 · 9977340 · 9977340 · vercel · Jun 20, 2023
1 parent 6376e2b
commit 9977340
Show file tree

Hide file tree

Showing 19 changed files with 4,722 additions and 3,801 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,6 @@
     "markdown.preview.fontSize": 16,
     "terminal.integrated.fontSize": 16,
     "editor.fontSize": 14,
-    "editor.scrollbar.verticalScrollbarSize": 12
+    "editor.scrollbar.verticalScrollbarSize": 12,
+    "typescript.tsdk": "node_modules/typescript/lib"
 }
diff --git a/package.json b/package.json
@@ -38,5 +38,9 @@
   },
   "devDependencies": {
     "husky": "^7.0.1"
+  },
+  "resolutions": {
+    "**/@types/react": "^17.0.38"
   }
+
 }
diff --git a/packages/react-app/package.json b/packages/react-app/package.json
@@ -42,7 +42,7 @@
     "@hookform/resolvers": "^2.7.1",
     "@netlify/plugin-nextjs": "^3.8.0",
     "@testing-library/react-hooks": "^8.0.0",
-    "@types/mongoose-paginate-v2": "^1.4.1",
+    "@types/mongoose-paginate-v2": "~1.4.1",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
     "axios": "^0.24.0",
     "chakra-react-select": "^4.4.2",
@@ -53,7 +53,7 @@
     "framer-motion": "^4.1.17",
     "lint-staged": "^11.0.0",
     "mongo-cursor-pagination": "^7.6.1",
-    "mongoose": "^5.13.4",
+    "mongoose": "^5.13.15",
     "next": "^12.1.0",
     "next-auth": "4.0.0-next.26",
     "next-seo": "^4.26.0",
@@ -80,11 +80,11 @@
     "@testing-library/react-hooks": "^8.0.0",
     "@types/dompurify": "^2.3.3",
     "@types/enzyme": "^3.10.10",
-    "@types/jest": "^27.0.2",
+    "@types/jest": "~27.5.0",
     "@types/next-auth": "^3.15.0",
     "@types/node": "^16.4.7",
     "@types/nprogress": "^0.2.0",
-    "@types/react": "^17.0.14",
+    "@types/react": "^17.0.2",
     "@types/react-csv": "^1.1.2",
     "@types/react-datepicker": "^4.3.4",
     "@types/react-html-parser": "^2.0.2",
@@ -95,7 +95,7 @@
     "enzyme-to-json": "^3.6.2",
     "eslint": "^7.30.0",
     "eslint-config-next": "^11.0.1",
-    "jest": "^27.3.1",
+    "jest": "~27.5.0",
     "react-dom": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "ts-jest": "^27.0.7",

diff --git a/packages/react-app/setupTests.ts b/packages/react-app/setupTests.ts
@@ -3,3 +3,14 @@ import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import '@testing-library/jest-dom';
 
 configure({ adapter: new Adapter() });
+
+window.matchMedia = (query) => ({
+	matches: false,
+	media: query,
+	onchange: null,
+	addListener: jest.fn(),
+	removeListener: jest.fn(),
+	addEventListener: jest.fn(),
+	removeEventListener: jest.fn(),
+	dispatchEvent: jest.fn(),
+});
diff --git a/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx b/packages/react-app/src/components/pages/Bounties/Bounty/index.tsx
@@ -42,6 +42,7 @@ import { useRouter } from 'next/router';
 import { BountyMarkPaidButton } from './markPaid';
 import { WarningIcon } from '@chakra-ui/icons';
 import { useUser } from '@app/hooks/useUser';
+import { useBounty } from '@app/hooks/useBounties';
 
 type SetState<T extends any> = (arg: T) => void;
 
@@ -347,6 +348,9 @@ const BountyDetails = ({
 		? MiscUtils.shortDate(new Date(bounty.dueAt))
 		: 'unspecified';
 
+	const bountyTemplate: BountyCollection | null | undefined = bounty.repeatTemplateId ?
+		useBounty(bounty.repeatTemplateId).bounty : null;
+
 	return (
 		<Flex justifyItems={'center'} alignItems="center" flexWrap="wrap" width="100%" pl="2" pr="2">
 			<Flex flexWrap="wrap" alignItems="center" width="100%" pb="3">
@@ -476,6 +480,48 @@ const BountyDetails = ({
 					</Text>
 				</Box>
 			</Flex>
+			{bountyTemplate &&
+				<Flex flexWrap="wrap" alignItems="center" width="80%" pb="3">
+					<Box
+						width="120px"
+						display="inline-block"
+						justifyContent="flex-end"
+						alignItems="center"
+						pr="2"
+					>
+						<Heading size="sm" m={0}>
+							repeats every
+						</Heading>
+					</Box>
+					<Box pr="2">
+						<Text isTruncated={true} as="span" fontSize="sm">
+							{bountyTemplate.repeatDays?.toString() +
+							  (bountyTemplate.repeatDays > 1 ? ' days' : ' day')}
+						</Text>
+					</Box>
+					<Spacer />
+					<Box
+						width="120px"
+						display="inline-block"
+						justifyContent="flex-end"
+						alignItems="center"
+						pr="2"
+						ml="2"
+					>
+						<Heading size="sm" m={0}>
+							{bountyTemplate.endRepeatsDate ? 'ending' : 'ending after'}
+						</Heading>
+					</Box>
+					<Box>
+						<Text as="span" fontSize="sm">
+							{bountyTemplate.endRepeatsDate ?
+								MiscUtils.shortDate(new Date(bountyTemplate.endRepeatsDate)) :
+								bountyTemplate.numRepeats.toString() + ' repeats'}
+						</Text>
+					</Box>
+
+				</Flex>
+			}
 			{bounty.tags &&
 				<Flex flexWrap="wrap" alignItems="center" width="100%" pb="3">
 					<Box

diff --git a/packages/react-app/src/components/pages/Bounties/Form/NewBountyForm.tsx b/packages/react-app/src/components/pages/Bounties/Form/NewBountyForm.tsx
@@ -32,6 +32,11 @@ const NotNeededFields = [
 	'isParent',
 	'parentId',
 	'childrenIds',
+	'isRepeatTemplate',
+	'repeatTemplateId',
+	'repeatDays',
+	'numRepeats',
+	'endRepeatsDate',
 	'assign',
 	'assignedName',
 	'assignTo',

diff --git a/packages/react-app/src/components/pages/Bounties/Form/index.tsx b/packages/react-app/src/components/pages/Bounties/Form/index.tsx
@@ -110,12 +110,12 @@ const Form = ({ bountyForm }: { bountyForm: any }): JSX.Element => {
 
 	return (
 		<form onSubmit={handleSubmit(onSubmit as SubmitHandler<JSON>)}>
-			<FormControl isInvalid={errors.title} mb={5}>
+			<FormControl isInvalid={Boolean(errors.title)} mb={5}>
 				<FormLabel htmlFor="title">Title</FormLabel>
 				<Input id="title" placeholder="title" {...register('title')} />
 				<FormErrorMessage>{errors.title?.message}</FormErrorMessage>
 			</FormControl>
-			<FormControl isInvalid={errors.description} mb={5}>
+			<FormControl isInvalid={Boolean(errors.description)} mb={5}>
 				<FormLabel htmlFor="description">Description</FormLabel>
 				<Textarea
 					id="description"
@@ -124,15 +124,15 @@ const Form = ({ bountyForm }: { bountyForm: any }): JSX.Element => {
 				/>
 				<FormErrorMessage>{errors.description?.message}</FormErrorMessage>
 			</FormControl>
-			<FormControl isInvalid={errors.criteria} mb={5}>
+			<FormControl isInvalid={Boolean(errors.criteria)} mb={5}>
 				<FormLabel htmlFor="criteria">Criteria</FormLabel>
 				<Textarea
 					id="criteria"
 					placeholder="criteria"
 					{...register('criteria')} />
 				<FormErrorMessage>{errors.criteria?.message}</FormErrorMessage>
 			</FormControl>
-			<FormControl isInvalid={errors.rewardAmount} mb={5}>
+			<FormControl isInvalid={Boolean(errors.rewardAmount)} mb={5}>
 				<FormLabel htmlFor="rewardAmount">Reward ($BANK)</FormLabel>
 				<Input
 					id="rewardAmount"

diff --git a/packages/react-app/src/hooks/useBounties.ts b/packages/react-app/src/hooks/useBounties.ts
@@ -39,10 +39,13 @@ export function useBounties(url: string, ready = true): useBountiesResponse {
 
 export function useBounty(id?: string | string[]): useBountyResponse {
 	const { customer } = useContext(CustomerContext);
+	console.log(`In useBounty id: ${id} customer: ${customer.customerId}`);
 	const { data, error } = useSWR<BountyCollection, unknown>(
 		id ? `/api/bounties/${id}` : null,
 		axiosFetcher
 	);
+	console.log(`Data: ${JSON.stringify(data)}`);
+	console.log(`Error: ${JSON.stringify(error)}`);
 	const mismatchedBounty = useMemo(() => {
 		return customer && data && customer.customerId !== data.customerId;
 	}, [customer, data]);

diff --git a/packages/react-app/src/models/Bounty.ts b/packages/react-app/src/models/Bounty.ts
@@ -201,6 +201,12 @@ export const BountySchema = object({
 	isParent: boolean().optional(),
 	parentId: string().optional().nullable(),
 	childrenIds: array(string()).optional(),
+	isRepeatTemplate: boolean().optional(),
+	repeatTemplateId: string().optional().nullable(),
+	repeatDays: number().optional(),
+	numRepeats: number().optional(),
+	endRepeatsDate: string().optional().nullable(),
+
 	assign: string().optional().nullable(),
 	assignedName: string().optional().nullable(),
 	assignTo: DiscordUser.optional().default(undefined),

diff --git a/packages/react-app/src/models/BountyDb.ts b/packages/react-app/src/models/BountyDb.ts
@@ -152,6 +152,23 @@ export const BountyBoardSchema = new mongoose.Schema({
 		type: Array,
 		default: undefined,
 	},
+	isRepeatTemplate: {
+		type: Boolean,
+	},
+	repeatTemplateId: {
+		type: String,
+	},
+	repeatDays: {
+		type: Number,
+	},
+	numRepeats: {
+		type: Number,
+	},
+	endRepeatsDate: {
+		type: String,
+	},
+
+
 	assign: {
 		type: String,
 	},

diff --git a/packages/react-app/src/pages/_app.tsx b/packages/react-app/src/pages/_app.tsx
@@ -14,6 +14,7 @@ import { CustomerContext } from '../context/CustomerContext';
 import { useTheme } from '@app/hooks/useTheme';
 import { useCustomer } from '@app/hooks/useCustomer';
 import AuthContextProvider from '@app/context/AuthContext';
+import { Session } from 'next-auth';
 
 Router.events.on('routeChangeStart', function() {
 	return NProgress.start();
@@ -30,16 +31,18 @@ Router.events.on('routeChangeError', function() {
 const MotionBox = motion(Box);
 
 function MyApp({
+	pageProps,
 	Component,
-	pageProps: { session, ...pageProps },
 	router,
-}: AppProps): JSX.Element {
+}: AppProps<{
+	session: Session
+}>): JSX.Element {
 	const { id, customerKey } = router.query;
 	const { customer, setCustomer } = useCustomer(id, customerKey);
 
 	const theme = useTheme(customer);
 	return (
-		<SessionProvider session={session}>
+		<SessionProvider session={pageProps.session}>
 			<CustomerContext.Provider value={{ customer, setCustomer }}>
 				<ChakraProvider resetCSS theme={theme}>
 					<AuthContextProvider>

diff --git a/packages/react-app/src/services/bounty.service.ts b/packages/react-app/src/services/bounty.service.ts
@@ -212,6 +212,16 @@ export const filterCustomerId = (
 	return query;
 };
 
+export const filterTemplates = (
+	query: FilterQuery<BountyCollection>
+): FilterQuery<BountyCollection> => {
+	/**
+   * Remove bounties not relating to the currently selected DAO
+   */
+	query['isRepeatTemplate'] = { $ne: true };
+	return query;
+};
+
 export const filterByUser = (
 	query: FilterQuery<BountyCollection>,
 	claimedBy: string | undefined,
@@ -295,6 +305,8 @@ export const getFilterQuery = (query: NextApiQuery): BountyQuery => {
 	});
 	filterQuery = filterByUser(filterQuery, claimedBy, createdBy);
 	filterQuery = filterTags(filterQuery, tags);
+	// For now, filter bounty templates
+	filterQuery = filterTemplates(filterQuery);
 	filterQuery = handleEmpty(filterQuery);
 
 	return { $match: filterQuery };
@@ -334,13 +346,13 @@ export const getBounties = async (
 	// Had to use a for loop so we didn't end up with a bunch of parallel db connections
 	if (aggregation && aggregation.results) {
 		const populatedResults = [];
-		for (const bounty of (aggregation.results as Array<BountyCollection>)) {
+		for (const bounty of (aggregation.results as unknown as Array<BountyCollection>)) {
 			populatedResults.push(await Bounty.populate(bounty, [{ path: 'payeeData' }]));
 		}
 		aggregation.results = populatedResults;
 	}
 
-	return aggregation;
+	return aggregation as unknown as Promise<PaginateResult<BountyCollection> | PaginateResult<[]>>;
 };
 
 export const getBounty = async (
@@ -350,6 +362,7 @@ export const getBounty = async (
    * @param id is a 24 character string, try to find it in the db
    * If the character !== 24 chars, or we can't find the bounty, return null
    */
+	console.log(`in API, id: ${id})`);
 	return id.length === 24 ? await Bounty.findById(id).populate('payeeData') : null;
 };
 

diff --git a/packages/react-app/src/types/Paginate.ts b/packages/react-app/src/types/Paginate.ts
@@ -38,7 +38,7 @@ export interface PaginateModel<
 }
 
 // extracting the callback type out for readability
-type PaginateCallback<T, TMethods, TVirtuals, Options> = (
+type PaginateCallback<T, TMethods, TVirtuals, Options extends PaginateOptions> = (
   err: any,
   result: PaginateResult<PaginateDocument<T, TMethods, TVirtuals, Options>>
 ) => void;
diff --git a/packages/react-app/src/types/Queries.ts b/packages/react-app/src/types/Queries.ts
@@ -1,6 +1,7 @@
 import type { AcceptedSortOutputs } from './Filter';
 
-export type NextApiQuery = Record<string, string | string[]>;
+// export type NextApiQuery = Record<string, string | string[]>;
+export type NextApiQuery = Partial<{ [key: string]: string | string[]; }>;
 
 export type Status =
   | 'Open'

diff --git a/packages/react-app/tests/integration/api/auth.spec.ts b/packages/react-app/tests/integration/api/auth.spec.ts
@@ -152,7 +152,6 @@ describe('Testing the Role Caching', () => {
 	});
 
 	it('Throws an error if we are missing a customer id', async () => {
-		// @ts-expect-error
 		req.query.customerId = undefined;
 
 		await roleHandler(req, res);

diff --git a/packages/react-app/tests/unit/services/bounty.service.spec.ts b/packages/react-app/tests/unit/services/bounty.service.spec.ts
@@ -153,6 +153,9 @@ describe('Testing the bounty service', () => {
 						$in: ['Open'],
 					},
 					customerId: 'testId',
+					'isRepeatTemplate': {
+					     '$ne': true,
+			    	},
 					$text: {
 						$search: 'Test',
 					},
@@ -187,6 +190,9 @@ describe('Testing the bounty service', () => {
 					$in: ['Open'],
 				},
 				customerId: 'testId',
+				'isRepeatTemplate': {
+					'$ne': true,
+				},
 				$text: {
 					$search: 'Test',
 				},

diff --git a/packages/react-app/tsconfig.jest.json b/packages/react-app/tsconfig.jest.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig",
   "compilerOptions": {
       "module": "commonjs",
-      "jsx": "react-jsx"
+      "jsx": "react-jsx",
+      "types": ["jest", "node"]
   }
 }
diff --git a/packages/react-app/tsconfig.json b/packages/react-app/tsconfig.json
@@ -26,6 +26,9 @@
       ],
       "@tests/*": [
         "tests/*"
+      ],
+      "react": [ 
+        "./node_modules/@types/react" 
       ]
     },
     "incremental": true