Merge branch '#232' into fix/qoh-card

hotwax · Dec 19, 2023 · 9dbe993 · 9dbe993
2 parents dcdbcf0 + 0078fb6
commit 9dbe993
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
@@ -24,8 +24,7 @@ const getUserProfile = async (token: any): Promise<any> => {
         'Content-Type': 'application/json'
       }
     });
-    if(hasError(resp)) return Promise.reject("Error getting user profile: " + JSON.stringify(resp.data));
-    if(resp.data.facilities.length === 0 ) return Promise.reject("User is not associated with any facility: " + JSON.stringify(resp.data));
+    if(hasError(resp)) return Promise.reject("Error getting user profile");
     return Promise.resolve(resp.data)
   } catch(error: any) {
     return Promise.reject(error)

diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
@@ -96,7 +96,8 @@ const actions: ActionTree<UserState, RootState> = {
       // TODO Check if handling of specific status codes is required.
       showToast(translate('Something went wrong while login. Please contact administrator'));
       console.error("error", err);
-      return Promise.reject(new Error(err))
+      // Added ternary check for serverResponse as in to correctly display the message on UI, need to remove this once all the service reject in same format
+      return Promise.reject(new Error(err?.serverResponse ? err.serverResponse : err))
     }
   },