From 224a1fdd093c621b9f8662f2f9f05cff912c6578 Mon Sep 17 00:00:00 2001
From: Polybius93 <adam.daniel.puskas@polybius-studios.com>
Date: Fri, 15 Dec 2023 12:31:59 +0100
Subject: [PATCH] feat: modifed unmint naming to redeem, fixed confirmaton
 checker

---
 src/app/components/header/components/tabs.tsx                 | 4 ++--
 .../mint-unmint/components/walkthrough/walkthrough.tsx        | 2 +-
 src/app/components/mint-unmint/mint-unmint.tsx                | 3 ++-
 src/app/components/my-vaults-small/my-vaults-small.tsx        | 2 +-
 .../components/my-vaults-header/my-vaults-header.tsx          | 2 +-
 src/app/hooks/use-confirmation-checker.ts                     | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/components/header/components/tabs.tsx b/src/app/components/header/components/tabs.tsx
index cfc24651..fa93a7b9 100644
--- a/src/app/components/header/components/tabs.tsx
+++ b/src/app/components/header/components/tabs.tsx
@@ -13,12 +13,12 @@ export function NavigationTabs({
   return (
     <HStack spacing={'25px'} marginRight={'150px'}>
       <TabButton
-        title={'Mint/Unmint dlcBTC'}
+        title={'Mint/Redeem dlcBTC'}
         isActive={activeTab === '/'}
         handleClick={() => handleTabClick('/')}
       />
       <TabButton
-        title={'My Vaults'}
+        title={'My Mint Vaults'}
         isActive={activeTab === '/my-vaults'}
         handleClick={() => handleTabClick('/my-vaults')}
       />
diff --git a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx
index 9f58ce44..79230cb1 100644
--- a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx
+++ b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx
@@ -147,7 +147,7 @@ export function Walkthrough({ flow, currentStep }: WalkthroughProps): React.JSX.
             <WalkthroughLayout>
               <WalkthroughHeader
                 currentStep={undefined}
-                title={'Unminted dlcBTC'}
+                title={'Redeemed dlcBTC'}
                 blockchain={'ethereum'}
               />
             </WalkthroughLayout>
diff --git a/src/app/components/mint-unmint/mint-unmint.tsx b/src/app/components/mint-unmint/mint-unmint.tsx
index 2eccc282..4ea5c094 100644
--- a/src/app/components/mint-unmint/mint-unmint.tsx
+++ b/src/app/components/mint-unmint/mint-unmint.tsx
@@ -31,6 +31,7 @@ export function MintUnmint({ address }: MintUnmintContainerProps): React.JSX.Ele
   const { activeTab, mintStep, unmintStep } = useSelector((state: RootState) => state.mintunmint);
 
   useEffect(() => {
+    if (!address) return;
     setAnimate(true);
     setTimeout(() => {
       setAnimate(false);
@@ -46,7 +47,7 @@ export function MintUnmint({ address }: MintUnmintContainerProps): React.JSX.Ele
       <Tabs variant="unstyled" index={activeTab} onChange={handleTabsChange}>
         <TabList>
           <Tab>Mint</Tab>
-          <Tab isDisabled={!address}>Unmint</Tab>
+          <Tab isDisabled={!address}>Redeem</Tab>
         </TabList>
         <TabIndicator mt="5px" h="3.5px" bg={'accent.cyan.01'} />
         <Spacer />
diff --git a/src/app/components/my-vaults-small/my-vaults-small.tsx b/src/app/components/my-vaults-small/my-vaults-small.tsx
index c6da6b6a..0d5a8d07 100644
--- a/src/app/components/my-vaults-small/my-vaults-small.tsx
+++ b/src/app/components/my-vaults-small/my-vaults-small.tsx
@@ -22,7 +22,7 @@ export function MyVaultsSmall({ address }: MyVaultsSmallProps): React.JSX.Elemen
 
   return (
     <MyVaultsSmallLayout>
-      <VaultsList title={'My Vaults'} height={'545px'} isScrollable={!!address && !isLoading}>
+      <VaultsList title={'My Mint Vaults'} height={'545px'} isScrollable={!!address && !isLoading}>
         {address ? (
           <Skeleton isLoaded={!isLoading} w={'100%'}>
             <VaultsListGroupContainer label="Lock BTC" vaults={readyVaults} />
diff --git a/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx b/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx
index cf0b1f83..bc834e81 100644
--- a/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx
+++ b/src/app/components/my-vaults/components/my-vaults-header/my-vaults-header.tsx
@@ -17,7 +17,7 @@ export function MyVaultsLargeHeader({
     <VStack w={'100%'} h={'100px'}>
       <HStack w={'100%'} h={'150px'} justifyContent={'space-between'} pr={'25px'}>
         <Text color={'white'} fontSize={'4xl'} fontWeight={600}>
-          My Vaults
+          My Mint Vaults
         </Text>
         <HStack w={'450px'} h={'75%'} justifyContent={'space-between'}>
           <Divider orientation={'vertical'} h={'35px'} variant={'thick'} />
diff --git a/src/app/hooks/use-confirmation-checker.ts b/src/app/hooks/use-confirmation-checker.ts
index 0f114bde..3074d7ef 100644
--- a/src/app/hooks/use-confirmation-checker.ts
+++ b/src/app/hooks/use-confirmation-checker.ts
@@ -44,7 +44,7 @@ export function useConfirmationChecker(
 
     const difference = bitcoinCurrentBlockHeight - bitcoinTransactionBlockHeight;
 
-    setTransactionProgress(difference);
+    setTransactionProgress(difference > 0 ? difference : 0);
 
     if (difference > 6) {
       clearInterval(fetchInterval.current);