fix: P4ADEV-3335 update logic of switch to expired (#309)

fix: P4ADEV-3335 update logic of switch to expired (#309) #330