admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted phone formatting libraries. IO-483

Browse Source
This commit is contained in:
Patrick Fic
2021-02-02 16:19:22 -08:00
parent 809ba0934a
commit 0bbfb259c0
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/form-items-formatted/phone-form-item.component.jsx
View File

@@ -1,9 +1,10 @@
import i18n from "i18next";
import phone from "phone";
import parsePhoneNumber from "libphonenumber-js";
import React, { forwardRef } from "react";
import PhoneInput from "react-phone-input-2";
import "react-phone-input-2/lib/high-res.css";
import "./phone-form-item.styles.scss";
function FormItemPhone(props, ref) {
return (
<PhoneInput
@@ -23,9 +24,9 @@ export const PhoneItemFormatterValidation = (getFieldValue, name) => ({
if (!getFieldValue(name)) {
return Promise.resolve();
} else {
const p = phone(getFieldValue(name), "us");
const p2 = phone(getFieldValue(name), "ca");
if (p.length > 0 || p2.length > 0) {
const p = parsePhoneNumber(getFieldValue(name), "CA");
if (p) {
return Promise.resolve();
} else {
return Promise.reject(i18n.t("general.validation.invalidphone"));

10
client/src/utils/PhoneFormatter.jsx
View File

@@ -1,8 +1,8 @@
import React from "react";
//import NumberFormat from "react-number-format";
import phone from "phone";
export default function PhoneNumberFormatter(props) {
const p = phone(props.children);
import parsePhoneNumber from "libphonenumber-js";
import React from "react";
return <span>{p[0]}</span>;
export default function PhoneNumberFormatter(props) {
const p = parsePhoneNumber(props.children, "CA");
return p ? <span>{p.formatInternational()}</span> : null;
}