@kimafinance/kima-transaction-widget 1.1.1 → 1.1.3

package/dist/index.modern.js

@@ -9,7 +9,7 @@ import { ethers, BigNumber } from 'ethers';
 import AnimatedNumber from 'animated-number-react';
 import { WalletReadyState } from '@solana/wallet-adapter-base';
 import { Contract } from '@ethersproject/contracts';
-import { parseUnits } from '@ethersproject/units';
+import { formatUnits, parseUnits } from '@ethersproject/units';
 import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, AccountLayout } from '@solana/spl-token';
 
 const Cross = ({
@@ -492,7 +492,7 @@ const CHAIN_NAMES_TO_EXPLORER = {
   [ChainName.AVALANCHE]: 'testnet.snowtrace.io',
   [ChainName.FUSE]: 'explorer.fuse.io',
   [ChainName.CELO]: 'explorer.celo.org',
-  [ChainName.SOLANA]: 'solscan.io'
+  [ChainName.SOLANA]: 'solscan.io/blocks?cluster=devnet'
 };
 const CHAIN_NAMES_TO_GECKO_ID = {
   [ChainName.ETHEREUM]: 'ethereum',
@@ -615,7 +615,6 @@ const initialState = {
   isSubmitting: false,
   isConfirming: false,
   feeDeduct: false,
-  splAllowance: 0,
   errorHandler: () => void 0,
   closeHandler: () => void 0,
   successHandler: () => void 0,
@@ -677,9 +676,6 @@ const optionSlice = createSlice({
     setSubmitting: (state, action) => {
       state.isSubmitting = action.payload;
     },
-    setSplAllowance: (state, action) => {
-      state.splAllowance = action.payload;
-    },
     setErrorHandler: (state, action) => {
       state.errorHandler = action.payload;
     },
@@ -731,7 +727,6 @@ const {
   setApproving,
   setSubmitting,
   setConfirming,
-  setSplAllowance,
   setErrorHandler,
   setCloseHandler,
   setSuccessHandler,
@@ -767,7 +762,6 @@ const selectTransactionOption = state => state.option.transactionOption;
 const selectAmount = state => state.option.amount;
 const selectApproving = state => state.option.isApproving;
 const selectSubmitting = state => state.option.isSubmitting;
-const selectSplAllowance = state => state.option.splAllowance;
 const selectErrorHandler = state => state.option.errorHandler;
 const selectCloseHandler = state => state.option.closeHandler;
 const selectSuccessHandler = state => state.option.successHandler;
@@ -6194,7 +6188,7 @@ class TokenAmount extends bn {
 
 function useAllowance() {
   const dispatch = useDispatch();
-  const [allowance, setAllowance] = useState(null);
+  const [allowance, setAllowance] = useState(0);
   const [decimals, setDecimals] = useState(null);
   const {
     signerAddress,
@@ -6212,8 +6206,6 @@ function useAllowance() {
   }, [selectedNetwork, evmChainId]);
   const amount = useSelector(selectAmount);
   const serviceFee = useSelector(selectServiceFee);
-  const isApproving = useSelector(selectApproving);
-  const splAllowance = useSelector(selectSplAllowance);
   const nodeProviderQuery = useSelector(selectNodeProviderQuery);
   const {
     connection
@@ -6228,12 +6220,8 @@ function useAllowance() {
   }, [selectedCoin, sourceChain]);
   const [targetAddress, setTargetAddress] = useState();
   const isApproved = useMemo(() => {
-    if (!isEVMChain(sourceChain)) {
-      return allowance >= amount + serviceFee;
-    }
-    if (allowance && amount && allowance.gte(parseUnits((amount + serviceFee).toString(), decimals))) return true;
-    return false;
-  }, [decimals, sourceChain, allowance, amount, splAllowance, serviceFee]);
+    return allowance >= amount + serviceFee;
+  }, [allowance, amount, serviceFee]);
   const updatePoolAddress = async () => {
     try {
       var _result$tssPubkey;
@@ -6273,12 +6261,12 @@ function useAllowance() {
         const decimals = await erc20Contract.decimals();
         const userAllowance = await erc20Contract.allowance(signerAddress, targetAddress);
         setDecimals(+decimals);
-        setAllowance(userAllowance);
+        setAllowance(+formatUnits(userAllowance, decimals));
       } catch (error) {
         errorHandler(error);
       }
     })();
-  }, [signerAddress, tokenAddress, targetAddress, isApproving, sourceChain, publicKey]);
+  }, [signerAddress, tokenAddress, targetAddress, sourceChain, publicKey]);
   const approve = useCallback(async () => {
     if (isEVMChain(sourceChain)) {
       if (!decimals || !tokenAddress || !signer || !targetAddress) return;
@@ -6288,6 +6276,7 @@ function useAllowance() {
         const approve = await erc20Contract.approve(targetAddress, parseUnits((amount + serviceFee).toString(), decimals));
         await approve.wait();
         dispatch(setApproving(false));
+        setAllowance(amount + serviceFee);
       } catch (error) {
         errorHandler(error);
         dispatch(setApproving(false));
@@ -6306,7 +6295,7 @@ function useAllowance() {
       transaction.recentBlockhash = await blockHash.blockhash;
       const signed = await signTransaction(transaction);
       await connection.sendRawTransaction(signed.serialize());
-      dispatch(setSplAllowance(amount + serviceFee));
+      setAllowance(amount + serviceFee);
       dispatch(setApproving(false));
     } catch (e) {
       errorHandler(e);