refactor(app:): split return type conditions

[pi0]

🔗 Linked issue

❓ Type of change

• 📖 Documentation (updates to the documentation, readme, or JSdoc annotations)
• 🐞 Bug fix (a non-breaking change that fixes an issue)
• 👌 Enhancement (improving an existing functionality like performance)
• ✨ New feature (a non-breaking change that adds functionality)
• 🧹 Chore (updates to the build process or auxiliary tools and libraries)
• ⚠️ Breaking change (fix or feature that would cause existing functionality to change)

📚 Description

This is a minor refactor to improve app's return type handler to split if conditions. While working on several PRs, it was hard to maintained.

New refactor is also safer against edge conditions by making sure val is not falsy.

📝 Checklist

• I have linked an issue or discussion.
• I have updated the documentation accordingly.