fix: 'Add approval' can be disabled even when 'Smart limit' are enabled #57006

nkdengineer · 2025-02-18T10:20:49Z

Explanation of Change

Fixed Issues

$ #56187
PROPOSAL: #56187 (comment)

Tests

Go to workspace settings > Workflows.
Enable Add approvals.
Go to workspace settings > Expensify card.
Click on the virtual card.
Click Limit type.
Select Smart limit and save it.
Go to workspace settings > Workflows.
Verify that: Add approvals is locked and we have additional text

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-02-18T11:14:31Z

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

src/languages/en.ts

dominictb · 2025-02-19T06:48:22Z

@nkdengineer Did you confirm the translation?

nkdengineer · 2025-02-19T09:05:06Z

@nkdengineer Did you confirm the translation?

@dominictb asking here

dominictb · 2025-02-23T13:41:27Z

@nkdengineer Seems like the translations are confirmed on Slack, code changes look good. But I need the final confirmation from @Expensify/design

Is it fine?

dubielzyk-expensify · 2025-02-24T07:04:04Z

If we have all the approvals listed below I worry the text will be missed. Part of me actually wonders if we should throw up a dialog if the user taps on the locked toggle:

I don't mind adding the text on the main page, but it feels overly long to me. Wonder if we can instead append it to the text instead of adding a full paragraph:

Keen to hear what @Expensify/design thinks.

dannymcclain · 2025-02-24T14:23:22Z

Wonder if we can instead append it to the text instead of adding a full paragraph:

I think I prefer this option. This feels more in line with how we handle this type of thing in other cases.

shawnborton · 2025-02-24T14:25:59Z

I'm not quite following. I thought whenever we had a locked toggle, we use hint text to explain why the toggle is indeed locked? if anything, I would think that the hint text in this screenshot here that says Require additional approval before authorizing a payment.:

Could be replaced with the block of text below that says Expensify Cards from this workspace currently rely on approval to define their Smart Limits. Please amend the limit types of any Expensify Cards with Smart Limits before disabling approvals., so it feels more consolidated.

Bonus points if we could make that even more concise though. But I feel like this pattern is the most consistent with how we already handle this everywhere else in the app...

nkdengineer · 2025-02-25T08:58:47Z

Option 1

Option 2

@Expensify/design Should we proceed with option 1 or option 2?

dannymcclain · 2025-02-25T13:56:55Z

While Option 1 follows the patterns we have for regular toggle rows more closely, Option 2 is more in line with the other toggle rows on the More Features page (bold title, contained in a card, etc). So I'd say go with Option 2.

@Expensify/design for the gut check.

Also, can we check the line-height we're using for these descriptions? The bottom two look tight and when I inspect I'm seeing a 16px line-height. They should have 20px line-height like the top one.

shawnborton · 2025-02-25T14:13:29Z

Interesting, I thought that if we were using the label font size (13px) that we should be using 16px line height?

shawnborton · 2025-02-25T14:15:40Z

In that screenshot above Danny, what are the font sizes? I think our hint text for toggles normally uses 13px font size (label) and thus I would expect it to use 16px line height. But if that text in your screenshot is 15px... then 20px line height makes sense.

dannymcclain · 2025-02-25T14:24:28Z

Interesting, I thought that if we were using the label font size (13px) that we should be using 16px line height?

In that screenshot above Danny, what are the font sizes? I think our hint text for toggles normally uses 13px font size (label) and thus I would expect it to use 16px line height. But if that text in your screenshot is 15px... then 20px line height makes sense.

@shawnborton These don't use our standard toggle rows. Because they act as titles/headers for the cards, we bumped everything up. Here's a comparison:

And then here's a comparison of Workflows page using the current, custom toggle rows and our standard rows.

Current, custom rows:

Standard toggle rows:

Hopefully this is helpful! 😅

shawnborton · 2025-02-25T14:27:05Z

Okay cool - so then 20px line height is the way to go here :)

dubielzyk-expensify · 2025-02-26T02:39:34Z

Great investigation! 20px sounds good to me 👍

nkdengineer · 2025-02-26T07:37:07Z

