merge #546 #545 #541 into main

[marfavi]

546 #545 #541

[ghost]

👇 Click on the image for a new way to code review

#### [](https://app.codesee.io/r/reviews?pr=547&src=https%3A%2F%2Fgithub.com%2FAnalogIO%2Fcoffeecard_app) #### Legend

[marfavi]

Will rebase and merge after smoke test

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

:exclamation: No coverage uploaded for pull request base (main@57e5565). Click here to learn what that means.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## main #547 +/- ## ======================================= Coverage ? 72.85% ======================================= Files ? 130 Lines ? 1573 Branches ? 0 ======================================= Hits ? 1146 Misses ? 427 Partials ? 0 ``` | [Flag](https://app.codecov.io/gh/AnalogIO/coffeecard_app/pull/547/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AnalogIO) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/AnalogIO/coffeecard_app/pull/547/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AnalogIO) | `72.85% <0.00%> (?)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=AnalogIO#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.