Revert "Revert "[Uptate Payment] - fix rate buy -> rate sell""

This reverts commit 4e4c497eef5bde0032822a951926f46b761a841b.