From 7a9fffb89289688822d28aef0716a456aa6fe9b9 Mon Sep 17 00:00:00 2001
From: David Dal Busco <david.dalbusco@dfinity.org>
Date: Mon, 28 Oct 2024 08:26:42 +0100
Subject: [PATCH 1/2] feat(frontend): extract common input currency component
 (#3144)

# Motivation

Similarly to #3141, this PR extract a common input component for input
of type currency.

# Changes

- Create component and consume it.
---
 .../components/send/SendInputAmount.svelte    |  9 +++----
 .../lib/components/ui/InputCurrency.svelte    | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 src/frontend/src/lib/components/ui/InputCurrency.svelte

diff --git a/src/frontend/src/lib/components/send/SendInputAmount.svelte b/src/frontend/src/lib/components/send/SendInputAmount.svelte
index 4085f362b2..542e7441ca 100644
--- a/src/frontend/src/lib/components/send/SendInputAmount.svelte
+++ b/src/frontend/src/lib/components/send/SendInputAmount.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import { Input } from '@dfinity/gix-components';
 	import { debounce, isNullish, nonNullish } from '@dfinity/utils';
 	import type { BigNumber } from '@ethersproject/bignumber';
 	import { createEventDispatcher } from 'svelte';
 	import { slide } from 'svelte/transition';
 	import MaxButton from '$lib/components/common/MaxButton.svelte';
+	import InputCurrency from '$lib/components/ui/InputCurrency.svelte';
 	import { SLIDE_DURATION } from '$lib/constants/transition.constants';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { invalidAmount } from '$lib/utils/input.utils';
@@ -56,19 +56,16 @@
 </script>
 
 <label for="amount" class="px-4.5 font-bold">{$i18n.core.text.amount}</label>
-<Input
+<InputCurrency
 	name="amount"
-	inputType="currency"
-	required
 	bind:value={amount}
 	decimals={tokenDecimals}
 	{placeholder}
-	spellcheck={false}
 	testId="amount-input"
 	on:nnsInput={onInput}
 >
 	<MaxButton slot="inner-end" on:click={onMax} disabled={isNullish(calculateMax)} />
-</Input>
+</InputCurrency>
 
 {#if nonNullish(error)}
 	<p transition:slide={SLIDE_DURATION} class="pb-3 text-cyclamen">{error.message}</p>
diff --git a/src/frontend/src/lib/components/ui/InputCurrency.svelte b/src/frontend/src/lib/components/ui/InputCurrency.svelte
new file mode 100644
index 0000000000..393cdb1d53
--- /dev/null
+++ b/src/frontend/src/lib/components/ui/InputCurrency.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+	import { Input } from '@dfinity/gix-components';
+
+	export let value: number | undefined = undefined;
+	export let name: string;
+	export let placeholder: string;
+	export let required = true;
+	export let decimals: number | undefined = undefined;
+	export let testId: string | undefined = undefined;
+</script>
+
+<Input
+	{name}
+	inputType="currency"
+	{required}
+	bind:value
+	{decimals}
+	{placeholder}
+	spellcheck={false}
+	{testId}
+	on:nnsInput
+>
+	<slot name="inner-end" slot="inner-end" />
+</Input>

From 2f93aac9ebf788e67a4a952552914549e43fd720 Mon Sep 17 00:00:00 2001
From: David Dal Busco <david.dalbusco@dfinity.org>
Date: Mon, 28 Oct 2024 08:34:14 +0100
Subject: [PATCH 2/2] feat(frontend): extract common input text component
 (#3141)

# Motivation

I noticed that all input type `text` are similar. Given that I want to
add a property to all of them, I thought that we can get started by
extracting a common component.

# Changes

- create `InputText` for all text inputs and consume it
---
 .../src/eth/components/tokens/AddTokenForm.svelte  |  7 ++-----
 .../wallet-connect/WalletConnectForm.svelte        | 11 +++--------
 .../icp/components/tokens/IcAddTokenForm.svelte    | 12 +++---------
 .../src/lib/components/manage/ManageTokens.svelte  | 10 +++++-----
 .../components/send/SendInputDestination.svelte    | 14 +++-----------
 .../src/lib/components/ui/InputText.svelte         | 12 ++++++++++++
 6 files changed, 28 insertions(+), 38 deletions(-)
 create mode 100644 src/frontend/src/lib/components/ui/InputText.svelte

diff --git a/src/frontend/src/eth/components/tokens/AddTokenForm.svelte b/src/frontend/src/eth/components/tokens/AddTokenForm.svelte
index e6970bf632..d63e11a915 100644
--- a/src/frontend/src/eth/components/tokens/AddTokenForm.svelte
+++ b/src/frontend/src/eth/components/tokens/AddTokenForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Input } from '@dfinity/gix-components';
+	import InputText from '$lib/components/ui/InputText.svelte';
 	import { i18n } from '$lib/stores/i18n.store';
 
 	export let contractAddress = '';
@@ -7,12 +7,9 @@
 
 <div class="stretch">
 	<label for="destination" class="px-4.5 font-bold">{$i18n.tokens.text.contract_address}:</label>
-	<Input
+	<InputText
 		name="contractAddress"
-		inputType="text"
-		required
 		bind:value={contractAddress}
 		placeholder={$i18n.tokens.placeholder.enter_contract_address}
-		spellcheck={false}
 	/>
 </div>
diff --git a/src/frontend/src/eth/components/wallet-connect/WalletConnectForm.svelte b/src/frontend/src/eth/components/wallet-connect/WalletConnectForm.svelte
index b00e7a4b05..a00ca9b50c 100644
--- a/src/frontend/src/eth/components/wallet-connect/WalletConnectForm.svelte
+++ b/src/frontend/src/eth/components/wallet-connect/WalletConnectForm.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-	import { Input, QRCodeReader } from '@dfinity/gix-components';
+	import { QRCodeReader } from '@dfinity/gix-components';
 	import { createEventDispatcher } from 'svelte';
 	import Button from '$lib/components/ui/Button.svelte';
 	import ButtonGroup from '$lib/components/ui/ButtonGroup.svelte';
 	import ContentWithToolbar from '$lib/components/ui/ContentWithToolbar.svelte';
+	import InputText from '$lib/components/ui/InputText.svelte';
 	import {
 		TRACK_COUNT_WALLET_CONNECT,
 		TRACK_COUNT_WALLET_CONNECT_QR_CODE
@@ -83,13 +84,7 @@
 
 	<p class="pb-2 pt-4 text-center">{$i18n.wallet_connect.text.or_use_link}</p>
 
-	<Input
-		name="uri"
-		required
-		inputType="text"
-		placeholder="e.g. wc:a281567bb3e4..."
-		bind:value={uri}
-	/>
+	<InputText name="uri" placeholder="e.g. wc:a281567bb3e4..." bind:value={uri} />
 
 	<ButtonGroup slot="toolbar">
 		<Button disabled={invalid} on:click={onClick}>
diff --git a/src/frontend/src/icp/components/tokens/IcAddTokenForm.svelte b/src/frontend/src/icp/components/tokens/IcAddTokenForm.svelte
index ff70b7b5f3..c44d03796b 100644
--- a/src/frontend/src/icp/components/tokens/IcAddTokenForm.svelte
+++ b/src/frontend/src/icp/components/tokens/IcAddTokenForm.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { Input } from '@dfinity/gix-components';
 	import ExternalLink from '$lib/components/ui/ExternalLink.svelte';
+	import InputText from '$lib/components/ui/InputText.svelte';
 	import { i18n } from '$lib/stores/i18n.store';
 	import { replaceOisyPlaceholders } from '$lib/utils/i18n.utils';
 
@@ -23,24 +23,18 @@
 	<label for="ledgerCanisterId" class="px-4.5 font-bold"
 		>{$i18n.tokens.import.text.ledger_canister_id}:</label
 	>
-	<Input
+	<InputText
 		name="ledgerCanisterId"
-		inputType="text"
-		required
 		bind:value={ledgerCanisterId}
 		placeholder="_____-_____-_____-_____-cai"
-		spellcheck={false}
 	/>
 
 	<label for="indexCanisterId" class="px-4.5 font-bold"
 		>{$i18n.tokens.import.text.index_canister_id}:</label
 	>
-	<Input
+	<InputText
 		name="indexCanisterId"
-		inputType="text"
-		required
 		bind:value={indexCanisterId}
 		placeholder="_____-_____-_____-_____-cai"
-		spellcheck={false}
 	/>
 </div>
diff --git a/src/frontend/src/lib/components/manage/ManageTokens.svelte b/src/frontend/src/lib/components/manage/ManageTokens.svelte
index 4e627f90a6..fdceac518d 100644
--- a/src/frontend/src/lib/components/manage/ManageTokens.svelte
+++ b/src/frontend/src/lib/components/manage/ManageTokens.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { IconClose, Input } from '@dfinity/gix-components';
+	import { IconClose } from '@dfinity/gix-components';
 	import { debounce, nonNullish } from '@dfinity/utils';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
@@ -27,6 +27,7 @@
 	import ButtonGroup from '$lib/components/ui/ButtonGroup.svelte';
 	import Card from '$lib/components/ui/Card.svelte';
 	import Hr from '$lib/components/ui/Hr.svelte';
+	import InputText from '$lib/components/ui/InputText.svelte';
 	import { exchanges } from '$lib/derived/exchange.derived';
 	import {
 		networkEthereum,
@@ -195,12 +196,11 @@
 </script>
 
 <div class="mb-4">
-	<Input
+	<InputText
 		name="filter"
-		inputType="text"
+		required={false}
 		bind:value={filter}
 		placeholder={$i18n.tokens.placeholder.search_token}
-		spellcheck={false}
 	>
 		<svelte:fragment slot="inner-end">
 			{#if noTokensMatch}
@@ -211,7 +211,7 @@
 				<IconSearch />
 			{/if}
 		</svelte:fragment>
-	</Input>
+	</InputText>
 </div>
 
 {#if nonNullish($selectedNetwork)}
diff --git a/src/frontend/src/lib/components/send/SendInputDestination.svelte b/src/frontend/src/lib/components/send/SendInputDestination.svelte
index baaf66cc4f..57a1b575e3 100644
--- a/src/frontend/src/lib/components/send/SendInputDestination.svelte
+++ b/src/frontend/src/lib/components/send/SendInputDestination.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import { Input } from '@dfinity/gix-components';
 	import { debounce, nonNullish } from '@dfinity/utils';
 	import { slide } from 'svelte/transition';
 	import QRButton from '$lib/components/common/QRButton.svelte';
+	import InputText from '$lib/components/ui/InputText.svelte';
 	import { SLIDE_DURATION } from '$lib/constants/transition.constants';
 	import { i18n } from '$lib/stores/i18n.store';
 	import type { NetworkId } from '$lib/types/network';
@@ -22,21 +22,13 @@
 </script>
 
 <label for="destination" class="px-4.5 font-bold">{$i18n.send.text.destination}:</label>
-<Input
-	name="destination"
-	inputType="text"
-	required
-	bind:value={destination}
-	placeholder={inputPlaceholder}
-	spellcheck={false}
-	on:nnsInput
->
+<InputText name="destination" bind:value={destination} placeholder={inputPlaceholder} on:nnsInput>
 	<svelte:fragment slot="inner-end">
 		{#if nonNullish(onQRButtonClick)}
 			<QRButton on:click={onQRButtonClick} />
 		{/if}
 	</svelte:fragment>
-</Input>
+</InputText>
 
 {#if invalidDestination}
 	<p transition:slide={SLIDE_DURATION} class="pb-3 text-cyclamen">
diff --git a/src/frontend/src/lib/components/ui/InputText.svelte b/src/frontend/src/lib/components/ui/InputText.svelte
new file mode 100644
index 0000000000..36f4da937b
--- /dev/null
+++ b/src/frontend/src/lib/components/ui/InputText.svelte
@@ -0,0 +1,12 @@
+<script lang="ts">
+	import { Input } from '@dfinity/gix-components';
+
+	export let value = '';
+	export let name: string;
+	export let placeholder: string;
+	export let required = true;
+</script>
+
+<Input {name} inputType="text" {required} bind:value {placeholder} spellcheck={false} on:nnsInput>
+	<slot name="inner-end" slot="inner-end" />
+</Input>