@instadapp/avocado-base 0.0.0-dev.d831e20 → 0.0.0-dev.dcb4af3

package/components/metadata/Bridge.vue

@@ -1,36 +1,55 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
+
+const compact = inject('compact')
+const tokens = inject<ITokenPrice[]>('tokens')
+
+const toToken = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+  return fetchTokenByAddress(props.metadata?.toToken, props.metadata?.toChainId, tokens)
+},
+)
 
-const compact = inject('compact');
+const fromToken = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+  return fetchTokenByAddress(props.metadata?.fromToken, props.chain_id, tokens)
+},
+)
 
-const toToken = asyncComputed(() =>
-  fetchTokenByAddress(props.metadata?.toToken, props.metadata?.toChainId)
-);
+const isTokensSame = computed(() => {
+  return toToken.value?.symbol === fromToken.value?.symbol
+})
 
 const bridgeAmountFormatted = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.amount, toToken?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.amount, fromToken?.value?.decimals).toFixed(),
+  ),
+)
 </script>
 
 <template>
-  <div v-if="!toToken" class="rounded-5 w-24 h-4 loading-box" />
+  <div v-if="!toToken || !fromToken" class="rounded-5 w-24 h-4 loading-box" />
   <div
+    v-if="toToken && fromToken"
     class="flex gap-5 items-center"
-    v-if="metadata.type === 'bridge' && toToken"
   >
     <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
     <span class="inline-flex gap-2.5 items-center">
-      <img width="20" height="20" class="w-5 h-5" :src="toToken.logo_url" />
+      <img width="20" height="20" class="w-5 h-5" :src="fromToken.logo_url">
       {{ bridgeAmountFormatted }}
-      <span class="uppercase">{{ toToken?.symbol }}</span>
+      <span class="uppercase">{{ fromToken?.symbol }}</span>
       <SvgoBridge class="text-slate-400 w-4 h-4" />
+      <template v-if="!isTokensSame">
+        <img width="20" height="20" class="w-5 h-5" :src="toToken.logo_url">
+        <span class="uppercase">{{ toToken?.symbol }}</span>
+      </template>
       <span class="flex items-center gap-2.5">
+        on
         <ChainLogo class="w-5" :chain="metadata.toChainId" />
         <span>{{ chainIdToName(metadata.toChainId) }}</span>
       </span>

package/components/metadata/CrossTransfer.vue

@@ -1,38 +1,53 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
 
-const compact = inject('compact');
+const compact = inject('compact')
+const tokens = inject<ITokenPrice[]>('tokens')
 
 const fromToken = asyncComputed(() => {
-  if (!props?.chain_id) return null;
+  if (!props?.chain_id)
+    return null
+
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
 
   return fetchTokenByAddress(
     props.metadata?.fromToken,
-    props?.chain_id
-  );
-});
+    props?.chain_id,
+    tokens,
+  )
+})
+
+const toToken = asyncComputed(() => {
+  if (!props?.metadata?.toChainId)
+    return null
 
-const formattedFromAmount = computed(() =>
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+
+  return fetchTokenByAddress(props.metadata?.toToken, props?.metadata?.toChainId, tokens)
+})
+
+const formattedToAmount = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.amount, fromToken?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.amount, toToken?.value?.decimals).toFixed(),
+  ),
+)
 </script>
 
 <template>
-  <div class="h-[60px]" v-if="!fromToken">
+  <div v-if="!fromToken" class="h-[60px]">
     <div class="rounded-5 w-24 h-4 loading-box" />
   </div>
-  <div class="flex gap-5 flex-col" v-else>
+  <div v-else class="flex gap-5 flex-col">
     <div class="flex items-center gap-5">
       <span v-if="!compact" class="capitalize text-xs sm:text-sm">Cross-chain send</span>
       <span class="inline-flex gap-2.5 items-center">
-        <img width="20" height="20" class="w-5 h-5" :src="fromToken?.logo_url" />
-        {{ formattedFromAmount }}
+        <img width="20" height="20" class="w-5 h-5" :src="fromToken?.logo_url">
+        {{ formattedToAmount }}
         <span class="uppercase">{{ fromToken?.symbol }}</span>
       </span>
     </div>
