feature/merge dev to main

src/common/modals/compositions/ChangeLockModal.vue

@@ -172,29 +172,24 @@ const clearFields = () => {
   form.lockPeriod = ''
 }
 
-const init = () => {
-  if (!props.isShown) {
-    return
-  }
-  form.lockPeriod = new Time().isAfter(
-    userPoolData.value?.claimLockEnd?.toString() ?? 0,
-  )
-    ? ''
-    : userPoolData.value?.claimLockEnd?.toString() ?? ''
-}
-
 watch(
   () => [
     props.poolId,
     form.lockPeriod,
     web3ProvidersStore.provider.selectedAddress,
     web3ProvidersStore.provider.chainId,
+    userPoolData.value?.claimLockEnd,
   ],
   () => fetchExpectedMultiplier(form.lockPeriod),
   { immediate: true },
 )
 
-watch(() => props.isShown, init)
+watch(
+  () => [props.isShown, userPoolData.value?.claimLockEnd],
+  () => {
+    form.lockPeriod = String(userPoolData.value?.claimLockEnd.toNumber() || '')
+  },
+)
 </script>
 
 <style lang="scss" scoped>

src/common/modals/compositions/DepositModal.vue

@@ -36,6 +36,7 @@ withDefaults(
     isShown: boolean
     poolId: number
     minStake: BigNumber
+    claimLockEnd: string
     isCloseByClickOutside?: boolean
   }>(),
   {

src/composables/use-pool.ts

@@ -4,6 +4,7 @@ import { type BigNumber, type Erc1967ProxyType } from '@/types'
 import { useTimestamp } from '@vueuse/core'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { ethers } from 'ethers'
+import { Time } from '@distributedlab/tools'
 
 const MULTIPLIER_SCALE = 21 //digits
 const REWARDS_DIVIDER = 10000
@@ -157,11 +158,16 @@ export const usePool = (poolId: number) => {
 
   const fetchExpectedMultiplier = async (lockPeriod: string) => {
     try {
+      const lockStart = new Time().isAfter(
+        userPoolData.value?.claimLockStart.toString(),
+      )
+        ? new Time().timestamp
+        : userPoolData.value?.claimLockStart.toString() ?? 0
       const multiplier =
         //eslint-disable-next-line max-len
         await web3ProvidersStore.erc1967ProxyContract.providerBased.value.getClaimLockPeriodMultiplier(
           poolId,
-          0,
+          lockStart,
           lockPeriod || 0,
         )
       expectedRewardsMultiplier.value = humanizeRewards(multiplier)

src/forms/DepositForm.vue

@@ -130,9 +130,8 @@ const allowances = reactive<Record<CURRENCIES, BigNumber | null>>({
 })
 
 const { t } = useI18n()
-const { expectedRewardsMultiplier, fetchExpectedMultiplier } = usePool(
-  props.poolId,
-)
+const { expectedRewardsMultiplier, fetchExpectedMultiplier, userPoolData } =
+  usePool(props.poolId)
 const web3ProvidersStore = useWeb3ProvidersStore()
 
 const action = computed<ACTIONS>(() => {
@@ -304,18 +303,26 @@ const init = async (): Promise<void> => {
     ErrorHandler.process(error)
   }
 
+  form.lockPeriod = String(userPoolData.value?.claimLockEnd.toNumber() || '')
+
   isInitializing.value = false
 }
 
 watch(
   () => [
     props.poolId,
-    web3ProvidersStore.erc1967ProxyContract.providerBased.value.address,
     web3ProvidersStore.provider.selectedAddress,
     form.lockPeriod,
+    userPoolData.value?.claimLockEnd,
   ],
-  () => fetchExpectedMultiplier(form.lockPeriod),
-  { immediate: true },
+  async () => {
+    if (!form.lockPeriod) {
+      form.lockPeriod = String(
+        userPoolData.value?.claimLockEnd.toNumber() || '',
+      )
+    }
+    await fetchExpectedMultiplier(form.lockPeriod)
+  },
 )
 
 onMounted(() => {

src/pages/HomePage/views/PublicPoolView.vue

@@ -44,6 +44,7 @@
               v-model:is-shown="isDepositModalShown"
               :pool-id="poolId"
               :min-stake="poolData.minimalStake"
+              :claim-lock-end="userPoolData?.claimLockEnd?.toString() ?? ''"
             />
           </div>
         </transition>