Bring back payment prompts on tip buttons; #597