I did show the customs my two I-797s when I returned to US in last July.
When I went to CBP today, they just want to confirm whether I showed my new I-797 at that time. I just said "yes I did" and they did not ask me any further question on that.
Anyway, they did fix it for me. Again, thank you very much for your help.
