Merge pull request Expensify#84209 from Expensify/claude-fixEmptyMerchantRuleValidation

luacmartins · web-flow · commit ad4f6c9dfc95 · 2026-03-04T17:32:02.000-07:00
Allow clearing optional merchant field in merchant rules
diff --git a/src/components/Rule/TextBase.tsx b/src/components/Rule/TextBase.tsx
@@ -63,7 +63,7 @@ function TextBase<TFormID extends OnyxFormKey>({
             if (!isValid) {
                 (errors as Record<string, string>)[fieldID] = translate('common.error.characterLimitExceedCounter', byteLength, characterLimit);
             } else if (fieldID === CONST.EXPENSE_RULES.FIELDS.RENAME_MERCHANT || fieldID === CONST.MERCHANT_RULES.FIELDS.MERCHANT) {
-                if (isInvalidMerchantValue(trimmedValue)) {
+                if (trimmedValue && isInvalidMerchantValue(trimmedValue)) {
                     (errors as Record<string, string>)[fieldID] = translate('iou.error.invalidMerchant');
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ function TextBase<TFormID extends OnyxFormKey>({`
`63`	`63`	`if (!isValid) {`
`64`	`64`	`(errors as Record<string, string>)[fieldID] = translate('common.error.characterLimitExceedCounter', byteLength, characterLimit);`
`65`	`65`	`} else if (fieldID === CONST.EXPENSE_RULES.FIELDS.RENAME_MERCHANT \|\| fieldID === CONST.MERCHANT_RULES.FIELDS.MERCHANT) {`
`66`		`- if (isInvalidMerchantValue(trimmedValue)) {`
	`66`	`+ if (trimmedValue && isInvalidMerchantValue(trimmedValue)) {`
`67`	`67`	`(errors as Record<string, string>)[fieldID] = translate('iou.error.invalidMerchant');`
`68`	`68`	`}`
`69`	`69`	`}`