@huma-finance/widgets 0.0.51-beta.351 → 0.0.51-beta.361

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.51-beta.351+353ad99",
+  "version": "0.0.51-beta.361+68c9d02",
   "publishConfig": {
     "access": "public"
   },
@@ -30,8 +30,8 @@
     "@ethersproject/experimental": "^5.7.0",
     "@ethersproject/providers": "^5.6.0",
     "@ethersproject/units": "^5.6.0",
-    "@huma-finance/sdk": "^0.0.51-beta.351+353ad99",
-    "@huma-finance/shared": "^0.0.51-beta.351+353ad99",
+    "@huma-finance/sdk": "^0.0.51-beta.361+68c9d02",
+    "@huma-finance/shared": "^0.0.51-beta.361+68c9d02",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",
     "@mui/styles": "^5.0.2",
@@ -193,5 +193,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "353ad99b004f9426abea8c1c0a0eccc7a62e99ea"
+  "gitHead": "68c9d025b5b4752b329e9ff82ba5cf2ec3dc8ed6"
 }

package/src/components/CreditLine/payment/1-ChooseAmount.tsx

@@ -6,6 +6,7 @@ import {
   useCLPoolAllowance,
 } from '@huma-finance/shared'
 import React, { useCallback, useEffect, useState } from 'react'
+import { BigNumber } from 'ethers'
 
 import { useAppDispatch } from '../../../hooks/useRedux'
 import { setPaymentAmount, setStep } from '../../../store/widgets.reducers'
@@ -48,8 +49,8 @@ export function ChooseAmount({
   )
 
   const handleAction = useCallback(() => {
-    const payAmount = upScale(currentAmount, decimals)
-    const step = toBigNumber(payAmount).gt(allowance)
+    const payAmount = upScale<BigNumber>(toBigNumber(currentAmount), decimals)
+    const step = payAmount.gt(allowance)
       ? WIDGET_STEP.ApproveAllowance
       : WIDGET_STEP.Transfer
     dispatch(setStep(step))

package/src/components/CreditLine/payment/3-Transfer.tsx

@@ -1,6 +1,7 @@
 import { useWeb3React } from '@web3-react/core'
 import { PoolInfoType, toBigNumber, upScale } from '@huma-finance/shared'
 import React, { useCallback } from 'react'
+import { BigNumber } from 'ethers'
 
 import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
 import { selectWidgetState } from '../../../store/widgets.selectors'
@@ -17,7 +18,10 @@ export function Transfer({ poolInfo }: Props): React.ReactElement {
   const { account } = useWeb3React()
   const { paymentAmount } = useAppSelector(selectWidgetState)
   const { decimals } = poolInfo.poolUnderlyingToken
-  const paymentBigNumber = toBigNumber(upScale(paymentAmount!, decimals))
+  const paymentBigNumber = upScale<BigNumber>(
+    toBigNumber(paymentAmount!),
+    decimals,
+  )
 
   const handleSuccess = useCallback(() => {
     dispatch(setStep(WIDGET_STEP.Done))

package/src/components/Lend/withdraw/index.tsx

@@ -62,8 +62,10 @@ export function LendWithdraw({
   )
 
   useEffect(() => {
-    if (!step && lenderPosition && poolBalance) {
+    if (!step && lenderPosition?.gt(0) && poolBalance?.gt(0)) {
       dispatch(setStep(WIDGET_STEP.CheckWithdrawable))
+    } else if (!step && (lenderPosition?.eq(0) || poolBalance?.eq(0))) {
+      dispatch(setStep(WIDGET_STEP.Error))
     }
   }, [dispatch, lenderPosition, poolBalance, step])
 
@@ -88,14 +90,14 @@ export function LendWithdraw({
       handleClose={handleClose}
       handleSuccess={handleWithdrawSuccess}
     >
-      {(!step || step === WIDGET_STEP.CheckWithdrawable) && (
+      {step === WIDGET_STEP.CheckWithdrawable && (
         <CheckWithdrawable poolInfo={poolInfo} handleClose={handleClose} />
       )}
-      {step === WIDGET_STEP.ChooseAmount && (
+      {step === WIDGET_STEP.ChooseAmount && lenderPosition && poolBalance && (
         <ChooseAmount
           poolInfo={poolInfo}
-          lenderPosition={lenderPosition!}
-          poolBalance={poolBalance!}
+          lenderPosition={lenderPosition}
+          poolBalance={poolBalance}
         />
       )}
       {step === WIDGET_STEP.Transfer && <Transfer poolInfo={poolInfo} />}