@huma-finance/widgets 0.0.7 → 0.0.10

package/src/cosmos/utils/index.ts

@@ -1,169 +1,169 @@
-/* eslint-disable arrow-body-style */
-/* eslint-disable @typescript-eslint/lines-between-class-members */
-/* eslint-disable prefer-destructuring */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable consistent-return */
-/**
- * Updates cy.visit() to include an injected window.ethereum provider.
- */
-import { Eip1193Bridge } from '@ethersproject/experimental/lib/eip1193-bridge'
-import { JsonRpcProvider } from '@ethersproject/providers'
-import { ethers, Wallet } from 'ethers'
-import { deepCopy } from 'ethers/lib/utils'
-
-export enum ChainEnum {
-  Goerli = 5,
-  Mumbai = 80001,
-}
-
-class MetamaskBridge extends Eip1193Bridge {
-  private walletAddress: string
-  private chainId: number
-
-  constructor(
-    signer: ethers.Signer,
-    provider: ethers.providers.Provider,
-    walletAddress: string,
-    chainId = 5,
-  ) {
-    super(signer, provider)
-    this.walletAddress = walletAddress
-    this.chainId = chainId
-  }
-
-  async sendAsync(...args: any[]) {
-    console.debug('sendAsync called', ...args)
-    return this.send(...args)
-  }
-  async send(...args: any[]) {
-    console.debug('send called', ...args)
-    const isCallbackForm =
-      typeof args[0] === 'object' && typeof args[1] === 'function'
-    let callback
-    let method
-    let params
-    if (isCallbackForm) {
-      callback = args[1]
-      method = args[0].method
-      params = args[0].params
-    } else {
-      method = args[0]
-      params = args[1]
-    }
-    if (method === 'eth_requestAccounts' || method === 'eth_accounts') {
-      if (isCallbackForm) {
-        callback({ result: [this.walletAddress] })
-      } else {
-        return Promise.resolve([this.walletAddress])
-      }
-    }
-    if (method === 'eth_chainId') {
-      const chainIdHex = ethers.utils.hexlify(this.chainId)
-      if (isCallbackForm) {
-        callback(null, { result: chainIdHex })
-      } else {
-        return Promise.resolve(chainIdHex)
-      }
-    }
-    // Eip1193Bridge only supports eth_sign
-    // address is the first param for eth_sign
-    if (method === 'personal_sign') {
-      method = 'eth_sign'
-      const [data, address] = deepCopy(params)
-      params[0] = address
-      params[1] = data
-    }
-    try {
-      // Please refer to: https://github.com/ethers-io/ethers.js/issues/1683
-      // If from is present on eth_call it errors, removing it makes the library set
-      // from as the connected wallet which works fine
-      if (params && params.length && method === 'eth_call') {
-        if (params[0].from) {
-          delete params[0].from
-        }
-        if (params[0].gas) {
-          delete params[0].gas
-        }
-      }
-
-      let result
-      // For sending a transaction if we call send it will error
-      // as it wants gasLimit in sendTransaction but hexlify sets the property gas
-      // to gasLimit which makes send transaction error.
-      // This have taken the code from the super method for sendTransaction and altered
-      // it slightly to make it work with the gas limit issues.
-      if (
-        params &&
-        params.length &&
-        params[0].from &&
-        method === 'eth_sendTransaction'
-      ) {
-        // Hexlify will not take gas, must be gasLimit, set this property to be gasLimit
-        params[0].gasLimit = params[0].gas
-        delete params[0].gas
-        // If from is present on eth_sendTransaction it errors, removing it makes the library set
-        // from as the connected wallet which works fine
-        delete params[0].from
-        const req = ethers.providers.JsonRpcProvider.hexlifyTransaction(
-          params[0],
-        )
-        // Hexlify sets the gasLimit property to be gas again and send transaction requires gasLimit
-        req.gasLimit = req.gas
-        delete req.gas
-        // Send the transaction
-        const tx = await this.signer.sendTransaction(req)
-        result = tx.hash
-      } else {
-        // All other transactions the base class works for
-        result = await super.send(method, params)
-      }
-      console.debug('result received', method, params, result)
-      if (isCallbackForm) {
-        callback(null, { result })
-      } else {
-        return result
-      }
-    } catch (error) {
-      console.log(error)
-      if (isCallbackForm) {
-        callback(error, null)
-      } else {
-        throw error
-      }
-    }
-  }
-}
-
-export const getProvider = (chainId = ChainEnum.Goerli) => {
-  const rpcUrlMap: { [x: number]: { name: string; url: string } } = {
-    [ChainEnum.Goerli]: {
-      name: 'Goerli',
-      url: `https://goerli.infura.io/v3/${process.env.REACT_APP_INFURA_API_KEY}`,
-    },
-    [ChainEnum.Mumbai]: {
-      name: 'Mumbai',
-      url: `https://polygon-mumbai.g.alchemy.com/v2/${process.env.REACT_APP_ALCHEMY_API_KEY}`,
-    },
-  }
-  return new JsonRpcProvider(rpcUrlMap[chainId].url, {
-    name: rpcUrlMap[chainId].name,
-    chainId,
-  })
-}
-
-export const getInjectedMetamask = (
-  testPrivateKey: string,
-  chainId = ChainEnum.Goerli,
-) => {
-  const TEST_ADDRESS_NEVER_USE = new Wallet(testPrivateKey).address
-  const provider = getProvider(chainId)
-  const signer = new Wallet(testPrivateKey, provider)
-  return new MetamaskBridge(signer, provider, TEST_ADDRESS_NEVER_USE, chainId)
-}
-
-export const getSigner = (
-  testPrivateKey: string,
-  chainId = ChainEnum.Goerli,
-) => {
-  return new Wallet(testPrivateKey, getProvider(chainId))
-}
+/* eslint-disable arrow-body-style */
+/* eslint-disable @typescript-eslint/lines-between-class-members */
+/* eslint-disable prefer-destructuring */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable consistent-return */
+/**
+ * Updates cy.visit() to include an injected window.ethereum provider.
+ */
+import { Eip1193Bridge } from '@ethersproject/experimental/lib/eip1193-bridge'
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { ethers, Wallet } from 'ethers'
+import { deepCopy } from 'ethers/lib/utils'
+
+export enum ChainEnum {
+  Goerli = 5,
+  Mumbai = 80001,
+}
+
+class MetamaskBridge extends Eip1193Bridge {
+  private walletAddress: string
+  private chainId: number
+
+  constructor(
+    signer: ethers.Signer,
+    provider: ethers.providers.Provider,
+    walletAddress: string,
+    chainId = 5,
+  ) {
+    super(signer, provider)
+    this.walletAddress = walletAddress
+    this.chainId = chainId
+  }
+
+  async sendAsync(...args: any[]) {
+    console.debug('sendAsync called', ...args)
+    return this.send(...args)
+  }
+  async send(...args: any[]) {
+    console.debug('send called', ...args)
+    const isCallbackForm =
+      typeof args[0] === 'object' && typeof args[1] === 'function'
+    let callback
+    let method
+    let params
+    if (isCallbackForm) {
+      callback = args[1]
+      method = args[0].method
+      params = args[0].params
+    } else {
+      method = args[0]
+      params = args[1]
+    }
+    if (method === 'eth_requestAccounts' || method === 'eth_accounts') {
+      if (isCallbackForm) {
+        callback({ result: [this.walletAddress] })
+      } else {
+        return Promise.resolve([this.walletAddress])
+      }
+    }
+    if (method === 'eth_chainId') {
+      const chainIdHex = ethers.utils.hexlify(this.chainId)
+      if (isCallbackForm) {
+        callback(null, { result: chainIdHex })
+      } else {
+        return Promise.resolve(chainIdHex)
+      }
+    }
+    // Eip1193Bridge only supports eth_sign
+    // address is the first param for eth_sign
+    if (method === 'personal_sign') {
+      method = 'eth_sign'
+      const [data, address] = deepCopy(params)
+      params[0] = address
+      params[1] = data
+    }
+    try {
+      // Please refer to: https://github.com/ethers-io/ethers.js/issues/1683
+      // If from is present on eth_call it errors, removing it makes the library set
+      // from as the connected wallet which works fine
+      if (params && params.length && method === 'eth_call') {
+        if (params[0].from) {
+          delete params[0].from
+        }
+        if (params[0].gas) {
+          delete params[0].gas
+        }
+      }
+
+      let result
+      // For sending a transaction if we call send it will error
+      // as it wants gasLimit in sendTransaction but hexlify sets the property gas
+      // to gasLimit which makes send transaction error.
+      // This have taken the code from the super method for sendTransaction and altered
+      // it slightly to make it work with the gas limit issues.
+      if (
+        params &&
+        params.length &&
+        params[0].from &&
+        method === 'eth_sendTransaction'
+      ) {
+        // Hexlify will not take gas, must be gasLimit, set this property to be gasLimit
+        params[0].gasLimit = params[0].gas
+        delete params[0].gas
+        // If from is present on eth_sendTransaction it errors, removing it makes the library set
+        // from as the connected wallet which works fine
+        delete params[0].from
+        const req = ethers.providers.JsonRpcProvider.hexlifyTransaction(
+          params[0],
+        )
+        // Hexlify sets the gasLimit property to be gas again and send transaction requires gasLimit
+        req.gasLimit = req.gas
+        delete req.gas
+        // Send the transaction
+        const tx = await this.signer.sendTransaction(req)
+        result = tx.hash
+      } else {
+        // All other transactions the base class works for
+        result = await super.send(method, params)
+      }
+      console.debug('result received', method, params, result)
+      if (isCallbackForm) {
+        callback(null, { result })
+      } else {
+        return result
+      }
+    } catch (error) {
+      console.log(error)
+      if (isCallbackForm) {
+        callback(error, null)
+      } else {
+        throw error
+      }
+    }
+  }
+}
+
+export const getProvider = (chainId = ChainEnum.Goerli) => {
+  const rpcUrlMap: { [x: number]: { name: string; url: string } } = {
+    [ChainEnum.Goerli]: {
+      name: 'Goerli',
+      url: `https://goerli.infura.io/v3/${process.env.REACT_APP_INFURA_API_KEY}`,
+    },
+    [ChainEnum.Mumbai]: {
+      name: 'Mumbai',
+      url: `https://polygon-mumbai.g.alchemy.com/v2/${process.env.REACT_APP_ALCHEMY_API_KEY}`,
+    },
+  }
+  return new JsonRpcProvider(rpcUrlMap[chainId].url, {
+    name: rpcUrlMap[chainId].name,
+    chainId,
+  })
+}
+
+export const getInjectedMetamask = (
+  testPrivateKey: string,
+  chainId = ChainEnum.Goerli,
+) => {
+  const TEST_ADDRESS_NEVER_USE = new Wallet(testPrivateKey).address
+  const provider = getProvider(chainId)
+  const signer = new Wallet(testPrivateKey, provider)
+  return new MetamaskBridge(signer, provider, TEST_ADDRESS_NEVER_USE, chainId)
+}
+
+export const getSigner = (
+  testPrivateKey: string,
+  chainId = ChainEnum.Goerli,
+) => {
+  return new Wallet(testPrivateKey, getProvider(chainId))
+}

