@huma-finance/widgets 0.0.34 → 0.0.36

package/src/components/ApproveAllowanceModal.tsx

@@ -1,121 +1,138 @@
-import { MaxUint256 } from '@ethersproject/constants'
-import { Box, css, useTheme } from '@mui/material'
-import { useWeb3React } from '@web3-react/core'
-import { BigNumber } from 'ethers'
-import {
-  PoolInfoType,
-  sendTxAtom,
-  txAtom,
-  TxStateType,
-  useMount,
-  usePoolUnderlyingTokenContract,
-} from '@huma-finance/shared'
-import { useAtom } from 'jotai'
-import { useResetAtom } from 'jotai/utils'
-import React, { useCallback, useEffect } from 'react'
-
-import { BottomButton } from './BottomButton'
-import { AutoPaybackIcon } from './icons'
-import { LoadingModal } from './LoadingModal'
-import { ViewOnExplorer } from './ViewOnExplorer'
-import { WrapperModal } from './WrapperModal'
-
-type Props = {
-  poolInfo: PoolInfoType
-  showAutoPayback?: boolean
-  allowanceAmount?: BigNumber | string
-  spender?: string
-  handleSuccess: () => void
-}
-
-export function ApproveAllowanceModal({
-  poolInfo,
-  showAutoPayback = false,
-  allowanceAmount,
-  spender,
-  handleSuccess,
-}: Props): React.ReactElement | null {
-  const theme = useTheme()
-  const { provider } = useWeb3React()
-  const { poolUnderlyingToken } = poolInfo
-  const { symbol } = poolUnderlyingToken
-  const poolUnderlyingTokenContract = usePoolUnderlyingTokenContract(
-    poolInfo.poolName,
-    poolInfo.poolType,
-  )
-  const reset = useResetAtom(txAtom)
-  const [{ state, txHash }, send] = useAtom(sendTxAtom)
-  const waitingForAccept = state === TxStateType.New
-
-  useEffect(() => {
-    if (state === TxStateType.Success) {
-      reset()
-      handleSuccess()
-    }
-  }, [handleSuccess, reset, state, symbol])
-
-  const styles = {
-    iconWrapper: css`
-      ${theme.cssMixins.rowCentered};
-      margin-top: 30px;
-    `,
-    description: css`
-      margin-top: 14px;
-      font-family: 'Uni-Neue-Regular';
-      font-size: 16px;
-      color: #a8a1b2;
-      padding: 0 12px;
-    `,
-  }
-
-  const sendApprove = useCallback(() => {
-    send({
-      contract: poolUnderlyingTokenContract!,
-      method: 'approve',
-      params: [spender ?? poolInfo.pool, allowanceAmount ?? MaxUint256],
-      provider,
-    })
-  }, [
-    allowanceAmount,
-    poolInfo.pool,
-    poolUnderlyingTokenContract,
-    provider,
-    send,
-    spender,
-  ])
-
-  useMount(() => {
-    if (!showAutoPayback) {
-      sendApprove()
-    }
-  })
-
-  if (showAutoPayback && waitingForAccept) {
-    return (
-      <WrapperModal
-        title='Auto Payback'
-        subTitle='Enable auto payback and never miss payments. You only need to do it once.'
-      >
-        <Box css={styles.iconWrapper}>
-          <AutoPaybackIcon />
-        </Box>
-        <Box css={styles.description}>
-          This allowance transaction removes the need to confirm follow up{' '}
-          {symbol} transactions. Gas is on us.
-        </Box>
-        <BottomButton variant='contained' onClick={sendApprove}>
-          APPROVE {symbol} PAYMENTS
-        </BottomButton>
-      </WrapperModal>
-    )
-  }
-
-  return (
-    <LoadingModal
-      title={`Approve ${symbol}`}
-      description='Waiting for approval confirmation...'
-    >
-      <ViewOnExplorer txHash={txHash} />
-    </LoadingModal>
-  )
-}
+import { MaxUint256 } from '@ethersproject/constants'
+import { Box, css, useTheme } from '@mui/material'
+import { useWeb3React } from '@web3-react/core'
+import { BigNumber, BigNumberish } from 'ethers'
+import {
+  PoolInfoType,
+  sendTxAtom,
+  txAtom,
+  TxStateType,
+  useMount,
+  usePoolUnderlyingTokenContract,
+} from '@huma-finance/shared'
+import { useAtom } from 'jotai'
+import { useResetAtom } from 'jotai/utils'
+import React, { useCallback, useEffect } from 'react'
+
+import { BottomButton } from './BottomButton'
+import { AutoPaybackImg } from './images'
+import { LoadingModal } from './LoadingModal'
+import { ViewOnExplorer } from './ViewOnExplorer'
+import { WrapperModal } from './WrapperModal'
+
+type Props = {
+  poolInfo: PoolInfoType
+  showAutoPayback?: boolean
+  allowanceAmount?: BigNumberish
+  spender?: string
+  resetAfterSuccess?: boolean
+  handleSuccess: () => void
+}
+
+export function ApproveAllowanceModal({
+  poolInfo,
+  showAutoPayback = false,
+  allowanceAmount,
+  spender,
+  resetAfterSuccess = true,
+  handleSuccess,
+}: Props): React.ReactElement | null {
+  const theme = useTheme()
+  const { provider, account } = useWeb3React()
+  const { poolUnderlyingToken } = poolInfo
+  const { symbol } = poolUnderlyingToken
+  const poolUnderlyingTokenContract = usePoolUnderlyingTokenContract(
+    poolInfo.poolName,
+    poolInfo.poolType,
+  )
+  const reset = useResetAtom(txAtom)
+  const [{ state, txHash }, send] = useAtom(sendTxAtom)
+  const waitingForAccept = state === TxStateType.New
+
+  useEffect(() => {
+    if (state === TxStateType.Success) {
+      if (resetAfterSuccess) {
+        reset()
+      }
+      handleSuccess()
+    }
+  }, [handleSuccess, reset, resetAfterSuccess, state, symbol])
+
+  const styles = {
+    iconWrapper: css`
+      ${theme.cssMixins.rowCentered};
+      margin-top: 50px;
+      & > img {
+        width: 220px;
+      }
+    `,
+    description: css`
+      margin-top: 34px;
+      font-family: 'Uni-Neue-Regular';
+      font-size: 16px;
+      color: #a8a1b2;
+      padding: 0 12px;
+    `,
+  }
+
+  const sendIncreaseAllowance = useCallback(async () => {
+    const allowanceSpender = spender ?? poolInfo.pool
+    const targetAllowanceAmount = allowanceAmount ?? MaxUint256
+    const currentAllowance = await poolUnderlyingTokenContract?.allowance(
+      account!,
+      allowanceSpender,
+    )
+    const amountToIncrease = BigNumber.from(targetAllowanceAmount).sub(
+      currentAllowance ?? 0,
+    )
+    send({
+      contract: poolUnderlyingTokenContract!,
+      method: 'increaseAllowance',
+      params: [allowanceSpender, amountToIncrease],
+      provider,
+    })
+  }, [
+    account,
+    allowanceAmount,
+    poolInfo.pool,
+    poolUnderlyingTokenContract,
+    provider,
+    send,
+    spender,
+  ])
+
+  useMount(() => {
+    if (!showAutoPayback) {
+      sendIncreaseAllowance()
+    }
+  })
+
+  if (showAutoPayback && waitingForAccept) {
+    return (
+      <WrapperModal
+        title='Auto Payback'
+        subTitle='Enable auto payback and never miss payments. You only need to do it once.'
+      >
+        <Box css={styles.iconWrapper}>
+          <img src={AutoPaybackImg} alt='auto-payback' />
+        </Box>
+        <Box css={styles.description}>
+          This allowance transaction removes the need to confirm follow up{' '}
+          {symbol} transactions. Gas is on us.
+        </Box>
+        <BottomButton variant='contained' onClick={sendIncreaseAllowance}>
+          APPROVE {symbol} PAYMENTS
+        </BottomButton>
+      </WrapperModal>
+    )
+  }
+
+  return (
+    <LoadingModal
+      title={`Approve ${symbol}`}
+      description='Waiting for approval confirmation...'
+    >
+      <ViewOnExplorer txHash={txHash} />
+    </LoadingModal>
+  )
+}

