Use computed variable instead of UseEffect

Use computed variable instead of UseEffect #949