Oh yes! Good shout. I remember that same pain from 3 iPhones ago.
I have since moved all my 2FA to 1Password and have not had a problem since. It also makes it a lot easier to log in as it copies the 2FA code when you autofill the login.
2 exceptions:
- Office 365 as Microsoft unfortunately must have their own authentication standard, so I need their Authenticator app.
- 1Password itself which I have set up in same Microsoft Authenticator app, so I can’t lock myself out