Fix auto-dismiss of ShopViewController when completed payment