modal button text update
Remove unneccessary partial
mergefix
Update cancel order modal