Feature/select wallet on bip21

Closes #1722 
It this is intended to be commented out? Could you remove it?