fix bugs

darwinia-network · Sep 13, 2024 · 0423ccb · 0423ccb
1 parent d38545b
commit 0423ccb
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 24 deletions.
diff --git a/src/components/amount-input-with-balance.tsx b/src/components/amount-input-with-balance.tsx
@@ -1,9 +1,13 @@
 import React, { useCallback, useMemo } from 'react';
 import { Button, cn } from '@nextui-org/react';
 import { BigNumber } from 'bignumber.js';
-
 import BalanceDescription from './balance-description';
 
+BigNumber.config({
+  EXPONENTIAL_AT: [-1000, 1000],
+  DECIMAL_PLACES: 1000
+});
+
 interface AmountInputWithBalanceProps {
   symbol?: string;
   className?: string;
@@ -39,22 +43,39 @@ const AmountInputWithBalance = ({
     (e: React.ChangeEvent<HTMLInputElement>) => {
       if (isDisabled) return;
       const newValue = e.target.value;
-      const numValue = new BigNumber(newValue);
-
-      if (newValue === '' || numValue.isNaN()) {
-        onChange?.(e);
-      } else {
-        const minValue = new BigNumber(min);
-        const result = BigNumber.max(BigNumber.min(numValue, maxValue), minValue);
-        onChange?.({ target: { value: result.toString() } } as React.ChangeEvent<HTMLInputElement>);
+      // // 允许输入小数点和数字
+      if (newValue === '' || /^[0-9]*\.?[0-9]*$/.test(newValue)) {
+        onChange?.({
+          target: { value: newValue }
+        } as React.ChangeEvent<HTMLInputElement>);
       }
     },
-    [onChange, min, maxValue, isDisabled]
+    [isDisabled, onChange]
   );
 
+  const handleInputBlur = useCallback(() => {
+    if (value === '' || value === '.') {
+      onChange?.({
+        target: { value: '0' }
+      } as React.ChangeEvent<HTMLInputElement>);
+      return;
+    }
+
+    const numValue = new BigNumber(value || '0');
+    const minValue = new BigNumber(min);
+    const result = BigNumber.max(BigNumber.min(numValue, maxValue), minValue);
+    const formattedResult = result.decimalPlaces(18, BigNumber.ROUND_DOWN);
+
+    onChange?.({
+      target: { value: formattedResult?.toString() }
+    } as React.ChangeEvent<HTMLInputElement>);
+  }, [value, onChange, min, maxValue]);
+
   const handleMaxClick = useCallback(() => {
-    onChange?.({ target: { value: balance || '0' } } as React.ChangeEvent<HTMLInputElement>);
-  }, [balance, onChange]);
+    onChange?.({
+      target: { value: maxValue?.toString() }
+    } as React.ChangeEvent<HTMLInputElement>);
+  }, [maxValue, onChange]);
 
   return (
     <div className={cn('flex w-full flex-col gap-[0.31rem]', className)}>
@@ -67,6 +88,7 @@ const AmountInputWithBalance = ({
             placeholder="0"
             className="w-full appearance-none bg-transparent pr-16 text-[1rem] font-bold text-foreground placeholder:text-[0.875rem] placeholder:font-bold placeholder:text-[#c6c6c6] hover:bg-transparent focus-visible:outline-none"
             onChange={handleInputChange}
+            onBlur={handleInputBlur}
             step="any"
             disabled={isDisabled}
           />

diff --git a/src/components/collator/_hooks/collator.ts b/src/components/collator/_hooks/collator.ts
@@ -77,7 +77,7 @@ export const useCreateCollator = ({
     functionName: 'assetsToVotes',
     args: [stakedOf ?? 0n, commission],
     query: {
-      enabled: isEnabled && !!commission && !!stakedOf && enabled
+      enabled: isEnabled && !!stakedOf && enabled
     }
   });
 

diff --git a/src/components/collator/_hooks/update-commission.ts b/src/components/collator/_hooks/update-commission.ts
@@ -27,7 +27,7 @@ const useUpdateCommission = ({
     functionName: 'assetsToVotes',
     args: [totalAssets, newCommission],
     query: {
-      enabled: !!newCommission && !isNil(totalAssets)
+      enabled: !isNil(totalAssets)
     }
   });
 

diff --git a/src/hooks/useAssetsToVotes.ts b/src/hooks/useAssetsToVotes.ts
@@ -14,13 +14,14 @@ interface AssetsToVotesProps {
 
 function useAssetsToVotes({ commission, totalAmount, inputAmount, operation }: AssetsToVotesProps) {
   const { isEnabled } = useWalletStatus();
+
   const result = useReadContract({
     abi,
     address,
     functionName: 'assetsToVotes',
     args: [commission, calculateAssets(totalAmount, inputAmount, operation)],
     query: {
-      enabled: isEnabled && !isNil(totalAmount) && !isNil(inputAmount) && !!commission
+      enabled: isEnabled && !isNil(totalAmount) && !isNil(inputAmount)
     }
   });
 

diff --git a/src/hooks/useDebouncedState.ts b/src/hooks/useDebouncedState.ts
@@ -1,4 +1,4 @@
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useEffect } from 'react';
 import { useDebounce } from 'react-use';
 
 interface UseDebouncedStateProps<T> {
@@ -23,7 +23,7 @@ export function useDebouncedState<T>({
   const [debouncedValue, setDebouncedValue] = useState<T>(initialValue);
   const [isLoading, setIsLoading] = useState(false);
 
-  const [, cancel] = useDebounce(
+  useDebounce(
     () => {
       setDebouncedValue(value);
       setIsLoading(false);
@@ -32,14 +32,15 @@ export function useDebouncedState<T>({
     [value]
   );
 
-  const handleChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      cancel();
+  useEffect(() => {
+    if (value !== debouncedValue) {
       setIsLoading(true);
-      setValue(e.target.value as unknown as T);
-    },
-    [cancel]
-  );
+    }
+  }, [value, debouncedValue]);
+
+  const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    setValue(e.target.value as unknown as T);
+  }, []);
 
   const reset = useCallback(() => {
     setValue(initialValue);