is there a better way to handle this? _Originally posted by @AarshShah9 in https://github.com/CGC-2026/client/pull/4#discussion_r2670158751_