SOC-3702 | Social-Notification - Refactor code on social-notification