Fixed bug where button was still showing with no amount entered
Merge remote-tracking branch 'origin/dev' into dev