From f9a276d96801b973b735c06cdf188236f503087e Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:28:35 +0700
Subject: [PATCH 1/4] fix: toPunycodeURL if no / specified at the end, do not
 display

---
 ui/pages/confirmations/utils/confirm.test.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/pages/confirmations/utils/confirm.test.ts b/ui/pages/confirmations/utils/confirm.test.ts
index 9a8b3d1a0f8a..4c09930addfb 100644
--- a/ui/pages/confirmations/utils/confirm.test.ts
+++ b/ui/pages/confirmations/utils/confirm.test.ts
@@ -93,8 +93,15 @@ describe('confirm util', () => {
       expect(toPunycodeURL('https://iոfura.io/gnosis')).toStrictEqual(
         'https://xn--ifura-dig.io/gnosis',
       );
+      expect(toPunycodeURL('https://iոfura.io')).toStrictEqual(
+        'https://xn--ifura-dig.io',
+      );
+      expect(toPunycodeURL('https://iոfura.io/')).toStrictEqual(
+        'https://xn--ifura-dig.io/',
+      );
+
       expect(toPunycodeURL('https://www.google.com')).toStrictEqual(
-        'https://www.google.com/',
+        'https://www.google.com',
       );
       expect(
         toPunycodeURL('https://iոfura.io/gnosis:5050?test=iոfura&foo=bar'),
@@ -102,7 +109,7 @@ describe('confirm util', () => {
         'https://xn--ifura-dig.io/gnosis:5050?test=i%D5%B8fura&foo=bar',
       );
       expect(toPunycodeURL('https://www.google.com')).toStrictEqual(
-        'https://www.google.com/',
+        'https://www.google.com',
       );
     });
   });

From c5285031a5b606ef570e231a1fa0c125b56d680c Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:29:09 +0700
Subject: [PATCH 2/4] test:fix: remove duplicate in toPunycodeURL

---
 ui/pages/confirmations/utils/confirm.test.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/pages/confirmations/utils/confirm.test.ts b/ui/pages/confirmations/utils/confirm.test.ts
index 4c09930addfb..a81b5959a916 100644
--- a/ui/pages/confirmations/utils/confirm.test.ts
+++ b/ui/pages/confirmations/utils/confirm.test.ts
@@ -99,10 +99,6 @@ describe('confirm util', () => {
       expect(toPunycodeURL('https://iոfura.io/')).toStrictEqual(
         'https://xn--ifura-dig.io/',
       );
-
-      expect(toPunycodeURL('https://www.google.com')).toStrictEqual(
-        'https://www.google.com',
-      );
       expect(
         toPunycodeURL('https://iոfura.io/gnosis:5050?test=iոfura&foo=bar'),
       ).toStrictEqual(

From 02c065d440a783ba5b24882019bf3ea323d66090 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:32:40 +0700
Subject: [PATCH 3/4] test: add network URL test in AddEthereumChain

---
 .../confirmation/templates/add-ethereum-chain.test.js            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
index 19f51b6fa798..50fb4a04e4c7 100644
--- a/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
+++ b/ui/pages/confirmations/confirmation/templates/add-ethereum-chain.test.js
@@ -159,6 +159,7 @@ describe('add-ethereum-chain confirmation', () => {
           "Attackers sometimes mimic sites by making small changes to the site address. Make sure you're interacting with the intended site before you continue. Punycode version: https://xn--ifura-dig.io/gnosis",
         ),
       ).toBeInTheDocument();
+      expect(getByText('https://iոfura.io/gnosis')).toBeInTheDocument();
     });
   });
 });

From 4d6948ef2238e49282b410c4bfbb970397b833d9 Mon Sep 17 00:00:00 2001
From: digiwand <20778143+digiwand@users.noreply.github.com>
Date: Wed, 18 Dec 2024 22:33:56 +0700
Subject: [PATCH 4/4] fix: toPunycodeURL if no / specified at the end, do not
 display pt 2

---
 ui/pages/confirmations/utils/confirm.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/pages/confirmations/utils/confirm.ts b/ui/pages/confirmations/utils/confirm.ts
index f464f51e8159..379d98728be2 100644
--- a/ui/pages/confirmations/utils/confirm.ts
+++ b/ui/pages/confirmations/utils/confirm.ts
@@ -80,7 +80,12 @@ export const isValidASCIIURL = (urlString?: string) => {
 
 export const toPunycodeURL = (urlString: string) => {
   try {
-    return new URL(urlString).href;
+    const url = new URL(urlString);
+    const { protocol, hostname, port, search, hash } = url;
+    const pathname =
+      url.pathname === '/' && !urlString.endsWith('/') ? '' : url.pathname;
+
+    return `${protocol}//${hostname}${port}${pathname}${search}${hash}`;
   } catch (err: unknown) {
     console.error(`Failed to convert URL to Punycode: ${err}`);
     return undefined;