If you think that's a shame, do check out Fairphone [0]. It's not completely modular, but it's trivial to replace the battery, screen and camera's without tools. See also their spare parts shop [1], all of which you can replace by yourself.
Coincidentally they just made some announcements on that [0].
> Right now, we’re hard at work to get Android 7.1 “Nougat” into the hands of existing and new Fairphone 2 users this summer.
Unfortunately:
> Now, you may be wondering, “why not Android 8, ‘Oreo’?”. Android 8 and 9 are entirely new levels of complexity from Android 7, far more different than 7 was to 6. Therefore, attempting the upgrade to 7 was the best option.
[0] https://www.fairphone.com [1] https://shop.fairphone.com/en/spare-parts/?ref=header