Fix
- Samsung payment
- uid from api request
Merge branch 'hotfix/1.8.5'