How can I transfer my Non B visa to a new passport after getting a new one in Vietnam?

I have one concern. I am from Vietnam and I am working in Bangkok with a Non B visa issued by Thai immigration in Bangkok, last month my passport was accidentally get wet , then my photo is blurry abit. I have no problem with it when I arrive Thailand (or other countries). But when I departed from my country, the immigration officer asked me should make new passport.

So I plan to go back to Vietnam next month, and will do it, but how can I transfer my current visa to the new one?

Once i get the new passport, will my current passport be voided?

I prefer to do new passport in Vietnam

Please kindly suggest, thanks alot