Add popup
Remove TODO
Merge branch 'popup'
Add AlertDialog to SaleActivity