[Finishes #60828404] add type to components