package/src/hooks/useEA.ts

@@ -9,7 +9,7 @@ import {
 } from '@huma-finance/shared'
 import { useCallback } from 'react'
 
-import { setApproveInfo, setError, setStep } from '../store/widgets.reducers'
+import { setApproval, setError, setStep } from '../store/widgets.reducers'
 import { WIDGET_STEP } from '../store/widgets.store'
 import { useAppDispatch } from './useRedux'
 import { envUtil } from '../utils/env'
@@ -30,15 +30,17 @@ const useEA = () => {
           chainId!,
           envUtil.checkIsDev(),
         )
-        result.creditLimit = downScale<number>(
-          result.creditLimit,
-          result.tokenDecimal,
+        result.terms.creditLimit = downScale<number>(
+          result.terms.creditLimit,
+          result.token.decimal,
         )
-        result.receivableAmount = downScale<number>(
-          result.receivableAmount,
-          result.tokenDecimal,
-        )
-        dispatch(setApproveInfo({ ...result, nextStep }))
+        if (result.receivable) {
+          result.receivable.amount = downScale<number>(
+            result.receivable.amount,
+            result.token.decimal,
+          )
+        }
+        dispatch(setApproval({ ...result, nextStep }))
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (e: any) {
         if (e instanceof EARejectionError) {

package/src/hooks/useRedux.ts

@@ -1,6 +1,6 @@
-import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
-import type { RootState, AppDispatch } from '../store'
-
-// Use throughout your app instead of plain `useDispatch` and `useSelector`
-export const useAppDispatch = () => useDispatch<AppDispatch>()
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
+import type { RootState, AppDispatch } from '../store'
+
+// Use throughout your app instead of plain `useDispatch` and `useSelector`
+export const useAppDispatch = () => useDispatch<AppDispatch>()
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector

package/src/index.css

@@ -1,61 +1,61 @@
-@font-face {
-  font-family: 'Recoleta-Medium';
-  src: local('Recoleta-Medium'),
-    url(./fonts/Recoleta/Recoleta-Medium.otf) format('truetype');
-  font-weight: 500;
-}
-
-@font-face {
-  font-family: 'Roboto-Medium';
-  src: local('Roboto-Medium'),
-    url(./fonts/Roboto/Roboto-Medium.ttf) format('truetype');
-  font-weight: 500;
-}
-
-@font-face {
-  font-family: 'Roboto-Regular';
-  src: local('Roboto-Regular'),
-    url(./fonts/Roboto/Roboto-Regular.ttf) format('truetype');
-  font-weight: 400;
-}
-
-@font-face {
-  font-family: 'Inter-Bold';
-  src: local('Inter-Bold'), url(./fonts/Inter/Inter-Bold.ttf) format('truetype');
-  font-weight: 700;
-}
-
-@font-face {
-  font-family: 'Inter-Medium';
-  src: local('Inter-Medium'),
-    url(./fonts/Inter/Inter-Medium.ttf) format('truetype');
-  font-weight: 500;
-}
-
-@font-face {
-  font-family: 'Inter-Regular';
-  src: local('Inter-Regular'),
-    url(./fonts/Inter/Inter-Regular.ttf) format('truetype');
-  font-weight: 400;
-}
-
-@font-face {
-  font-family: 'Uni-Neue-Black';
-  src: local('Uni-Neue-Black'),
-    url(./fonts/UniNeue/UniNeue-Black.ttf) format('truetype');
-  font-weight: 800;
-}
-
-@font-face {
-  font-family: 'Uni-Neue-Bold';
-  src: local('Uni-Neue-Bold'),
-    url(./fonts/UniNeue/UniNeue-Bold.ttf) format('truetype');
-  font-weight: 700;
-}
-
-@font-face {
-  font-family: 'Uni-Neue-Regular';
-  src: local('Uni-Neue-Regular'),
-    url(./fonts/UniNeue/UniNeue-Regular.ttf) format('truetype');
-  font-weight: 400;
-}
+@font-face {
+  font-family: 'Recoleta-Medium';
+  src: local('Recoleta-Medium'),
+    url(./fonts/Recoleta/Recoleta-Medium.otf) format('truetype');
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'Roboto-Medium';
+  src: local('Roboto-Medium'),
+    url(./fonts/Roboto/Roboto-Medium.ttf) format('truetype');
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'Roboto-Regular';
+  src: local('Roboto-Regular'),
+    url(./fonts/Roboto/Roboto-Regular.ttf) format('truetype');
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'Inter-Bold';
+  src: local('Inter-Bold'), url(./fonts/Inter/Inter-Bold.ttf) format('truetype');
+  font-weight: 700;
+}
+
+@font-face {
+  font-family: 'Inter-Medium';
+  src: local('Inter-Medium'),
+    url(./fonts/Inter/Inter-Medium.ttf) format('truetype');
+  font-weight: 500;
+}
+
+@font-face {
+  font-family: 'Inter-Regular';
+  src: local('Inter-Regular'),
+    url(./fonts/Inter/Inter-Regular.ttf) format('truetype');
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'Uni-Neue-Black';
+  src: local('Uni-Neue-Black'),
+    url(./fonts/UniNeue/UniNeue-Black.ttf) format('truetype');
+  font-weight: 800;
+}
+
+@font-face {
+  font-family: 'Uni-Neue-Bold';
+  src: local('Uni-Neue-Bold'),
+    url(./fonts/UniNeue/UniNeue-Bold.ttf) format('truetype');
+  font-weight: 700;
+}
+
+@font-face {
+  font-family: 'Uni-Neue-Regular';
+  src: local('Uni-Neue-Regular'),
+    url(./fonts/UniNeue/UniNeue-Regular.ttf) format('truetype');
+  font-weight: 400;
+}

package/src/index.tsx

@@ -3,10 +3,6 @@ import './index.css'
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { ThemeProvider } from '@mui/material'
 import { Provider as Eip1193Provider } from '@web3-react/types'
-import {
-  Provider as Web3Provider,
-  ProviderProps as Web3Props,
-} from '@huma-finance/shared'
 import { Provider as AtomProvider } from 'jotai'
 import { Provider as ReduxProvider } from 'react-redux'
 
@@ -58,9 +54,7 @@ function Widget(props: WCProps<WidgetProps>) {
   return (
     <ThemeProvider theme={themeHuma}>
       <ReduxProvider store={store}>
-        <Web3Provider {...(props as Web3Props)}>
-          <AtomProvider>{children}</AtomProvider>
-        </Web3Provider>
+        <AtomProvider>{children}</AtomProvider>
       </ReduxProvider>
     </ThemeProvider>
   )

package/src/react-app-env.d.ts

@@ -1 +1 @@
-/// <reference types="react-scripts" />
+/// <reference types="react-scripts" />

package/src/reportWebVitals.ts

@@ -1,15 +1,15 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;
+import { ReportHandler } from 'web-vitals';
+
+const reportWebVitals = (onPerfEntry?: ReportHandler) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

package/src/setupTests.ts

@@ -1,6 +1,6 @@
-/* eslint-disable import/no-extraneous-dependencies */
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect'
+/* eslint-disable import/no-extraneous-dependencies */
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom/extend-expect'

package/src/store/index.ts

@@ -1,27 +1,27 @@
-import {
-  Action,
-  ActionCreator,
-  AnyAction,
-  configureStore,
-  ThunkAction,
-} from '@reduxjs/toolkit'
-
-import widgetsReducers from './widgets.reducers'
-
-export const store = configureStore({
-  reducer: {
-    widget: widgetsReducers,
-  },
-})
-
-export type AppDispatch = typeof store.dispatch
-export type RootState = ReturnType<typeof store.getState>
-export type AppThunk<ReturnType = void> = ThunkAction<
-  ReturnType,
-  RootState,
-  unknown,
-  Action<string>
->
-export type AppActionThunk<ReturnType = void> = ActionCreator<
-  ThunkAction<ReturnType, RootState, unknown, AnyAction>
->
+import {
+  Action,
+  ActionCreator,
+  AnyAction,
+  configureStore,
+  ThunkAction,
+} from '@reduxjs/toolkit'
+
+import widgetsReducers from './widgets.reducers'
+
+export const store = configureStore({
+  reducer: {
+    widget: widgetsReducers,
+  },
+})
+
+export type AppDispatch = typeof store.dispatch
+export type RootState = ReturnType<typeof store.getState>
+export type AppThunk<ReturnType = void> = ThunkAction<
+  ReturnType,
+  RootState,
+  unknown,
+  Action<string>
+>
+export type AppActionThunk<ReturnType = void> = ActionCreator<
+  ThunkAction<ReturnType, RootState, unknown, AnyAction>
+>