Switched message text based on notification type and changed to async action