From 100b7a9807cae92a0f76416351d085015873c711 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 11:42:21 +0100
Subject: [PATCH 01/19] adds autofocus to InputTextWithAction component

---
 .../src/lib/components/manage/ManageTokens.svelte        | 1 +
 .../src/lib/components/swap/SwapTokensList.svelte        | 1 +
 src/frontend/src/lib/components/ui/InputSearch.svelte    | 3 ++-
 .../src/lib/components/ui/InputTextWithAction.svelte     | 9 +++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index 38445ff478..a3f23c17d0 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -143,6 +143,7 @@
 		bind:filter
 		noMatch={noTokensMatch}
 		placeholder={$i18n.tokens.placeholder.search_token}
+		autofocus={window.innerWidth >= 1024}
 	/>
 </div>
 
diff --git a/src/frontend/src/lib/components/swap/SwapTokensList.svelte b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
index 4e64adb23c..83e8cdd81c 100644
--- a/src/frontend/src/lib/components/swap/SwapTokensList.svelte
+++ b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
@@ -40,6 +40,7 @@
 	bind:filter
 	noMatch={noTokensMatch}
 	placeholder={$i18n.tokens.placeholder.search_token}
+	autofocus={window.innerWidth >= 1024}
 />
 
 <div class="my-6 flex flex-col overflow-y-hidden sm:max-h-[26rem]">
diff --git a/src/frontend/src/lib/components/ui/InputSearch.svelte b/src/frontend/src/lib/components/ui/InputSearch.svelte
index 77398994c8..20edc2c849 100644
--- a/src/frontend/src/lib/components/ui/InputSearch.svelte
+++ b/src/frontend/src/lib/components/ui/InputSearch.svelte
@@ -7,9 +7,10 @@
 	export let filter = '';
 	export let noMatch = false;
 	export let placeholder: string;
+	export let autofocus = false;
 </script>
 
-<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder}>
+<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder} {autofocus}>
 	<svelte:fragment slot="inner-end">
 		{#if noMatch}
 			<button on:click={() => (filter = '')} aria-label={$i18n.core.text.clear_filter}>
diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 1016684a2b..be7496826e 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -1,11 +1,20 @@
 <script lang="ts">
 	import { Input } from '@dfinity/gix-components';
+	import { onMount } from 'svelte';
 
 	export let value = '';
 	export let name: string;
 	export let placeholder: string;
 	export let required = true;
 	export let testId: string | undefined = undefined;
+	export let autofocus = false;
+
+	onMount(() => {
+		if (autofocus) {
+			let component = document.querySelector(`input[name="${name}"]`);
+			component.focus();
+		}
+	});
 </script>
 
 <Input

From 7b7bd362ccb4b9a926df4823c433b739bcc49493 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 11:49:30 +0100
Subject: [PATCH 02/19] fix lint issues

---
 .../src/lib/components/ui/InputTextWithAction.svelte         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index be7496826e..499641dd38 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { Input } from '@dfinity/gix-components';
 	import { onMount } from 'svelte';
+	import { nonNullish } from '@dfinity/utils';
 
 	export let value = '';
 	export let name: string;
@@ -12,7 +13,9 @@
 	onMount(() => {
 		if (autofocus) {
 			let component = document.querySelector(`input[name="${name}"]`);
-			component.focus();
+			if (nonNullish(component)) {
+				component.focus();
+			}
 		}
 	});
 </script>

From 2c4b9fc3c0c63d9a7578008d2cbdc1eae8854bbf Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 10:51:36 +0000
Subject: [PATCH 03/19] =?UTF-8?q?=F0=9F=A4=96=20Apply=20formatting=20chang?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/lib/components/ui/InputTextWithAction.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 499641dd38..852ec814f9 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Input } from '@dfinity/gix-components';
-	import { onMount } from 'svelte';
 	import { nonNullish } from '@dfinity/utils';
+	import { onMount } from 'svelte';
 
 	export let value = '';
 	export let name: string;

From b673abe272072d2b8f2e0c7d6ad3b99ae27326f4 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 12:52:31 +0100
Subject: [PATCH 04/19] fix lint issues

