fix send button
Merge branch 'origin/dev'