@@ -47,18 +62,12 @@ const formattedFromAmount = computed(() =>
 
       <span class="flex items-center gap-2.5">
         <ChainLogo class="w-5" :chain="metadata?.toChainId" />
-
-        <a
-          target="_blank"
-          class="text-primary"
-          :href="
-            getExplorerUrl(
-              metadata?.toChainId,
-              `/address/${metadata.receiver}`
-            )
-          "
-          >{{ shortenHash(metadata.receiver) }}</a
-        >
+        <Address
+          :address="metadata.receiver" :to="getExplorerUrl(
+            metadata?.toChainId,
+            `/address/${metadata.receiver}`,
+          )"
+        />
         on
         <span>{{ chainIdToName(metadata?.toChainId) }}</span>
       </span>

package/components/metadata/GasTopup.vue

@@ -1,29 +1,34 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
+
+const tokens = inject<ITokenPrice[]>('tokens')
+
+const token = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
 
-const token = asyncComputed(() =>
-  fetchTokenByAddress(props.metadata?.token, props?.chain_id)
-);
+  return fetchTokenByAddress(props.metadata?.token, props?.chain_id, tokens)
+},
+)
 
-const compact = inject('compact');
+const compact = inject('compact')
 
 const formattedAmount = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed(),
+  ),
+)
 </script>
 
 <template>
   <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
-  <div class="flex items-center gap-5" v-else>
+  <div v-else class="flex items-center gap-5">
     <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
     <span class="inline-flex gap-2.5 items-center">
-      <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url" />
+      <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url">
       {{ formattedAmount }}
       <span class="uppercase">{{ token?.symbol }}</span>
       <SvgoGas class="w-4 h-4 text-slate-400 mx-2" />

package/components/metadata/Permit2.vue

@@ -1,24 +1,28 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
+
+const tokens = inject<ITokenPrice[]>('tokens')
 
-const token = asyncComputed(() =>
-  fetchTokenByAddress(props.metadata?.token, props?.chain_id)
-);
+const token = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+  return fetchTokenByAddress(props.metadata?.token, props?.chain_id, tokens)
+},
+)
 
-const calculateDate = (timestamp: number) => {
-  return new Date(timestamp * 1000).toLocaleString();
-};
+function calculateDate(timestamp: number) {
+  return new Date(timestamp * 1000).toLocaleString()
+}
 </script>
 
 <template>
   <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
   <div v-else class="inline-flex items-center gap-2 flex-wrap">
     <span>Permit2 Allowance: </span>
-    <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url" />
+    <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url">
     <span class="capitalize">{{ token?.symbol }}</span>
     to
     <NuxtLink

package/components/metadata/Signers.vue

@@ -0,0 +1,19 @@
+<script setup lang="ts">
+defineProps<{
+  chain_id: number | string
+  metadata: {
+    type: MetadataTypes
+    [key: string]: any
+  }
+  compact?: boolean
+}>()
+</script>
+
+<template>
+  <ul class="flex gap-2 flex-wrap">
+    <li v-for="address in metadata.addresses" :key="address" class="flex rounded-2xl gap-2 bg-gray-900 w-fit items-center py-1.5 px-2.5">
+      <AuthorityAvatar class="size-5" :address="address" />
+      <Address :address="address" />
+    </li>
+  </ul>
+</template>

package/components/metadata/Swap.vue

@@ -1,67 +1,66 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
 
-const compact = inject('compact');
+const compact = inject('compact')
+const tokens = inject<ITokenPrice[]>('tokens')
 
-const buyToken = asyncComputed(() =>
-  fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id)
-);
-const sellToken = asyncComputed(() =>
-  fetchTokenByAddress(props.metadata?.sellToken, props?.chain_id)
-);
+const buyToken = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+  return fetchTokenByAddress(props.metadata?.buyToken, props?.chain_id, tokens)
+},
+)
+const sellToken = asyncComputed(() => {
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
+  return fetchTokenByAddress(props.metadata?.sellToken, props?.chain_id, tokens)
+},
+)
 
 const sellAmountFormatted = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.sellAmount, sellToken?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.sellAmount, sellToken?.value?.decimals).toFixed(),
+  ),
+)
 
 const buyAmountFormatted = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.buyAmount, buyToken?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.buyAmount, buyToken?.value?.decimals).toFixed(),
+  ),
+)
 
-const formatProtocol = (protocol: string) => {
+function formatProtocol(protocol: string) {
   return (
     new Map([
-      ["1inch-v5", "1inch"],
-      ["0x-v1", "0x"],
-      ["paraswap-v5", "Paraswap"],
-      ["kyber-v1", "Kyber Network"],
+      ['1inch-v5', '1inch'],
+      ['0x-v1', '0x'],
+      ['paraswap-v5', 'Paraswap'],
+      ['kyber-v1', 'Kyber Network'],
     ]).get(protocol) || protocol
-  );
-};
-
-
+  )
+}
 </script>
 
 <template>
   <div v-if="!sellToken || !buyToken" class="rounded-5 w-24 h-4 loading-box" />
