Merge pull request #812 from Real-Dev-Squad/develop

Dev to Main Sync

Author: iamitprakash

task-requests/script.js

@@ -60,22 +60,25 @@ async function getTaskRequests(query = {}, nextLink) {
 
     if (res.status === 401) {
       showMessage('ERROR', ErrorMessages.UNAUTHENTICATED);
-      return;
+      return { data: [] };
     }
 
     if (res.status === 403) {
       showMessage('ERROR', ErrorMessages.UNAUTHORIZED);
-      return;
+      return { data: [] };
     }
 
     if (res.status === 404) {
       showMessage('ERROR', ErrorMessages.NOT_FOUND);
-      return;
+      return { data: [] };
     }
 
     showMessage('ERROR', ErrorMessages.SERVER_ERROR);
+    return { data: [] };
   } catch (e) {
     console.error(e);
+    showMessage('ERROR', ErrorMessages.SERVER_ERROR);
+    return { data: [] };
   }
 }
 

task-requests/style.css

@@ -364,12 +364,13 @@ body {
   gap: 1rem;
 }
 .taskRequest__message {
-  line-height: 1.25rem;
+  line-height: 1.2;
   font-weight: 600;
   text-align: center;
   font-size: 1.5rem;
   width: 100%;
   position: absolute;
+  word-wrap: break-word;
 }
 .taskRequest__message--error {
   color: var(--color-error);
@@ -482,6 +483,10 @@ body {
   .funnel-icon {
     margin: auto;
   }
+
+  .taskRequest__message--error {
+    position: static;
+  }
 }
 
 @media screen and (max-width: 320px) {