The never ending potty training

Sam was doing really well before the "incident" I gave up even trying and put her back into diapers. She hasnt pooped in the potty at all but knows exactly when she is about to go. Her big thing now is to take her diaper off after she has gone pee, thankfully she doesnt do it after poo. So now her thing is to ask me to put a diaper on before she goes poo or pee so today I got really fed up because she literally took off her panties, asked for a diaper, peed then took the diaper off and put her panties back on. I yelled "that's it NO MORE DIAPERS" and ever since then she's peed and pooped on the pot so let's see if this lasts!