From e9088d1878b2b94adb72b7023f11a2f6b5f3a123 Mon Sep 17 00:00:00 2001
From: marcobaobao <marco.piovanello@gmail.com>
Date: Thu, 27 Jan 2022 18:21:13 +0100
Subject: [PATCH] small fixes

---
 frontend/src/App.tsx  | 2 +-
 frontend/src/utils.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 3fcfdfe..665c4d9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -229,7 +229,7 @@ export function App() {
                                             <ProgressBar className="container-padding mt-2" now={progressMap.get(message[0])} variant="primary" /> :
                                             null
                                         }
-                                        {message[1] && message[1] !== 'Done!' ?
+                                        {message[0] && message[1] && message[1] !== 'Done!' ?
                                             <Row>
                                                 <Col>
                                                     <Button variant={darkMode ? 'dark' : 'light'} className="float-end" active size="sm" onClick={() => abort(message[0])}>
diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
index fb070fb..2e51d8a 100644
--- a/frontend/src/utils.ts
+++ b/frontend/src/utils.ts
@@ -10,7 +10,7 @@ export function validateDomain(domainName: string): boolean {
 
 export function ellipsis(str: string, lim: number): string {
     if (str) {
-        return str.length > lim ? `${str.substr(0, lim)}...` : str
+        return str.length > lim ? `${str.substring(0, lim)}...` : str
     }
     return ''
 }