refactor(app): Use currentState
for tip detection
#16904
Merged
currentState
for tip detection
#16904