LF-5272: Replace yes/no crop generated field with crop/animal toggle on custom revenue type form by SayakaOno · Pull Request #4168 · LiteFarmOrg/LiteFarm

SayakaOno · 2026-05-11T16:30:24Z

Description

Add EntityAssociationToggle component
Replace the radio buttons in CustomRevenueRadios with EntityAssociationToggle
Replace 'crop_generated' with 'entity_type' and remove 'agriculture_associated'
Add isCropSale function
Remove temporary compatibility shims from sagas
Add gap to InputBaseLabel component ⬇️

Jira link: https://lite-farm.atlassian.net/browse/LF-5272

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

Passes test case
UI components visually reviewed on desktop view
UI components visually reviewed on mobile view
Other (please explain)

Checklist:

I have commented my code, particularly in hard-to-understand areas
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
The precommit and linting ran successfully
I have added or updated language tags for text that's part of the UI
I have ordered translation keys alphabetically (optional: run pnpm i18n to help with this)
I have added the GNU General Public License to all new files

Replace crop_generated/agriculture_associated with entity_type on RevenueType. Add EntityType, AnimalSaleItem, FarmExpenseCropVariety, FarmExpenseAnimal types. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

… consumers Remove the saga bridge that converted entity_type → crop_generated. Update revenueTypeSlice pick list, saga payload handling, util.js helpers, and useTransactions to use entity_type === 'crop' directly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Two-button toggle (Crops/Animals) with deselect support. EntityToggleButton defined in the same file. Uses InputBaseLabel for the label/optional pattern. Adds REVENUE.ENTITY_ASSOCIATION i18n keys to the English locale. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Replace CROP_GENERATED constant with ENTITY_TYPE. Swap RadioGroup in CustomRevenueRadios for EntityAssociationToggle (via useController). Update Edit/ReadOnly views to default to entity_type, showing 'Not associated' when no selection in read-only mode. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…w, test, and story Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…_field_with_crop/animal_toggle_on_custom_revenue_type_form

kathyavini

