fix types

MorpheusAIs · Feb 14, 2025 · c384691 · c384691
1 parent e4aabdf
commit c384691
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 112 deletions.
diff --git a/src/common/modals/compositions/ChangeLockModal.vue b/src/common/modals/compositions/ChangeLockModal.vue
@@ -89,7 +89,7 @@ const web3ProvidersStore = useWeb3ProvidersStore()
 const isSubmitting = ref(false)
 
 const form = reactive({
-  lockPeriod: '',
+  lockPeriod: '' as number | '',
 })
 
 const userMultiplier = computed(() =>
@@ -179,7 +179,7 @@ watch(
     web3ProvidersStore.provider.chainId,
     userPoolData.value?.claimLockEnd,
   ],
-  () => fetchExpectedMultiplier(form.lockPeriod),
+  () => fetchExpectedMultiplier(String(form.lockPeriod)),
   { immediate: true },
 )
 
@@ -191,12 +191,12 @@ watch(
     const usersLockEnd = time(userPoolData.value?.claimLockEnd?.toNumber())
 
     if (usersLockEnd.isAfter(time())) {
-      form.lockPeriod = String(userPoolData.value?.claimLockEnd?.toNumber())
+      form.lockPeriod = userPoolData.value?.claimLockEnd?.toNumber() ?? ''
 
       return
     }
 
-    form.lockPeriod = String(time().add(1, 'minute').timestamp)
+    form.lockPeriod = time().add(1, 'minute').timestamp
   },
 )
 </script>

diff --git a/src/forms/DepositForm.vue b/src/forms/DepositForm.vue
@@ -178,7 +178,7 @@ const getLockPeriodMinValue = () => {
 
 const form = reactive({
   amount: '',
-  lockPeriod: getLockPeriodMinValue().timestamp.toString() || '',
+  lockPeriod: getLockPeriodMinValue().timestamp || ('' as number | ''),
   referrer: '',
 })
 
@@ -318,10 +318,10 @@ watch(
   ],
   async () => {
     if (!form.lockPeriod) {
-      form.lockPeriod = getLockPeriodMinValue().timestamp.toString()
+      form.lockPeriod = getLockPeriodMinValue().timestamp
     }
     if (isMultiplierShown.value) {
-      await fetchExpectedMultiplier(form.lockPeriod)
+      await fetchExpectedMultiplier(String(form.lockPeriod))
     }
   },
 )

diff --git a/src/forms/Mor20CreationForm/components/EthereumStep/components/GroupBuilder.vue b/src/forms/Mor20CreationForm/components/EthereumStep/components/GroupBuilder.vue
@@ -7,7 +7,7 @@
     />
     <div class="group-builder__fields">
       <datetime-field
-        v-model="group.payoutStartAt"
+        v-model="group.payoutStartAt as ''"
         :placeholder="$t(`${I18N_KEY_PREFIX}.payout-start-placeholder`)"
         :error-message="getFieldErrorMessage('payoutStartAt')"
         :disabled="disabled"

diff --git a/src/pages/Builders/pages/BuildersList/index.vue b/src/pages/Builders/pages/BuildersList/index.vue
@@ -95,11 +95,11 @@
 
     <template
       v-if="
-        buildersProjectsState.isLoaded.value &&
+        builderSubnetsState.isLoaded.value &&
         allPredefinedBuildersState.isLoaded.value
       "
     >
-      <template v-if="buildersProjectsState.isLoadFailed.value">
+      <template v-if="builderSubnetsState.isLoadFailed.value">
         <error-message
           :message="$t('builders-list.loading-projects-error-msg')"
         />
@@ -313,62 +313,63 @@ const mapperUsersBuildersOrderBy = computed(() =>
   mapUsersOrderFilter(usersBuildersOrderBy.value),
 )
 
-const { data: allPredefinedBuilders } = useLoad<LoadBuildersResponse>(
-  {
-    builderSubnets: [],
-    userAccountBuilderSubnets: [],
-    buildersCounters: {} as CombinedBuilderSubnetsQuery['counters'][0],
-  },
-  async (): Promise<LoadBuildersResponse> => {
-    const loadFn = async (
-      client: ApolloClient<NormalizedCacheObject>,
-      chain: EthereumChains,
-    ) => {
-      const { data } = await client.query<
-        CombinedBuilderSubnetsFilteredByPredefinedBuildersQuery,
-        CombinedBuilderSubnetsFilteredByPredefinedBuildersQueryVariables
-      >({
-        query: CombinedBuilderSubnetsFilteredByPredefinedBuilders,
-        fetchPolicy: 'network-only',
-        variables: {
-          orderBy: Object.values(BuilderSubnet_OrderBy).includes(
-            orderBy.value as BuilderSubnet_OrderBy,
-          )
-            ? (orderBy.value as BuilderSubnet_OrderBy)
-            : BuilderSubnet_OrderBy.TotalStaked,
-          usersOrderBy: mapperUsersBuildersOrderBy.value,
-          usersDirection: usersOrderDirection.value,
-          orderDirection: orderDirection.value,
-          name_in: predefinedBuildersMeta
-            .map(el => el.name)
-            .filter(el =>
-              el.toLowerCase().includes(searchQuery.value.toLowerCase()),
-            ),
+const { data: allPredefinedBuilders, ...allPredefinedBuildersState } =
+  useLoad<LoadBuildersResponse>(
+    {
+      builderSubnets: [],
+      userAccountBuilderSubnets: [],
+      buildersCounters: {} as CombinedBuilderSubnetsQuery['counters'][0],
+    },
+    async (): Promise<LoadBuildersResponse> => {
+      const loadFn = async (
+        client: ApolloClient<NormalizedCacheObject>,
+        chain: EthereumChains,
+      ) => {
+        const { data } = await client.query<
+          CombinedBuilderSubnetsFilteredByPredefinedBuildersQuery,
+          CombinedBuilderSubnetsFilteredByPredefinedBuildersQueryVariables
+        >({
+          query: CombinedBuilderSubnetsFilteredByPredefinedBuilders,
+          fetchPolicy: 'network-only',
+          variables: {
+            orderBy: Object.values(BuilderSubnet_OrderBy).includes(
+              orderBy.value as BuilderSubnet_OrderBy,
+            )
+              ? (orderBy.value as BuilderSubnet_OrderBy)
+              : BuilderSubnet_OrderBy.TotalStaked,
+            usersOrderBy: mapperUsersBuildersOrderBy.value,
+            usersDirection: usersOrderDirection.value,
+            orderDirection: orderDirection.value,
+            name_in: predefinedBuildersMeta
+              .map(el => el.name)
+              .filter(el =>
+                el.toLowerCase().includes(searchQuery.value.toLowerCase()),
+              ),
 
             address: provider.value.selectedAddress,
           },
         })
 
-      return {
-        data: {
-          builderSubnets: data.builderSubnets.map(el => ({ ...el, chain })),
-          buildersUsers: data.builderUsers.map(el => {
-            return {
-              ...el,
-              builderSubnet: {
-                ...el.builderSubnet,
-                chain,
-              },
-            }
-          }),
-          buildersCounters: {
-            id: '',
-            totalBuilderProjects: data.builderSubnets.length,
-            totalSubnets: 0,
+        return {
+          data: {
+            builderSubnets: data.builderSubnets.map(el => ({ ...el, chain })),
+            buildersUsers: data.builderUsers.map(el => {
+              return {
+                ...el,
+                builderSubnet: {
+                  ...el.builderSubnet,
+                  chain,
+                },
+              }
+            }),
+            buildersCounters: {
+              id: '',
+              totalBuilderProjects: data.builderSubnets.length,
+              totalSubnets: 0,
+            },
           },
-        },
+        }
       }
-    }
 
       if (!selectedChain.value) {
         const response = await Promise.all(
@@ -377,33 +378,33 @@ const { data: allPredefinedBuilders } = useLoad<LoadBuildersResponse>(
           }),
         )
 
-      const result = response.reduce(
-        (acc, curr) => {
-          acc['builderSubnets'] = acc['builderSubnets'].concat(
-            curr.data.builderSubnets,
-          )
-          acc['userAccountBuilderSubnets'] = acc[
-            'userAccountBuilderSubnets'
-          ].concat(curr.data.buildersUsers.map(el => el.builderSubnet))
-
-          acc['buildersCounters'] = {
-            id: '',
-            totalBuilderProjects: acc.builderSubnets.length,
-            totalSubnets: 0,
-          }
+        const result = response.reduce(
+          (acc, curr) => {
+            acc['builderSubnets'] = acc['builderSubnets'].concat(
+              curr.data.builderSubnets,
+            )
+            acc['userAccountBuilderSubnets'] = acc[
+              'userAccountBuilderSubnets'
+            ].concat(curr.data.buildersUsers.map(el => el.builderSubnet))
+
+            acc['buildersCounters'] = {
+              id: '',
+              totalBuilderProjects: acc.builderSubnets.length,
+              totalSubnets: 0,
+            }
 
-          return acc
-        },
-        {
-          builderSubnets: [],
-          userAccountBuilderSubnets: [],
-          buildersCounters: {
-            id: '',
-            totalBuilderProjects: 0,
-            totalSubnets: 0,
-          } as LoadBuildersResponse['buildersCounters'],
-        } as LoadBuildersResponse,
-      )
+            return acc
+          },
+          {
+            builderSubnets: [],
+            userAccountBuilderSubnets: [],
+            buildersCounters: {
+              id: '',
+              totalBuilderProjects: 0,
+              totalSubnets: 0,
+            } as LoadBuildersResponse['buildersCounters'],
+          } as LoadBuildersResponse,
+        )
 
         return result
       }
@@ -413,32 +414,34 @@ const { data: allPredefinedBuilders } = useLoad<LoadBuildersResponse>(
         selectedChain.value,
       )
 
-    return {
-      builderSubnets: data.builderSubnets,
-      userAccountBuilderSubnets: data.buildersUsers.map(el => el.builderSubnet),
-      buildersCounters: {
-        id: '',
-        totalBuilderProjects: data.builderSubnets.length,
-        totalSubnets: 0,
-      },
-    }
-  },
-  {
-    isLoadOnMount: networkType.value === NetworkTypes.Mainnet,
-    reloadArgs: [
-      orderBy,
-      orderDirection,
-      mapperUsersBuildersOrderBy,
-      usersOrderDirection,
-      () => route.query.user,
-      () => route.query.network,
-      () => provider.value.chainId,
-      selectedChain,
-      searchQuery,
-    ],
-    updateArgs: [[orderBy, orderDirection]],
-  },
-)
+      return {
+        builderSubnets: data.builderSubnets,
+        userAccountBuilderSubnets: data.buildersUsers.map(
+          el => el.builderSubnet,
+        ),
+        buildersCounters: {
+          id: '',
+          totalBuilderProjects: data.builderSubnets.length,
+          totalSubnets: 0,
+        },
+      }
+    },
+    {
+      isLoadOnMount: networkType.value === NetworkTypes.Mainnet,
+      reloadArgs: [
+        orderBy,
+        orderDirection,
+        mapperUsersBuildersOrderBy,
+        usersOrderDirection,
+        () => route.query.user,
+        () => route.query.network,
+        () => provider.value.chainId,
+        selectedChain,
+        searchQuery,
+      ],
+      updateArgs: [[orderBy, orderDirection]],
+    },
+  )
 
 const paginateThroughAllPredefinedBuilders = async (args: {
   skip: number

diff --git a/src/pages/DelegationPage/components/DelegateSubnetModal.vue b/src/pages/DelegationPage/components/DelegateSubnetModal.vue
@@ -109,7 +109,7 @@ const form = reactive({
   link: '',
   fee: '',
   address: '',
-  deregistrationDate: '',
+  deregistrationDate: '' as number | '',
 })
 
 const validationRules = computed(() => ({