Main to dev

[martincai8]

Description

Syncing main to dev since I've been pushing stuff to main directly because dev had the rewards stuff LOL

Other considerations

[github-actions[bot]]

Visit the preview URL for this PR (updated for commit d1d8685):

https://nwplus-ubc--pr632-main-x261679r.web.app

_{(expires Fri, 08 Nov 2024 04:19:53 GMT)}

_{🔥 via Firebase Hosting GitHub Action 🌎}

_{Sign: 8c7ea898e009e43455645bc310bcbccfc0f87e48}