refactor: toPunycodeURL uses href in logic

MetaMask · Jan 8, 2025 · 4c48863 · 4c48863
1 parent 3e2aac9
commit 4c48863
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/app/util/url/index.ts b/app/util/url/index.ts
@@ -50,12 +50,10 @@ function removePathTrailingSlash(path: string) {
 export const toPunycodeURL = (urlString: string) => {
   try {
     const url = new URL(urlString);
-    const punycodeHostname = punycode.toASCII(url.hostname);
-    const { protocol, port, search, hash } = url;
-    const pathname =
-      url.pathname === '/' && !urlString.endsWith('/') ? '' : url.pathname;
+    const punycodeUrl = punycode.toASCII(url.href);
+    const isWithoutEndSlash = url.pathname === '/' && !urlString.endsWith('/');
 
-    return `${protocol}//${punycodeHostname}${port}${pathname}${search}${hash}`;
+    return isWithoutEndSlash ? punycodeUrl.slice(0, -1) : punycodeUrl;
   } catch (err: unknown) {
     console.error(`Failed to convert URL to Punycode: ${err}`);
     return urlString;