Merge pull request #924 from liquality/bugfix/liq-206-nft-tab-not-acc…

…essible-in-overview-screen Fixing small check for NFTs
liquality · Nov 14, 2022 · 9fbe6b3 · 9fbe6b3
2 parents d1c20ac + 7120507
commit 9fbe6b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/components/WalletAccounts.vue b/src/components/WalletAccounts.vue
@@ -71,7 +71,7 @@
         </ListItem>
         <div class="account-assets" :class="{ active: shouldExpandAccount(account) }">
           <ListItem
-            v-if="account.nfts && !isAssetList && hasNFTActivity(account)"
+            v-if="!isAssetList && (hasNft(account) || hasNFTActivity(account))"
             @item-selected="
               $router.push({
                 path: `/wallet/nfts/activity/${account.id}`,
@@ -216,6 +216,10 @@ export default {
         this.activity.filter((item) => item.type === 'NFT' && item.accountId === account.id)
           .length > 0
       )
+    },
+    hasNft(account) {
+      const { nfts } = account
+      return !!(nfts && nfts.length)
     }
   }
 }

diff --git a/src/views/Swap/Swap.vue b/src/views/Swap/Swap.vue
@@ -808,7 +808,7 @@ export default {
       return getSwapProvider(this.activeNetwork, this.selectedQuote.provider)
     },
     defaultAmount() {
-      return this.max;
+      return this.max
     },
     isPairAvailable() {
       const liqualityMarket = this.networkMarketData?.find(

diff --git a/src/views/Swap/SwapProvidersInfoModal.vue b/src/views/Swap/SwapProvidersInfoModal.vue
@@ -14,9 +14,7 @@
           <ul>
             <li v-for="provider in uniqueProvides" :key="provider.id" class="py-1 px-2">
               <span class="d-flex align-items-center"
-                ><img :src="getProviderIcon(provider.id)" class="mr-2" />{{
-                  provider.name
-                }}</span
+                ><img :src="getProviderIcon(provider.id)" class="mr-2" />{{ provider.name }}</span
               >
             </li>
           </ul>