popup works
Merge branch 'hotfix/paymentupdate'