@huma-finance/widgets 0.0.8 → 0.0.11

package/src/components/StreamFactoring/borrow/2-ChooseAmount.tsx

@@ -1,124 +1,124 @@
-import {
-  downScale,
-  PoolInfoType,
-  toBigNumber,
-  upScale,
-  useFeeManager,
-} from '@huma-finance/shared'
-import React, { useCallback, useState } from 'react'
-
-import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
-import { setBorrowInfo, setStream } from '../../../store/widgets.reducers'
-import { selectWidgetState } from '../../../store/widgets.selectors'
-import { WIDGET_STEP } from '../../../store/widgets.store'
-import { ChooseAmountModal } from '../../ChooseAmountModal'
-
-type Props = {
-  poolInfo: PoolInfoType
-  currentFlowRate: string
-}
-
-export function ChooseAmount({
-  poolInfo,
-  currentFlowRate,
-}: Props): React.ReactElement | null {
-  const dispatch = useAppDispatch()
-  const { approveInfo } = useAppSelector(selectWidgetState)
-  const { getFeesCharged } = useFeeManager(poolInfo.poolName, poolInfo.poolType)
-  const [chargedFees, setChargedFees] = useState(0)
-  const [currentAmount, setCurrentAmount] = useState(0)
-  const borrowPeriodInSeconds = approveInfo!.intervalInDays * 24 * 60 * 60
-
-  const getBorrowFlowrateAndAmount = useCallback(
-    (borrowAmount: number) => {
-      const currentFlowRateBN = toBigNumber(currentFlowRate)
-      const borrowAmountBN = toBigNumber(
-        upScale(borrowAmount, approveInfo!.tokenDecimal),
-      )
-
-      const totalAmountInBorrowPeriod = currentFlowRateBN.mul(
-        borrowPeriodInSeconds,
-      )
-      let borrowFlowrate = borrowAmountBN
-        .mul(currentFlowRateBN)
-        .div(totalAmountInBorrowPeriod)
-        // To ensure enough flowRate due to round down when convert to string
-        .add(1)
-
-      // Can not borrow all the available flowrate
-      if (borrowFlowrate.gte(currentFlowRateBN)) {
-        borrowFlowrate = currentFlowRateBN.sub(1)
-      }
-
-      // As borrowFlowrate adds 1, need to calculate the new accurate borrow amount
-      const newBorrowAmountBN = borrowFlowrate
-        .mul(totalAmountInBorrowPeriod)
-        .div(currentFlowRateBN)
-      const newBorrowAmount = downScale(
-        newBorrowAmountBN,
-        approveInfo!.tokenDecimal,
-      )
-
-      return {
-        borrowFlowrate: borrowFlowrate.toString(),
-        borrowAmount: Number(newBorrowAmount),
-        borrowAmountBN: newBorrowAmountBN.toString(),
-      }
-    },
-    [approveInfo, borrowPeriodInSeconds, currentFlowRate],
-  )
-
-  const handleChangeAmount = useCallback(
-    (newAmount: number) => {
-      if (approveInfo) {
-        setCurrentAmount(newAmount)
-        setChargedFees(getFeesCharged(newAmount))
-      }
-    },
-    [approveInfo, getFeesCharged],
-  )
-  const handleAction = useCallback(() => {
-    const { borrowFlowrate, borrowAmount, borrowAmountBN } =
-      getBorrowFlowrateAndAmount(currentAmount)
-
-    dispatch(
-      setStream({
-        borrowFlowrate,
-        durationInSeconds: borrowPeriodInSeconds,
-      }),
-    )
-    dispatch(
-      setBorrowInfo({
-        borrowAmount,
-        borrowAmountBN,
-        chargedFees,
-        nextStep: WIDGET_STEP.ConfirmTransfer,
-      }),
-    )
-  }, [
-    borrowPeriodInSeconds,
-    chargedFees,
-    currentAmount,
-    dispatch,
-    getBorrowFlowrateAndAmount,
-  ])
-
-  if (!approveInfo) {
-    return null
-  }
-
-  return (
-    <ChooseAmountModal
-      title='Choose Amount'
-      description1='Access up to 100% of your stream flowrate'
-      sliderMax={Number(approveInfo.creditLimit)}
-      currentAmount={currentAmount}
-      tokenSymbol={approveInfo.tokenSymbol}
-      topLeft='Fees'
-      topRight={`${chargedFees} ${approveInfo.tokenSymbol}`}
-      handleChangeAmount={handleChangeAmount}
-      handleAction={handleAction}
-      actionText='Confirm Transfer'
-    />
-  )
-}
+import {
+  downScale,
+  PoolInfoType,
+  toBigNumber,
+  upScale,
+  useFeeManager,
+} from '@huma-finance/shared'
+import React, { useCallback, useState } from 'react'
+
+import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
+import { setBorrowInfo, setStream } from '../../../store/widgets.reducers'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { ChooseAmountModal } from '../../ChooseAmountModal'
+
+type Props = {
+  poolInfo: PoolInfoType
+  currentFlowRate: string
+}
+
+export function ChooseAmount({
+  poolInfo,
+  currentFlowRate,
+}: Props): React.ReactElement | null {
+  const dispatch = useAppDispatch()
+  const { approval } = useAppSelector(selectWidgetState)
+  const { getFeesCharged } = useFeeManager(poolInfo.poolName, poolInfo.poolType)
+  const [chargedFees, setChargedFees] = useState(0)
+  const [currentAmount, setCurrentAmount] = useState(0)
+  const borrowPeriodInSeconds = approval!.terms.intervalInDays * 24 * 60 * 60
+
+  const getBorrowFlowrateAndAmount = useCallback(
+    (borrowAmount: number) => {
+      const currentFlowRateBN = toBigNumber(currentFlowRate)
+      const borrowAmountBN = toBigNumber(
+        upScale(borrowAmount, approval!.token.decimal),
+      )
+
+      const totalAmountInBorrowPeriod = currentFlowRateBN.mul(
+        borrowPeriodInSeconds,
+      )
+      let borrowFlowrate = borrowAmountBN
+        .mul(currentFlowRateBN)
+        .div(totalAmountInBorrowPeriod)
+        // To ensure enough flowRate due to round down when convert to string
+        .add(1)
+
+      // Can not borrow all the available flowrate
+      if (borrowFlowrate.gte(currentFlowRateBN)) {
+        borrowFlowrate = currentFlowRateBN.sub(1)
+      }
+
+      // As borrowFlowrate adds 1, need to calculate the new accurate borrow amount
+      const newBorrowAmountBN = borrowFlowrate
+        .mul(totalAmountInBorrowPeriod)
+        .div(currentFlowRateBN)
+      const newBorrowAmount = downScale(
+        newBorrowAmountBN,
+        approval!.token.decimal,
+      )
+
+      return {
+        borrowFlowrate: borrowFlowrate.toString(),
+        borrowAmount: Number(newBorrowAmount),
+        borrowAmountBN: newBorrowAmountBN.toString(),
+      }
+    },
+    [approval, borrowPeriodInSeconds, currentFlowRate],
+  )
+
+  const handleChangeAmount = useCallback(
+    (newAmount: number) => {
+      if (approval) {
+        setCurrentAmount(newAmount)
+        setChargedFees(getFeesCharged(newAmount))
+      }
+    },
+    [approval, getFeesCharged],
+  )
+  const handleAction = useCallback(() => {
+    const { borrowFlowrate, borrowAmount, borrowAmountBN } =
+      getBorrowFlowrateAndAmount(currentAmount)
+
+    dispatch(
+      setStream({
+        borrowFlowrate,
+        durationInSeconds: borrowPeriodInSeconds,
+      }),
+    )
+    dispatch(
+      setBorrowInfo({
+        borrowAmount,
+        borrowAmountBN,
+        chargedFees,
+        nextStep: WIDGET_STEP.ConfirmTransfer,
+      }),
+    )
+  }, [
+    borrowPeriodInSeconds,
+    chargedFees,
+    currentAmount,
+    dispatch,
+    getBorrowFlowrateAndAmount,
+  ])
+
+  if (!approval) {
+    return null
+  }
+
+  return (
+    <ChooseAmountModal
+      title='Choose Amount'
+      description1='Access up to 100% of your stream flowrate'
+      sliderMax={Number(approval.terms.creditLimit)}
+      currentAmount={currentAmount}
+      tokenSymbol={approval.token.symbol}
+      topLeft='Fees'
+      topRight={`${chargedFees} ${approval.token.symbol}`}
+      handleChangeAmount={handleChangeAmount}
+      handleAction={handleAction}
+      actionText='Confirm Transfer'
+    />
+  )
+}

