Changed a few class components into functional

2 jobs for issue422 in 3 minutes and 1 second (queued for 3 seconds)
Status Job ID Name Coverage
  Test
passed #145201
Lint

00:01:23

passed #145202
Test

00:03:01