Resolve merge conflicts between 'remove-wallet-migration-code' and 'remodel'

[ekzyis]

Description

This fixes merge conflicts between the remove-wallet-migration-code and remodel branch.

So iiuc, when remove-wallet-migration-code is merged into master (#2552), this PR—essentially merging remove-wallet-migration-code into remodel—can be merged to resolve conflicts between remodel and master.

Or the other way around; if this PR is merged first and then #2552, there should also be no conflicts between remodel and master. 🤔

But we can ofc also just merge master into remodel if #2552 is merged first.

Checklist

Are your changes backward compatible? Please answer below:

tbd

On a scale of 1-10 how well and how have you QA'd this change and any features it might affect? Please answer below:

tbd

For frontend changes: Tested on mobile, light and dark mode? Please answer below:

n/a

Did you introduce any new environment variables? If so, call them out explicitly here:

no

Did you use AI for this? If so, how much did it assist you?

no

[ekzyis]

Closing because this only fixes merge conflicts with a single PR (#2552). I created one PR for all my proposed wallet changes now: #2572

IMO, we should just merge it into master and then merge master into remodel. You can let me know in advance when you merge it into master, then I can immediately fix merge conflicts between master and remodel myself.