package/src/components/StreamFactoring/borrow/3-ConfirmTransfer.tsx

@@ -1,104 +1,104 @@
-import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'
-import { Box, Button, css, Typography, useTheme } from '@mui/material'
-import { useWeb3React } from '@web3-react/core'
-import { CHAINS, isEmpty } from '@huma-finance/shared'
-import React from 'react'
-
-import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
-import { setStep } from '../../../store/widgets.reducers'
-import { selectWidgetState } from '../../../store/widgets.selectors'
-import { WIDGET_STEP } from '../../../store/widgets.store'
-
-export function ConfirmTransfer(): React.ReactElement | null {
-  const theme = useTheme()
-  const dispatch = useAppDispatch()
-  const { chainId } = useWeb3React()
-  const { borrowAmount, approveInfo } = useAppSelector(selectWidgetState)
-
-  const styles = {
-    wrapper: css`
-      height: 518px;
-      position: relative;
-      ${theme.cssMixins.colStretch};
-    `,
-    header: css`
-      ${theme.cssMixins.rowHCentered};
-      margin-top: -5px;
-    `,
-    description: css`
-      font-weight: 500;
-      font-size: 16px;
-      color: #49505b;
-      margin-top: 30px;
-    `,
-    transferWrapper: css`
-      margin-top: 75px;
-    `,
-    transfer: css`
-      ${theme.cssMixins.rowSpaceBetweened}
-      ${theme.cssMixins.rowVCentered}
-      height: 72px;
-      background: #f9f8fa;
-      border-radius: 4px;
-      font-weight: 500;
-      font-size: 16px;
-      color: #49505b;
-      padding: 24px 32px;
-      margin-bottom: 9px;
-      position: relative;
-    `,
-    arrow: css`
-      color: #d2d0d6;
-      position: absolute;
-      margin: auto;
-      top: 0;
-      left: 0;
-      bottom: 0;
-      right: 0;
-    `,
-    okButton: css`
-      width: 100%;
-      position: absolute;
-      bottom: 0;
-    `,
-  }
-
-  const handleAction = () => {
-    const step = CHAINS[chainId!].isTestnet
-      ? WIDGET_STEP.ApproveAllowance
-      : WIDGET_STEP.Permit
-    dispatch(setStep(step))
-  }
-
-  if (isEmpty(borrowAmount) || isEmpty(approveInfo)) {
-    return null
-  }
-
-  return (
-    <Box css={styles.wrapper}>
-      <Typography variant='h6' css={styles.header}>
-        Confirm transaction details
-      </Typography>
-      <Box css={styles.description}>
-        Huma keeps your Tradable Stream NFT as collateral until it's fully paid.
-      </Box>
-      <Box css={styles.transferWrapper}>
-        <Box css={styles.transfer}>
-          <Box>Tradable Stream</Box>
-          <ArrowForwardIosIcon css={styles.arrow} />
-          <Box>Huma</Box>
-        </Box>
-        <Box css={styles.transfer}>
-          <Box>
-            {borrowAmount!.toFixed(2)} {approveInfo?.tokenSymbol}
-          </Box>
-          <ArrowForwardIosIcon css={styles.arrow} />
-          <Box>You</Box>
-        </Box>
-      </Box>
-      <Button variant='contained' css={styles.okButton} onClick={handleAction}>
-        Approve Transfer
-      </Button>
-    </Box>
-  )
-}
+import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'
+import { Box, Button, css, Typography, useTheme } from '@mui/material'
+import { useWeb3React } from '@web3-react/core'
+import { CHAINS, isEmpty } from '@huma-finance/shared'
+import React from 'react'
+
+import { useAppDispatch, useAppSelector } from '../../../hooks/useRedux'
+import { setStep } from '../../../store/widgets.reducers'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+
+export function ConfirmTransfer(): React.ReactElement | null {
+  const theme = useTheme()
+  const dispatch = useAppDispatch()
+  const { chainId } = useWeb3React()
+  const { borrowAmount, approval } = useAppSelector(selectWidgetState)
+
+  const styles = {
+    wrapper: css`
+      height: 518px;
+      position: relative;
+      ${theme.cssMixins.colStretch};
+    `,
+    header: css`
+      ${theme.cssMixins.rowHCentered};
+      margin-top: -5px;
+    `,
+    description: css`
+      font-weight: 500;
+      font-size: 16px;
+      color: #49505b;
+      margin-top: 30px;
+    `,
+    transferWrapper: css`
+      margin-top: 75px;
+    `,
+    transfer: css`
+      ${theme.cssMixins.rowSpaceBetweened}
+      ${theme.cssMixins.rowVCentered}
+      height: 72px;
+      background: #f9f8fa;
+      border-radius: 4px;
+      font-weight: 500;
+      font-size: 16px;
+      color: #49505b;
+      padding: 24px 32px;
+      margin-bottom: 9px;
+      position: relative;
+    `,
+    arrow: css`
+      color: #d2d0d6;
+      position: absolute;
+      margin: auto;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+    `,
+    okButton: css`
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+    `,
+  }
+
+  const handleAction = () => {
+    const step = CHAINS[chainId!].isTestnet
+      ? WIDGET_STEP.ApproveAllowance
+      : WIDGET_STEP.Permit
+    dispatch(setStep(step))
+  }
+
+  if (isEmpty(borrowAmount) || isEmpty(approval)) {
+    return null
+  }
+
+  return (
+    <Box css={styles.wrapper}>
+      <Typography variant='h6' css={styles.header}>
+        Confirm transaction details
+      </Typography>
+      <Box css={styles.description}>
+        Huma keeps your Tradable Stream NFT as collateral until it's fully paid.
+      </Box>
+      <Box css={styles.transferWrapper}>
+        <Box css={styles.transfer}>
+          <Box>Tradable Stream</Box>
+          <ArrowForwardIosIcon css={styles.arrow} />
+          <Box>Huma</Box>
+        </Box>
+        <Box css={styles.transfer}>
+          <Box>
+            {borrowAmount!.toFixed(2)} {approval?.token.symbol}
+          </Box>
+          <ArrowForwardIosIcon css={styles.arrow} />
+          <Box>You</Box>
+        </Box>
+      </Box>
+      <Button variant='contained' css={styles.okButton} onClick={handleAction}>
+        Approve Transfer
+      </Button>
+    </Box>
+  )
+}

