improvement: better error handling

frontend/src/pages/Connection/index.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from "react";
 import { useHistory } from "react-router-dom";
 import api from "../../services/api";
 import openSocket from "socket.io-client";
+import { toast } from "react-toastify";
 
 import { makeStyles } from "@material-ui/core/styles";
 
@@ -46,6 +47,9 @@ const WhatsAuth = () => {
 				setSession(data);
 			} catch (err) {
 				console.log(err);
+				if (err.response && err.response.data && err.response.data.error) {
+					toast.error(err.response.data.error);
+				}
 			}
 		};
 		fetchSession();

frontend/src/pages/Contacts/index.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useReducer } from "react";
 import openSocket from "socket.io-client";
+import { toast } from "react-toastify";
 
 import { makeStyles } from "@material-ui/core/styles";
 import Table from "@material-ui/core/Table";
@@ -114,7 +115,9 @@ const Contacts = () => {
 					setLoading(false);
 				} catch (err) {
 					console.log(err);
-					alert(err);
+					if (err.response && err.response.data && err.response.data.error) {
+						toast.error(err.response.data.error);
+					}
 				}
 			};
 			fetchContacts();
@@ -161,8 +164,12 @@ const Contacts = () => {
 	const handleDeleteContact = async contactId => {
 		try {
 			await api.delete(`/contacts/${contactId}`);
+			toast.success("Contact deleted sucessfully!");
 		} catch (err) {
-			alert(err);
+			console.log(err);
+			if (err.response && err.response.data && err.response.data.error) {
+				toast.error(err.response.data.error);
+			}
 		}
 		setDeletingContact(null);
 		setSearchParam("");
@@ -172,8 +179,10 @@ const Contacts = () => {
 	const handleimportContact = async () => {
 		try {
 			await api.post("/contacts/import");
+			window.location.reload(false);
 		} catch (err) {
 			console.log(err);
+			window.location.reload(false);
 		}
 	};
 

frontend/src/pages/Settings/index.js

@@ -43,6 +43,9 @@ const Settings = () => {
 				setSettings(data);
 			} catch (err) {
 				console.log(err);
+				if (err.response && err.response.data && err.response.data.error) {
+					toast.error(err.response.data.error);
+				}
 			}
 		};
 		fetchSession();
@@ -77,14 +80,16 @@ const Settings = () => {
 			});
 			toast.success("Setting updated");
 		} catch (err) {
-			alert(err);
 			console.log(err);
+			if (err.response && err.response.data && err.response.data.error) {
+				toast.error(err.response.data.error);
+			}
 		}
 	};
 
 	const getSettingValue = key => {
-		const setting = settings.find(s => s.key === key);
-		return setting.value;
+		const { value } = settings.find(s => s.key === key);
+		return value;
 	};
 
 	return (

frontend/src/pages/Signup/index.js

@@ -78,7 +78,10 @@ const SignUp = () => {
 			toast.success(i18n.t("signup.toasts.success"));
 			history.push("/login");
 		} catch (err) {
-			toast.error(i18n.t("signup.toasts.fail"));
+			console.log(err);
+			if (err.response && err.response.data && err.response.data.error) {
+				toast.error(err.response.data.error);
+			}
 		}
 	};