---
 src/frontend/src/lib/components/ui/InputTextWithAction.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 852ec814f9..4030e6115d 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -12,7 +12,7 @@
 
 	onMount(() => {
 		if (autofocus) {
-			let component = document.querySelector(`input[name="${name}"]`);
+			let component = document.querySelector<HTMLInputElement>(`input[name="${name}"]`);
 			if (nonNullish(component)) {
 				component.focus();
 			}

From dc3fd9ba1ff28641c1a62a2b503af6ca8ed07ffe Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 13:34:01 +0100
Subject: [PATCH 05/19] adds device utils

---
 .../src/lib/components/manage/ManageTokens.svelte  |  3 ++-
 .../src/lib/components/swap/SwapTokensList.svelte  |  3 ++-
 src/frontend/src/lib/utils/device.utils.ts         | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 src/frontend/src/lib/utils/device.utils.ts

diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index a3f23c17d0..5bd257c7af 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -32,6 +32,7 @@
 	import type { SplTokenToggleable } from '$sol/types/spl-token-toggleable';
 	import { isTokenSplToggleable } from '$sol/utils/spl.utils';
 	import { isSolanaToken } from '$sol/utils/token.utils';
+	import { isDesktop } from '$lib/utils/device.utils';
 
 	const dispatch = createEventDispatcher();
 
@@ -143,7 +144,7 @@
 		bind:filter
 		noMatch={noTokensMatch}
 		placeholder={$i18n.tokens.placeholder.search_token}
-		autofocus={window.innerWidth >= 1024}
+		autofocus={isDesktop()}
 	/>
 </div>
 
diff --git a/src/frontend/src/lib/components/swap/SwapTokensList.svelte b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
index 83e8cdd81c..a8820f402f 100644
--- a/src/frontend/src/lib/components/swap/SwapTokensList.svelte
+++ b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
@@ -13,6 +13,7 @@
 	import { SWAP_CONTEXT_KEY, type SwapContext } from '$lib/stores/swap.store';
 	import type { Token } from '$lib/types/token';
 	import { filterTokens, pinTokensWithBalanceAtTop } from '$lib/utils/tokens.utils';
+	import { isDesktop } from '$lib/utils/device.utils';
 
 	const { sourceToken, destinationToken } = getContext<SwapContext>(SWAP_CONTEXT_KEY);
 
@@ -40,7 +41,7 @@
 	bind:filter
 	noMatch={noTokensMatch}
 	placeholder={$i18n.tokens.placeholder.search_token}
-	autofocus={window.innerWidth >= 1024}
+	autofocus={isDesktop()}
 />
 
 <div class="my-6 flex flex-col overflow-y-hidden sm:max-h-[26rem]">
diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
new file mode 100644
index 0000000000..870b177a84
--- /dev/null
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -0,0 +1,14 @@
+import { nonNullish } from '@dfinity/utils';
+
+export const isMobile = () => {
+	if ("userAgentData" in navigator && nonNullish(navigator.userAgentData)) {
+		const userAgentData: any = navigator.userAgentData;
+		return userAgentData.mobile;
+	}
+	const isTouchScreen = window.matchMedia("(any-pointer:coarse)").matches;
+	return isTouchScreen;
+};
+
+export const isDesktop = () => {
+	return !isMobile();
+}
\ No newline at end of file

From 8f5b407c5163393d5a63aee7447a6d74945f5ded Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 12:36:03 +0000
Subject: [PATCH 06/19] =?UTF-8?q?=F0=9F=A4=96=20Apply=20formatting=20chang?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/components/manage/ManageTokens.svelte |  2 +-
 .../lib/components/swap/SwapTokensList.svelte |  2 +-
 src/frontend/src/lib/utils/device.utils.ts    | 28 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index 5bd257c7af..783d43df58 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -25,6 +25,7 @@
 	import type { ExchangesData } from '$lib/types/exchange';
 	import type { Token } from '$lib/types/token';
 	import type { TokenToggleable } from '$lib/types/token-toggleable';
+	import { isDesktop } from '$lib/utils/device.utils';
 	import { replacePlaceholders } from '$lib/utils/i18n.utils';
 	import { filterTokensForSelectedNetwork } from '$lib/utils/network.utils';
 	import { filterTokens, pinEnabledTokensAtTop, sortTokens } from '$lib/utils/tokens.utils';
@@ -32,7 +33,6 @@
 	import type { SplTokenToggleable } from '$sol/types/spl-token-toggleable';
 	import { isTokenSplToggleable } from '$sol/utils/spl.utils';
 	import { isSolanaToken } from '$sol/utils/token.utils';
-	import { isDesktop } from '$lib/utils/device.utils';
 
 	const dispatch = createEventDispatcher();
 
diff --git a/src/frontend/src/lib/components/swap/SwapTokensList.svelte b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
index a8820f402f..1904a4f65e 100644
--- a/src/frontend/src/lib/components/swap/SwapTokensList.svelte
+++ b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
@@ -12,8 +12,8 @@
 	import { i18n } from '$lib/stores/i18n.store';
 	import { SWAP_CONTEXT_KEY, type SwapContext } from '$lib/stores/swap.store';
 	import type { Token } from '$lib/types/token';
-	import { filterTokens, pinTokensWithBalanceAtTop } from '$lib/utils/tokens.utils';
 	import { isDesktop } from '$lib/utils/device.utils';
+	import { filterTokens, pinTokensWithBalanceAtTop } from '$lib/utils/tokens.utils';
 
 	const { sourceToken, destinationToken } = getContext<SwapContext>(SWAP_CONTEXT_KEY);
 
diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index 870b177a84..a8a7661124 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -1,14 +1,14 @@
-import { nonNullish } from '@dfinity/utils';
-
-export const isMobile = () => {
-	if ("userAgentData" in navigator && nonNullish(navigator.userAgentData)) {
-		const userAgentData: any = navigator.userAgentData;
-		return userAgentData.mobile;
-	}
-	const isTouchScreen = window.matchMedia("(any-pointer:coarse)").matches;
-	return isTouchScreen;
-};
-
-export const isDesktop = () => {
-	return !isMobile();
-}
\ No newline at end of file
+import { nonNullish } from '@dfinity/utils';
+
+export const isMobile = () => {
+	if ('userAgentData' in navigator && nonNullish(navigator.userAgentData)) {
+		const userAgentData: any = navigator.userAgentData;
+		return userAgentData.mobile;
+	}
+	const isTouchScreen = window.matchMedia('(any-pointer:coarse)').matches;
+	return isTouchScreen;
+};
+
+export const isDesktop = () => {
+	return !isMobile();
+};

From 57abaf1484f9678e7a8ce68ddc00591983a70613 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 13:42:18 +0100
Subject: [PATCH 07/19] adds custom type

---
 src/frontend/src/lib/utils/device.utils.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index a8a7661124..ed00ed39b5 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -1,8 +1,12 @@
 import { nonNullish } from '@dfinity/utils';
 
+type UserAgentData = {
+	mobile: boolean;
+};
+
 export const isMobile = () => {
 	if ('userAgentData' in navigator && nonNullish(navigator.userAgentData)) {
-		const userAgentData: any = navigator.userAgentData;
+		const userAgentData: UserAgentData = navigator.userAgentData;
 		return userAgentData.mobile;
 	}
 	const isTouchScreen = window.matchMedia('(any-pointer:coarse)').matches;

From 64d61320f66b02c875a77a6fcff39932f8988e62 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 13:45:45 +0100
Subject: [PATCH 08/19] fixes lint issues

---
 src/frontend/src/lib/utils/device.utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index ed00ed39b5..a091c37162 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -1,13 +1,13 @@
 import { nonNullish } from '@dfinity/utils';
 
 type UserAgentData = {
-	mobile: boolean;
+	mobile?: boolean;
 };
 
 export const isMobile = () => {
 	if ('userAgentData' in navigator && nonNullish(navigator.userAgentData)) {
 		const userAgentData: UserAgentData = navigator.userAgentData;
-		return userAgentData.mobile;
+		return nonNullish(userAgentData.mobile) && userAgentData.mobile;
 	}
 	const isTouchScreen = window.matchMedia('(any-pointer:coarse)').matches;
 	return isTouchScreen;

From 0d9a3db8b5753adb1e1e5de5f6c02fba56eaa862 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 13:49:01 +0100
Subject: [PATCH 09/19] fixes lint issues

---
 src/frontend/src/lib/utils/device.utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index a091c37162..90797b30fc 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -1,8 +1,8 @@
 import { nonNullish } from '@dfinity/utils';
 
-type UserAgentData = {
+interface UserAgentData {
 	mobile?: boolean;
-};
+}
 
 export const isMobile = () => {
 	if ('userAgentData' in navigator && nonNullish(navigator.userAgentData)) {

From 2dd27315698c75ae29a407fc901c7fe4ab3d2751 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 27 Jan 2025 13:52:23 +0100
Subject: [PATCH 10/19] fixes lint issues

---
 src/frontend/src/lib/utils/device.utils.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index 90797b30fc..9b2a4fd527 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -13,6 +13,4 @@ export const isMobile = () => {
 	return isTouchScreen;
 };
 
-export const isDesktop = () => {
-	return !isMobile();
-};
+export const isDesktop = () => !isMobile();

From 3f3f438d907f5cb4ba8a5c362312ade93ea80799 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Wed, 29 Jan 2025 08:15:21 +0100
Subject: [PATCH 11/19] updates device.utils.ts

---
 src/frontend/src/lib/utils/device.utils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index 9b2a4fd527..f2891eeda1 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -10,7 +10,8 @@ export const isMobile = () => {
 		return nonNullish(userAgentData.mobile) && userAgentData.mobile;
 	}
 	const isTouchScreen = window.matchMedia('(any-pointer:coarse)').matches;
-	return isTouchScreen;
+	const isMouseScreen = window.matchMedia('(any-pointer:fine)').matches;
+	return isTouchScreen && !isMouseScreen;
 };
 
 export const isDesktop = () => !isMobile();

From a4e11d052887950da04926493c27cbc1aa0e1f2b Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Wed, 29 Jan 2025 08:50:11 +0100
Subject: [PATCH 12/19] adds return value

---
 src/frontend/src/lib/utils/device.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/utils/device.utils.ts b/src/frontend/src/lib/utils/device.utils.ts
index f2891eeda1..8b1e2dc667 100644
--- a/src/frontend/src/lib/utils/device.utils.ts
+++ b/src/frontend/src/lib/utils/device.utils.ts
@@ -4,7 +4,7 @@ interface UserAgentData {
 	mobile?: boolean;
 }
 
-export const isMobile = () => {
+export const isMobile = (): boolean => {
 	if ('userAgentData' in navigator && nonNullish(navigator.userAgentData)) {
 		const userAgentData: UserAgentData = navigator.userAgentData;
 		return nonNullish(userAgentData.mobile) && userAgentData.mobile;

From a0d9c87b76ccc868335ed41e76e0cb89535a3cf9 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Wed, 29 Jan 2025 09:32:34 +0100
Subject: [PATCH 13/19] implements test cases for the device utils

---
 .../src/tests/lib/utils/device.utils.spec.ts  | 127 ++++++++++++++++++
 1 file changed, 127 insertions(+)
 create mode 100644 src/frontend/src/tests/lib/utils/device.utils.spec.ts

diff --git a/src/frontend/src/tests/lib/utils/device.utils.spec.ts b/src/frontend/src/tests/lib/utils/device.utils.spec.ts
new file mode 100644
index 0000000000..c925ec6499
--- /dev/null
+++ b/src/frontend/src/tests/lib/utils/device.utils.spec.ts
@@ -0,0 +1,127 @@
+import { isDesktop, isMobile } from '$lib/utils/device.utils';
+
+describe('device.utils', () => {
+	describe('isMobile', () => {
+		it('should return true for mobile device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: true
+					}
+				},
+			});
+
+			expect(isMobile()).toBe(true);
+		});
+
+		it('should return false for desktop device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: false
+					}
+				},
+			});
+
+			expect(isMobile()).toBe(false);
+		});
+
+		it('should return true for mobile device checking the match media', () => {
+			Object.defineProperties(window, {
+				'navigator': {
+					writable: true,
+					value: {},
+				},
+				'matchMedia': {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:coarse)',
+					}))
+				}
+			});
+
+			expect(isMobile()).toBe(true);
+		});
+
+		it('should return false for desktop device checking the match media', () => {
+			Object.defineProperties(window, {
+				'navigator': {
+					writable: true,
+					value: {},
+				},
+				'matchMedia': {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:fine)',
+					}))
+				}
+			});
+
+			expect(isMobile()).toBe(false);
+		});
+	});
+
+	describe('isDesktop', () => {
+		it('should return false for mobile device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: true
+					}
+				},
+			});
+
+			expect(isDesktop()).toBe(false);
+		});
+
+		it('should return true for desktop device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: false
+					}
+				},
+			});
+
+			expect(isDesktop()).toBe(true);
+		});
+
+		it('should return false for mobile device checking the match media', () => {
+			Object.defineProperties(window, {
+				'navigator': {
+					writable: true,
+					value: {},
+				},
+				'matchMedia': {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:coarse)',
+					}))
+				}
+			});
+
+			expect(isDesktop()).toBe(false);
+		});
+
+		it('should return true for desktop device checking the match media', () => {
+			Object.defineProperties(window, {
+				'navigator': {
+					writable: true,
+					value: {},
+				},
+				'matchMedia': {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:fine)',
+					}))
+				}
+			});
+
+			expect(isDesktop()).toBe(true);
+		});
+	});
+});
\ No newline at end of file

From 329f42a351b55f47c6d44ceb34b486ea8969f79b Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Wed, 29 Jan 2025 09:34:29 +0100
Subject: [PATCH 14/19] removes unused code

---
 .../src/lib/components/manage/ManageTokens.svelte    |  2 --
 .../src/lib/components/swap/SwapTokensList.svelte    |  2 --
 .../src/lib/components/ui/InputSearch.svelte         |  3 +--
 .../src/lib/components/ui/InputTextWithAction.svelte | 12 ------------
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index 783d43df58..38445ff478 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -25,7 +25,6 @@
 	import type { ExchangesData } from '$lib/types/exchange';
 	import type { Token } from '$lib/types/token';
 	import type { TokenToggleable } from '$lib/types/token-toggleable';
-	import { isDesktop } from '$lib/utils/device.utils';
 	import { replacePlaceholders } from '$lib/utils/i18n.utils';
 	import { filterTokensForSelectedNetwork } from '$lib/utils/network.utils';
 	import { filterTokens, pinEnabledTokensAtTop, sortTokens } from '$lib/utils/tokens.utils';
@@ -144,7 +143,6 @@
 		bind:filter
 		noMatch={noTokensMatch}
 		placeholder={$i18n.tokens.placeholder.search_token}
-		autofocus={isDesktop()}
 	/>
 </div>
 