package/src/components/StreamFactoring/borrow/4-ApproveAllowance.tsx

@@ -1,65 +1,65 @@
-import { useWeb3React } from '@web3-react/core'
-import {
-  PoolInfoType,
-  toBigNumber,
-  upScale,
-  usePoolAllowance,
-} from '@huma-finance/shared'
-import React, { useCallback } from 'react'
-import { useDispatch } from 'react-redux'
-
-import { useAppSelector } from '../../../hooks/useRedux'
-import { setStep } from '../../../store/widgets.reducers'
-import { selectWidgetState } from '../../../store/widgets.selectors'
-import { WIDGET_STEP } from '../../../store/widgets.store'
-import { ApproveAllowanceModal } from '../../ApproveAllowanceModal'
-import { LoadingModal } from '../../LoadingModal'
-
-type Props = {
-  poolInfo: PoolInfoType
-}
-
-export function ApproveAllowance({
-  poolInfo,
-}: Props): React.ReactElement | null {
-  const dispatch = useDispatch()
-  const { account } = useWeb3React()
-  const { borrowAmount, approveInfo } = useAppSelector(selectWidgetState)
-  const { allowance, loaded } = usePoolAllowance(
-    poolInfo.poolName,
-    poolInfo.poolType,
-    account,
-  )
-
-  const getNewAllowance = () => {
-    if (!borrowAmount || !loaded) {
-      return null
-    }
-    return toBigNumber(
-      upScale(borrowAmount, poolInfo.poolUnderlyingToken.decimals),
-    ).add(allowance)
-  }
-
-  const handleSuccess = useCallback(() => {
-    dispatch(setStep(WIDGET_STEP.Permit))
-  }, [dispatch])
-
-  const newAllowance = getNewAllowance()
-
-  if (!newAllowance) {
-    return (
-      <LoadingModal
-        title={`Approve ${approveInfo?.tokenSymbol}`}
-        description='Waiting for approval confirmation...'
-      />
-    )
-  }
-
-  return (
-    <ApproveAllowanceModal
-      poolInfo={poolInfo}
-      allowanceAmount={newAllowance}
-      handleSuccess={handleSuccess}
-    />
-  )
-}
+import { useWeb3React } from '@web3-react/core'
+import {
+  PoolInfoType,
+  toBigNumber,
+  upScale,
+  usePoolAllowance,
+} from '@huma-finance/shared'
+import React, { useCallback } from 'react'
+import { useDispatch } from 'react-redux'
+
+import { useAppSelector } from '../../../hooks/useRedux'
+import { setStep } from '../../../store/widgets.reducers'
+import { selectWidgetState } from '../../../store/widgets.selectors'
+import { WIDGET_STEP } from '../../../store/widgets.store'
+import { ApproveAllowanceModal } from '../../ApproveAllowanceModal'
+import { LoadingModal } from '../../LoadingModal'
+
+type Props = {
+  poolInfo: PoolInfoType
+}
+
+export function ApproveAllowance({
+  poolInfo,
+}: Props): React.ReactElement | null {
+  const dispatch = useDispatch()
+  const { account } = useWeb3React()
+  const { borrowAmount, approval } = useAppSelector(selectWidgetState)
+  const { allowance, loaded } = usePoolAllowance(
+    poolInfo.poolName,
+    poolInfo.poolType,
+    account,
+  )
+
+  const getNewAllowance = () => {
+    if (!borrowAmount || !loaded) {
+      return null
+    }
+    return toBigNumber(
+      upScale(borrowAmount, poolInfo.poolUnderlyingToken.decimals),
+    ).add(allowance)
+  }
+
+  const handleSuccess = useCallback(() => {
+    dispatch(setStep(WIDGET_STEP.Permit))
+  }, [dispatch])
+
+  const newAllowance = getNewAllowance()
+
+  if (!newAllowance) {
+    return (
+      <LoadingModal
+        title={`Approve ${approval?.token?.symbol}`}
+        description='Waiting for approval confirmation...'
+      />
+    )
+  }
+
+  return (
+    <ApproveAllowanceModal
+      poolInfo={poolInfo}
+      allowanceAmount={newAllowance}
+      handleSuccess={handleSuccess}
+    />
+  )
+}