Merge branch 'fix-havne-currencies-error' of https://github.com/cake-tech/cake_wallet into haven-update