From f9e37e6fe3a062ee26439f9fc5dee3c19bb4fa4a Mon Sep 17 00:00:00 2001 From: "jiwon93.son" Date: Fri, 26 Jul 2024 16:06:03 +0900 Subject: [PATCH] =?UTF-8?q?[MobileSendPopUp]=20SHOPTIME-2875=20-=20?= =?UTF-8?q?=EA=B5=AD=EA=B0=80=EB=B3=84=20=EB=B2=88=ED=98=B8=20=EC=9E=90?= =?UTF-8?q?=EB=A6=BF=20=EC=88=98=20=EC=97=AC=EB=B6=80=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=20sms=20=ED=98=B8=EC=B6=9C=20-=20=EC=9E=90=EB=A6=BF?= =?UTF-8?q?=20=EC=88=98=20=EB=A7=9E=EC=A7=80=20=EC=95=8A=EC=9C=BC=EB=A9=B4?= =?UTF-8?q?=20=EC=95=8C=EB=9F=BF=EB=A9=94=EC=84=B8=EC=A7=80=20=EB=85=B8?= =?UTF-8?q?=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/MobileSend/MobileSendPopUp.jsx | 74 ++++++++++++------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx index 2e73fdce..002f1501 100644 --- a/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx +++ b/com.twin.app.shoptime/src/components/MobileSend/MobileSendPopUp.jsx @@ -1,48 +1,67 @@ -import React, { useCallback, useEffect, useMemo, useState } from "react"; +import React, { + useCallback, + useEffect, + useMemo, + useState, +} from 'react'; -import classNames from "classnames"; +import classNames from 'classnames'; import { AsYouTypeFormatter, PhoneNumberFormat, PhoneNumberUtil, -} from "google-libphonenumber"; -import { useDispatch, useSelector } from "react-redux"; +} from 'google-libphonenumber'; +import { + useDispatch, + useSelector, +} from 'react-redux'; -import { off, on } from "@enact/core/dispatcher"; -import spotlight, { Spotlight } from "@enact/spotlight"; -import { SpotlightContainerDecorator } from "@enact/spotlight/SpotlightContainerDecorator"; -import { Spottable } from "@enact/spotlight/Spottable"; +import { + off, + on, +} from '@enact/core/dispatcher'; +import spotlight, { Spotlight } from '@enact/spotlight'; +import { + SpotlightContainerDecorator, +} from '@enact/spotlight/SpotlightContainerDecorator'; +import { Spottable } from '@enact/spotlight/Spottable'; -import defaultImage from "../../../assets/images/img-thumb-empty-144@3x.png"; -import { types } from "../../actions/actionTypes"; -import { clearSMS, sendSms } from "../../actions/appDataActions"; +import defaultImage from '../../../assets/images/img-thumb-empty-144@3x.png'; +import { types } from '../../actions/actionTypes'; +import { + clearSMS, + sendSms, +} from '../../actions/appDataActions'; import { changeLocalSettings, setHidePopup, setShowPopup, -} from "../../actions/commonActions"; +} from '../../actions/commonActions'; import { clearRegisterDeviceInfo, getDeviceAdditionInfo, registerDeviceInfo, -} from "../../actions/deviceActions"; +} from '../../actions/deviceActions'; import { clearCurationCoupon, setEventIssueReq, -} from "../../actions/eventActions"; -import { sendLogShopByMobile } from "../../actions/logActions"; -import { ACTIVE_POPUP, LOG_TP_NO } from "../../utils/Config"; +} from '../../actions/eventActions'; +import { sendLogShopByMobile } from '../../actions/logActions'; +import { + ACTIVE_POPUP, + LOG_TP_NO, +} from '../../utils/Config'; import { $L, decryptPhoneNumber, encryptPhoneNumber, -} from "../../utils/helperMethods"; -import CustomImage from "../CustomImage/CustomImage"; -import TButton from "../TButton/TButton"; -import TPopUp from "../TPopUp/TPopUp"; -import HistoryPhoneNumber from "./HistoryPhoneNumber/HistoryPhoneNumber"; -import css from "./MobileSendPopUp.module.less"; -import SMSNumKeyPad from "./SMSNumKeyPad"; +} from '../../utils/helperMethods'; +import CustomImage from '../CustomImage/CustomImage'; +import TButton from '../TButton/TButton'; +import TPopUp from '../TPopUp/TPopUp'; +import HistoryPhoneNumber from './HistoryPhoneNumber/HistoryPhoneNumber'; +import css from './MobileSendPopUp.module.less'; +import SMSNumKeyPad from './SMSNumKeyPad'; const SECRET_KEY = "fy7BTKuM9eeTQqEC9sF3Iw5qG43Aaip"; @@ -277,10 +296,13 @@ export default function MobileSendPopUp({ }; const handleAgreeSendClick = useCallback(() => { - if (!mobileNumber) return; - let naturalNumber = mobileNumber.replace(/\D/g, ""); + if (!mobileNumber || naturalNumber.length < getMaxNum(deviceCountryCode)) { + setSmsRetCode(907); + return; + } + if (deviceCountryCode === "KR") { naturalNumber = "82" + naturalNumber; } @@ -476,6 +498,8 @@ export default function MobileSendPopUp({ return SMS_ERROR_905; case 906: return SMS_ERROR_906; + case 907: + return SMS_ERROR_907; default: return SMS_ERROR_900; }