Merge pull request #61 from MorpheusAIs/fix/claim-data

Fix/claim data view
MorpheusAIs · Jul 24, 2024 · 86a0429 · 86a0429
2 parents 4159e8a + a19f09b
commit 86a0429
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 22 deletions.
diff --git a/src/composables/use-pool.ts b/src/composables/use-pool.ts
@@ -5,16 +5,16 @@ import { useTimestamp } from '@vueuse/core'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { ethers } from 'ethers'
 
-const MULTIPLIER_SCALE = 25 //digits
-
+const MULTIPLIER_SCALE = 21 //digits
+const REWARDS_DIVIDER = 10000
 export const usePool = (poolId: number) => {
   let _currentUserRewardUpdateIntervalId: NodeJS.Timeout
 
   const currentUserReward = ref<BigNumber | null>(null)
   const dailyReward = ref<BigNumber | null>(null)
   const poolData = ref<Erc1967ProxyType.PoolData | null>(null)
   const userPoolData = ref<Erc1967ProxyType.UserData | null>(null)
-  const rewardsMultiplier = ref(1)
+  const rewardsMultiplier = ref('1')
 
   const isInitializing = ref(false)
   const isUserDataUpdating = ref(false)
@@ -177,9 +177,9 @@ export const usePool = (poolId: number) => {
       const scaleFactor = ethers.BigNumber.from(10).pow(MULTIPLIER_SCALE)
       const scaledNumber = response.div(scaleFactor)
 
-      rewardsMultiplier.value = Number(
-        parseFloat(scaledNumber.toString()).toFixed(2),
-      )
+      rewardsMultiplier.value = (
+        scaledNumber.toNumber() / REWARDS_DIVIDER
+      ).toFixed(4)
     } catch (e) {
       ErrorHandler.processWithoutFeedback(e)
     }

diff --git a/src/fields/DatetimeField/index.vue b/src/fields/DatetimeField/index.vue
@@ -58,10 +58,7 @@ import type { Options } from 'flatpickr/dist/types/options'
 import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import arrowIconHTML from '@/assets/icons/chevron-down-icon.svg?raw'
 
-enum POSITION {
-  bottom = 'bottom',
-  leftBottom = 'bottom-left',
-}
+type POSITION = 'bottom' | 'bottom-left' | 'bottom-right' | 'top'
 
 const emit = defineEmits<{
   (event: 'update:model-value', value: string): void
@@ -76,7 +73,7 @@ const props = withDefaults(
   }>(),
   {
     disabled: false,
-    position: POSITION.leftBottom,
+    position: 'bottom-right',
   },
 )
 
@@ -116,6 +113,7 @@ const initFlatpickr = (): void => {
     onChange: dates => {
       if (!dates.length) return
       emit('update:model-value', String(dates[0].getTime() / 1000))
+      isOpen.value = false
     },
   }
 
@@ -218,6 +216,13 @@ $z-index: 1;
     position: static;
   }
 
+  &--top {
+    bottom: 120%;
+    top: auto;
+    right: 50%;
+    transform: translateX(50%);
+  }
+
   &--bottom {
     top: 120%;
     right: 50%;

diff --git a/src/forms/DepositForm.vue b/src/forms/DepositForm.vue
@@ -48,6 +48,7 @@
       </input-field>
       <datetime-field
         v-model="form.lockPeriod"
+        position="top"
         :placeholder="$t(`deposit-form.lock-period-placeholder`)"
         :error-message="getFieldErrorMessage('lockPeriod')"
         :is-loading="isInitializing"

diff --git a/src/pages/HomePage/components/ZeroPoolDescription.vue b/src/pages/HomePage/components/ZeroPoolDescription.vue
@@ -33,7 +33,8 @@ const { t } = useI18n()
 const listItems = computed<string[]>(() => [
   t('zero-pool-description.list.1'),
   t('zero-pool-description.list.2'),
-  t('zero-pool-description.list.3'),
+  // TODO: HIDDEN BEFORE PROD
+  // t('zero-pool-description.list.3'),
   t('zero-pool-description.list.4'),
 ])
 </script>

diff --git a/src/pages/HomePage/views/PublicPoolView.vue b/src/pages/HomePage/views/PublicPoolView.vue
@@ -158,7 +158,7 @@ const claimLockTime = computed(() => {
         : poolData.value.payoutStart
             .add(poolData.value.withdrawLockPeriod)
             .toNumber(),
-    )
+    ).format(DEFAULT_TIME_FORMAT)
   }
   return ''
 })
@@ -184,18 +184,22 @@ const barIndicators = computed<InfoBarType.Indicator[]>(() => [
   },
   {
     title: t('home-page.public-pool-view.withdraw-at-title'),
-    value: claimLockTime.value.toString(),
-    note: t('home-page.public-pool-view.withdraw-at-note'),
-  },
-  {
-    title: t('home-page.public-pool-view.claim-at-title'),
     value: poolData.value
       ? new Time(
-          poolData.value.payoutStart
-            .add(poolData.value.claimLockPeriod)
-            .toNumber(),
+          userPoolData.value && !userPoolData.value.lastStake.isZero()
+            ? userPoolData.value.lastStake
+                .add(poolData.value.withdrawLockPeriodAfterStake)
+                .toNumber()
+            : poolData.value.payoutStart
+                .add(poolData.value.withdrawLockPeriod)
+                .toNumber(),
         ).format(DEFAULT_TIME_FORMAT)
       : '',
+    note: t('home-page.public-pool-view.withdraw-at-note'),
+  },
+  {
+    title: t('home-page.public-pool-view.claim-at-title'),
+    value: claimLockTime.value.toString(),
     note: t('home-page.public-pool-view.claim-at-note'),
   },
 ])
@@ -217,7 +221,7 @@ const dashboardIndicators = computed<InfoDashboardType.Indicator[]>(() => [
   },
   {
     title: t('home-page.public-pool-view.multiplier-title'),
-    value: `${rewardsMultiplier.value}X`,
+    value: `x${rewardsMultiplier.value}`,
   },
 ])
 </script>