🚀 resolve conflicts

components/bsx/Gallery/Item/AvailableActions.vue

@@ -1,7 +1,11 @@
 <template>
   <div>
     <Loader v-model="isLoading" :status="status" />
-    <ActionList v-if="accountId" :actions="actions" @click="handleAction" />
+    <ActionList
+      v-if="accountId"
+      :actions="actions"
+      :isMakeOffersAllowed="isMakeOffersAllowed"
+      @click="handleAction" />
     <component
       class="mb-4"
       v-if="showMeta"
@@ -54,6 +58,7 @@ export default class AvailableActions extends mixins(
   @Prop() public price!: string
   @Prop(String) public nftId!: string
   @Prop(String) public collectionId!: string
+  @Prop(Boolean) public isMakeOffersAllowed!: boolean
   @Prop({ type: Array, default: () => [] }) public ipfsHashes!: string[]
 
   private selectedAction: ShoppingActions | '' = ''

components/bsx/Gallery/Item/GalleryItem.vue

@@ -88,6 +88,7 @@
                           :delegateId="nft.delegate"
                           :collectionId="collectionId"
                           :frozen="nft.isFrozen"
+                          :isMakeOffersAllowed="isMakeOffersAllowed"
                           :ipfs-hashes="[
                             nft.image,
                             nft.animation_url,
@@ -114,6 +115,7 @@
       <OfferList
         :current-owner-id="nft.currentOwner"
         :nftId="id"
+        @offersUpdate="offersUpdate"
         :collectionId="collectionId" />
     </template>
   </BaseGalleryItem>
@@ -198,6 +200,7 @@ export default class GalleryItem extends mixins(
   public meta: NFTMetadata = emptyObject<NFTMetadata>()
   public emotes: Emote[] = []
   public message = ''
+  public isMakeOffersAllowed = true
 
   public async created() {
     this.checkId()
@@ -227,6 +230,12 @@ export default class GalleryItem extends mixins(
     )
   }
 
+  public offersUpdate({ offers }) {
+    this.isMakeOffersAllowed = !offers.find(({ caller }) => {
+      return caller === this.accountId
+    })
+  }
+
   protected observeOwner(data: Option<InstanceDetails>) {
     const instance = unwrapOrNull(data)
     if (instance) {

components/bsx/Offer/OfferList.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts">
-import { Component, mixins, Prop } from 'nuxt-property-decorator'
+import { Component, Emit, mixins, Prop } from 'nuxt-property-decorator'
 import { isSameAccount } from '~/utils/account'
 import AuthMixin from '~/utils/mixins/authMixin'
 import MetaTransactionMixin from '~/utils/mixins/metaMixin'
@@ -72,6 +72,7 @@ export default class OfferList extends mixins(
     })
   }
 
+  @Emit('offersUpdate')
   protected setResponse(response: OfferResponse) {
     this.offers = response.offers
     this.total = response.stats.total

components/rmrk/Gallery/Item/ActionList.vue

@@ -1,14 +1,22 @@
 <template>
   <div class="buttons">
-    <b-button
-      v-for="action in actions"
-      :key="action"
-      :type="iconType(action)"
-      outlined
-      expanded
-      @click="handleActionSelect(action)">
-      {{ action }}
-    </b-button>
+    <b-tooltip
+      class="w-100"
+      :active="!isMakeOffersAllowed"
+      :label="$t('tooltip.makeOfferDisabled')">
+      <b-button
+        v-for="action in actions"
+        :key="action"
+        :type="iconType(action)"
+        :disabled="
+          action === ShoppingActions.MAKE_OFFER && !isMakeOffersAllowed
+        "
+        outlined
+        expanded
+        @click="handleActionSelect(action)">
+        {{ action }}
+      </b-button>
+    </b-tooltip>
   </div>
 </template>
 
@@ -19,6 +27,9 @@ import { getActionButtonColor, ShoppingActions } from '@/utils/shoppingActions'
 @Component({})
 export default class ActionList extends Vue {
   @Prop({ type: Array, required: false }) public actions!: ShoppingActions[]
+  @Prop(Boolean) public isMakeOffersAllowed!: boolean
+
+  private ShoppingActions = ShoppingActions
 
   @Emit('click')
   protected handleActionSelect(action: ShoppingActions) {

components/rmrk/Gallery/LatestSales.vue

@@ -72,7 +72,7 @@ export default class LatestSales extends mixins(PrefixMixin, AuthMixin) {
       limit: 10,
       event: 'BUY',
     }
-    if (this.isLogIn && this.passionList.length > 9) {
+    if (this.isLogIn) {
       queryVars.and.nft = {
         issuer_in: this.passionList,
       }

langDir/en.json

@@ -473,7 +473,8 @@
     "random": "Go to random page",
     "buyDisabled": "Not enough balance",
     "holdings": "Nfts owned by",
-    "gains": "Gained by"
+    "gains": "Gained by",
+    "makeOfferDisabled": "You have already made an offer for this NFT"
   },
   "nft": {
     "carbonless": "This NFT is carbonless",

styles/global.scss

@@ -286,3 +286,7 @@ button.button.navbar-link-background {
   border: none!important;
   border-top: 1px solid $primary!important;
 }
+
+.w-100 {
+  width: 100%;
+}