Hello guys thanks for the suggestions. Iām back in Thailand now entering on 30 days tourist visa. The good news is I can still keep my visa but to exit the country within 30 days and come back with my old passport with the re entry permit. So the extension is still valid. šš»šš»šš»