Transition out of the swaddle first?

If your little one is sleeping in their own room at night, do you still swaddle them or did you wait to transition them to their room after you transitioned out of the swaddle? I plan to transition my little one to her room at night in the next month or two (getting to long for the bassinet) but wondering if I should transition out of the swaddle (Halo Sleepsack Swaddle) first.