This looks (and behaves -- I've been using the draft state as my base branch for the last revenue ticket) great!

Personally I think it could deserve its own Storybook story, since it has a few states and will get used in two contexts, but it's up to you 🙂

Other that that, just a few super tiny things below.

AI review pass flagged the accessibility of the toggle (particularly reading the selected state to screen readers now that it's a button), but I don't think it will be the easiest fix and of course screen reader accessibility is a huge gap in app already...

kathyavini · 2026-05-13T19:45:01Z

      "DUPLICATE_NAME": "A revenue type with this name already exists.  Please choose another.",
-      "DUPLICATE_NAME_RETIRED": "A retired revenue type with this name already exists.  Please choose another."
+      "DUPLICATE_NAME_RETIRED": "A retired revenue type with this name already exists.  Please choose another.",
+      "ENTITY_ASSOCIATION_LABEL": "Is this revenue associated with animals or crop?"


I think this is a mistake on Figma; it should be "crops" to be both grammatical and accurate.

kathyavini · 2026-05-13T19:52:49Z

- */
-
-function CustomRevenueRadios({ control, watch, view }) {
+function CustomRevenueRadios({ control, view }) {


Does this component need another name, now that there is no <RadioGroup> here? Something a bit more general like CustomRevenueEntityTypeSelector or such?

kathyavini · 2026-05-13T20:19:11Z

+    @include truncateText();
+  }
+
+  &:hover {


This may be a good use case for the @media (hover: hover) pattern, because on mobile when you tap, and then tap again to deselect, this is the state that persists, giving a sort of false 'active' look.

SayakaOno · 2026-05-15T17:33:36Z

Thank you Joyce for the comments, and I'm sorry I forgot this was blocking your ticket...

I thought about creating a story as well, but I didn't think it would be very useful, so I decided not to.

Personally, accessibility is definitely something I'd like to get better at, but I'll leave it for now. I wasn't even sure how to classify that component, de-selectable radio buttons? Checkboxes where only one option can be selected? Anyways...

Thank you for re-reviewing! 🙏

kathyavini

I wasn't even sure how to classify that component, de-selectable radio buttons? Checkboxes where only one option can be selected?

Now that you say it, it's kind of weird isn't it? 😅

SayakaOno and others added 12 commits May 8, 2026 12:34

LF-5272 Step 9: Update TypeScript types for entity_type

f0a8dee

Replace crop_generated/agriculture_associated with entity_type on RevenueType. Add EntityType, AnimalSaleItem, FarmExpenseCropVariety, FarmExpenseAnimal types. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

LF-5272 Fix remaining crop_generated reads in sale inputs, detail vie…

850e3a8

…w, test, and story Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

LF-5272 Simplify EntityToggleButton component

bdd3d19

LF-5272 Fix string 'none'

fc9b56a

LF-5272 Cleanup customFormFields prop

16b6199

LF-5272 Add isCropSale function

e7fcd92

Merge branch 'integration' into LF-5272/Replace_yes/no_crop_generated…

de2e678

…_field_with_crop/animal_toggle_on_custom_revenue_type_form

LF-5272 Revert unnecessary changes

e83893b

LF-5272 Add disabled button style

8d52892

SayakaOno self-assigned this May 11, 2026

SayakaOno added enhancement New feature or request new translations New translations to be sent to CrowdIn are present labels May 11, 2026

SayakaOno added 5 commits May 11, 2026 10:15

LF-5272 Add mobile button styles

000a22c

LF-5272 Replace fieldset with div:

e0a67ce

LF-5272 Add gap to labelContainer in InputBaseLabel

6120e52

LF-5272 Update EntityAssociationToggle to accept label as prop

abdc62a

LF-5272 Add EntityTypeButton styles

bf82d5a

SayakaOno marked this pull request as ready for review May 13, 2026 19:06

SayakaOno requested review from a team as code owners May 13, 2026 19:06

SayakaOno requested review from kathyavini and removed request for a team May 13, 2026 19:06

kathyavini reviewed May 13, 2026

View reviewed changes

kathyavini mentioned this pull request May 14, 2026

LF-5274 Add animal batch selector with quantity and sale value to the revenue entry form #4170

Merged

16 tasks

SayakaOno added 3 commits May 15, 2026 10:10

LF-5272 Update translation string

8371413

LF-5272 Rename CustomRevenueRadios to CustomRevenueEntityTypeSelector

0854122

LF-5272 Use @media for hover style

056314e

kathyavini approved these changes May 15, 2026

View reviewed changes

kathyavini added this pull request to the merge queue May 15, 2026

Merged via the queue into integration with commit 33feb49 May 15, 2026
6 checks passed

SayakaOno deleted the LF-5272/Replace_yes/no_crop_generated_field_with_crop/animal_toggle_on_custom_revenue_type_form branch May 15, 2026 17:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LF-5272: Replace yes/no crop generated field with crop/animal toggle on custom revenue type form#4168

LF-5272: Replace yes/no crop generated field with crop/animal toggle on custom revenue type form#4168
kathyavini merged 20 commits into
integrationfrom
LF-5272/Replace_yes/no_crop_generated_field_with_crop/animal_toggle_on_custom_revenue_type_form

SayakaOno commented May 11, 2026 •

edited

Loading

Uh oh!

kathyavini left a comment •

edited

Loading

Uh oh!

kathyavini May 13, 2026

Uh oh!

kathyavini May 13, 2026

Uh oh!

kathyavini May 13, 2026

Uh oh!

SayakaOno commented May 15, 2026

Uh oh!

kathyavini left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

SayakaOno commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kathyavini left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kathyavini May 13, 2026

Choose a reason for hiding this comment

Uh oh!

kathyavini May 13, 2026

Choose a reason for hiding this comment

Uh oh!

kathyavini May 13, 2026

Choose a reason for hiding this comment

Uh oh!

SayakaOno commented May 15, 2026

Uh oh!

kathyavini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

SayakaOno commented May 11, 2026 •

edited

Loading

kathyavini left a comment •

edited

Loading