diff --git a/src/frontend/src/lib/components/swap/SwapTokensList.svelte b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
index 1904a4f65e..4e64adb23c 100644
--- a/src/frontend/src/lib/components/swap/SwapTokensList.svelte
+++ b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
@@ -12,7 +12,6 @@
 	import { i18n } from '$lib/stores/i18n.store';
 	import { SWAP_CONTEXT_KEY, type SwapContext } from '$lib/stores/swap.store';
 	import type { Token } from '$lib/types/token';
-	import { isDesktop } from '$lib/utils/device.utils';
 	import { filterTokens, pinTokensWithBalanceAtTop } from '$lib/utils/tokens.utils';
 
 	const { sourceToken, destinationToken } = getContext<SwapContext>(SWAP_CONTEXT_KEY);
@@ -41,7 +40,6 @@
 	bind:filter
 	noMatch={noTokensMatch}
 	placeholder={$i18n.tokens.placeholder.search_token}
-	autofocus={isDesktop()}
 />
 
 <div class="my-6 flex flex-col overflow-y-hidden sm:max-h-[26rem]">
diff --git a/src/frontend/src/lib/components/ui/InputSearch.svelte b/src/frontend/src/lib/components/ui/InputSearch.svelte
index 20edc2c849..77398994c8 100644
--- a/src/frontend/src/lib/components/ui/InputSearch.svelte
+++ b/src/frontend/src/lib/components/ui/InputSearch.svelte
@@ -7,10 +7,9 @@
 	export let filter = '';
 	export let noMatch = false;
 	export let placeholder: string;