-  <div
-      class="flex items-center gap-5"
-        v-else
-    >
-      <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
-      <span class="inline-flex gap-2.5 items-center">
-        <img width="20" height="20" class="w-5 h-5" :src="sellToken?.logo_url" />
-        {{ sellAmountFormatted }}
-        <span class="uppercase">{{ sellToken?.symbol }}</span>
-        <SvgoRefresh class="w-4 h-4 text-slate-400 mx-2" />
-        <img width="20" height="20" class="w-5 h-5" :src="buyToken?.logo_url" />
-        {{ buyAmountFormatted }}
-        <span class="uppercase">{{ buyToken?.symbol }}</span>
-        <span
-          class="capitalize hidden sm:flex items-center gap-2.5"
-          v-if="metadata.protocol && !compact"
-        >
-          On <ProtocolLogo class="w-5 h-5" :name="metadata.protocol" />
-          {{ formatProtocol(metadata.protocol) }}
-        </span>
+  <div v-else class="flex items-center gap-5">
+    <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
+    <span class="inline-flex gap-2.5 items-center">
+      <img width="20" height="20" class="w-5 h-5" :src="sellToken?.logo_url">
+      {{ sellAmountFormatted }}
+      <span class="uppercase">{{ sellToken?.symbol }}</span>
+      <SvgoRefresh class="w-4 h-4 text-slate-400 mx-2" />
+      <img width="20" height="20" class="w-5 h-5" :src="buyToken?.logo_url">
+      ~ {{ buyAmountFormatted }}
+      <span class="uppercase">{{ buyToken?.symbol }}</span>
+      <span v-if="metadata.protocol && !compact" class="capitalize hidden sm:flex items-center gap-2.5">
+        On
+        <ProtocolLogo class="w-5 h-5" :name="metadata.protocol" />
+        {{ formatProtocol(metadata.protocol) }}
       </span>
-    </div>
+    </span>
+  </div>
 </template>

package/components/metadata/Transfer.vue

@@ -1,46 +1,49 @@
 <script setup lang="ts">
-
 const props = defineProps<{
-  metadata: any;
+  metadata: any
   chain_id: number | string
-}>();
+}>()
 
-const compact = inject('compact');
+const compact = inject('compact')
+const tokens = inject<ITokenPrice[]>('tokens')
 
 const token = asyncComputed(() => {
-  if (!props?.chain_id) return null;
+  if (!props?.chain_id)
+    return null
+
+  if (Array.isArray(tokens) && !tokens.length)
+    return null
 
   return fetchTokenByAddress(
     props.metadata?.token,
-    props?.chain_id
-  );
-});
+    props?.chain_id,
+    tokens,
+  )
+})
 
 const formattedAmount = computed(() =>
   formatDecimal(
-    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed()
-  )
-);
+    fromWei(props.metadata?.amount, token?.value?.decimals).toFixed(),
+    3,
+  ),
+)
 </script>
 
 <template>
   <div v-if="!token" class="rounded-5 w-24 h-4 loading-box" />
-  <div class="flex items-center gap-5" v-else>
+  <div v-else class="flex items-center gap-5">
     <span v-if="!compact" class="capitalize text-xs sm:text-sm">{{ metadata.type }}</span>
     <span class="inline-flex gap-2.5 items-center">
-      {{ formattedAmount }}
-      <span class="uppercase">{{ token?.symbol }}</span>
-      <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url" />
-      <SvgoArrowRight class="w-4 h-4 text-slate-400 mx-2" />
-      <NuxtLink
-        class="text-primary"
-        target="_blank"
-        external
-        :to="
-          getExplorerUrl(chain_id, `/address/${metadata.receiver}`)
-        "
-        >{{ shortenHash(metadata.receiver) }}
-        </NuxtLink>
+      <span class="w-[8em]">
+        {{ formattedAmount }}
+        <span class="uppercase">{{ token?.symbol }}</span>
+      </span>
+      <img width="20" height="20" class="w-5 h-5" :src="token?.logo_url">
+      <SvgoArrowRight class="w-4 h-4 text-slate-400" />
+      <Address
+        :to="getExplorerUrl(chain_id, `/address/${metadata.receiver}`)"
+        :address="metadata.receiver"
+      />
     </span>
   </div>
 </template>