Your daughter can stand and sit without support now, so you can switch her from the bath tub to regular shower under your supervision.
If she's enjoying bathing in the bathtub, there is no reason to move out of it now.
If she is enjoying in the bath tub, you can use the bath tub. Why have a switch?
ma baby is 18months too. he has since stopped using the bath tub...