Merge pull request #157 from 00labs/notifi-fixes

Notifi fixes
00labs · Mar 12, 2024 · 5ff3b81 · 5ff3b81
2 parents adf5203 + bf680fa
commit 5ff3b81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/packages/huma-shared/src/utils/notifi.ts b/packages/huma-shared/src/utils/notifi.ts
@@ -1,9 +1,5 @@
 import { ChainEnum } from './chain'
 
-export function getNotifiDappId(isDev: boolean): string {
-  return isDev ? 'humadapp' : 'humafinanceprod'
-}
-
 export function getBlockchainConfigFromChain(
   chainEnum: ChainEnum,
 ): 'POLYGON' | 'ETHEREUM' {

diff --git a/packages/huma-shared/tests/utils/notifi.test.ts b/packages/huma-shared/tests/utils/notifi.test.ts
@@ -3,23 +3,8 @@ import { ChainEnum } from '../../src/utils/chain'
 import {
   doesChainSupportNotifi,
   getBlockchainConfigFromChain,
-  getNotifiDappId,
 } from '../../src/utils/notifi'
 
-describe('getNotifiDappId', () => {
-  it('returns the correct dappId for development', () => {
-    const result = getNotifiDappId(true)
-
-    expect(result).toBe('humadapp')
-  })
-
-  it('returns the correct dappId for production', () => {
-    const result = getNotifiDappId(false)
-
-    expect(result).toBe('humafinanceprod')
-  })
-})
-
 describe('getBlockchainConfigFromChain', () => {
   it('returns POLYGON for Polygon and Mumbai chains', () => {
     expect(getBlockchainConfigFromChain(ChainEnum.Polygon)).toBe('POLYGON')

diff --git a/packages/huma-widget/src/components/Notifi/NotifiSubscriptionModal.tsx b/packages/huma-widget/src/components/Notifi/NotifiSubscriptionModal.tsx
@@ -1,8 +1,4 @@
-import {
-  checkIsDev,
-  getBlockchainConfigFromChain,
-  txAtom,
-} from '@huma-finance/shared'
+import { getBlockchainConfigFromChain, txAtom } from '@huma-finance/shared'
 import { Box, css, TextField, Typography, useTheme } from '@mui/material'
 import {
   BroadcastEventTypeItem,
@@ -95,7 +91,7 @@ export function NotifiSubscriptionModal({
   const [isLoading, setIsLoading] = useState<boolean>(false)
   const [emailAddress, setEmailAddress] = useState<string>('')
   const [emailValid, setEmailValid] = useState<boolean>()
-  const { notifiClient } = useNotifiClient(account, chainId, checkIsDev())
+  const { notifiClient } = useNotifiClient(account, chainId)
 
   const signMessage: Uint8SignMessageFunction = async (
     message: Uint8Array,

diff --git a/packages/huma-widget/src/hooks/useNotifi.ts b/packages/huma-widget/src/hooks/useNotifi.ts
@@ -3,7 +3,6 @@ import {
   checkIsDev,
   doesChainSupportNotifi,
   getBlockchainConfigFromChain,
-  getNotifiDappId,
 } from '@huma-finance/shared'
 import {
   NotifiFrontendClient,
@@ -34,7 +33,6 @@ export const useDoesChainSupportNotifi = (
 export const useNotifiClient = (
   account: string | undefined,
   chainId: number | undefined,
-  isDev: boolean,
 ) => {
   const [notifiClient, setNotifiClient] = useState<NotifiFrontendClient | null>(
     null,
@@ -46,8 +44,8 @@ export const useNotifiClient = (
       if (account != null && chainId != null && notifiChainSupported) {
         const client = newFrontendClient({
           account: { publicKey: account },
-          tenantId: getNotifiDappId(isDev),
-          env: isDev ? 'Development' : 'Production',
+          tenantId: 'humafinanceprod',
+          env: 'Production',
           walletBlockchain: getBlockchainConfigFromChain(chainId),
         })
         await client.initialize()
@@ -56,7 +54,7 @@ export const useNotifiClient = (
     }
 
     createNotifiClient()
-  }, [account, chainId, isDev, notifiChainSupported])
+  }, [account, chainId, notifiChainSupported])
 
   return { notifiClient }
 }
@@ -66,7 +64,7 @@ export const useIsFirstTimeNotifiUser = (
   chainId: number | undefined,
 ) => {
   const [isFirstTimeNotifiUser, setIsFirstTimeNotifiUser] = useState(false)
-  const { notifiClient } = useNotifiClient(account, chainId, checkIsDev())
+  const { notifiClient } = useNotifiClient(account, chainId)
   const { notifiChainSupported } = useDoesChainSupportNotifi(account, chainId)
 
   useEffect(() => {