convert transactions show correct units on both sides of the transaction
Merge branch 'conversion' into testing