-	export let autofocus = false;
 </script>
 
-<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder} {autofocus}>
+<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder}>
 	<svelte:fragment slot="inner-end">
 		{#if noMatch}
 			<button on:click={() => (filter = '')} aria-label={$i18n.core.text.clear_filter}>
diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 4030e6115d..1016684a2b 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -1,23 +1,11 @@
 <script lang="ts">
 	import { Input } from '@dfinity/gix-components';
-	import { nonNullish } from '@dfinity/utils';
-	import { onMount } from 'svelte';
 
 	export let value = '';
 	export let name: string;
 	export let placeholder: string;
 	export let required = true;
 	export let testId: string | undefined = undefined;
-	export let autofocus = false;
-
-	onMount(() => {
-		if (autofocus) {
-			let component = document.querySelector<HTMLInputElement>(`input[name="${name}"]`);
-			if (nonNullish(component)) {
-				component.focus();
-			}
-		}
-	});
 </script>
 
 <Input

From 80c2049abe9137c50556ebb3756ec0f4dd0a283b Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:36:25 +0000
Subject: [PATCH 15/19] =?UTF-8?q?=F0=9F=A4=96=20Apply=20formatting=20chang?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/tests/lib/utils/device.utils.spec.ts  | 254 +++++++++---------
 1 file changed, 127 insertions(+), 127 deletions(-)

diff --git a/src/frontend/src/tests/lib/utils/device.utils.spec.ts b/src/frontend/src/tests/lib/utils/device.utils.spec.ts
index c925ec6499..0684f6af8c 100644
--- a/src/frontend/src/tests/lib/utils/device.utils.spec.ts
+++ b/src/frontend/src/tests/lib/utils/device.utils.spec.ts
@@ -1,127 +1,127 @@
-import { isDesktop, isMobile } from '$lib/utils/device.utils';
-
-describe('device.utils', () => {
-	describe('isMobile', () => {
-		it('should return true for mobile device checking the navigator', () => {
-			Object.defineProperty(window, 'navigator', {
-				writable: true,
-				value: {
-					userAgentData: {
-						mobile: true
-					}
-				},
-			});
-
-			expect(isMobile()).toBe(true);
-		});
-
-		it('should return false for desktop device checking the navigator', () => {
-			Object.defineProperty(window, 'navigator', {
-				writable: true,
-				value: {
-					userAgentData: {
-						mobile: false
-					}
-				},
-			});
-
-			expect(isMobile()).toBe(false);
-		});
-
-		it('should return true for mobile device checking the match media', () => {
-			Object.defineProperties(window, {
-				'navigator': {
-					writable: true,
-					value: {},
-				},
-				'matchMedia': {
-					writable: true,
-					value: vi.fn().mockImplementation((query) => ({
-						matches: query === '(any-pointer:coarse)',
-					}))
-				}
-			});
-
-			expect(isMobile()).toBe(true);
-		});
-
-		it('should return false for desktop device checking the match media', () => {
-			Object.defineProperties(window, {
-				'navigator': {
-					writable: true,
-					value: {},
-				},
-				'matchMedia': {
-					writable: true,
-					value: vi.fn().mockImplementation((query) => ({
-						matches: query === '(any-pointer:fine)',
-					}))
-				}
-			});
-
-			expect(isMobile()).toBe(false);
-		});
-	});
-
-	describe('isDesktop', () => {
-		it('should return false for mobile device checking the navigator', () => {
-			Object.defineProperty(window, 'navigator', {
-				writable: true,
-				value: {
-					userAgentData: {
-						mobile: true
-					}
-				},
-			});
-
-			expect(isDesktop()).toBe(false);
-		});
-
-		it('should return true for desktop device checking the navigator', () => {
-			Object.defineProperty(window, 'navigator', {
-				writable: true,
-				value: {
-					userAgentData: {
-						mobile: false
-					}
-				},
-			});
-
-			expect(isDesktop()).toBe(true);
-		});
-
-		it('should return false for mobile device checking the match media', () => {
-			Object.defineProperties(window, {
-				'navigator': {
-					writable: true,
-					value: {},
-				},
-				'matchMedia': {
-					writable: true,
-					value: vi.fn().mockImplementation((query) => ({
-						matches: query === '(any-pointer:coarse)',
-					}))
-				}
-			});
-
-			expect(isDesktop()).toBe(false);
-		});
-
-		it('should return true for desktop device checking the match media', () => {
-			Object.defineProperties(window, {
-				'navigator': {
-					writable: true,
-					value: {},
-				},
-				'matchMedia': {
-					writable: true,
-					value: vi.fn().mockImplementation((query) => ({
-						matches: query === '(any-pointer:fine)',
-					}))
-				}
-			});
-
-			expect(isDesktop()).toBe(true);
-		});
-	});
-});
\ No newline at end of file
+import { isDesktop, isMobile } from '$lib/utils/device.utils';
+
+describe('device.utils', () => {
+	describe('isMobile', () => {
+		it('should return true for mobile device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: true
+					}
+				}
+			});
+
+			expect(isMobile()).toBe(true);
+		});
+
+		it('should return false for desktop device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: false
+					}
+				}
+			});
+
+			expect(isMobile()).toBe(false);
+		});
+
+		it('should return true for mobile device checking the match media', () => {
+			Object.defineProperties(window, {
+				navigator: {
+					writable: true,
+					value: {}
+				},
+				matchMedia: {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:coarse)'
+					}))
+				}
+			});
+
+			expect(isMobile()).toBe(true);
+		});
+
+		it('should return false for desktop device checking the match media', () => {
+			Object.defineProperties(window, {
+				navigator: {
+					writable: true,
+					value: {}
+				},
+				matchMedia: {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:fine)'
+					}))
+				}
+			});
+
+			expect(isMobile()).toBe(false);
+		});
+	});
+
+	describe('isDesktop', () => {
+		it('should return false for mobile device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: true
+					}
+				}
+			});
+
+			expect(isDesktop()).toBe(false);
+		});
+
+		it('should return true for desktop device checking the navigator', () => {
+			Object.defineProperty(window, 'navigator', {
+				writable: true,
+				value: {
+					userAgentData: {
+						mobile: false
+					}
+				}
+			});
+
+			expect(isDesktop()).toBe(true);
+		});
+
+		it('should return false for mobile device checking the match media', () => {
+			Object.defineProperties(window, {
+				navigator: {
+					writable: true,
+					value: {}
+				},
+				matchMedia: {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:coarse)'
+					}))
+				}
+			});
+
+			expect(isDesktop()).toBe(false);
+		});
+
+		it('should return true for desktop device checking the match media', () => {
+			Object.defineProperties(window, {
+				navigator: {
+					writable: true,
+					value: {}
+				},
+				matchMedia: {
+					writable: true,
+					value: vi.fn().mockImplementation((query) => ({
+						matches: query === '(any-pointer:fine)'
+					}))
+				}
+			});
+
+			expect(isDesktop()).toBe(true);
+		});
+	});
+});

