fix: merge style bugs
This commit is contained in:
@@ -16,9 +16,11 @@ import {
|
||||
changePhoneNumber,
|
||||
} from '../../api/settingsApi';
|
||||
import { type Phone } from '../../types/settingsType';
|
||||
import { useToast } from '@rkheftan/harmony-ui';
|
||||
|
||||
export function PhoneNumber() {
|
||||
const { t, i18n } = useTranslation('setting');
|
||||
const toast = useToast();
|
||||
const [isEditing, setIsEditing] = useState(false);
|
||||
const [phoneNumber, setPhoneNumber] = useState('');
|
||||
const [verificationCode, setVerificationCode] = useState('');
|
||||
@@ -74,12 +76,36 @@ export function PhoneNumber() {
|
||||
}
|
||||
}, [profileData]);
|
||||
|
||||
useEffect(() => {
|
||||
if (fetchError) {
|
||||
toast({
|
||||
message:
|
||||
getErrorMessage(fetchError) || t('settingForm.errorFetchPhoneNumber'),
|
||||
severity: 'error',
|
||||
});
|
||||
}
|
||||
}, [fetchError, toast, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (sendCodeData?.success) {
|
||||
setButtonState('counting');
|
||||
setIsVerified(false);
|
||||
toast({
|
||||
message: t('settingForm.codeSentSuccessfully'),
|
||||
severity: 'success',
|
||||
});
|
||||
}
|
||||
}, [sendCodeData]);
|
||||
}, [sendCodeData, t, toast]);
|
||||
|
||||
useEffect(() => {
|
||||
if (sendCodeError) {
|
||||
toast({
|
||||
message:
|
||||
getErrorMessage(sendCodeError) || t('settingForm.errorSendCode'),
|
||||
severity: 'error',
|
||||
});
|
||||
}
|
||||
}, [sendCodeError, toast, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (confirmData?.success && confirmData.confirm) {
|
||||
@@ -87,8 +113,22 @@ export function PhoneNumber() {
|
||||
setShowToast(true);
|
||||
const fullPhoneNumber = countryCode + phoneNumber.replace(/^0/, '');
|
||||
executeChangePhone({ phoneNumber: fullPhoneNumber });
|
||||
toast({
|
||||
message: t('settingForm.phoneVerified'),
|
||||
severity: 'success',
|
||||
});
|
||||
}
|
||||
}, [confirmData, countryCode, phoneNumber, executeChangePhone]);
|
||||
}, [confirmData, countryCode, phoneNumber, executeChangePhone, t, toast]);
|
||||
|
||||
useEffect(() => {
|
||||
if (confirmError) {
|
||||
toast({
|
||||
message:
|
||||
getErrorMessage(confirmError) || t('settingForm.errorConfirmCode'),
|
||||
severity: 'error',
|
||||
});
|
||||
}
|
||||
}, [confirmError, toast, t]);
|
||||
|
||||
useEffect(() => {
|
||||
if (changePhoneData?.success) {
|
||||
@@ -101,8 +141,23 @@ export function PhoneNumber() {
|
||||
},
|
||||
]);
|
||||
setIsEditing(false);
|
||||
toast({
|
||||
message: t('settingForm.phoneChangedSuccessfully'),
|
||||
severity: 'success',
|
||||
});
|
||||
}
|
||||
}, [changePhoneData, countryCode, phoneNumber, t]);
|
||||
}, [changePhoneData, countryCode, phoneNumber, t, toast]);
|
||||
|
||||
useEffect(() => {
|
||||
if (changePhoneError) {
|
||||
toast({
|
||||
message:
|
||||
getErrorMessage(changePhoneError) ||
|
||||
t('settingForm.errorChangePhone'),
|
||||
severity: 'error',
|
||||
});
|
||||
}
|
||||
}, [changePhoneError, toast, t]);
|
||||
|
||||
const apiError = useMemo(
|
||||
() => sendCodeError || confirmError || changePhoneError,
|
||||
@@ -151,7 +206,6 @@ export function PhoneNumber() {
|
||||
const handleSendCode = () => {
|
||||
handleBlur();
|
||||
if (formError || !isPhoneValid(countryCode, phoneNumber)) return;
|
||||
|
||||
executeSendCode({
|
||||
phoneNumber: countryCode + phoneNumber.replace(/^0/, ''),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user