Merge pull request #246 from godwokenrises/fix-fast-withdraw-left-time

Fix: fast withdrawal left time
godwokenrises · Dec 26, 2022 · 8426531 · 8426531 · vercel · Dec 26, 2022
2 parents 0031b15 + f530f1e
commit 8426531
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apps/godwoken-bridge/src/components/Withdrawal/WithdrawalItemV0.tsx b/apps/godwoken-bridge/src/components/Withdrawal/WithdrawalItemV0.tsx
@@ -208,18 +208,18 @@ const WithdrawalRequestCard = ({
           </div>
         </div>
         <div className="right-side">
-          {status === "pending" && !isDue && shouldShowMore && (
+          {status === "pending" && !isDue && !isFastWithdrawal && shouldShowMore && (
             <div className="time">
               <ArrowUpIcon />
             </div>
           )}
-          {status === "pending" && !isDue && !shouldShowMore && (
+          {status === "pending" && !isDue && !isFastWithdrawal && !shouldShowMore && (
             <div className="time">
               <MainText title="Estimated time left">{countdownText}</MainText>
               <ArrowDownIcon />
             </div>
           )}
-          {status === "pending" && isDue && !shouldShowMore && (
+          {status === "pending" && (isDue || isFastWithdrawal) && (
             <Tooltip title="Unlocking withdrawal">
               <LoadingOutlined style={{ color: "#484848", height: "21px", lineHeight: "21px" }} />
             </Tooltip>

diff --git a/apps/godwoken-bridge/src/components/Withdrawal/WithdrawalTarget.tsx b/apps/godwoken-bridge/src/components/Withdrawal/WithdrawalTarget.tsx
@@ -29,7 +29,7 @@ export default function WithdrawalTarget({ value, onSelectedChange }: Withdrawal
         <Row className="second-row">
           <Radio.Group onChange={onChange} value={value}>
             <Radio value={CKB_L1}>CKB L1</Radio>
-            <Radio value={GODWOKEN_V1}>GodWoken V1</Radio>
+            <Radio value={GODWOKEN_V1}>Godwoken V1</Radio>
           </Radio.Group>
         </Row>
       </InputCard>