Issues with Nginx & Argocd with basehref set

[ramanNarasimhan77]

Hello,
If I run argo-cd without basehref, I am able to select Helm repositories/Git Repositories on the Create new application screen and then argo-cd is able to auto-populate the folder or chart and version drop downs

However, if I run argo-cd with basehref set to /argo-cd. And setup http ingress for the UI with the url-rewites as described in the documentation - option-2-multiple-ingress-objects-and-hosts, & UI Basepath; I seem to be hitting this issue - URLs with special characters don't work in the presence of URL rewriting #5576

The URL in this case contains special characters (URL encoded helm repo url), and Nginx ingress controller is unable to parse it properly and extract the rewrite-target.

Wondering if anyone else has faced this issue?