[#67779306] Update front-end effects for picking an item
Fix conflicts