@dominictb i updated, please check again

dominictb · 2025-02-26T17:01:33Z

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

Screen.Recording.2025-02-26.at.23.56.03.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2025-02-26.at.23.54.50.mov

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

dominictb · 2025-02-26T17:02:24Z

Thank you @nkdengineer

src/libs/CardUtils.ts

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx

nkdengineer · 2025-03-03T05:18:11Z

@mountiny i updated

mountiny

Thanks!

OSBotify · 2025-03-05T23:39:13Z

✋ 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-03-06T23:14:47Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.10-0 🚀

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

github-actions · 2025-03-10T21:10:19Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.10-6 🚀

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

nkdengineer added 2 commits February 18, 2025 17:20

fix: 'Add approval' can be disabled even when 'Smart limit' are enabled

459a6f2

fix lint

bfcfdcc

nkdengineer marked this pull request as ready for review February 18, 2025 11:14

nkdengineer requested a review from a team as a code owner February 18, 2025 11:14

melvin-bot bot requested review from dominictb and removed request for a team February 18, 2025 11:14

dominictb reviewed Feb 19, 2025

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

rename variable

f80c51d

resolve conflict

0faab92

resolve conflict

9407722

nkdengineer added 2 commits February 26, 2025 14:14

Merge branch 'main' into fix/56187

5bfe262

fix style

ea366a8

dominictb approved these changes Feb 26, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny February 26, 2025 17:02

mountiny assigned nkdengineer Mar 3, 2025

mountiny requested changes Mar 3, 2025

View reviewed changes

src/libs/CardUtils.ts Outdated Show resolved Hide resolved

src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx Outdated Show resolved Hide resolved

nkdengineer added 2 commits March 3, 2025 12:10

Merge branch 'main' into fix/56187

7201069

rename function

1b816ae

mountiny approved these changes Mar 5, 2025

View reviewed changes

mountiny merged commit 4dd22d5 into Expensify:main Mar 5, 2025
16 checks passed

github-actions bot mentioned this pull request Mar 6, 2025

Deploy Checklist: New Expensify 2025-03-06 #57963

Closed

93 tasks

cristipaval mentioned this pull request Mar 7, 2025

[Due for payment 2025-03-27] Add approvals switch is locked&disabled after reenabling Workflows when Smart limit is selected #57998

Closed

8 tasks

melvin-bot bot mentioned this pull request Mar 10, 2025

[Awaiting checklist] [$250] Expensify Card - "Add approval' can be disabled even when "Smart limit"s are enabled on Expensify Cards #56187

Closed

8 tasks

fix: 'Add approval' can be disabled even when 'Smart limit' are enabled #57006

fix: 'Add approval' can be disabled even when 'Smart limit' are enabled #57006

Uh oh!

Conversation

nkdengineer commented Feb 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 18, 2025

Uh oh!

Uh oh!

dominictb commented Feb 19, 2025

Uh oh!

nkdengineer commented Feb 19, 2025

Uh oh!

dominictb commented Feb 23, 2025

Uh oh!

dubielzyk-expensify commented Feb 24, 2025

Uh oh!

dannymcclain commented Feb 24, 2025

Uh oh!

shawnborton commented Feb 24, 2025

Uh oh!

nkdengineer commented Feb 25, 2025

Option 1

Option 2

Uh oh!

dannymcclain commented Feb 25, 2025

Uh oh!

shawnborton commented Feb 25, 2025

Uh oh!

shawnborton commented Feb 25, 2025

Uh oh!

dannymcclain commented Feb 25, 2025

Uh oh!

shawnborton commented Feb 25, 2025

Uh oh!

dubielzyk-expensify commented Feb 26, 2025

Uh oh!

nkdengineer commented Feb 26, 2025

Uh oh!

dominictb commented Feb 26, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb commented Feb 26, 2025

Uh oh!

Uh oh!

Uh oh!

nkdengineer commented Mar 3, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 5, 2025

Uh oh!

github-actions bot commented Mar 6, 2025

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

Uh oh!

nkdengineer commented Feb 18, 2025 •

edited

Loading