Merge remote-tracking branch 'origin/main' into fix-relative-time

thesis · Nov 18, 2024 · 84be61b · 84be61b
2 parents 7f03b0a + ec5496f
commit 84be61b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx b/dapp/src/pages/DashboardPage/TransactionHistory/EstimatedDuration.tsx
@@ -1,11 +1,7 @@
 import React from "react"
 import { Box, Tag, TagLabel, Flex, TagLeftIcon } from "@chakra-ui/react"
 import Spinner from "#/components/shared/Spinner"
-import {
-  convertActivityTypeToLabel,
-  getEstimatedDuration,
-  isActivityCompleted,
-} from "#/utils"
+import { getEstimatedDuration, isActivityCompleted } from "#/utils"
 import { Activity } from "#/types"
 
 export default function EstimatedDuration({
@@ -26,7 +22,7 @@ export default function EstimatedDuration({
           color="gold.400"
           emptyColor="brand.400"
         />
-        <TagLabel>{`${convertActivityTypeToLabel(activity.type)} transaction pending...`}</TagLabel>
+        <TagLabel>In progress...</TagLabel>
       </Tag>
       <Tag variant="solid">
         <TagLabel display="flex" gap={1}>

diff --git a/dapp/src/utils/activities.ts b/dapp/src/utils/activities.ts
@@ -30,9 +30,3 @@ export function getEstimatedDuration(
 
   return "3 hours"
 }
-
-export function convertActivityTypeToLabel(type: ActivityType): string {
-  if (isWithdrawType(type)) return "Unstaking"
-
-  return "Staking"
-}