Skip to content

fix: show lock icon on tag GL code field when connected to accounting - #102501

Merged
blimpich merged 1 commit into
Expensify:mainfrom
neerajbachani:fix/102485-tag-gl-code-lock-icon
Sep 29, 2026
Merged

blimpich merged 1 commit into
Expensify:mainfrom
neerajbachani:fix/102485-tag-gl-code-lock-icon

Conversation

@neerajbachani

@neerajbachani neerajbachani commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

$ #102485

Explanation of Change

When a workspace is connected to accounting, the tag GL code field is locked and should show a lock icon. MenuItem only renders the trailing icon when shouldShowRightIcon is true. The GL code row passed the lock through iconRight, but shouldShowRightIcon was canWriteTags && !hasAccountingConnections, which is false exactly when accounting is connected, so the lock never rendered.

This sets shouldShowRightIcon to canWriteTags. iconRight and interactive are unchanged, so the row stays non-tappable when accounting is connected and still shows a chevron when it is not.

Fixed Issues

$ #102485
PROPOSAL:

Tests

  1. Sign in as a workspace admin on a Control workspace that is connected to QuickBooks Online (or another accounting integration).
  2. Open Workspace settings, then Tags.
  3. Open any tag. For dependent multi-level tags, also open a subtag.
  4. Verify the GL code row shows a lock icon on the right.
  5. Tap the GL code row and verify it does not open the GL code editor.
  6. Disconnect accounting from the same workspace.
  7. Reopen the same tag.
  8. Verify the lock icon is gone and a chevron is shown.
  9. Tap the GL code row and verify the GL code editor opens.
  • Verify that no errors appear in the JS console

Offline tests

  1. With the workspace still connected to accounting, open a tag so the GL code row is visible and the lock icon is shown.
  2. Turn the network off.
  3. Verify the lock icon remains on the GL code row.
  4. Tap the GL code row and verify it still does not open the editor.
  5. Turn the network back on.

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  1. Sign in as a workspace admin on a Control workspace that is connected to QuickBooks Online (or another accounting integration).
  2. Open Workspace settings, then Tags.
  3. Open any tag. For dependent multi-level tags, also open a subtag.
  4. Verify the GL code row shows a lock icon on the right.
  5. Tap the GL code row and verify it does not open the GL code editor.
  6. Disconnect accounting from the same workspace.
  7. Reopen the same tag.
  8. Verify the lock icon is gone and a chevron is shown.
  9. Tap the GL code row and verify the GL code editor opens.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome image
iOS: Native image
iOS: mWeb Safari image
MacOS: Chrome / Safari image

MenuItem only renders the trailing icon when shouldShowRightIcon is true. Gating that on !hasAccountingConnections hid the lock exactly when the workspace is connected to accounting.

$ Expensify#102485
@neerajbachani
neerajbachani marked this pull request as ready for review September 29, 2026 06:59
@neerajbachani
neerajbachani requested review from a team as code owners September 29, 2026 06:59
@melvin-bot
melvin-bot Bot requested review from DylanDylann and dylanexpensify and removed request for a team September 29, 2026 06:59
@melvin-bot

melvin-bot Bot commented Sep 29, 2026

Copy link
Copy Markdown

@DylanDylann 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team September 29, 2026 06:59
@DylanDylann

DylanDylann commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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)
  • 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)
  • 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.
  • 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

Screenshot 2026-09-29 at 14 38 36
Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@melvin-bot
melvin-bot Bot requested a review from blimpich September 29, 2026 07:38

@dylanexpensify dylanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from a product perspective 👍

Curious though, @Expensify/design are we standardizing on a tool tip for all locked items?

@dannymcclain

Copy link
Copy Markdown
Contributor

Why does the field need a lock icon if it's already read-only? Isn't it being non-editable enough?

@neerajbachani

Copy link
Copy Markdown
Contributor Author

@dannymcclain The row is already non-tappable when accounting is connected, and that part did not change. What disappeared is the lock, which is the only cue that the field is owned by the accounting connection rather than just a row that does not open.

The lock is the existing pattern. Without it, the field looks accidentally read-only, which is what #102485 reported.

This PR only restores that icon. interactive is still false when accounting is connected. If we want connected GL code fields to have no lock at all, that should be a separate design change, not part of this regression fix.

cc: @DylanDylann

@dannymcclain

Copy link
Copy Markdown
Contributor

If we want connected GL code fields to have no lock at all, that should be a separate design change, not part of this regression fix.

Yeah that makes sense to me. Down to proceed here.

@blimpich

Copy link
Copy Markdown
Contributor

conversation here: https://expensify.slack.com/archives/C01GTK53T8Q/p1790646913227189

@blimpich
blimpich merged commit b594885 into Expensify:main Sep 29, 2026
42 of 83 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 blimpich has triggered a test Expensify/App build. You can view the workflow run here.

OSBotify pushed a commit that referenced this pull request Sep 29, 2026
…lock-icon

fix: show lock icon on tag GL code field when connected to accounting
(cherry picked from commit b594885)

(cherry-picked to staging by blimpich)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Sep 29, 2026
@tgolen tgolen mentioned this pull request Sep 29, 2026
40 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.95-1 🚀

platform result
🕸 web 🕸 failure ❌
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update is needed. This bug fix only makes the existing lock icon show on the tag GL Code field when accounting is connected, and no sentence in Create and manage expense tags is made incorrect by it.


view run

@os-botify

os-botify Bot commented Sep 29, 2026

Copy link
Copy Markdown

🔁 Filed a Staging retest request for deploy blockers #102485 after this PR was cherry-picked to staging.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.95-1 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update is needed. This bug fix only makes the lock icon show on a tag's GL Code field when accounting is connected, and no sentence in Create and manage expense tags is made incorrect by it.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.95-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 failure ❌

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.96-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 cancelled 🔪
🍎 iOS 🍎 cancelled 🔪

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update is needed. This PR only restores the missing lock icon on the tag GL code row for workspaces with an accounting connection; the row was already non-editable, and no sentence in Create and manage expense tags becomes incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.99-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update is needed. This bug fix restores the lock icon on the tag GL Code row for workspaces connected to accounting, and no existing article sentence describes that icon or becomes incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.99-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants