Add toggle for enable/disable instead of label by abzokhattab · Pull Request #55192 · Expensify/App

abzokhattab · 2025-01-14T03:08:14Z

Explanation of Change

Fixed Issues

$ #55052
$ #53798
PROPOSAL: #53798 (comment)

Tests

Categories :

Create a workspace.
Navigate to workspace settings.
Open the Categories page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off
When offline, if a user removes a category record, ensure the toggle is disabled.

Taxes :

Create a workspace.
Navigate to workspace settings.
Open the Taxes page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off
When offline, if a user removes a tax record, ensure the toggle is disabled.

Distance Rates :

Create a workspace.
Navigate to workspace settings.
Enable Distance Rate from the More Features page.
Open the Distance Rate page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off
When offline, if a user removes a rate record, ensure the toggle is disabled.

Tags :

Create a workspace.
Navigate to workspace settings.
Open the Tags page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off
When offline, if a user removes a tag record, ensure the toggle is disabled.

Multilevel Tags :

Prerequisites:

Create a workspace with dependent tags imported from the old dot system. Use this file to add dependent tags.

Navigate to workspace settings.
Open the Tags page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off.

Report Fields :

Create a workspace.
Navigate to workspace settings.
Enable Report Fields from the More Features page.
Open the Report Fields page.
Create a report field with the type List .
Edit the report field and navigate to the List page.
Verify that the Status column uses a toggle switch instead of a label and confirm that the status updates correctly when toggled on or off.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-12-12.at.00.45.35.mov

Android: mWeb Chrome

Screen.Recording.2024-12-12.at.00.51.20.mov

iOS: Native

Screen.Recording.2024-12-12.at.00.45.35.mov

iOS: mWeb Safari

Screen.Recording.2024-12-12.at.00.51.20.mov

MacOS: Chrome / Safari

Categories:

Screen.Recording.2024-12-12.at.00.52.19.mov

Taxes:

taxes.mov

Distance Rates:

distance.mov

Screen.Recording.2025-01-14.at.04.07.06.mov

Tags:

tags-single.mov

Multilevel Tags:

tags-mult.mov

Report Fields:

report-fields.mov

MacOS: Desktop

Screen.Recording.2024-12-10.at.00.04.15.mov

melvin-bot · 2025-01-14T03:08:20Z

@akinwale Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

abzokhattab · 2025-01-14T03:09:47Z

I am not able to reproduce this issue #55053 ... can you please also recheck @akinwale

akinwale · 2025-01-14T18:17:56Z

I am not able to reproduce this issue #55053 ... can you please also recheck @akinwale

That was probably related to the default empty string values. I will start testing the PR.

akinwale · 2025-01-17T12:29:45Z

@abzokhattab There is weird behaviour with the toggles. After I put the network back online, they don't respond properly. Additionally, when I scroll down the Category view and then click on a toggle, it doesn't respond. However, if I click on the next toggle, then both toggles change their state at the same time. The video below shows what's going on.

Could you please check this and make sure everything works properly? Thanks.

Screen.Recording.2025-01-17.at.13.25.14.mp4

…/disable-instead-of-label

abzokhattab · 2025-01-18T18:39:33Z

@abzokhattab There is weird behaviour with the toggles. After I put the network back online, they don't respond properly. Additionally, when I scroll down the Category view and then click on a toggle, it doesn't respond. However, if I click on the next toggle, then both toggles change their state at the same time. The video below shows what's going on.

i am not sure how to solve this issue but from what i notice its not that its not responding however its just abit heavy ... do you think this is still a bug and what could be the cause of that?

Screen.Recording.2025-01-18.at.19.35.48.mov

akinwale · 2025-01-19T06:32:31Z

@abzokhattab It would still count as a bug since it is not behaving as the user expects, especially when interacting with the toggles after scrolling down. Try to create a Slack thread in #expensify-open-source asking if there are any tips or ideas on solving the problem.

shawnborton · 2025-01-20T06:52:21Z

Please let us know when this is ready for a @Expensify/design review, thanks!

shawnborton · 2025-01-20T06:52:46Z

cc @JmillsExpensify @trjExpensify for vis

…/disable-instead-of-label

anmurali · 2025-01-22T02:02:48Z

Try to create a Slack thread in #expensify-open-source asking if there are any tips or ideas on solving the problem.

@abzokhattab - Did you happen to do this? This particular update is really critical and it would be great to move this forward with a bit more urgency.

jamesdeanexpensify · 2025-01-22T17:49:29Z

Posted here for discussion.

jamesdeanexpensify · 2025-01-22T17:49:42Z

We really need to keep this moving forward, please!

abzokhattab · 2025-01-23T22:01:15Z

The issue is not related to being offline or online; I can reproduce it in both scenarios.
I have been unable to determine the root cause of the problem. The useMemo hook is using the correct dependency list, so I’m unsure what could be going wrong.
I tried adding the {initWithStoredValues: false} option here as suggested by this comment , but it still didn’t resolve the issue.
I am also able to reproduce the issue on the tags page.
What steps should we take next to address this? Please let me know if you have any suggestions.

