From a13bfe76a061ea5e5b332ec3e82a1410667f7eac Mon Sep 17 00:00:00 2001 From: phegalante Date: Tue, 8 Sep 2020 20:11:31 -0300 Subject: [PATCH] fix: import contacts --- backend/src/controllers/ImportPhoneContactsController.js | 2 +- frontend/src/pages/Contacts/index.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/controllers/ImportPhoneContactsController.js b/backend/src/controllers/ImportPhoneContactsController.js index b24ee0d..1d443ed 100644 --- a/backend/src/controllers/ImportPhoneContactsController.js +++ b/backend/src/controllers/ImportPhoneContactsController.js @@ -15,7 +15,7 @@ exports.store = async (req, res, next) => { } const io = getIO(); - const wbot = getWbot(defaultWhatsapp); + const wbot = getWbot(defaultWhatsapp.id); let phoneContacts; diff --git a/frontend/src/pages/Contacts/index.js b/frontend/src/pages/Contacts/index.js index 5f916a2..226d5b8 100644 --- a/frontend/src/pages/Contacts/index.js +++ b/frontend/src/pages/Contacts/index.js @@ -182,7 +182,9 @@ const Contacts = () => { window.location.reload(false); } catch (err) { console.log(err); - window.location.reload(false); + if (err.response && err.response.data && err.response.data.error) { + toast.error(err.response.data.error); + } } }; @@ -210,8 +212,8 @@ const Contacts = () => { title={ deletingContact ? `${i18n.t("contacts.confirmationModal.deleteTitle")} ${ - deletingContact.name - }?` + deletingContact.name + }?` : `${i18n.t("contacts.confirmationModal.importTitlte")}` } open={confirmOpen}