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

This reverts commit 98935e0335e46834edf91b37f41be7691da9b5a6.
Revert "Revert "[Uptate Payment] - fix rate buy -> rate sell""

This reverts commit 4e4c497eef5bde0032822a951926f46b761a841b.
Merge remote-tracking branch 'origin/branch-3' into branch-8