Fix plugin validation errors on settings pages (#81)

* Fix "At least one channel is required." error

* Fix "Bot Token required." error

.changeset/brave-bobcats-pull.md

@@ -0,0 +1,5 @@
+---
+"wptelegram": patch
+---
+
+Fix "At least one channel is required." error

.changeset/cuddly-weeks-play.md

@@ -0,0 +1,5 @@
+---
+"wptelegram-widget": patch
+---
+
+Fix "Bot Token required." error

plugins/wptelegram-widget/js/settings/services/fields.ts

@@ -55,10 +55,10 @@ export const validationSchema = yup.object({
 				excludeEmptyString: true,
 			})
 			// make bot token required when username is added
-			.when('username', (username, schema) => {
-				return username
-					? schema.required(() => getErrorMessage('bot_token', 'required'))
-					: schema;
+			.when('username', {
+				is: (username: string) => Boolean(username),
+				then: (schema) =>
+					schema.required(() => getErrorMessage('bot_token', 'required')),
 			}),
 		author_photo: yup
 			.mixed<'auto' | 'always_show' | 'always_hide'>()

plugins/wptelegram/js/settings/services/fields.ts

@@ -57,25 +57,25 @@ export const validationSchema = yup.object({
 						}),
 				}),
 			)
-			.when('active', (active, schema) => {
-				return !active
-					? schema
-					: schema
-							.required(
-								sprintf(
-									/* translators: %s: field label */
-									__('At least one %s is required.'),
-									__('channel'),
-								),
-							)
-							.min(
-								1,
-								sprintf(
-									/* translators: %s: field label */
-									__('At least one %s is required.'),
-									__('channel'),
-								),
-							);
+			.when('active', {
+				is: true,
+				then: (schema) =>
+					schema
+						.required(
+							sprintf(
+								/* translators: %s: field label */
+								__('At least one %s is required.'),
+								__('channel'),
+							),
+						)
+						.min(
+							1,
+							sprintf(
+								/* translators: %s: field label */
+								__('At least one %s is required.'),
+								__('channel'),
+							),
+						),
 			}),
 		send_when: yup
 			.array()