diff --git a/new-lamassu-admin/src/components/layout/Sidebar.jsx b/new-lamassu-admin/src/components/layout/Sidebar.jsx
index 72c9c0a6..ff63bc08 100644
--- a/new-lamassu-admin/src/components/layout/Sidebar.jsx
+++ b/new-lamassu-admin/src/components/layout/Sidebar.jsx
@@ -31,7 +31,6 @@ const Sidebar = ({
             className={classes.linkWrapper}
             onClick={() => onClick(it)}>
             <div
-              key={idx}
               className={classnames({
                 [classes.activeLink]: isSelected(it),
                 [classes.customRenderActiveLink]: itemRender && isSelected(it),
diff --git a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
index 0d2c316f..2f13948c 100644
--- a/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
+++ b/new-lamassu-admin/src/pages/Customers/components/CreateCustomerModal.jsx
@@ -39,12 +39,7 @@ const getValidationSchema = countryCodes =>
       .required('A phone number is required')
       .test('is-valid-number', 'That is not a valid phone number', value => {
         try {
-          const validMap = R.map(it => {
-            const number = parsePhoneNumberWithError(value, it)
-            return number.isValid()
-          }, countryCodes)
-
-          return R.any(it => it === true, validMap)
+          return countryCodes.some(countryCode => parsePhoneNumberWithError(value, countryCode).isValid())
         } catch (e) {
           return false
         }