merge "fix/BuyButton" into "main"

FIX: Updated the buy button functionality to improve user experience and make it more like a real shop would