Feature/react cart popup rebase