@churchapps/apphelper 0.3.12 → 0.3.14
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/dist/components/FormCardPayment.js +10 -9
- package/dist/components/FormCardPayment.js.map +1 -1
- package/dist/components/FormSubmissionEdit.js +1 -1
- package/dist/components/FormSubmissionEdit.js.map +1 -1
- package/dist/pageComponents/components/LoginSetPassword.d.ts.map +1 -1
- package/dist/pageComponents/components/LoginSetPassword.js +29 -7
- package/dist/pageComponents/components/LoginSetPassword.js.map +1 -1
- package/dist/public/locales/en.json +2 -0
- package/package.json +1 -1
- package/public/locales/en.json +2 -0
- package/src/components/FormCardPayment.tsx +3 -3
- package/src/components/FormSubmissionEdit.tsx +1 -1
- package/src/pageComponents/components/LoginSetPassword.tsx +39 -11
|
@@ -63,6 +63,7 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
63
63
|
});
|
|
64
64
|
};
|
|
65
65
|
const handlePayment = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
66
|
+
var _c;
|
|
66
67
|
const validateErrors = validate();
|
|
67
68
|
if (validateErrors.length > 0) {
|
|
68
69
|
return { paymentSuccessful: false, errors: validateErrors };
|
|
@@ -73,17 +74,17 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
73
74
|
const person = yield helpers_1.ApiHelper.post("/people/loadOrCreate", personData, "MembershipApi");
|
|
74
75
|
const cardSavedRes = yield saveCard(userData, person);
|
|
75
76
|
if (!cardSavedRes.success) {
|
|
76
|
-
return { paymentSuccessful: false, errors: cardSavedRes.errors };
|
|
77
|
+
return { paymentSuccessful: false, name: "", errors: cardSavedRes.errors };
|
|
77
78
|
}
|
|
78
|
-
return { paymentSuccessful: true, errors: [] };
|
|
79
|
+
return { paymentSuccessful: true, name: ((_c = person === null || person === void 0 ? void 0 : person.name) === null || _c === void 0 ? void 0 : _c.display) || "", errors: [] };
|
|
79
80
|
}
|
|
80
81
|
catch (err) {
|
|
81
82
|
const errorMessage = "An error occurred while processing your payment.";
|
|
82
|
-
return { paymentSuccessful: false, errors: [errorMessage] };
|
|
83
|
+
return { paymentSuccessful: false, name: "", errors: [errorMessage] };
|
|
83
84
|
}
|
|
84
85
|
});
|
|
85
86
|
const saveCard = (user, person) => __awaiter(void 0, void 0, void 0, function* () {
|
|
86
|
-
var
|
|
87
|
+
var _d;
|
|
87
88
|
const cardData = elements.getElement(react_stripe_js_1.CardElement);
|
|
88
89
|
try {
|
|
89
90
|
const stripePM = yield stripe.createPaymentMethod({ type: "card", card: cardData });
|
|
@@ -94,7 +95,7 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
94
95
|
const pm = { id: stripePM.paymentMethod.id, personId: person.id, email: email, name: person.name.display, churchId: props.churchId };
|
|
95
96
|
try {
|
|
96
97
|
const result = yield helpers_1.ApiHelper.post("/paymentmethods/addcard", pm, "GivingApi");
|
|
97
|
-
if ((
|
|
98
|
+
if ((_d = result === null || result === void 0 ? void 0 : result.raw) === null || _d === void 0 ? void 0 : _d.message) {
|
|
98
99
|
return { success: false, errors: [result.raw.message] };
|
|
99
100
|
}
|
|
100
101
|
else {
|
|
@@ -116,7 +117,7 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
116
117
|
}
|
|
117
118
|
});
|
|
118
119
|
const savePayment = (paymentMethod, customerId, person) => __awaiter(void 0, void 0, void 0, function* () {
|
|
119
|
-
var
|
|
120
|
+
var _e, _f, _g;
|
|
120
121
|
let payment = {
|
|
121
122
|
amount: amt,
|
|
122
123
|
id: paymentMethod.id,
|
|
@@ -126,8 +127,8 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
126
127
|
funds: [{ id: fundId, amount: amt, name: fund.name }],
|
|
127
128
|
person: {
|
|
128
129
|
id: person.id,
|
|
129
|
-
email: (
|
|
130
|
-
name: (
|
|
130
|
+
email: (_e = person === null || person === void 0 ? void 0 : person.contactInfo) === null || _e === void 0 ? void 0 : _e.email,
|
|
131
|
+
name: (_f = person === null || person === void 0 ? void 0 : person.name) === null || _f === void 0 ? void 0 : _f.display,
|
|
131
132
|
}
|
|
132
133
|
};
|
|
133
134
|
const churchObj = {
|
|
@@ -141,7 +142,7 @@ exports.FormCardPayment = (0, react_1.forwardRef)((props, ref) => {
|
|
|
141
142
|
if ((result === null || result === void 0 ? void 0 : result.status) === "succeeded" || (result === null || result === void 0 ? void 0 : result.status) === "pending") {
|
|
142
143
|
return { success: true, errors: [] };
|
|
143
144
|
}
|
|
144
|
-
if ((
|
|
145
|
+
if ((_g = result === null || result === void 0 ? void 0 : result.raw) === null || _g === void 0 ? void 0 : _g.message) {
|
|
145
146
|
return { success: false, errors: [result.raw.message] };
|
|
146
147
|
}
|
|
147
148
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormCardPayment.js","sourceRoot":"","sources":["../../src/components/FormCardPayment.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAA+D;AAC/D,6DAA8E;AAC9E,4CAAqD;AAErD,wCAAsL;AAOzK,QAAA,eAAe,GAAG,IAAA,kBAAU,EAAC,CAAC,KAAY,EAAE,GAAG,EAAE,EAAE;;IAC9D,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAA,6BAAW,GAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAA,2BAAS,GAAE,CAAC;IAC3B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpI,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpJ,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChJ,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAmB,CAAC;IAC9D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAiB,CAAA;IACvD,IAAI,GAAG,GAAG,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC,CAAC;IAC/E,IAAI,MAAM,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC;IAE1E,MAAM,aAAa,GAAG,GAAG,EAAE;;QACzB,IAAI,MAAM,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC;QAC1E,mBAAS,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxE,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,mBAAS,CAAC,GAAG,CAAC,kBAAkB,GAAG,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC1E,MAAM,MAAM,GAAG,qBAAW,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACtD,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,GAAS,EAAE
|
|
1
|
+
{"version":3,"file":"FormCardPayment.js","sourceRoot":"","sources":["../../src/components/FormCardPayment.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAA+D;AAC/D,6DAA8E;AAC9E,4CAAqD;AAErD,wCAAsL;AAOzK,QAAA,eAAe,GAAG,IAAA,kBAAU,EAAC,CAAC,KAAY,EAAE,GAAG,EAAE,EAAE;;IAC9D,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAA,6BAAW,GAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAA,2BAAS,GAAE,CAAC;IAC3B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpI,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpJ,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,CAAC,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChJ,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAmB,CAAC;IAC9D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,eAAK,CAAC,QAAQ,EAAiB,CAAA;IACvD,IAAI,GAAG,GAAG,MAAM,CAAC,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC,CAAC;IAC/E,IAAI,MAAM,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC;IAE1E,MAAM,aAAa,GAAG,GAAG,EAAE;;QACzB,IAAI,MAAM,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,0CAAE,KAAK,CAAC;QAC1E,mBAAS,CAAC,GAAG,CAAC,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxE,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QACH,mBAAS,CAAC,GAAG,CAAC,kBAAkB,GAAG,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC1E,MAAM,MAAM,GAAG,qBAAW,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACtD,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,GAAS,EAAE;;QAC/B,MAAM,cAAc,GAAG,QAAQ,EAAE,CAAC;QAClC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAA;SAC5D;QAED,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,mBAAS,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;YAEzH,MAAM,UAAU,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YAC5E,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,IAAI,CAAC,sBAAsB,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;YAEzF,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;gBACzB,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAA;aAC3E;YAED,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,OAAO,KAAI,EAAE,EAAE,MAAM,EAAE,EAAc,EAAE,CAAA;SAC9F;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,YAAY,GAAG,kDAAkD,CAAC;YACxE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,YAAY,CAAa,EAAE,CAAA;SAClF;IACH,CAAC,CAAA,CAAA;IAED,MAAM,QAAQ,GAAG,CAAO,IAAmB,EAAE,MAAuB,EAAE,EAAE;;QACtE,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,6BAAW,CAAC,CAAC;QAClD,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpF,IAAI,QAAQ,CAAC,KAAK,EAAE;gBAClB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7D;iBAAM;gBACL,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACrI,IAAI;oBACF,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,EAAE,WAAW,CAAC,CAAC;oBAChF,IAAI,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,0CAAE,OAAO,EAAE;wBACxB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;qBACzD;yBAAM;wBACL,MAAM,CAAC,GAA+D,MAAM,CAAA;wBAC5E,MAAM,eAAe,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;wBACjF,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE;4BAC5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,CAAC,MAAM,EAAE,CAAA;yBAC1D;wBACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;qBACrC;iBACF;gBAAC,OAAO,QAAQ,EAAE;oBACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,0CAA0C,CAAC,EAAE,CAAA;iBAChF;aACF;SACF;QAAC,OAAO,WAAW,EAAE;YACpB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,yDAAyD,CAAC,EAAE,CAAC;SAChG;IACH,CAAC,CAAA,CAAA;IAED,MAAM,WAAW,GAAG,CAAO,aAAkC,EAAE,UAAkB,EAAE,MAAwB,EAAE,EAAE;;QAE7G,IAAI,OAAO,GAA4B;YACrC,MAAM,EAAE,GAAG;YACX,EAAE,EAAE,aAAa,CAAC,EAAE;YACpB,UAAU,EAAE,UAAU;YACtB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YACrD,MAAM,EAAE;gBACN,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,KAAK,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,0CAAE,KAAK;gBACjC,IAAI,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,OAAO;aAC5B;SACF,CAAA;QAED,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,SAAS,EAAE,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM;YAClE,IAAI,EAAE,EAAE;SACT,CAAA;QAED,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,mBAAS,CAAC,IAAI,CAAC,iBAAiB,kCAAO,OAAO,KAAE,MAAM,EAAE,SAAS,KAAI,WAAW,CAAC,CAAC;YACvG,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,MAAK,WAAW,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,MAAK,SAAS,EAAE;gBAClE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAA;aACrC;YAED,IAAI,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,0CAAE,OAAO,EAAE;gBACxB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;aACxD;SAEF;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,8CAA8C,CAAC,EAAE,CAAA;SACpF;IAEH,CAAC,CAAA,CAAA;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS;YAAE,MAAM,CAAC,IAAI,CAAC,gBAAM,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,QAAQ;YAAE,MAAM,CAAC,IAAI,CAAC,gBAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,gBAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAC;QAC9E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC;gBAAE,MAAM,CAAC,IAAI,CAAC,gBAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC,CAAC,CAAE,qBAAqB;SAClK;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAA;IAED,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9B,aAAa;QACb,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE;KAC9B,CAAC,CAAC,CAAC;IAEJ,eAAK,CAAC,SAAS,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IAEnC,OAAO,gCAAK,KAAK,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAC9E,wBAAC,eAAI,IAAC,SAAS,QAAC,OAAO,EAAE,CAAC,aACxB,uBAAC,eAAI,IAAC,IAAI,QAAC,EAAE,EAAE,EAAE,YACf,uBAAC,oBAAS,IAAC,SAAS,QAAC,QAAQ,QAAC,IAAI,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAE,EAAC,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAC,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,GAAI,GAClU,EACP,uBAAC,eAAI,IAAC,IAAI,QAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YACtB,uBAAC,oBAAS,IAAC,SAAS,QAAC,QAAQ,QAAC,IAAI,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAE,EAAC,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAC,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,SAAS,KAAK,EAAE,GAAI,GAClV,EACP,uBAAC,eAAI,IAAC,IAAI,QAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YACtB,uBAAC,oBAAS,IAAC,SAAS,QAAC,QAAQ,QAAC,IAAI,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,EAAC,KAAK,EAAE,EAAC,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAC,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,mBAAS,CAAC,eAAe,IAAI,oBAAU,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,GAAI,GAC9U,EACP,uBAAC,eAAI,IAAC,IAAI,QAAC,EAAE,EAAE,EAAE,YACf,wBAAC,cAAG,IAAC,EAAE,EAAE,EAAE,eAAe,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,mBAAK,GAAG,IAAO,GAC/H,EACP,uBAAC,eAAI,IAAC,IAAI,QAAC,EAAE,EAAE,EAAE,YACf,gCAAK,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,YAC9F,uBAAC,6BAAW,IAAC,OAAO,EAAE,WAAW,GAAI,GACjC,GACD,IACF,GACH,CAAA;AACR,CAAC,CAAC,CAAC"}
|
|
@@ -130,7 +130,7 @@ const FormSubmissionEdit = (_a) => {
|
|
|
130
130
|
// Mark payment as successful in answers
|
|
131
131
|
const paymentAnswer = fs.answers.find((a) => a.questionId === paymentRef.current.questionId);
|
|
132
132
|
if (paymentAnswer) {
|
|
133
|
-
paymentAnswer.value =
|
|
133
|
+
paymentAnswer.value = `Payment Successful [${paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.name}]`;
|
|
134
134
|
}
|
|
135
135
|
else {
|
|
136
136
|
fs.answers.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormSubmissionEdit.js","sourceRoot":"","sources":["../../src/components/FormSubmissionEdit.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FormSubmissionEdit.js","sourceRoot":"","sources":["../../src/components/FormSubmissionEdit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSetPassword.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"LoginSetPassword.d.ts","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,UAAU,KAAK;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA+E5C,CAAA"}
|
|
@@ -44,6 +44,7 @@ const LoginSetPassword = props => {
|
|
|
44
44
|
const [verifyPassword, setVerifyPassword] = react_1.default.useState("");
|
|
45
45
|
const [user, setUser] = react_1.default.useState(null);
|
|
46
46
|
const [showPassword, setShowPassword] = (0, react_1.useState)(false);
|
|
47
|
+
const [linkExpired, setLinkExpired] = react_1.default.useState(false);
|
|
47
48
|
const validate = () => {
|
|
48
49
|
const result = [];
|
|
49
50
|
if (!password)
|
|
@@ -56,7 +57,10 @@ const LoginSetPassword = props => {
|
|
|
56
57
|
return result.length === 0;
|
|
57
58
|
};
|
|
58
59
|
const submitChangePassword = () => {
|
|
59
|
-
if (
|
|
60
|
+
if (linkExpired) {
|
|
61
|
+
window.open("/login", "_blank");
|
|
62
|
+
}
|
|
63
|
+
else if (validate()) {
|
|
60
64
|
submit();
|
|
61
65
|
}
|
|
62
66
|
};
|
|
@@ -78,12 +82,30 @@ const LoginSetPassword = props => {
|
|
|
78
82
|
else
|
|
79
83
|
props.setShowForgot(true);
|
|
80
84
|
});
|
|
81
|
-
react_1.default.useEffect(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
react_1.default.useEffect(() => {
|
|
86
|
+
//Get the timestamp from the URL
|
|
87
|
+
const urlParams = new URLSearchParams(window.location.search);
|
|
88
|
+
const timestampParam = urlParams.get("timestamp");
|
|
89
|
+
if (timestampParam) {
|
|
90
|
+
const linkTimestamp = parseInt(timestampParam, 10);
|
|
91
|
+
const currentTime = Date.now();
|
|
92
|
+
//Check if the link is expired (2 min)
|
|
93
|
+
if (currentTime - linkTimestamp > 120000) {
|
|
94
|
+
setLinkExpired(true);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
loadUser();
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
setLinkExpired(true); //No timestamp means link is invalid
|
|
102
|
+
}
|
|
103
|
+
}, []);
|
|
104
|
+
return ((0, jsx_runtime_1.jsx)(components_1.InputBox, { headerText: helpers_1.Locale.label("login.setPassword"), saveFunction: submitChangePassword, saveButtonType: "submit", saveText: !linkExpired ? (props.isSubmitting || !user) ? helpers_1.Locale.label("common.pleaseWait") : helpers_1.Locale.label("login.signIn") : helpers_1.Locale.label("login.requestLink"), isSubmitting: props.isSubmitting, children: linkExpired ? ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)(material_1.Typography, { sx: { color: "#c62828 !important", paddingBottom: 3 }, children: helpers_1.Locale.label("login.expiredLink") }) })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [user && (0, jsx_runtime_1.jsxs)("p", { style: { marginTop: 0, marginBottom: 0 }, children: [helpers_1.Locale.label("login.welcomeBack"), " ", user.firstName, "."] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { fullWidth: true, name: "password", type: showPassword ? "text" : "password", label: helpers_1.Locale.label("login.setPassword"), value: password, onChange: (e) => { e.preventDefault(); setPassword(e.target.value); }, InputProps: {
|
|
105
|
+
endAdornment: ((0, jsx_runtime_1.jsx)(material_1.InputAdornment, { position: "end", children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "toggle password visibility", onClick: () => { setShowPassword(!showPassword); }, children: showPassword ? (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility" }) : (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility_off" }) }) }))
|
|
106
|
+
} }), (0, jsx_runtime_1.jsx)(material_1.TextField, { fullWidth: true, name: "verifyPassword", type: showPassword ? "text" : "password", label: helpers_1.Locale.label("login.verifyPassword"), value: verifyPassword, onChange: (e) => { e.preventDefault(); setVerifyPassword(e.target.value); }, InputProps: {
|
|
107
|
+
endAdornment: ((0, jsx_runtime_1.jsx)(material_1.InputAdornment, { position: "end", children: (0, jsx_runtime_1.jsx)(material_1.IconButton, { "aria-label": "toggle password visibility", onClick: () => { setShowPassword(!showPassword); }, children: showPassword ? (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility" }) : (0, jsx_runtime_1.jsx)(material_1.Icon, { children: "visibility_off" }) }) }))
|
|
108
|
+
} })] })) }));
|
|
87
109
|
};
|
|
88
110
|
exports.LoginSetPassword = LoginSetPassword;
|
|
89
111
|
//# sourceMappingURL=LoginSetPassword.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginSetPassword.js","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,+CAAwC;AACxC,iDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"LoginSetPassword.js","sourceRoot":"","sources":["../../../src/pageComponents/components/LoginSetPassword.tsx"],"names":[],"mappings":"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"}
|
|
@@ -153,12 +153,14 @@
|
|
|
153
153
|
"login": {
|
|
154
154
|
"createAccount": "Create an Account",
|
|
155
155
|
"email": "Email",
|
|
156
|
+
"expiredLink": "The current link is expired.",
|
|
156
157
|
"forgot": "Forgot Password",
|
|
157
158
|
"goLogin": "Go to Login",
|
|
158
159
|
"login": "Login",
|
|
159
160
|
"password": "Password",
|
|
160
161
|
"register": "Register",
|
|
161
162
|
"registerThankYou": "Thank you for registering! Please check your email to verify your account.",
|
|
163
|
+
"requestLink": "Request a new reset link",
|
|
162
164
|
"reset": "Reset",
|
|
163
165
|
"resetInstructions": "Enter your email address to request a password reset.",
|
|
164
166
|
"resetPassword": "Reset Password",
|
package/package.json
CHANGED
package/public/locales/en.json
CHANGED
|
@@ -153,12 +153,14 @@
|
|
|
153
153
|
"login": {
|
|
154
154
|
"createAccount": "Create an Account",
|
|
155
155
|
"email": "Email",
|
|
156
|
+
"expiredLink": "The current link is expired.",
|
|
156
157
|
"forgot": "Forgot Password",
|
|
157
158
|
"goLogin": "Go to Login",
|
|
158
159
|
"login": "Login",
|
|
159
160
|
"password": "Password",
|
|
160
161
|
"register": "Register",
|
|
161
162
|
"registerThankYou": "Thank you for registering! Please check your email to verify your account.",
|
|
163
|
+
"requestLink": "Request a new reset link",
|
|
162
164
|
"reset": "Reset",
|
|
163
165
|
"resetInstructions": "Enter your email address to request a password reset.",
|
|
164
166
|
"resetPassword": "Reset Password",
|
|
@@ -48,13 +48,13 @@ export const FormCardPayment = forwardRef((props: Props, ref) => {
|
|
|
48
48
|
|
|
49
49
|
const cardSavedRes = await saveCard(userData, person);
|
|
50
50
|
if (!cardSavedRes.success) {
|
|
51
|
-
return { paymentSuccessful: false, errors: cardSavedRes.errors }
|
|
51
|
+
return { paymentSuccessful: false, name: "", errors: cardSavedRes.errors }
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
return { paymentSuccessful: true, errors: [] }
|
|
54
|
+
return { paymentSuccessful: true, name: person?.name?.display || "", errors: [] as string[] }
|
|
55
55
|
} catch (err) {
|
|
56
56
|
const errorMessage = "An error occurred while processing your payment.";
|
|
57
|
-
return { paymentSuccessful: false, errors: [errorMessage] }
|
|
57
|
+
return { paymentSuccessful: false, name: "", errors: [errorMessage] as string[] }
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
|
|
@@ -98,7 +98,7 @@ export const FormSubmissionEdit: React.FC<Props> = ({showHeader = true, noBackgr
|
|
|
98
98
|
// Mark payment as successful in answers
|
|
99
99
|
const paymentAnswer = fs.answers.find((a: AnswerInterface) => a.questionId === paymentRef.current.questionId);
|
|
100
100
|
if (paymentAnswer) {
|
|
101
|
-
paymentAnswer.value =
|
|
101
|
+
paymentAnswer.value = `Payment Successful [${paymentResult?.name}]`;
|
|
102
102
|
} else {
|
|
103
103
|
fs.answers.push({
|
|
104
104
|
questionId: paymentRef.current.questionId,
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import React, { useState } from "react";
|
|
4
4
|
import { InputBox } from "../../components";
|
|
5
|
-
import { Icon, IconButton, InputAdornment, TextField } from "@mui/material";
|
|
5
|
+
import { Icon, IconButton, InputAdornment, TextField, Typography } from "@mui/material";
|
|
6
6
|
import { LoginResponseInterface, UserInterface } from "@churchapps/helpers";
|
|
7
7
|
import { ApiHelper, Locale } from "../../helpers";
|
|
8
8
|
|
|
@@ -21,6 +21,7 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
21
21
|
const [verifyPassword, setVerifyPassword] = React.useState("");
|
|
22
22
|
const [user, setUser] = React.useState<UserInterface>(null);
|
|
23
23
|
const [showPassword, setShowPassword] = useState(false);
|
|
24
|
+
const [linkExpired, setLinkExpired] = React.useState(false);
|
|
24
25
|
|
|
25
26
|
const validate = () => {
|
|
26
27
|
const result = [];
|
|
@@ -32,7 +33,9 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
32
33
|
}
|
|
33
34
|
|
|
34
35
|
const submitChangePassword = () => {
|
|
35
|
-
if (
|
|
36
|
+
if (linkExpired) {
|
|
37
|
+
window.open("/login", "_blank");
|
|
38
|
+
} else if (validate()) {
|
|
36
39
|
submit();
|
|
37
40
|
}
|
|
38
41
|
}
|
|
@@ -54,17 +57,42 @@ export const LoginSetPassword: React.FC<Props> = props => {
|
|
|
54
57
|
else props.setShowForgot(true);
|
|
55
58
|
}
|
|
56
59
|
|
|
57
|
-
React.useEffect(
|
|
60
|
+
React.useEffect(() => {
|
|
61
|
+
//Get the timestamp from the URL
|
|
62
|
+
const urlParams = new URLSearchParams(window.location.search);
|
|
63
|
+
const timestampParam = urlParams.get("timestamp");
|
|
64
|
+
if (timestampParam) {
|
|
65
|
+
const linkTimestamp = parseInt(timestampParam, 10);
|
|
66
|
+
const currentTime = Date.now();
|
|
67
|
+
|
|
68
|
+
//Check if the link is expired (2 min)
|
|
69
|
+
if (currentTime - linkTimestamp > 120000) {
|
|
70
|
+
setLinkExpired(true);
|
|
71
|
+
} else {
|
|
72
|
+
loadUser();
|
|
73
|
+
}
|
|
74
|
+
} else {
|
|
75
|
+
setLinkExpired(true); //No timestamp means link is invalid
|
|
76
|
+
}
|
|
77
|
+
}, []);
|
|
58
78
|
|
|
59
79
|
return (
|
|
60
|
-
<InputBox headerText={Locale.label("login.setPassword")} saveFunction={submitChangePassword} saveButtonType="submit" saveText={(props.isSubmitting || !user) ? Locale.label("common.pleaseWait") : Locale.label("login.signIn")} isSubmitting={props.isSubmitting}>
|
|
61
|
-
{
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
80
|
+
<InputBox headerText={Locale.label("login.setPassword")} saveFunction={submitChangePassword} saveButtonType="submit" saveText={!linkExpired ? (props.isSubmitting || !user) ? Locale.label("common.pleaseWait") : Locale.label("login.signIn") : Locale.label("login.requestLink")} isSubmitting={props.isSubmitting}>
|
|
81
|
+
{linkExpired ? (
|
|
82
|
+
<>
|
|
83
|
+
<Typography sx={{ color: "#c62828 !important", paddingBottom: 3 }}>{Locale.label("login.expiredLink")}</Typography>
|
|
84
|
+
</>
|
|
85
|
+
) : (
|
|
86
|
+
<>
|
|
87
|
+
{user && <p style={{ marginTop: 0, marginBottom: 0 }}>{Locale.label("login.welcomeBack")} {user.firstName}.</p>}
|
|
88
|
+
<TextField fullWidth name="password" type={showPassword ? "text" : "password"} label={Locale.label("login.setPassword")} value={password} onChange={(e) => { e.preventDefault(); setPassword(e.target.value) }} InputProps={{
|
|
89
|
+
endAdornment: (<InputAdornment position="end"><IconButton aria-label="toggle password visibility" onClick={() => { setShowPassword(!showPassword) }}>{showPassword ? <Icon>visibility</Icon> : <Icon>visibility_off</Icon>}</IconButton></InputAdornment>)
|
|
90
|
+
}} />
|
|
91
|
+
<TextField fullWidth name="verifyPassword" type={showPassword ? "text" : "password"} label={Locale.label("login.verifyPassword")} value={verifyPassword} onChange={(e) => { e.preventDefault(); setVerifyPassword(e.target.value) }} InputProps={{
|
|
92
|
+
endAdornment: (<InputAdornment position="end"><IconButton aria-label="toggle password visibility" onClick={() => { setShowPassword(!showPassword) }}>{showPassword ? <Icon>visibility</Icon> : <Icon>visibility_off</Icon>}</IconButton></InputAdornment>)
|
|
93
|
+
}} />
|
|
94
|
+
</>
|
|
95
|
+
)}
|
|
68
96
|
</InputBox>
|
|
69
97
|
);
|
|
70
98
|
}
|