refactor: be optimistic to empty reverse result (#10375)

DimensionDev · Aug 14, 2023 · ded15fe · ded15fe
1 parent 6007c73
commit ded15fe
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx b/packages/dashboard/src/pages/Wallets/components/HistoryTableRow/index.tsx
@@ -79,7 +79,7 @@ HistoryTableRow.displayName = 'HistoryTableRow'
 export interface HistoryTableRowUIProps extends HistoryTableRowProps {
     selectedChainId: Web3Helper.ChainIdAll
     formattedType: string
-    domain?: string
+    domain?: string | null
 }
 
 export const HistoryTableRowUI = memo<HistoryTableRowUIProps>(

diff --git a/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx b/packages/dashboard/src/pages/Wallets/components/WalletStateBar/index.tsx
@@ -92,7 +92,7 @@ interface WalletStateBarUIProps {
     provider?: Web3Helper.ProviderDescriptorAll
     name?: string
     address?: string
-    domain?: string
+    domain?: string | null
     openConnectWalletDialog(): void
 }
 

diff --git a/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/components/WalletInfo/index.tsx
@@ -84,7 +84,7 @@ export interface WalletInfoUIProps {
     onSettingClick: () => void
     onEditClick: () => void
     hideSettings: boolean
-    domain?: string
+    domain?: string | null
     formatDomainName?: (domain: string, size?: number) => string | undefined
 }
 

diff --git a/packages/plugins/RSS3/src/SiteAdaptor/contexts/FeedOwnerContext.tsx b/packages/plugins/RSS3/src/SiteAdaptor/contexts/FeedOwnerContext.tsx
@@ -3,7 +3,7 @@ import { createContext, useContext } from 'react'
 export interface FeedOwnerOptions {
     address: string
     /** ENS, RNS or SOL, etc */
-    name?: string
+    name?: string | null
     ownerDisplay: string
 }
 export const FeedOwnerContext = createContext<FeedOwnerOptions>(null!)

diff --git a/packages/web3-hooks/base/src/useLookupAddress.ts b/packages/web3-hooks/base/src/useLookupAddress.ts
@@ -7,7 +7,7 @@ import { useWeb3Others } from './useWeb3Others.js'
 
 export function useLookupAddress<T extends NetworkPluginID>(
     pluginID?: T,
-    domain?: string,
+    domain?: string | null,
     expectedChainId?: Web3Helper.Definition[T]['ChainId'],
 ) {
     const { chainId } = useChainContext({ chainId: expectedChainId })

diff --git a/packages/web3-hooks/base/src/useReverseAddress.ts b/packages/web3-hooks/base/src/useReverseAddress.ts
@@ -5,13 +5,12 @@ import { useWeb3State } from './useWeb3State.js'
 export function useReverseAddress<T extends NetworkPluginID>(pluginID?: T, address?: string) {
     const { NameService } = useWeb3State(pluginID)
 
-    const isBad = !address || !NameService
-    return useQuery<string | undefined>({
+    return useQuery({
         queryKey: ['reverse', address],
-        enabled: !isBad,
+        enabled: !!NameService?.reverse,
         queryFn: async () => {
-            if (isBad) return
-            return NameService.reverse?.(address)
+            if (!address) return null
+            return NameService!.reverse!(address) || null
         },
     })
 }
diff --git a/packages/web3-providers/src/Web3/Base/apis/OthersAPI.ts b/packages/web3-providers/src/Web3/Base/apis/OthersAPI.ts
@@ -80,7 +80,7 @@ export class OthersAPI_Base<ChainId, SchemaType, ProviderType, NetworkType, Tran
     formatTokenId(id?: string | undefined, size?: number | undefined): string {
         throw new Error('Method not implemented.')
     }
-    formatDomainName(domain?: string | undefined, size?: number | undefined): string {
+    formatDomainName(domain?: string | null | undefined, size?: number | undefined): string {
         throw new Error('Method not implemented.')
     }
     formatSchemaType(schema: SchemaType): string {