Conleth I suggest you do as
@Puthea ****
reported above...
Just to be sure your UNDER CONSIDERATION stamp is closed properly.
Then you are covered to July 31 under the amnesty extension.
Immigration offices are OPEN tomorrow Friday May 1...
But...Immigration offices are closed both next Monday and Thursday as Thai Holidays..
Rereading your post...
Did you go to CW Immigration today April 30 ?