Merge pull request #11000 from hassnian/issue-10646-2

fix: Listing popup displayed with listing modal
kodadot · Sep 19, 2024 · fc2b589 · fc2b589
2 parents eedf527 + 157df86
commit fc2b589
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/components/collection/drop/ItemsGrid.vue b/components/collection/drop/ItemsGrid.vue
@@ -28,6 +28,7 @@
       :grid-size="'medium'"
       display-name-with-sn
       collection-popover-hide
+      hide-listing
       show-timestamp
       :reset-search-query-params="['sort']"
     />

diff --git a/components/items/ItemsGrid/ItemsGrid.vue b/components/items/ItemsGrid/ItemsGrid.vue
@@ -28,6 +28,7 @@
           :display-name-with-sn="displayNameWithSn"
           :show-timestamp="showTimestamp"
           :collection-popover-hide="collectionPopoverHide"
+          :hide-listing="hideListing"
           :lazy-loading="
             shouldLazyLoad({
               cols: slotProps.cols,
@@ -49,6 +50,7 @@
           :entity="entity"
           :hide-media-info="hideMediaInfo"
           :hide-action="hideNFTHoverAction"
+          :hide-listing="hideListing"
           :display-name-with-sn="displayNameWithSn"
           hide-video-controls
           :lazy-loading="
@@ -146,6 +148,7 @@ const props = defineProps<{
   showTimestamp?: boolean
   hideHoverAction?: boolean
   collectionPopoverHide?: boolean
+  hideListing?: boolean
 }>()
 
 const emit = defineEmits(['total', 'loading'])

diff --git a/components/items/ItemsGrid/ItemsGridImage.vue b/components/items/ItemsGrid/ItemsGridImage.vue
@@ -60,7 +60,7 @@
         </NeoButton>
       </div>
       <div
-        v-else-if="isOwner && listVisible(urlPrefix)"
+        v-else-if="isOwner && listVisible(urlPrefix) && !hideListing"
         class="flex"
       >
         <NeoButton
@@ -112,6 +112,7 @@ const props = defineProps<{
   hideMediaInfo?: boolean
   hideAction?: boolean
   hideVideoControls?: boolean
+  hideListing?: boolean
   displayNameWithSn?: boolean
   showTimestamp?: boolean
   collectionPopoverHide?: boolean

diff --git a/components/items/ItemsGrid/ItemsGridImageTokenEntity.vue b/components/items/ItemsGrid/ItemsGridImageTokenEntity.vue
@@ -59,7 +59,7 @@
         </NeoButton>
       </div>
       <div
-        v-else-if="isOwner"
+        v-else-if="isOwner && !hideListing"
         class="flex"
       >
         <template v-if="isStack">
@@ -129,6 +129,7 @@ const props = defineProps<{
   displayNameWithSn?: boolean
   lazyLoading?: boolean
   skeletonVariant: string
+  hideListing?: boolean
 }>()
 
 const {

diff --git a/layouts/unlockable-mint-layout.vue b/layouts/unlockable-mint-layout.vue
@@ -8,7 +8,6 @@
     <LazyCookieBanner />
     <KeyboardShortcutsModal />
     <Buy />
-    <ListingCartMini />
     <ListingCartModal />
   </div>
 </template>