refactoring bugfix related to wallet
refactor make transactions work again