@redneckz/wildless-cms-uni-blocks 0.14.892 → 0.14.893
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/bundle.umd.js +8 -4
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +7 -3
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +7 -3
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +8 -4
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +7 -3
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +7 -3
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +8 -3
- package/package.json +1 -1
- package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +8 -3
|
@@ -25,22 +25,23 @@ const CODE_LENGTH = 4;
|
|
|
25
25
|
exports.VerifyPhoneDialog = (0, uni_jsx_1.JSX)(({ phone, withDescription = true, consents, onSuccess = noop_1.noop, onClose = noop_1.noop, formatData, reqId, isRetail = true, }) => {
|
|
26
26
|
const [values, setValues] = (0, hooks_1.useState)(Array(CODE_LENGTH).fill(''));
|
|
27
27
|
const sessionStore = (0, useSessionStore_1.useSessionStore)();
|
|
28
|
+
const [requestId, setRequestId] = (0, hooks_1.useState)(reqId);
|
|
28
29
|
const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = (0, useVerifyPhoneDialogSubmit_1.useVerifyPhoneDialogSubmit)({
|
|
29
30
|
values,
|
|
30
31
|
onSuccess,
|
|
31
32
|
formatData,
|
|
32
|
-
reqId,
|
|
33
|
+
reqId: requestId,
|
|
33
34
|
isRetail,
|
|
34
35
|
});
|
|
35
36
|
const captchaDialog = (0, useDialog_1.useDialog)(CaptchaDialog_1.CaptchaDialog);
|
|
36
37
|
const phoneNumber = (0, formatPhone_1.formatPhone)(phone);
|
|
37
38
|
const restartTimer = (0, useCountDownTimer_1.useCountDownTimer)({ seconds: timeNextReq, onTick: setTimeNextReq });
|
|
38
39
|
const handleSendCode = (0, hooks_1.useCallback)(async () => {
|
|
39
|
-
const
|
|
40
|
+
const response = await (0, sendCode_1.sendCode)({
|
|
40
41
|
phoneNumber,
|
|
41
42
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
42
43
|
}, isRetail);
|
|
43
|
-
if (
|
|
44
|
+
if (response) {
|
|
44
45
|
setTimeNextReq(useVerifyPhoneDialogSubmit_1.TIME_TO_RESEND);
|
|
45
46
|
restartTimer(useVerifyPhoneDialogSubmit_1.TIME_TO_RESEND);
|
|
46
47
|
setErrorText('');
|
|
@@ -48,6 +49,9 @@ exports.VerifyPhoneDialog = (0, uni_jsx_1.JSX)(({ phone, withDescription = true,
|
|
|
48
49
|
sendTime: Date.now(),
|
|
49
50
|
attempts: 0,
|
|
50
51
|
};
|
|
52
|
+
if (!isRetail) {
|
|
53
|
+
setRequestId(String(response));
|
|
54
|
+
}
|
|
51
55
|
}
|
|
52
56
|
else {
|
|
53
57
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":";;;AAAA,2CAA2C;AAC3C,+CAAwC;AACxC,uDAA+E;AAC/E,iFAA8E;AAE9E,oEAAiE;AAEjE,0DAAuD;AACvD,oEAAiE;AACjE,iEAA8D;AAC9D,uEAAoE;AACpE,0DAAuD;AACvD,gEAA6D;AAC7D,6DAA0D;AAC1D,qFAAkF;AAClF,4DAAyD;AACzD,8CAA2C;AAC3C,iDAA8C;AAC9C,kEAA+D;AAC/D,2CAAwC;AACxC,iDAA8C;AAC9C,6EAIsC;AAEtC,MAAM,WAAW,GAAG,CAAC,CAAC;AAYT,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAClC,CAAC,EACC,KAAK,EACL,eAAe,GAAG,IAAI,EACtB,QAAQ,EACR,SAAS,GAAG,WAAI,EAChB,OAAO,GAAG,WAAI,EACd,UAAU,EACV,KAAK,EACL,QAAQ,GAAG,IAAI,GAChB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,22 +23,23 @@ const CODE_LENGTH = 4;
|
|
|
23
23
|
export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop, formatData, reqId, isRetail = true, }) => {
|
|
24
24
|
const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
|
|
25
25
|
const sessionStore = useSessionStore();
|
|
26
|
+
const [requestId, setRequestId] = useState(reqId);
|
|
26
27
|
const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({
|
|
27
28
|
values,
|
|
28
29
|
onSuccess,
|
|
29
30
|
formatData,
|
|
30
|
-
reqId,
|
|
31
|
+
reqId: requestId,
|
|
31
32
|
isRetail,
|
|
32
33
|
});
|
|
33
34
|
const captchaDialog = useDialog(CaptchaDialog);
|
|
34
35
|
const phoneNumber = formatPhone(phone);
|
|
35
36
|
const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
|
|
36
37
|
const handleSendCode = useCallback(async () => {
|
|
37
|
-
const
|
|
38
|
+
const response = await sendCode({
|
|
38
39
|
phoneNumber,
|
|
39
40
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
40
41
|
}, isRetail);
|
|
41
|
-
if (
|
|
42
|
+
if (response) {
|
|
42
43
|
setTimeNextReq(TIME_TO_RESEND);
|
|
43
44
|
restartTimer(TIME_TO_RESEND);
|
|
44
45
|
setErrorText('');
|
|
@@ -46,6 +47,9 @@ export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents,
|
|
|
46
47
|
sendTime: Date.now(),
|
|
47
48
|
attempts: 0,
|
|
48
49
|
};
|
|
50
|
+
if (!isRetail) {
|
|
51
|
+
setRequestId(String(response));
|
|
52
|
+
}
|
|
49
53
|
}
|
|
50
54
|
else {
|
|
51
55
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,sCAAsC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,cAAc,EACd,0BAA0B,GAE3B,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,GAAG,CAAC,CAAC;AAYtB,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAClC,CAAC,EACC,KAAK,EACL,eAAe,GAAG,IAAI,EACtB,QAAQ,EACR,SAAS,GAAG,IAAI,EAChB,OAAO,GAAG,IAAI,EACd,UAAU,EACV,KAAK,EACL,QAAQ,GAAG,IAAI,GAChB,EAAE,EAAE;IACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,eAAe,EAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
50
50
|
}) => {
|
|
51
51
|
const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
|
|
52
52
|
const sessionStore = useSessionStore<SmsCodeStore>();
|
|
53
|
+
const [requestId, setRequestId] = useState(reqId);
|
|
53
54
|
|
|
54
55
|
const {
|
|
55
56
|
handleSubmit,
|
|
@@ -64,7 +65,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
64
65
|
values,
|
|
65
66
|
onSuccess,
|
|
66
67
|
formatData,
|
|
67
|
-
reqId,
|
|
68
|
+
reqId: requestId,
|
|
68
69
|
isRetail,
|
|
69
70
|
});
|
|
70
71
|
|
|
@@ -75,7 +76,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
75
76
|
const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
|
|
76
77
|
|
|
77
78
|
const handleSendCode = useCallback(async () => {
|
|
78
|
-
const
|
|
79
|
+
const response = await sendCode(
|
|
79
80
|
{
|
|
80
81
|
phoneNumber,
|
|
81
82
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
@@ -83,7 +84,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
83
84
|
isRetail,
|
|
84
85
|
);
|
|
85
86
|
|
|
86
|
-
if (
|
|
87
|
+
if (response) {
|
|
87
88
|
setTimeNextReq(TIME_TO_RESEND);
|
|
88
89
|
restartTimer(TIME_TO_RESEND);
|
|
89
90
|
setErrorText('');
|
|
@@ -91,6 +92,10 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
91
92
|
sendTime: Date.now(),
|
|
92
93
|
attempts: 0,
|
|
93
94
|
};
|
|
95
|
+
|
|
96
|
+
if (!isRetail) {
|
|
97
|
+
setRequestId(String(response));
|
|
98
|
+
}
|
|
94
99
|
} else {
|
|
95
100
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
96
101
|
}
|
package/package.json
CHANGED
|
@@ -50,6 +50,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
50
50
|
}) => {
|
|
51
51
|
const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
|
|
52
52
|
const sessionStore = useSessionStore<SmsCodeStore>();
|
|
53
|
+
const [requestId, setRequestId] = useState(reqId);
|
|
53
54
|
|
|
54
55
|
const {
|
|
55
56
|
handleSubmit,
|
|
@@ -64,7 +65,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
64
65
|
values,
|
|
65
66
|
onSuccess,
|
|
66
67
|
formatData,
|
|
67
|
-
reqId,
|
|
68
|
+
reqId: requestId,
|
|
68
69
|
isRetail,
|
|
69
70
|
});
|
|
70
71
|
|
|
@@ -75,7 +76,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
75
76
|
const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
|
|
76
77
|
|
|
77
78
|
const handleSendCode = useCallback(async () => {
|
|
78
|
-
const
|
|
79
|
+
const response = await sendCode(
|
|
79
80
|
{
|
|
80
81
|
phoneNumber,
|
|
81
82
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
@@ -83,7 +84,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
83
84
|
isRetail,
|
|
84
85
|
);
|
|
85
86
|
|
|
86
|
-
if (
|
|
87
|
+
if (response) {
|
|
87
88
|
setTimeNextReq(TIME_TO_RESEND);
|
|
88
89
|
restartTimer(TIME_TO_RESEND);
|
|
89
90
|
setErrorText('');
|
|
@@ -91,6 +92,10 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
91
92
|
sendTime: Date.now(),
|
|
92
93
|
attempts: 0,
|
|
93
94
|
};
|
|
95
|
+
|
|
96
|
+
if (!isRetail) {
|
|
97
|
+
setRequestId(String(response));
|
|
98
|
+
}
|
|
94
99
|
} else {
|
|
95
100
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
96
101
|
}
|