[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

Krishna2323 · 2024-07-04T19:26:22Z

Details

Fixed Issues

$ #44826
PROPOSAL: #44826 (comment)

Tests

Select a workspace with an integration from workspace page > Categories
Click Settings > Verify Require a category on every expense... is shown
Select a workspace with no integration from workspace page > Categories
Click Settings > Verify no subtitle is shown below switch

Verify that no errors appear in the JS console

Offline tests

Select a workspace with an integration from workspace page > Categories
Click Settings > Verify Require a category on every expense... is shown
Select a workspace with no integration from workspace page > Categories
Click Settings > Verify no subtitle is shown below switch

QA Steps

Select a workspace with an integration from workspace page > Categories
Click Settings > Verify Require a category on every expense... is shown
Select a workspace with no integration from workspace page > Categories
Click Settings > Verify no subtitle is shown below switch

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

…enses' contains 'undefined'. Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

melvin-bot · 2024-07-04T19:26:27Z

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

Krishna2323 · 2024-07-04T19:30:48Z

recording videos, will take about 20 mins from now

allgandalf

tests good, just one change which i think is logical

allgandalf · 2024-07-04T20:28:36Z

src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx

@@ -48,7 +48,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                <View style={styles.flexGrow1}>
                    <ToggleSettingOptionRow
                        title={translate('workspace.categories.requiresCategory')}
-                        subtitle={toggleSubtitle}
+                        subtitle={isConnectedToAccounting ? toggleSubtitle : undefined}


I think it would make more sense to make toggleSubtitle undefined than doing it here, can you update accordingly please

@allgandalf, can you pls check now. Sorry haven't pulled main branch yet, just a min.

@allgandalf, pls check now.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

allgandalf · 2024-07-04T20:50:26Z

src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx

@@ -49,7 +49,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                    <ToggleSettingOptionRow
                        title={translate('workspace.categories.requiresCategory')}
                        subtitle={toggleSubtitle}
-                        switchAccessibilityLabel={toggleSubtitle}
+                        switchAccessibilityLabel={translate('workspace.categories.requiresCategory')}


is this because switchAccessibilityLabel cannot be undefined?

allgandalf · 2024-07-04T21: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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

MacOS: Desktop

allgandalf

Tests well, LGTM

fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. (cherry picked from commit 4933a33)

OSBotify · 2024-07-04T21:44:10Z

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

OSBotify · 2024-07-04T22:17:15Z

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-05T12:32:46Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.0.4-6 🚀

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

OSBotify · 2024-07-10T11:07:11Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

OSBotify · 2024-07-15T20:25:53Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

fix: Categories - The subtitle under 'Members must categorize all exp…

2e5aa05

…enses' contains 'undefined'. Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner July 4, 2024 19:26

melvin-bot bot requested review from allgandalf and removed request for a team July 4, 2024 19:26

Merge branch 'Expensify:main' into krishna2323/issue/44826

ecd93c0

allgandalf reviewed Jul 4, 2024

View reviewed changes

Krishna2323 added 2 commits July 5, 2024 02:05

minor updates.

72a1986

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

merge main.

5158ef1

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

allgandalf reviewed Jul 4, 2024

View reviewed changes

allgandalf approved these changes Jul 4, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen July 4, 2024 21:29

luacmartins approved these changes Jul 4, 2024

View reviewed changes

tgolen approved these changes Jul 4, 2024

View reviewed changes

tgolen merged commit 4933a33 into Expensify:main Jul 4, 2024
16 of 19 checks passed

OSBotify pushed a commit that referenced this pull request Jul 4, 2024

Merge pull request #44866 from Krishna2323/krishna2323/issue/44826

2bee9af

fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. (cherry picked from commit 4933a33)

github-actions bot mentioned this pull request Jul 4, 2024

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

mountiny changed the title ~~fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'.~~ [CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. Jul 5, 2024

melvin-bot bot mentioned this pull request Jul 10, 2024

[HOLD for payment 2024-07-17] Categories - The subtitle under "Members must categorize all expenses" contains "undefined" #44826

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

Krishna2323 commented Jul 4, 2024 •

edited

Loading

melvin-bot bot commented Jul 4, 2024

Krishna2323 commented Jul 4, 2024

allgandalf left a comment

allgandalf Jul 4, 2024

Krishna2323 Jul 4, 2024 •

edited

Loading

allgandalf Jul 4, 2024

Krishna2323 Jul 4, 2024

allgandalf Jul 4, 2024

Krishna2323 Jul 4, 2024

allgandalf commented Jul 4, 2024

allgandalf left a comment

OSBotify commented Jul 4, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 5, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

Conversation

Krishna2323 commented Jul 4, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 4, 2024

Krishna2323 commented Jul 4, 2024

allgandalf left a comment

Choose a reason for hiding this comment

allgandalf Jul 4, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 4, 2024 • edited Loading

Choose a reason for hiding this comment

allgandalf Jul 4, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 4, 2024

Choose a reason for hiding this comment

allgandalf Jul 4, 2024

Choose a reason for hiding this comment

Krishna2323 Jul 4, 2024

Choose a reason for hiding this comment

allgandalf commented Jul 4, 2024

Reviewer Checklist

Screenshots/Videos

allgandalf left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 4, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 5, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

Krishna2323 commented Jul 4, 2024 •

edited

Loading

Krishna2323 Jul 4, 2024 •

edited

Loading