fix: reactivity problem between withdrawal form and amount range comp…

…onent (#43) * feat: update mountRangeInput component and reset form properly * fix: remove afterUpdate to prevent disabled input * fix: add a hack to force a re-render of the component --------- Co-authored-by: Begoña Alvarez <[email protected]>
iotaledger · May 20, 2024 · 3134a4b · 3134a4b
1 parent 08f625f
commit 3134a4b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 16 deletions.
diff --git a/src/components/inputs/amount-range.svelte b/src/components/inputs/amount-range.svelte
@@ -1,8 +1,10 @@
 <script lang="ts">
+  import { onMount } from 'svelte';
+
   export let decimals: number = 0;
   export let min: number = 0;
   export let max: number = 0;
-  export let value: number = 0;
+  export let value: number;
   export let disabled: boolean = false;
   export let label: string = '';
   export let valid: boolean = true;
@@ -15,6 +17,11 @@
   $: maxValueFormatted = max / 10 ** decimals;
   $: valid = value >= min && value <= max;
 
+  onMount(() => {
+    value = Math.max(min, Math.min(max, value));
+    valueFormatted = value / 10 ** decimals;
+  });
+
   function handleRangeChange(event): void {
     value = event.target.value;
     valueFormatted = value / 10 ** decimals;

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -1,5 +1,6 @@
 export const EVMAddressLength = 42;
 export const NativeTokenIDLength = 38;
 
+export const L1_BASE_TOKEN_DECIMALS = 6;
 export const L2_NATIVE_GAS_TOKEN_DECIMALS = 18;
 export const wSMR_TOKEN_DECIMALS = 18;
diff --git a/src/routes/sections/withdraw-section.svelte b/src/routes/sections/withdraw-section.svelte
@@ -3,7 +3,10 @@
   import { AmountRangeInput, Button, Input, Select } from '$components';
   import { getBech32AddressLengthFromChain, truncateText } from '$lib/common';
   import { InputType } from '$lib/common/enums';
-  import { L2_NATIVE_GAS_TOKEN_DECIMALS } from '$lib/constants';
+  import {
+    L2_NATIVE_GAS_TOKEN_DECIMALS,
+    L1_BASE_TOKEN_DECIMALS,
+  } from '$lib/constants';
   import {
     appConfiguration,
     nodeClient,
@@ -20,7 +23,7 @@
     withdrawStateStore,
   } from '$lib/withdraw';
 
-  const formInput: WithdrawFormInput = {
+  let formInput: WithdrawFormInput = {
     receiverAddress: '',
     baseTokensToSend: storageDeposit,
     nativeTokensToSend: {},
@@ -49,6 +52,10 @@
   $: $withdrawStateStore, updateFormInput();
   $: placeholderHrp = `${$appConfiguration?.bech32Hrp.toLowerCase()}...`;
 
+  $: storageDepositAdjustedDecimals =
+    storageDeposit *
+    10 ** (L2_NATIVE_GAS_TOKEN_DECIMALS - L1_BASE_TOKEN_DECIMALS);
+
   function updateFormInput() {
     if (formInput.baseTokensToSend > $withdrawStateStore.availableBaseTokens) {
       formInput.baseTokensToSend = 0;
@@ -132,7 +139,7 @@
     }
 
     if (result.status) {
-      resetForm();
+      resetView();
       showNotification({
         type: NotificationType.Success,
         message: `Withdraw request sent. BlockIndex: ${result.blockNumber}`,
@@ -221,11 +228,15 @@
     });
   };
 
-  function resetForm(): void {
+  let resetReactiveVariable = 0; // This is a hack to force a re-render of the component
+  function resetView(): void {
     formInput.receiverAddress = '';
     formInput.baseTokensToSend = storageDeposit;
     formInput.nativeTokensToSend = {};
     formInput.nftIDToSend = null;
+    formInput = formInput;
+
+    resetReactiveVariable++;
   }
 </script>
 
@@ -255,17 +266,19 @@
     <tokens-to-send-wrapper>
       <div class="mb-2">Tokens to send</div>
       <info-box class="flex flex-col space-y-4 max-h-96 overflow-auto">
-        <AmountRangeInput
-          label="{$appConfiguration?.ticker} Token:"
-          bind:value={formInput.baseTokensToSend}
-          disabled={!canSetAmountToWithdraw}
-          min={storageDeposit}
-          max={Math.max(
-            $withdrawStateStore.availableBaseTokens - storageDeposit,
-            0,
-          )}
-          decimals={L2_NATIVE_GAS_TOKEN_DECIMALS}
-        />
+        {#key resetReactiveVariable}
+          <AmountRangeInput
+            label="{$appConfiguration?.ticker} Token:"
+            bind:value={formInput.baseTokensToSend}
+            disabled={!canSetAmountToWithdraw}
+            min={storageDepositAdjustedDecimals}
+            max={Math.max(
+              $withdrawStateStore.availableBaseTokens - storageDeposit,
+              0,
+            )}
+            decimals={L2_NATIVE_GAS_TOKEN_DECIMALS}
+          />
+        {/key}
         {#each $withdrawStateStore.availableNativeTokens as nativeToken}
           <AmountRangeInput
             bind:value={formInput.nativeTokensToSend[nativeToken.id]}