@huma-finance/widgets 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huma-finance/widgets",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "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.13",
-    "@huma-finance/shared": "^0.0.13",
+    "@huma-finance/sdk": "^0.0.15",
+    "@huma-finance/shared": "^0.0.15",
     "@mui/icons-material": "^5.3.0",
     "@mui/material": "^5.0.6",
     "@mui/styles": "^5.0.2",
@@ -191,5 +191,5 @@
   "optionalDependencies": {
     "encoding": "^0.1.13"
   },
-  "gitHead": "d4c4b86cde3f84209204f8f926de995bb07a1bd2"
+  "gitHead": "2a3b42fb7373cc84c02cc14057fbe66465ac0988"
 }

package/src/components/ChainNotSupportedModal.tsx

@@ -5,14 +5,16 @@ import { HumaModal, HumaModalHeader } from './humaModal'
 
 type Props = {
   handleClose: () => void
+  isOpen: boolean
 }
 
 export function ChainNotSupportedModal({
   handleClose,
+  isOpen,
 }: Props): React.ReactElement | null {
   return (
     <HumaModal
-      isOpen
+      isOpen={isOpen}
       overflowY='auto'
       onClose={handleClose}
       width='480px'

package/src/components/StreamFactoring/borrow/1-Evaluation.tsx

@@ -30,7 +30,7 @@ export function Evaluation({
             receivable: {
               address: poolInfo.assetAddress!,
             },
-            payerAddress,
+            payerWalletAddress: payerAddress,
             superToken,
           },
         },

package/src/components/SuperfluidFactoring/SuperfluidFactoredList.tsx

@@ -1,6 +1,6 @@
 import { EmotionJSX } from '@emotion/react/types/jsx-namespace'
 import { AccountStats, PoolInfoType } from '@huma-finance/shared'
-import React from 'react'
+import React, { useCallback } from 'react'
 
 import { ColumnType } from '../../utilTypes'
 import { FactoredList } from '../Factoring'
@@ -48,6 +48,14 @@ export function SuperfluidFactoredList({
   accountStats,
   handlePayManually,
 }: Props): React.ReactElement {
+  const setItem = useCallback(
+    () =>
+      Promise.resolve({
+        name: poolInfo?.extra?.superTokens?.[0].symbol ?? '',
+      }),
+    [poolInfo?.extra?.superTokens],
+  )
+
   return (
     <FactoredList
       title='Streams'
@@ -56,6 +64,7 @@ export function SuperfluidFactoredList({
       handlePayManually={handlePayManually}
       getColumns={getColumns}
       accountStats={accountStats}
+      setItem={setItem}
     />
   )
 }

package/src/components/SuperfluidFactoring/SuperfluidUpcomingList.tsx

@@ -1,16 +1,14 @@
 import { gql, useQuery } from '@apollo/client'
 import { EmotionJSX } from '@emotion/react/types/jsx-namespace'
-import { Button } from '@mui/material'
-import { useWeb3React } from '@web3-react/core'
-import { History } from 'history'
 import {
   downScale,
   getWalletAddressAbbr,
   PoolInfoType,
   toBigNumber,
 } from '@huma-finance/shared'
+import { Button } from '@mui/material'
+import { useWeb3React } from '@web3-react/core'
 import React, { useCallback, useEffect, useState } from 'react'
-import { useHistory } from 'react-router'
 
 import { ColumnType } from '../../utilTypes'
 import { TableActionButton } from '../buttons'
@@ -71,7 +69,6 @@ type Props = {
 const getUpcomingColumns = (
   userHasActiveLoan: boolean,
   handleGetPaid: (id: StreamItem) => void,
-  history: History,
 ): ColumnType<StreamItem>[] => [
   {
     title: '',
@@ -86,20 +83,6 @@ const getUpcomingColumns = (
     dataIndex: 'payerAbbr',
   },
   { title: 'Flow rate', dataIndex: 'flowrateMonth' },
-  {
-    title: 'Payer Approve',
-    action: (record) => (
-      <TableActionButton
-        title='Go To Approve'
-        handleClick={() =>
-          history.push(
-            `/superfluid?payer=${record.payer}&superToken=${record.tokenId}`,
-          )
-        }
-        disabled={userHasActiveLoan}
-      />
-    ),
-  },
   {
     title: 'Get Paid',
     action: (record) => (
@@ -118,7 +101,6 @@ export function SuperfluidUpcomingList({
   loading,
   handleGetPaid,
 }: Props): React.ReactElement {
-  const history = useHistory()
   const { account, isActive } = useWeb3React()
   const [streams, setStreams] = useState<StreamItem[] | undefined>()
   const { data } = useQuery<{ streams: Stream[] }>(GET_RECEIVED_STREAMS, {
@@ -161,7 +143,7 @@ export function SuperfluidUpcomingList({
     <UpcomingList<StreamItem>
       items={streams}
       loading={loading}
-      columns={getUpcomingColumns(hasActiveLoan, handleGetPaid, history)}
+      columns={getUpcomingColumns(hasActiveLoan, handleGetPaid)}
       title='Ongoing Streams'
       connectWalletDesc='Please connect wallet to check your ongoing streams.'
       noItemDesc='You don’t have any ongoing streams eligible for factoring. For now, you can click the button

package/src/index.tsx

@@ -60,14 +60,26 @@ type WidgetProps = {
 }
 
 function Widget(props: WCProps<WidgetProps>) {
-  const { children, desiredChainId, handleClose } = props
-  const netWorkVersion =
-    // @ts-ignore
-    window.ethereum?.networkVersion || window.ethereum?.chainId
+  const { children, desiredChainId } = props
+  // @ts-ignore
+  const netWorkVersion = window.ethereum?.networkVersion
   const [currentChainId, setCurrentChainId] = useState<number | undefined>(
     netWorkVersion ? Number(netWorkVersion) : undefined,
   )
   const chainSupported = !!supportedChainId(currentChainId)
+  const [chainNotSupportedOpen, setChainNotSupportedOpen] = useState(false)
+
+  useEffect(() => {
+    setCurrentChainId(netWorkVersion ? Number(netWorkVersion) : undefined)
+  }, [netWorkVersion])
+
+  useEffect(() => {
+    if (chainSupported) {
+      setChainNotSupportedOpen(false)
+    } else {
+      setChainNotSupportedOpen(true)
+    }
+  }, [chainSupported])
 
   useEffect(() => {
     const chainChangeListener = (chainId: number) => {
@@ -108,16 +120,17 @@ function Widget(props: WCProps<WidgetProps>) {
   }, [currentChainId, desiredChainId])
 
   const handleCloseCallback = useCallback(() => {
-    if (handleClose) {
-      handleClose()
-    }
-  }, [handleClose])
+    setChainNotSupportedOpen(false)
+  }, [])
 
   if (!chainSupported) {
     return (
       <ThemeProvider theme={themeHuma}>
         <ReduxProvider store={store}>
-          <ChainNotSupportedModal handleClose={handleCloseCallback} />
+          <ChainNotSupportedModal
+            isOpen={chainNotSupportedOpen}
+            handleClose={handleCloseCallback}
+          />
         </ReduxProvider>
       </ThemeProvider>
     )