I believe the following solution could be helpful. I’ve made some modifications to your code, which you can review here: enter link description here.

Additionally, it’s generally a good practice to split your forms into two independent forms, each with its own validation schema. This approach ensures better scalability and manageability, especially if the number of input fields increases significantly or if the dependencies between tabs become more complex.

PS: This is a solution to address the issue mentioned in the post, not an enhancement or an explanation of how to improve it further.