When switching wallets, the popover closes and returns to wrong view

[AGKDesigns]

When you change wallets, and the wallet selector closes, it always returns the user to the wallet screen. This can be jarring, jumping across the app because it's not where the user accessed the selector from.

We also cannot assume thats the screen they want to interact with the wallet in.

If I open from settings, swap wallets, it should return to settings.