From 7e359ff862836b7a813d58e38d94f88fbfd2dfc0 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Wed, 29 Jan 2025 10:04:22 +0100
Subject: [PATCH 16/19] adds auto select code

---
 .../src/lib/components/manage/ManageTokens.svelte    |  2 ++
 .../src/lib/components/swap/SwapTokensList.svelte    |  2 ++
 .../src/lib/components/ui/InputSearch.svelte         |  3 ++-
 .../src/lib/components/ui/InputTextWithAction.svelte | 12 ++++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index 38445ff478..783d43df58 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -25,6 +25,7 @@
 	import type { ExchangesData } from '$lib/types/exchange';
 	import type { Token } from '$lib/types/token';
 	import type { TokenToggleable } from '$lib/types/token-toggleable';
+	import { isDesktop } from '$lib/utils/device.utils';
 	import { replacePlaceholders } from '$lib/utils/i18n.utils';
 	import { filterTokensForSelectedNetwork } from '$lib/utils/network.utils';
 	import { filterTokens, pinEnabledTokensAtTop, sortTokens } from '$lib/utils/tokens.utils';
@@ -143,6 +144,7 @@
 		bind:filter
 		noMatch={noTokensMatch}
 		placeholder={$i18n.tokens.placeholder.search_token}
+		autofocus={isDesktop()}
 	/>
 </div>
 
