How do I get return key back instead of emoji (Oreo)
Hold down the comma button
Select GBoard
Select Preferences
Make sure Show Emoji Switch Key is on.


Although this solves this issue I am not 100% convinced this was how I got to this problem. Is there a gesture or something that caused this to switch?

source