@kimafinance/kima-transaction-widget 1.1.1 → 1.1.2

package/dist/index.js

@@ -680,7 +680,6 @@ var initialState = {
   isSubmitting: false,
   isConfirming: false,
   feeDeduct: false,
-  splAllowance: 0,
   errorHandler: function errorHandler() {
     return void 0;
   },
@@ -748,9 +747,6 @@ var optionSlice = toolkit.createSlice({
     setSubmitting: function setSubmitting(state, action) {
       state.isSubmitting = action.payload;
     },
-    setSplAllowance: function setSplAllowance(state, action) {
-      state.splAllowance = action.payload;
-    },
     setErrorHandler: function setErrorHandler(state, action) {
       state.errorHandler = action.payload;
     },
@@ -802,7 +798,6 @@ var _optionSlice$actions = optionSlice.actions,
   setApproving = _optionSlice$actions.setApproving,
   setSubmitting = _optionSlice$actions.setSubmitting,
   setConfirming = _optionSlice$actions.setConfirming,
-  setSplAllowance = _optionSlice$actions.setSplAllowance,
   setErrorHandler = _optionSlice$actions.setErrorHandler,
   setCloseHandler = _optionSlice$actions.setCloseHandler,
   setSuccessHandler = _optionSlice$actions.setSuccessHandler,
@@ -864,9 +859,6 @@ var selectApproving = function selectApproving(state) {
 var selectSubmitting = function selectSubmitting(state) {
   return state.option.isSubmitting;
 };
-var selectSplAllowance = function selectSplAllowance(state) {
-  return state.option.splAllowance;
-};
 var selectErrorHandler = function selectErrorHandler(state) {
   return state.option.errorHandler;
 };
@@ -6552,7 +6544,7 @@ var TokenAmount = /*#__PURE__*/function (_BN) {
 
 function useAllowance() {
   var dispatch = reactRedux.useDispatch();
-  var _useState = React.useState(null),
+  var _useState = React.useState(0),
     allowance = _useState[0],
     setAllowance = _useState[1];
   var _useState2 = React.useState(null),
@@ -6573,8 +6565,6 @@ function useAllowance() {
   }, [selectedNetwork, evmChainId]);
   var amount = reactRedux.useSelector(selectAmount);
   var serviceFee = reactRedux.useSelector(selectServiceFee);
-  var isApproving = reactRedux.useSelector(selectApproving);
-  var splAllowance = reactRedux.useSelector(selectSplAllowance);
   var nodeProviderQuery = reactRedux.useSelector(selectNodeProviderQuery);
   var _useConnection = walletAdapterReact.useConnection(),
     connection = _useConnection.connection;
@@ -6589,12 +6579,8 @@ function useAllowance() {
     targetAddress = _useState3[0],
     setTargetAddress = _useState3[1];
   var isApproved = React.useMemo(function () {
-    if (!isEVMChain(sourceChain)) {
-      return allowance >= amount + serviceFee;
-    }
-    if (allowance && amount && allowance.gte(units.parseUnits((amount + serviceFee).toString(), decimals))) return true;
-    return false;
-  }, [decimals, sourceChain, allowance, amount, splAllowance, serviceFee]);
+    return allowance >= amount + serviceFee;
+  }, [allowance, amount, serviceFee]);
   var updatePoolAddress = function updatePoolAddress() {
     try {
       return Promise.resolve(_catch(function () {
@@ -6632,7 +6618,7 @@ function useAllowance() {
             return Promise.resolve(erc20Contract.decimals()).then(function (decimals) {
               return Promise.resolve(erc20Contract.allowance(signerAddress, targetAddress)).then(function (userAllowance) {
                 setDecimals(+decimals);
-                setAllowance(userAllowance);
+                setAllowance(+units.formatUnits(userAllowance, decimals));
               });
             });
           }
@@ -6659,7 +6645,7 @@ function useAllowance() {
         Promise.reject(e);
       }
     })();
-  }, [signerAddress, tokenAddress, targetAddress, isApproving, sourceChain, publicKey]);
+  }, [signerAddress, tokenAddress, targetAddress, sourceChain, publicKey]);
   var approve = React.useCallback(function () {
     try {
       var _temp8 = function _temp8(_result4) {
@@ -6677,7 +6663,7 @@ function useAllowance() {
                 transaction.recentBlockhash = _blockHash$blockhash;
                 return Promise.resolve(signTransaction(transaction)).then(function (signed) {
                   return Promise.resolve(connection.sendRawTransaction(signed.serialize())).then(function () {
-                    dispatch(setSplAllowance(amount + serviceFee));
+                    setAllowance(amount + serviceFee);
                     dispatch(setApproving(false));
                   });
                 });
@@ -6706,6 +6692,7 @@ function useAllowance() {
             return Promise.resolve(erc20Contract.approve(targetAddress, units.parseUnits((amount + serviceFee).toString(), decimals))).then(function (approve) {
               return Promise.resolve(approve.wait()).then(function () {
                 dispatch(setApproving(false));
+                setAllowance(amount + serviceFee);
               });
             });
           }, function (error) {