fix join wallet WIP
fix tests
Merge pull request #71 from matiu/bug/fix-loading3

Bug/fix loading3