61588d89-5342-4d1a-9a0f-aee19c26ebc5.MP4

…/disable-instead-of-label

s77rt · 2025-01-24T21:38:34Z

Hey, I am not able to reproduce this. Can you please add reproduction steps?

Regardless, looking at the setWorkspaceCategoryEnabled onyx data, it's not exactly correct. Please try apply this diff and check again

diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
index 1b3267f5916..dcd37973af0 100644
--- a/src/libs/actions/Policy/Category.ts
+++ b/src/libs/actions/Policy/Category.ts
@@ -2,6 +2,7 @@ import lodashCloneDeep from 'lodash/cloneDeep';
 import lodashUnion from 'lodash/union';
 import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {PartialDeep} from 'type-fest';
 import * as API from '@libs/API';
 import type {
     EnablePolicyCategoriesParams,
@@ -215,7 +216,6 @@ function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Recor
     const optimisticPolicyCategoriesData = {
         ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
             acc[key] = {
-                ...policyCategories[key],
                 ...categoriesToUpdate[key],
                 errors: null,
                 pendingFields: {
@@ -241,10 +241,8 @@ function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Recor
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
                 value: {
-                    ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
+                    ...Object.keys(categoriesToUpdate).reduce<PartialDeep<PolicyCategories>>((acc, key) => {
                         acc[key] = {
-                            ...policyCategories[key],
-                            ...categoriesToUpdate[key],
                             errors: null,
                             pendingFields: {
                                 enabled: null,
@@ -265,7 +263,6 @@ function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Recor
                     ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
                         acc[key] = {
                             ...policyCategories[key],
-                            ...categoriesToUpdate[key],
                             errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateFailureMessage'),
                             pendingFields: {
                                 enabled: null,

Explanation:

The optimistic data does not require ...policyCategories because we are merging data (Onyx.METHOD.MERGE)
The success data does not require neither ...policyCategories nor ...categoriesToUpdate because those are already set optimistically. <-- I'm assuming this is the culprit in your testing videos, as it keeps overriding the values for the new queued requests
The failure data does not require ...categoriesToUpdate. In case of failure we want to revert back to policyCategories only.

waterim · 2025-01-25T12:27:42Z

Cant reproduce now, updating success data resolves all issues!
Good catch @s77rt !

akinwale · 2025-01-26T05:29:22Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

55192-web.mp4

MacOS: Desktop

akinwale

LGTM.

grgia · 2025-01-27T15:59:25Z

src/libs/actions/Policy/DistanceRate.ts

+    if (!customUnitID) {
+        return;
+    }
+


if this is true, do we catch this error in any way? Should we be calling clearDeleteDistanceRateError without customUnitID?

I updated it to be required only and modified the dismissError function to check if the customUnitID is not undefined. Please review this commit:
c78e104

src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx

akinwale · 2025-01-28T09:52:26Z

@abzokhattab There are some additional conflicts. Could you please resolve them?

…or and clearCreateDistanceRateItemAndError

…/disable-instead-of-label

akinwale · 2025-01-29T10:15:24Z

@grgia Re-tested and confirmed working ok. All yours.

OSBotify · 2025-01-30T11:35:25Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-01-31T07:02:13Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.0.93-0 🚀

platform	result
🤖 android 🤖	cancelled 🔪
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	cancelled 🔪
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	cancelled 🔪
🍎🔄 iOS HybridApp 🍎🔄	cancelled 🔪

vincdargento · 2025-01-31T16:43:08Z

@abzokhattab This PR is failing because of issue #56173
The issue is reproducible in:

Android: Standalone
Android: HybridApp

bug.mp4

izarutskaya · 2025-01-31T18:06:28Z

Found issues #56172, #56158

https://platform.applause.com/services/links/v1/external/3bb55111859f85b6b1f63f20b239899f3a9ca6ff6528c10d7e50dce4c495c92b

https://platform.utest.com/testcycles/487710/issues/6729647

roryabraham · 2025-02-03T20:05:33Z

It seems like this PR caused a regression: #56173

I'm not going to block deploy on it because it's minor, but can we please follow-up to fix this bug?

github-actions · 2025-02-03T23:07:23Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.93-3 🚀

platform	result
🤖 android 🤖	true ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

jjcoffee · 2025-09-02T11:47:22Z

src/pages/workspace/categories/WorkspaceCategoriesPage.tsx

                errors: value.errors ?? undefined,
-                rightElement: <ListItemRightCaretWithLabel labelText={value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
+                rightElement: (
+                    <Switch


Coming from #67934. We should've added a lock icon (via showLockIcon) here if it's the last enabled rate, to keep things consistent with categories and tags pages.

Add toggle for enable/disable instead of label

71eceaa

abzokhattab requested a review from a team as a code owner January 14, 2025 03:08

melvin-bot bot requested review from akinwale and removed request for a team January 14, 2025 03:08

abzokhattab added 3 commits January 14, 2025 04:27

Fixing eslint errs

c6ddd5f

fixing eslint

310a02b

fixing linting errs

5ebb6c7

Merge remote-tracking branch 'origin/main' into add-toggle-for-enable…

3a6c8f5

…/disable-instead-of-label

shawnborton requested a review from a team January 20, 2025 06:52

Merge remote-tracking branch 'origin/main' into add-toggle-for-enable…

09c1f7e

…/disable-instead-of-label

mountiny assigned abzokhattab Jan 23, 2025

Merge remote-tracking branch 'origin/main' into add-toggle-for-enable…

7259c2e

…/disable-instead-of-label

Refactor setWorkspaceCategoryEnabled oynx data

d27e7a9

akinwale approved these changes Jan 26, 2025

View reviewed changes

melvin-bot bot requested a review from grgia January 26, 2025 05:29

grgia reviewed Jan 27, 2025

View reviewed changes

src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx Outdated Show resolved Hide resolved

abzokhattab force-pushed the add-toggle-for-enable/disable-instead-of-label branch from 460c5d6 to d27e7a9 Compare January 28, 2025 15:33

abzokhattab added 3 commits January 28, 2025 16:36

Refactor customUnitID type to be string in clearDeleteDistanceRateErr…

c78e104

…or and clearCreateDistanceRateItemAndError

Merge remote-tracking branch 'origin/main' into add-toggle-for-enable…

96540b2

…/disable-instead-of-label

minor edit

5fbb8af

abzokhattab requested a review from grgia January 28, 2025 15:50

mountiny approved these changes Jan 30, 2025

View reviewed changes

grgia approved these changes Jan 30, 2025

View reviewed changes

grgia merged commit d96792f into Expensify:main Jan 30, 2025
15 checks passed

github-actions bot mentioned this pull request Jan 31, 2025

Deploy Checklist: New Expensify 2025-01-31 #56137

Closed

42 tasks

IuliiaHerets mentioned this pull request Jan 31, 2025

[Due for payment 2025-02-27] [$250] Taxes - App crashes when trying to disable tax rate. #56158

Closed

8 tasks

vincdargento mentioned this pull request Jan 31, 2025

[$250] Distance Rates - Disabling rate toggle triggers a brief on-off action after relogging #56173

Closed

8 tasks

CortneyOfstad mentioned this pull request Feb 3, 2025

[Due for payment 2025-02-10] [$250] Add toggle for enable/disable to each category row in Categories page of workspace settings #53798

Closed

melvin-bot bot mentioned this pull request Feb 3, 2025

[Due for payment 2025-02-10] [$250] Distance rates - Dropdown does not show "Enable" after disabling rate while selecting all rates #55052

Closed

8 tasks

bernhardoj mentioned this pull request Feb 16, 2025

[Due for payment 2025-03-05] [$250] Tags - Tags are disabled when toggling off members must tag all expense for independent tags #56903

Closed

8 tasks

jjcoffee reviewed Sep 2, 2025

View reviewed changes

Conversation

abzokhattab commented Jan 14, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 14, 2025

Uh oh!

abzokhattab commented Jan 14, 2025

Uh oh!

akinwale commented Jan 14, 2025

Uh oh!

akinwale commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abzokhattab commented Jan 18, 2025

Uh oh!

akinwale commented Jan 19, 2025

Uh oh!

shawnborton commented Jan 20, 2025

Uh oh!

shawnborton commented Jan 20, 2025

Uh oh!

anmurali commented Jan 22, 2025

Uh oh!

jamesdeanexpensify commented Jan 22, 2025

Uh oh!

jamesdeanexpensify commented Jan 22, 2025

Uh oh!

abzokhattab commented Jan 23, 2025

Uh oh!

s77rt commented Jan 24, 2025

Uh oh!

waterim commented Jan 25, 2025

Uh oh!

akinwale commented Jan 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

akinwale left a comment

Choose a reason for hiding this comment

Uh oh!

grgia Jan 27, 2025

Choose a reason for hiding this comment

Uh oh!

abzokhattab Jan 28, 2025 • 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!

Uh oh!

akinwale commented Jan 28, 2025

Uh oh!

akinwale commented Jan 29, 2025

Uh oh!

Uh oh!

OSBotify commented Jan 30, 2025

Uh oh!

github-actions bot commented Jan 31, 2025

Uh oh!

vincdargento commented Jan 31, 2025

Uh oh!

izarutskaya commented Jan 31, 2025

Uh oh!

roryabraham commented Feb 3, 2025

Uh oh!

github-actions bot commented Feb 3, 2025

Uh oh!

jjcoffee Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

akinwale commented Jan 17, 2025 •

edited

Loading

akinwale commented Jan 26, 2025 •

edited

Loading

abzokhattab Jan 28, 2025 •

edited

Loading