@huma-finance/widgets 0.0.62-beta.599 → 0.0.62-beta.611

package/src/components/SolanaViewOnExplorer.tsx

@@ -0,0 +1,29 @@
+import { Box, Button } from '@mui/material'
+import {
+  getSolanaExplorerUrl,
+  openInNewTab,
+  SolanaChainEnum,
+} from '@huma-finance/shared'
+import React from 'react'
+
+type Props = {
+  chainId: SolanaChainEnum
+  signature: string
+}
+
+export function SolanaViewOnExplorer({
+  chainId,
+  signature,
+}: Props): React.ReactElement | null {
+  const link = getSolanaExplorerUrl(chainId, signature, 'tx')
+
+  if (!link) {
+    return null
+  }
+
+  return (
+    <Button fullWidth variant='outlined' onClick={() => openInNewTab(link)}>
+      <Box component='span'>VIEW ON EXPLORER</Box>
+    </Button>
+  )
+}

package/src/components/WidgetWrapper.tsx

@@ -31,7 +31,7 @@ export function WidgetWrapper({
 }: WCProps<Props>): React.ReactElement | null {
   const theme = useTheme()
   const dispatch = useAppDispatch()
-  const { step } = useAppSelector(selectWidgetState)
+  const { step, solanaSignature } = useAppSelector(selectWidgetState)
   const [{ state, failReason, txReceipt }] = useAtom(sendTxAtom)
   const reset = useResetAtom(txAtom)
 
@@ -42,12 +42,14 @@ export function WidgetWrapper({
   }, [dispatch, failReason, state])
 
   useEffect(() => {
-    if (step === WIDGET_STEP.Done && txReceipt) {
-      if (handleSuccess) {
+    if (step === WIDGET_STEP.Done && (txReceipt || solanaSignature)) {
+      if (handleSuccess && txReceipt) {
         handleSuccess(txReceipt.blockNumber)
+      } else if (handleSuccess && solanaSignature) {
+        handleSuccess(0) // solana tx doesn't have block number
       }
     }
-  }, [handleSuccess, step, txReceipt])
+  }, [handleSuccess, solanaSignature, step, txReceipt])
 
   const handleCloseModal = useCallback(() => {
     reset()

package/src/index.tsx

@@ -73,6 +73,22 @@ import { SuperfluidFactoring } from './components/SuperfluidFactoring'
 import { store } from './store'
 import { themeHuma } from './theme'
 import { WCProps } from './utilTypes'
+import {
+  SolanaLendSupply,
+  SolanaLendSupplyProps,
+} from './components/Lend/solanaSupply'
+import {
+  SolanaLendAddRedemption,
+  SolanaLendAddRedemptionProps,
+} from './components/Lend/solanaAddRedemption'
+import {
+  SolanaLendCancelRedemption,
+  SolanaLendCancelRedemptionProps,
+} from './components/Lend/solanaCancelRedemption'
+import {
+  SolanaBorrow,
+  SolanaBorrowProps,
+} from './components/CreditLine/solanaBorrow'
 
 /**
  * Mapping of your JSON-RPC connections indexed by chainId
@@ -528,3 +544,111 @@ export function ReceivableBackedCreditLinePaymentWidgetV2(
     </Widget>
   )
 }
+
+/**
+ * Object representing the props passed to Solana widgets
+ * @typedef {Object} SolanaWidgetProps
+ */
+type SolanaWidgetProps = {
+  handleClose?: () => void
+}
+
+function SolanaWidget(props: WCProps<SolanaWidgetProps>) {
+  const { children } = props
+
+  return (
+    <ThemeProvider theme={themeHuma}>
+      <ReduxProvider store={store}>{children}</ReduxProvider>
+    </ThemeProvider>
+  )
+}
+
+/**
+ * Lend pool supply widget props for Solana pools
+ * @typedef {Object} SolanaLendSupplyWidgetProps
+ * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
+ * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
+ */
+type SolanaLendSupplyWidgetProps = SolanaLendSupplyProps & SolanaWidgetProps
+
+/**
+ * Lend pool supply widget for Solana pools
+ *
+ * @param {SolanaLendSupplyWidgetProps} props - Widget props
+ */
+export function SolanaLendSupplyWidget(props: SolanaLendSupplyWidgetProps) {
+  return (
+    <SolanaWidget {...props}>
+      <SolanaLendSupply {...props} />
+    </SolanaWidget>
+  )
+}
+
+/**
+ * Lend pool supply widget props for Solana pools
+ * @typedef {Object} SolanaLendAddRedemptionWidgetProps
+ * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
+ * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
+ */
+type SolanaLendAddRedemptionWidgetProps = SolanaLendAddRedemptionProps &
+  SolanaWidgetProps
+
+/**
+ * Lend pool supply widget for Solana pools
+ *
+ * @param {SolanaLendAddRedemptionWidgetProps} props - Widget props
+ */
+export function SolanaLendAddRedemptionWidget(
+  props: SolanaLendAddRedemptionWidgetProps,
+) {
+  return (
+    <SolanaWidget {...props}>
+      <SolanaLendAddRedemption {...props} />
+    </SolanaWidget>
+  )
+}
+
+/**
+ * Lend pool supply widget props for Solana pools
+ * @typedef {Object} SolanaLendCancelRedemptionWidgetProps
+ * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
+ * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
+ */
+type SolanaLendCancelRedemptionWidgetProps = SolanaLendCancelRedemptionProps &
+  SolanaWidgetProps
+
+/**
+ * Lend pool supply widget for Solana pools
+ *
+ * @param {SolanaLendCancelRedemptionWidgetProps} props - Widget props
+ */
+export function SolanaLendCancelRedemptionWidget(
+  props: SolanaLendCancelRedemptionWidgetProps,
+) {
+  return (
+    <SolanaWidget {...props}>
+      <SolanaLendCancelRedemption {...props} />
+    </SolanaWidget>
+  )
+}
+
+/**
+ * Lend pool supply widget props for Solana pools
+ * @typedef {Object} SolanaBorrowWidgetProps
+ * @property {SolanaLendSupplyProps} SolanaLendSupplyProps - Specific widget props
+ * @property {SolanaWidgetProps} SolanaWidgetProps - Widget general props.
+ */
+type SolanaBorrowWidgetProps = SolanaBorrowProps & SolanaWidgetProps
+
+/**
+ * Lend pool supply widget for Solana pools
+ *
+ * @param {SolanaBorrowWidgetProps} props - Widget props
+ */
+export function SolanaBorrowWidget(props: SolanaBorrowWidgetProps) {
+  return (
+    <SolanaWidget {...props}>
+      <SolanaBorrow {...props} />
+    </SolanaWidget>
+  )
+}

package/src/store/widgets.reducers.ts

@@ -32,6 +32,7 @@ export const widgetSlice = createSlice({
       state.withdrawShares = undefined
       state.redeemAmount = undefined
       state.redeemShares = undefined
+      state.solanaSignature = undefined
     },
     setStep: (state, { payload }: PayloadAction<WIDGET_STEP>) => {
       state.step = payload
@@ -102,6 +103,9 @@ export const widgetSlice = createSlice({
     setMultisend: (state, { payload }: PayloadAction<MultisendPayload>) => {
       state.multisend = payload
     },
+    setSolanaSignature: (state, { payload }: PayloadAction<string>) => {
+      state.solanaSignature = payload
+    },
     setError: (
       state,
       {
@@ -130,6 +134,7 @@ export const {
   setWithdrawShares,
   setRedeemAmount,
   setRedeemShares,
+  setSolanaSignature,
 } = widgetSlice.actions
 
 export default widgetSlice.reducer

package/src/store/widgets.store.ts

@@ -58,6 +58,7 @@ export type WidgetState = {
   tokenId?: string
   stream?: WidgetStream
   multisend?: MultisendPayload
+  solanaSignature?: string
 }
 
 export const initialWidgetState: WidgetState = {}