package/src/components/BottomButton.tsx

@@ -1,33 +1,33 @@
-import { Box, Button, css } from '@mui/material'
-import React from 'react'
-
-import { WCProps } from '../utilTypes'
-
-type Props = {
-  variant: 'contained' | 'outlined'
-  disabled?: boolean
-  onClick?: () => void
-}
-
-export function BottomButton({
-  variant,
-  disabled = false,
-  onClick,
-  children,
-}: WCProps<Props>): React.ReactElement {
-  const styles = css`
-    & .MuiButtonBase-root {
-      width: 100%;
-      position: absolute;
-      bottom: 0;
-    }
-  `
-
-  return (
-    <Box css={styles}>
-      <Button variant={variant} onClick={onClick} disabled={disabled}>
-        {children}
-      </Button>
-    </Box>
-  )
-}
+import { Box, Button, css } from '@mui/material'
+import React from 'react'
+
+import { WCProps } from '../utilTypes'
+
+type Props = {
+  variant: 'contained' | 'outlined'
+  disabled?: boolean
+  onClick?: () => void
+}
+
+export function BottomButton({
+  variant,
+  disabled = false,
+  onClick,
+  children,
+}: WCProps<Props>): React.ReactElement {
+  const styles = css`
+    & .MuiButtonBase-root {
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+    }
+  `
+
+  return (
+    <Box css={styles}>
+      <Button variant={variant} onClick={onClick} disabled={disabled}>
+        {children}
+      </Button>
+    </Box>
+  )
+}

