[TASK] Adapt refactoring of condition ViewHelpers