diff --git a/src/frontend/src/lib/components/swap/SwapTokensList.svelte b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
index 4e64adb23c..1904a4f65e 100644
--- a/src/frontend/src/lib/components/swap/SwapTokensList.svelte
+++ b/src/frontend/src/lib/components/swap/SwapTokensList.svelte
@@ -12,6 +12,7 @@
 	import { i18n } from '$lib/stores/i18n.store';
 	import { SWAP_CONTEXT_KEY, type SwapContext } from '$lib/stores/swap.store';
 	import type { Token } from '$lib/types/token';
+	import { isDesktop } from '$lib/utils/device.utils';
 	import { filterTokens, pinTokensWithBalanceAtTop } from '$lib/utils/tokens.utils';
 
 	const { sourceToken, destinationToken } = getContext<SwapContext>(SWAP_CONTEXT_KEY);
@@ -40,6 +41,7 @@
 	bind:filter
 	noMatch={noTokensMatch}
 	placeholder={$i18n.tokens.placeholder.search_token}
+	autofocus={isDesktop()}
 />
 
 <div class="my-6 flex flex-col overflow-y-hidden sm:max-h-[26rem]">
diff --git a/src/frontend/src/lib/components/ui/InputSearch.svelte b/src/frontend/src/lib/components/ui/InputSearch.svelte
index 77398994c8..20edc2c849 100644
--- a/src/frontend/src/lib/components/ui/InputSearch.svelte
+++ b/src/frontend/src/lib/components/ui/InputSearch.svelte
@@ -7,9 +7,10 @@
 	export let filter = '';
 	export let noMatch = false;
 	export let placeholder: string;
+	export let autofocus = false;
 </script>
 