package/src/components/ChainNotSupportedModal.tsx

@@ -1,33 +1,33 @@
-import React from 'react'
-
-import { ErrorModal } from './ErrorModal'
-import { HumaModal, HumaModalHeader } from './humaModal'
-
-type Props = {
-  handleClose: () => void
-  isOpen: boolean
-}
-
-export function ChainNotSupportedModal({
-  handleClose,
-  isOpen,
-}: Props): React.ReactElement | null {
-  return (
-    <HumaModal
-      isOpen={isOpen}
-      overflowY='auto'
-      onClose={handleClose}
-      width='480px'
-      padding='30px 40px'
-      disableBackdropClick
-    >
-      <HumaModalHeader onClose={handleClose} height={0} />
-      <ErrorModal
-        title='Network Not Supported'
-        errorReason='Please switch to a supported network.'
-        handleOk={handleClose}
-        okText='Close'
-      />
-    </HumaModal>
-  )
-}
+import React from 'react'
+
+import { ErrorModal } from './ErrorModal'
+import { HumaModal, HumaModalHeader } from './humaModal'
+
+type Props = {
+  handleClose: () => void
+  isOpen: boolean
+}
+
+export function ChainNotSupportedModal({
+  handleClose,
+  isOpen,
+}: Props): React.ReactElement | null {
+  return (
+    <HumaModal
+      isOpen={isOpen}
+      overflowY='auto'
+      onClose={handleClose}
+      width='480px'
+      padding='30px 40px'
+      disableBackdropClick
+    >
+      <HumaModalHeader onClose={handleClose} height={0} />
+      <ErrorModal
+        title='Network Not Supported'
+        errorReason='Please switch to a supported network.'
+        handleOk={handleClose}
+        okText='Close'
+      />
+    </HumaModal>
+  )
+}