Consolidate the flow for local and remote wallet connections for consolidate. When unlocking a local wallet wait for the macaroon to be generated before we try to use it.