-<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder}>
+<InputTextWithAction name="filter" required={false} bind:value={filter} {placeholder} {autofocus}>
 	<svelte:fragment slot="inner-end">
 		{#if noMatch}
 			<button on:click={() => (filter = '')} aria-label={$i18n.core.text.clear_filter}>
diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 1016684a2b..4030e6115d 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -1,11 +1,23 @@
 <script lang="ts">
 	import { Input } from '@dfinity/gix-components';
+	import { nonNullish } from '@dfinity/utils';
+	import { onMount } from 'svelte';
 
 	export let value = '';
 	export let name: string;
 	export let placeholder: string;
 	export let required = true;
 	export let testId: string | undefined = undefined;
+	export let autofocus = false;
+
+	onMount(() => {
+		if (autofocus) {
+			let component = document.querySelector<HTMLInputElement>(`input[name="${name}"]`);
+			if (nonNullish(component)) {
+				component.focus();
+			}
+		}
+	});
 </script>
 
 <Input

From 1d645dd2168aed39987695ba7c1a7ea6ea9c8019 Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 3 Feb 2025 08:32:46 +0100
Subject: [PATCH 17/19] updates gix components dependency

---
 package-lock.json                                      |  8 ++++----
 package.json                                           |  2 +-
 .../src/lib/components/ui/InputTextWithAction.svelte   | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e41d2ba65a..38c6273a08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
 				"@dfinity/candid": "^2.1.2",
 				"@dfinity/ckbtc": "^3.1.6",
 				"@dfinity/cketh": "^3.4.3",
-				"@dfinity/gix-components": "^5.0.0-next-2024-12-10",
+				"@dfinity/gix-components": "^5.0.0-next-2025-01-31",
 				"@dfinity/ledger-icp": "^2.6.7",
 				"@dfinity/ledger-icrc": "^2.7.2",
 				"@dfinity/oisy-wallet-signer": "^0.1.4",
@@ -365,9 +365,9 @@
 			}
 		},
 		"node_modules/@dfinity/gix-components": {
-			"version": "5.0.0-next-2024-12-10",
-			"resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-5.0.0-next-2024-12-10.tgz",
-			"integrity": "sha512-rdKfTWSUnVYjr3XjtQbc3XwaG8RWAOAggeuAVmVH+Ds2D/+8O/bGVRdzt/nYVrntTULem221YalmWTU1FLZztg==",
+			"version": "5.0.0-next-2025-01-31",
+			"resolved": "https://registry.npmjs.org/@dfinity/gix-components/-/gix-components-5.0.0-next-2025-01-31.tgz",
+			"integrity": "sha512-BxovOvGP9cIRsBlzv2SoLL8V53jDHPVFKjojvsFbqnOoNHVwMZiK76e+ENCuBRO/aZ7AR24Y9UAQ0K0IztqeTg==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"dompurify": "^3.1.6",
diff --git a/package.json b/package.json
index eeb79e96c4..60996145a6 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
 		"@dfinity/candid": "^2.1.2",
 		"@dfinity/ckbtc": "^3.1.6",
 		"@dfinity/cketh": "^3.4.3",
-		"@dfinity/gix-components": "^5.0.0-next-2024-12-10",
+		"@dfinity/gix-components": "^5.0.0-next-2025-01-31",
 		"@dfinity/ledger-icp": "^2.6.7",
 		"@dfinity/ledger-icrc": "^2.7.2",
 		"@dfinity/oisy-wallet-signer": "^0.1.4",
diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 4030e6115d..41c16de47b 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -10,12 +10,11 @@
 	export let testId: string | undefined = undefined;
 	export let autofocus = false;
 
+	let inputElement;
+
 	onMount(() => {
-		if (autofocus) {
-			let component = document.querySelector<HTMLInputElement>(`input[name="${name}"]`);
-			if (nonNullish(component)) {
-				component.focus();
-			}
+		if (autofocus && nonNullish(inputElement)) {
+			inputElement.focus();
 		}
 	});
 </script>
@@ -30,6 +29,7 @@
 	autocomplete="off"
 	{testId}
 	on:nnsInput
+	bind:inputElement={inputElement}
 >
 	<slot name="inner-end" slot="inner-end" />
 </Input>

From 38837be488b6afa6a9f16a636ad328bc75551bd2 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2025 07:34:51 +0000
Subject: [PATCH 18/19] =?UTF-8?q?=F0=9F=A4=96=20Apply=20formatting=20chang?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/lib/components/ui/InputTextWithAction.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 41c16de47b..9f1c379134 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -29,7 +29,7 @@
 	autocomplete="off"
 	{testId}
 	on:nnsInput
-	bind:inputElement={inputElement}
+	bind:inputElement
 >
 	<slot name="inner-end" slot="inner-end" />
 </Input>

From 4c1771d79d0d3fd2b2e213476d3cc3509607398a Mon Sep 17 00:00:00 2001
From: AlessandroBonomo <bonomo.alessandro@yahoo.de>
Date: Mon, 3 Feb 2025 08:36:54 +0100
Subject: [PATCH 19/19] resolves lint issue

---
 src/frontend/src/lib/components/ui/InputTextWithAction.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
index 9f1c379134..dfc0db6d9d 100644
--- a/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
+++ b/src/frontend/src/lib/components/ui/InputTextWithAction.svelte
@@ -10,7 +10,7 @@
 	export let testId: string | undefined = undefined;
 	export let autofocus = false;
 
-	let inputElement;
+	let inputElement: HTMLInputElement | undefined;
 
 	onMount(() => {
 		if (autofocus && nonNullish(inputElement)) {