Merge branch 'main' into issue-10420

kodadot · Jul 8, 2024 · d662bbd · d662bbd
2 parents 4f0738f + 98bbe40
commit d662bbd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/.github/actions/pnpm-install/action.yml b/.github/actions/pnpm-install/action.yml
@@ -10,11 +10,11 @@ runs:
       with:
         node-version: 20
 
-    - uses: pnpm/action-setup@v2
+    - uses: pnpm/action-setup@v4
       name: Install pnpm
       id: pnpm-install
       with:
-        version: 9
+        version: 9.4.0
 
     - name: Get pnpm store directory
       id: pnpm-cache

diff --git a/components/base/MediaItem.vue b/components/base/MediaItem.vue
@@ -1,5 +1,8 @@
 <template>
-  <div ref="mediaItem" class="media-object h-fit">
+  <div
+    ref="mediaItem"
+    class="media-object h-fit"
+    :class="{ relative: hasNormalTag }">
     <component
       :is="resolveComponent"
       ref="mediaRef"
@@ -135,10 +138,10 @@ const PREFIX = 'Neo'
 const SUFFIX = 'Media'
 const type = ref('')
 
-const hasNormalTag = computed(() => {
+const hasNormalTag = computed<boolean>(() => {
   return (
     props.enableNormalTag &&
-    (props.mimeType || type.value || !props.animationSrc) && // avoid showing normal tag before type has updated
+    Boolean(props.mimeType || type.value || !props.animationSrc) && // avoid showing normal tag before type has updated
     resolveMedia(mimeType.value) !== MediaType.IFRAME &&
     !props.isDetail
   )

diff --git a/components/common/ConnectWallet/WalletAssetNfts.vue b/components/common/ConnectWallet/WalletAssetNfts.vue
@@ -9,7 +9,6 @@
         :to="`/${urlPrefix}/gallery/${nft?.id}`">
         <BaseMediaItem
           :src="sanitizeIpfsUrl(nft?.meta.image)"
-          enable-normal-tag
           :mime-type="nft?.type" />
       </NuxtLink>
     </div>

diff --git a/components/profile/ProfileDetail.vue b/components/profile/ProfileDetail.vue
@@ -214,13 +214,13 @@
                 <div
                   v-for="(follower, index) in followers?.followers"
                   :key="index"
-                  :style="{ zIndex: 3 - index }"
-                  class="w-8 h-8 flex-shrink-0 rounded-full border">
-                  <BasicImage
-                    :src="follower.image"
-                    custom-class="object-cover"
-                    alt="follower avatar"
-                    rounded />
+                  class="flex"
+                  :style="{ zIndex: 3 - index }">
+                  <ProfileAvatar
+                    class="border"
+                    :profile-image="follower.image"
+                    :address="follower.address"
+                    :size="30" />
                 </div>
               </div>
             </NeoButton>

diff --git a/components/shared/ProfileAvatar.vue b/components/shared/ProfileAvatar.vue
@@ -1,14 +1,14 @@
 <template>
   <div
-    v-if="profile?.image"
+    v-if="profileImageUrl"
     class="rounded-full overflow-hidden bg-background-color border"
     :style="{
       width: `${size}px`,
       height: `${size}px`,
       padding: `${Math.round(size / 16)}px`,
     }">
     <BaseMediaItem
-      :src="profile?.image"
+      :src="profileImageUrl"
       :image-component="NuxtImg"
       title="User Avatar"
       class="object-cover overflow-hidden rounded-full h-full w-full !shadow-none" />
@@ -22,13 +22,21 @@ const NuxtImg = resolveComponent('NuxtImg')
 const props = withDefaults(
   defineProps<{
     address: string
+    profileImage?: string
     size?: number
   }>(),
   {
     value: '',
+    profileImage: undefined,
     size: 64,
   },
 )
 
-const { profile } = useFetchProfile(props.address)
+const { profile: profileFromAddress } = useFetchProfile(
+  props.profileImage ? undefined : props.address,
+)
+
+const profileImageUrl = computed(
+  () => props.profileImage || profileFromAddress.value?.image,
+)
 </script>
diff --git a/composables/autoTeleport/useAutoTeleportTransitionDetails.ts b/composables/autoTeleport/useAutoTeleportTransitionDetails.ts
@@ -15,7 +15,7 @@ import {
   getChainExistentialDeposit,
 } from './utils'
 
-const BUFFER_FEE_PERCENT = 0.4
+const BUFFER_FEE_PERCENT = 0.7
 const BUFFER_AMOUNT_PERCENT = 0.02
 
 const DEFAULT_AUTO_TELEPORT_FEE_PARAMS = {