Refactor wallet trade assets