@huma-finance/widgets 0.0.11 → 0.0.12

package/dist/cjs/index.cjs

@@ -2731,6 +2731,10 @@ function ChooseAmountModal(_ref) {
   var theme = material.useTheme();
   var _useMQ = shared.useMQ(),
     isXsSize = _useMQ.isXsSize;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    inputTouched = _useState2[0],
+    setInputTouched = _useState2[1];
   var styles = {
     subTitle: material.css(_templateObject$c || (_templateObject$c = _taggedTemplateLiteral(["\n      font-family: 'Uni-Neue-Regular';\n    "]))),
     description2: material.css(_templateObject2$9 || (_templateObject2$9 = _taggedTemplateLiteral(["\n      ", ";\n      font-family: 'Uni-Neue-Regular';\n      font-size: 16px;\n      color: #a8a1b2;\n      margin-top: 16px;\n    "])), theme.cssMixins.rowCentered),
@@ -2758,6 +2762,7 @@ function ChooseAmountModal(_ref) {
     handleChangeAmount(newValue);
   };
   var handleInputChange = function handleInputChange(event) {
+    setInputTouched(true);
     // @ts-ignore
     handleChangeAmount(event.target.value);
   };
@@ -2822,7 +2827,7 @@ function ChooseAmountModal(_ref) {
           })]
         })
       }), jsxRuntime.jsx(material.Slider, {
-        max: sliderMax,
+        max: Number(sliderMax),
         min: 0,
         css: styles.slider,
         "aria-label": "Amount",
@@ -2836,8 +2841,9 @@ function ChooseAmountModal(_ref) {
         children: [jsxRuntime.jsx(material.Input, {
           css: styles.inputField,
           type: "number",
-          value: currentAmount,
-          onChange: handleInputChange
+          value: !inputTouched && currentAmount === 0 ? '' : currentAmount,
+          onChange: handleInputChange,
+          placeholder: "0"
         }), jsxRuntime.jsx(material.Button, {
           variant: "contained",
           css: styles.maxButton,
@@ -2874,7 +2880,7 @@ function ChooseAmountModal(_ref) {
       variant: "contained",
       css: styles.okButton,
       onClick: handleAction,
-      disabled: currentAmount === 0 || currentAmount > sliderMax,
+      disabled: !currentAmount || Number(currentAmount) <= 0 || Number(currentAmount) > Number(sliderMax),
       children: actionText.toUpperCase()
     }), !hideTerms && jsxRuntime.jsxs(material.Box, {
       css: styles.terms,
@@ -2887,13 +2893,9 @@ function ChooseAmount$6(_ref) {
   var poolInfo = _ref.poolInfo,
     accountStats = _ref.accountStats;
   var dispatch = useAppDispatch();
-  var _useWeb3React = core.useWeb3React(),
-    account = _useWeb3React.account;
   var poolUnderlyingToken = poolInfo.poolUnderlyingToken;
   var symbol = poolUnderlyingToken.symbol,
     decimals = poolUnderlyingToken.decimals;
-  var _useCLPoolAllowance = shared.useCLPoolAllowance(poolInfo.poolName, account),
-    approved = _useCLPoolAllowance.approved;
   var _useCLFeeManager = shared.useCLFeeManager(poolInfo.poolName),
     getFeesCharged = _useCLFeeManager.getFeesCharged;
   var _useState = React.useState(0),
@@ -2912,14 +2914,14 @@ function ChooseAmount$6(_ref) {
     setChargedFees(newChargedFees);
   }, [getFeesCharged]);
   var handleAction = React.useCallback(function () {
-    var nextStep = approved ? WIDGET_STEP.Transfer : WIDGET_STEP.ApproveAllowance;
+    var nextStep = WIDGET_STEP.Transfer;
     dispatch(setBorrowInfo({
       borrowAmount: currentAmount,
       borrowAmountBN: shared.upScale(currentAmount, decimals),
       chargedFees: chargedFees,
       nextStep: nextStep
     }));
-  }, [approved, chargedFees, currentAmount, decimals, dispatch]);
+  }, [chargedFees, currentAmount, decimals, dispatch]);
   return jsxRuntime.jsx(ChooseAmountModal, {
     title: "Borrow",
     description1: "Choose Amount",
@@ -3046,7 +3048,7 @@ function ApproveAllowance$4(_ref) {
   var poolInfo = _ref.poolInfo;
   var dispatch = useAppDispatch();
   var handleSuccess = React.useCallback(function () {
-    dispatch(setStep(WIDGET_STEP.Transfer));
+    dispatch(setStep(WIDGET_STEP.Done));
   }, [dispatch]);
   return jsxRuntime.jsx(ApproveAllowanceModal, {
     poolInfo: poolInfo,
@@ -3099,11 +3101,18 @@ function TxSendModal(_ref) {
 function Transfer$6(_ref) {
   var poolInfo = _ref.poolInfo;
   var dispatch = useAppDispatch();
+  var reset = utils.useResetAtom(shared.txAtom);
+  var _useWeb3React = core.useWeb3React(),
+    account = _useWeb3React.account;
   var _useAppSelector = useAppSelector(selectWidgetState),
     borrowAmountBN = _useAppSelector.borrowAmountBN;
+  var _useCLPoolAllowance = shared.useCLPoolAllowance(poolInfo.poolName, account),
+    allowance = _useCLPoolAllowance.allowance;
   var handleSuccess = React.useCallback(function () {
-    dispatch(setStep(WIDGET_STEP.Done));
-  }, [dispatch]);
+    reset();
+    var nextStep = allowance.gte(shared.toBigNumber(borrowAmountBN)) ? WIDGET_STEP.Done : WIDGET_STEP.ApproveAllowance;
+    dispatch(setStep(nextStep));
+  }, [allowance, borrowAmountBN, dispatch, reset]);
   return jsxRuntime.jsx(TxSendModal, {
     poolInfo: poolInfo,
     method: "drawdown",