@1001-digital/components 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1001-digital/components",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "sideEffects": [
     "*.css"

package/src/base/components/Globals.vue

@@ -1,6 +1,8 @@
 <template>
-  <Toasts />
-  <ConfirmDialog />
+  <Toasts>
+    <ConfirmDialog />
+    <slot />
+  </Toasts>
 </template>
 
 <script setup lang="ts">

package/src/base/components/Toasts.vue

@@ -3,6 +3,8 @@
     :duration="duration"
     :swipe-direction="swipeDirection"
   >
+    <slot />
+
     <ToastRoot
       v-for="toast in toasts"
       :key="toast.id"

package/src/evm/components/EvmProfile.vue

@@ -17,6 +17,7 @@
     v-model:open="dialogOpen"
     class="evm-profile"
     title="Account"
+    compat
   >
     <div class="profile-header">
       <div
@@ -26,7 +27,10 @@
         "
       />
       <div class="avatar-wrapper">
-        <EvmAvatar :address="address" large />
+        <EvmAvatar
+          :address="address"
+          large
+        />
       </div>
     </div>
 

package/src/evm/components/EvmSwitchNetwork.vue

@@ -12,6 +12,7 @@
     title="Switch Network"
     v-model:open="dialogOpen"
     @closed="onClosed"
+    compat
   >
     <Alert
       v-if="errorMessage"
@@ -94,9 +95,10 @@ const switchTo = async (chain: Chain) => {
     dialogOpen.value = false
   } catch (e: unknown) {
     const message = e instanceof Error ? e.message : 'Failed to switch network.'
-    errorMessage.value = message.includes('rejected') || message.includes('denied')
-      ? 'Network switch cancelled.'
-      : 'Failed to switch network. Please try again.'
+    errorMessage.value =
+      message.includes('rejected') || message.includes('denied')
+        ? 'Network switch cancelled.'
+        : 'Failed to switch network. Please try again.'
     emit('error', { message: errorMessage.value })
   } finally {
     switching.value = false

package/src/evm/composables/ens.ts

@@ -1,5 +1,7 @@
+import { ref, computed, watchEffect, toValue, type MaybeRefOrGetter, type Ref } from 'vue'
 import { getPublicClient } from '@wagmi/core'
-import type { Config } from '@wagmi/vue'
+import { useConfig, type Config } from '@wagmi/vue'
+import { useEvmConfig } from '../config'
 import {
   ensCache,
   fetchEnsFromIndexer,
@@ -15,17 +17,6 @@ interface UseEnsOptions {
   mode?: MaybeRefOrGetter<EnsMode | undefined>
 }
 
-interface EnsRuntimeConfig {
-  ens?: { indexer1?: string; indexer2?: string; indexer3?: string }
-}
-
-function getIndexerUrls(config: EnsRuntimeConfig): string[] {
-  if (!config.ens) return []
-  return [config.ens.indexer1, config.ens.indexer2, config.ens.indexer3].filter(
-    Boolean,
-  ) as string[]
-}
-
 async function resolve(
   identifier: string,
   strategies: EnsMode[],
@@ -59,36 +50,45 @@ function useEnsBase(
   chainKeys: string[],
   options: UseEnsOptions = {},
 ) {
-  const { $wagmi } = useNuxtApp()
-  const appConfig = useAppConfig()
-  const runtimeConfig = useRuntimeConfig()
+  const config = useConfig()
+  const evmConfig = useEvmConfig()
 
   const mode = computed<EnsMode>(
-    () => toValue(options.mode) || appConfig.evm?.ens?.mode || 'indexer',
-  )
-  const indexerUrls = computed(() =>
-    getIndexerUrls(runtimeConfig.public.evm as EnsRuntimeConfig),
+    () => toValue(options.mode) || evmConfig.ens?.mode || 'indexer',
   )
+  const indexerUrls = computed(() => evmConfig.ens?.indexerUrls || [])
   const cacheKey = computed(() => `ens-${tier}-${toValue(identifier)}`)
 
-  return useAsyncData(
-    cacheKey.value,
-    async () => {
-      const id = toValue(identifier)
-      if (!id) return null
+  const data: Ref<EnsProfile | null | undefined> = ref(
+    ensCache.get(cacheKey.value) ?? undefined,
+  )
 
-      const strategies: EnsMode[] =
-        mode.value === 'indexer' ? ['indexer', 'chain'] : ['chain', 'indexer']
+  watchEffect(async () => {
+    const id = toValue(identifier)
+    if (!id) {
+      data.value = null
+      return
+    }
 
-      return ensCache.fetch(cacheKey.value, () =>
-        resolve(id, strategies, indexerUrls.value, $wagmi as Config, chainKeys),
+    const cached = ensCache.get(cacheKey.value)
+    if (cached) {
+      data.value = cached
+      return
+    }
+
+    const strategies: EnsMode[] =
+      mode.value === 'indexer' ? ['indexer', 'chain'] : ['chain', 'indexer']
+
+    try {
+      data.value = await ensCache.fetch(cacheKey.value, () =>
+        resolve(id, strategies, indexerUrls.value, config, chainKeys),
       )
-    },
-    {
-      watch: [() => toValue(identifier)],
-      getCachedData: () => ensCache.get(cacheKey.value) ?? undefined,
-    },
-  )
+    } catch {
+      data.value = null
+    }
+  })
+
+  return { data }
 }
 
 export const useEns = (

package/src/evm/composables/uri.ts

@@ -1,11 +1,12 @@
+import { useEvmConfig } from '../config'
 import { resolveUri } from '../utils/uri'
 
 export const useResolveUri = () => {
-  const appConfig = useAppConfig()
+  const evmConfig = useEvmConfig()
 
   return (uri?: string) =>
     resolveUri(uri, {
-      ipfsGateway: appConfig.evm?.ipfsGateway,
-      arweaveGateway: appConfig.evm?.arweaveGateway,
+      ipfsGateway: evmConfig.ipfsGateway,
+      arweaveGateway: evmConfig.arweaveGateway,
     })
 }

package/src/evm/config.ts

@@ -13,6 +13,8 @@ export interface EvmConfig {
     mode?: 'indexer' | 'chain'
     indexerUrls?: string[]
   }
+  ipfsGateway?: string
+  arweaveGateway?: string
   baseURL?: string
   walletConnectProjectId?: string
 }

package/src/evm/utils/ens.ts

@@ -49,7 +49,9 @@ export async function fetchEnsFromIndexer(
 
   for (const url of urls) {
     try {
-      return await $fetch<EnsProfile>(`${url}/${identifier}`)
+      const res = await fetch(`${url}/${identifier}`)
+      if (!res.ok) throw new Error(`Indexer error: ${res.status}`)
+      return (await res.json()) as EnsProfile
     } catch (err) {
       lastError = err as Error
     }