fixed js in transaction screen
Merge remote-tracking branch 'origin/master'