From 3cb45a84144e1029a115a3b4433406742f147ec2 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Thu, 14 Mar 2024 13:03:34 +0100
Subject: [PATCH] Fix for tier display to show more than 2 pages (#1229)

* Fix for tier display to show more than 2 pages

* Fill in all tier slots

* Fixed tier item height

* Get dApp tier fix
---
 .../components/leaderboard/Tier.vue           | 56 ++++++++++---------
 .../components/leaderboard/noEntry.vue        |  6 +-
 .../components/leaderboard/styles/tier.scss   |  1 +
 src/staking-v3/hooks/useDappStaking.ts        |  9 ++-
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/staking-v3/components/leaderboard/Tier.vue b/src/staking-v3/components/leaderboard/Tier.vue
index dcca05000..61962824e 100644
--- a/src/staking-v3/components/leaderboard/Tier.vue
+++ b/src/staking-v3/components/leaderboard/Tier.vue
@@ -11,24 +11,15 @@
     </div>
 
     <swiper class="swiper--tier" :navigation="true" :modules="modules">
-      <swiper-slide>
+      <swiper-slide v-for="(page, pageIndex) in pages" :key="`page-${pageIndex}`">
         <div class="container--dapps">
-          <div v-for="(dapp, index) in page1" :key="dapp.chain.id">
-            <dapp-item :index="index" :dapp="dapp" />
-          </div>
-          <div v-for="index in itemsPerPage - page1.length" :key="index">
-            <no-entry :index="index" :length="page1.length" />
-          </div>
-        </div>
-      </swiper-slide>
-
-      <swiper-slide>
-        <div class="container--dapps">
-          <div v-for="(dapp, index) in page2" :key="dapp.chain.id">
-            <dapp-item :index="index + itemsPerPage" :dapp="dapp" />
-          </div>
-          <div v-for="index in itemsPerPage - page2.length" :key="index">
-            <no-entry :index="index + itemsPerPage" :length="page2.length" />
+          <div v-for="(dapp, index) in page" :key="`page-${index}`">
+            <dapp-item
+              v-if="dapp !== null"
+              :index="pageIndex * itemsPerPage + index"
+              :dapp="dapp"
+            />
+            <no-entry v-else :index="pageIndex * itemsPerPage + index" />
           </div>
         </div>
       </swiper-slide>
@@ -39,7 +30,7 @@
 <script lang="ts">
 import { defineComponent, PropType, computed } from 'vue';
 import { CombinedDappInfo } from '../../logic';
-import { useDappStakingNavigation } from '../../hooks';
+import { useDappStakingNavigation, useDappStaking } from '../../hooks';
 import TokenBalanceNative from 'src/components/common/TokenBalanceNative.vue';
 import DappItem from './DappItem.vue';
 import noEntry from './noEntry.vue';
@@ -73,21 +64,36 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const itemsToShow = 10;
     const itemsPerPage = 5;
-    const slicedDapps = computed<CombinedDappInfo[]>(() => props.dapps.slice(0, itemsToShow));
+    const { tiersConfiguration } = useDappStaking();
+
+    const slotsPerTier = computed<number>(() => {
+      return tiersConfiguration.value.slotsPerTier[props.tier - 1];
+    });
+
+    // Fill in dapps array with nulls so total array length matches number of available slots.
+    const dappsFull = computed<(CombinedDappInfo | null)[]>(() => {
+      const result: (CombinedDappInfo | null)[] = [];
+      for (let i = 0; i < slotsPerTier.value; i++) {
+        result.push(i < props.dapps.length ? props.dapps[i] : null);
+      }
+      return result;
+    });
 
-    const page1 = computed<CombinedDappInfo[]>(() => props.dapps.slice(0, itemsPerPage));
-    const page2 = computed<CombinedDappInfo[]>(() => props.dapps.slice(itemsPerPage, itemsToShow));
+    const pages = computed<(CombinedDappInfo | null)[][]>(() => {
+      const pages = [];
+      for (let i = 0; i < dappsFull.value.length; i += itemsPerPage) {
+        pages.push(dappsFull.value.slice(i, i + itemsPerPage));
+      }
+      return pages;
+    });
 
     const { navigateDappPage } = useDappStakingNavigation();
 
     return {
       modules: [Navigation],
-      slicedDapps,
       itemsPerPage,
-      page1,
-      page2,
+      pages,
       navigateDappPage,
     };
   },
diff --git a/src/staking-v3/components/leaderboard/noEntry.vue b/src/staking-v3/components/leaderboard/noEntry.vue
index 8fdbf7e5e..6b6ef6b5c 100644
--- a/src/staking-v3/components/leaderboard/noEntry.vue
+++ b/src/staking-v3/components/leaderboard/noEntry.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dapp">
-    <div>{{ index + length }}</div>
+    <div>{{ index + 1 }}</div>
     <div class="dapp--button">
       <div class="dapp--image">
         <img :src="require('../../assets/burn.png')" :alt="$t('stakingV3.burn')" />
@@ -21,10 +21,6 @@ export default defineComponent({
       type: Number,
       required: true,
     },
-    length: {
-      type: Number,
-      required: true,
-    },
   },
   setup(props) {
     return {};
diff --git a/src/staking-v3/components/leaderboard/styles/tier.scss b/src/staking-v3/components/leaderboard/styles/tier.scss
index bad0b2979..916e039cd 100644
--- a/src/staking-v3/components/leaderboard/styles/tier.scss
+++ b/src/staking-v3/components/leaderboard/styles/tier.scss
@@ -49,6 +49,7 @@
   font-weight: 600;
   font-size: 14px;
   gap: 8px;
+  height: 80px;
 }
 
 .dapp--image {
diff --git a/src/staking-v3/hooks/useDappStaking.ts b/src/staking-v3/hooks/useDappStaking.ts
index adeea4c26..69811a529 100644
--- a/src/staking-v3/hooks/useDappStaking.ts
+++ b/src/staking-v3/hooks/useDappStaking.ts
@@ -130,6 +130,10 @@ export function useDappStaking() {
     () => store.getters['stakingV3/getTiersConfiguration'] ?? initialTiersConfiguration
   );
 
+  const leaderboard = computed<Map<number, number>>(
+    () => store.getters['stakingV3/getLeaderboard']
+  );
+
   const isCurrentPeriod = (period: number): boolean =>
     protocolState.value?.periodInfo.number === period;
 
@@ -548,9 +552,8 @@ export function useDappStaking() {
   };
 
   const getDappTier = (dappId: number): number | undefined => {
-    const tierId = dAppTiers.value?.dapps.find((x) => x.dappId === dappId)?.tierId;
-
-    return tierId !== undefined ? tierId + 1 : undefined;
+    const tier = leaderboard.value?.get(dappId);
+    return tier !== undefined ? tier + 1 : undefined;
   };
 
   const fetchStakerInfoToStore = async (): Promise<void> => {