From 1d2ca19c2d09791091a61dfcf56d3e3969ef8a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Fri, 8 Jan 2021 18:21:23 +0000 Subject: [PATCH] fix: default error message --- .../src/pages/LoyaltyPanel/CouponCodes.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/CouponCodes.js b/new-lamassu-admin/src/pages/LoyaltyPanel/CouponCodes.js index bf405ac1..69df295d 100644 --- a/new-lamassu-admin/src/pages/LoyaltyPanel/CouponCodes.js +++ b/new-lamassu-admin/src/pages/LoyaltyPanel/CouponCodes.js @@ -15,6 +15,9 @@ import CouponCodesModal from './CouponCodesModal' const useStyles = makeStyles(styles) +const DUPLICATE_ERROR_MSG = 'There is already a coupon with that code!' +const DEFAULT_ERROR_MSG = 'Failed to save' + const GET_COUPONS = gql` query coupons { coupons { @@ -69,16 +72,18 @@ const Coupons = () => { if (!res.errors) { return setShowModal(false) } else { - const duplicateCouponError = res.errors.some(e => { - return e.message.includes('duplicate') - }) + const duplicateCouponError = R.any(it => + R.includes('duplicate', it?.message) + )(res.errors) - if (duplicateCouponError) - setErrorMsg('There is already a coupon with that code!') + const msg = duplicateCouponError + ? DUPLICATE_ERROR_MSG + : DEFAULT_ERROR_MSG + setErrorMsg(msg) } }) .catch(err => { - setErrorMsg('Failed to save') + setErrorMsg(DEFAULT_ERROR_MSG) console.log(err) }) }