Transaction sort fixed
Merge branch 'sortTransactions'