That's correct - RAW 5e, Moon druids gain the ability to wildshape as a bonus action; they do not lose the ability to wildshape as an action. MoonMoon should be able to do either (or both) if desired, and they should be able to do it directly from one form to another, without reverting in between.