Fix tracking categories not dynamic by lakchote · Pull Request #42593 · Expensify/App

lakchote · 2024-05-24T13:39:34Z

Details

Related to https://expensify.slack.com/archives/C036QM0SLJK/p1716541958011089?thread_ts=1716238514.357639&cid=C036QM0SLJK

Fixed Issues

$
PROPOSAL:

Tests

Verify that no errors appear in the JS console

On a Xero account change your tracking categories to very specific names (like: Pizza toppings for example)

Connect to Xero on NewDot
Go to Import > Tracking categories
You should see something like this below:

Screen.Recording.2024-05-24.at.15.20.51.mov

Offline tests

NA

QA Steps

Verify that no errors appear in the JS console
Same as in tests

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
- MacOS: Desktop
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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 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)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-05-24.at.15.20.51.mov

MacOS: Desktop

melvin-bot · 2024-05-24T13:40:02Z

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

rlinoz · 2024-05-24T16:24:33Z

Code looks good, but I am probably doing something wrong when setting up the integration?

I am using the QA account, but no organization shows up after it is done syncing and the tracking categories is empty as well.

hungvu193 · 2024-05-25T00:15:09Z

Also lint is failing

lakchote · 2024-05-27T05:34:53Z

Code looks good, but I am probably doing something wrong when setting up the integration?

I am using the QA account, but no organization shows up after it is done syncing and the tracking categories is empty as well.

You need to sync to xero using the xero-merge-freeze branch first. A lot of commits/fixes are present there, it should resolve your issue for syncing. Then you'll be able to test the PR correctly 😄

lakchote · 2024-05-27T05:36:16Z

Also lint is failing

Fixed!

hungvu193 · 2024-05-27T06:42:02Z

it crashed when I opened the category detail

Screen.Recording.2024-05-27.at.13.41.31.mov

src/ROUTES.ts

…ries

hungvu193

@lakchote I left a comment about optionsList in XeroMapTrackingCategoryConfigurationPage. Would you mind to have a look at it? 😄

src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx

hungvu193 · 2024-05-27T10:27:02Z

@lakchote Lint is failing

hungvu193 · 2024-05-27T10:28:26Z

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.mov

Android: mWeb Chrome

mAndroid.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mSafari.mov

MacOS: Chrome / Safari

chrome.mov

MacOS: Desktop

desk.mov

hungvu193 · 2024-05-27T10:29:51Z

Seems we need to re-run the linting again 😄 . But this LGTM 🚀

melvin-bot · 2024-05-27T10:30:27Z

@stitesExpensify 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 · 2024-05-27T10:30:30Z

🎯 @hungvu193, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #42633.

lakchote · 2024-05-27T11:32:07Z

@hungvu193 thank you for the review, lint issue should be fixed now.

@rlinoz please review it again when you can, thanks!

github-actions · 2024-05-27T15:57:39Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/42593/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/42593/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/42593/NewExpensify.dmg	https://42593.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

rlinoz

Worked on the adhoc build 😄

stitesExpensify · 2024-05-27T20:05:53Z

src/libs/actions/connections/ConnectToXero.ts

 };

-/**
- * Fetches the category object from the xero.data.trackingCategories based on the category name.


NAB why remove the comment?

I've removed it since it was not relevant anymore as it's been replaced by getTrackingCategories().

And as getTrackingCategories() is self-explaining, I felt like it was not necessary to add a comment for it.

OSBotify · 2024-05-30T21:55:47Z

🚀 Deployed to staging by https://github.com/lakchote in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T22:32:17Z

🚀 Deployed to staging by https://github.com/lakchote in version: 1.4.77-11 🚀

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

OSBotify · 2024-06-04T13:58:19Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.78-5 🚀

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

eh2077 · 2024-12-10T11:43:00Z

src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx

    const updateMapping = useCallback(
        (option: {value: string}) => {
-            if (option.value !== category?.value) {
+            if (option.value !== categoryName) {


This change caused a regression #53128

We should prevent calling update xero API when selecting the selected value #53116

lakchote added 12 commits May 24, 2024 15:32

make translations dynamic for xero tracking categories

86bbf4b

use only one route for tracking category mapping

ff704d1

use one screen for the tracking category mapping

9e860f3

handle navigation for the new page for tracking category

1b8901a

add new types for tracking category mapping

c837440

map the tracking category page to rhp

2256423

create function to get tracking categories

bb8c24e

modify component for dynamic translations

5b797b6

make the handling of tracking categories dynamic

ed4c53f

fix style

0371ac1

delete specific tracking categories pages

c48295c

make the handling of tracking categories dynamic

be80134

lakchote self-assigned this May 24, 2024

lakchote requested a review from a team as a code owner May 24, 2024 13:39

melvin-bot bot requested review from rlinoz and removed request for a team May 24, 2024 13:40

fix lint

e3e42b7

hungvu193 suggested changes May 27, 2024

View reviewed changes

src/ROUTES.ts Outdated Show resolved Hide resolved

lakchote added 5 commits May 27, 2024 10:21

Merge branch 'xero-merge-freeze' into lucien/fix-xero-tracking-catego…

5a8efbf

…ries

fix lint

72ce91a

fix typo

e0bb804

encode category name

4df274a

decode category name

0b94f59

hungvu193 suggested changes May 27, 2024

View reviewed changes

lakchote added 2 commits May 27, 2024 12:07

fix isSelected

3d30445

use already decoded category name

7a559df

hungvu193 approved these changes May 27, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify May 27, 2024 10:30

melvin-bot bot mentioned this pull request May 27, 2024

Payment issue for E/App PR#42593 #42633

Closed

fix lint

a8e48c9

rlinoz added the Ready To Build label May 27, 2024

rlinoz approved these changes May 27, 2024

View reviewed changes

stitesExpensify approved these changes May 27, 2024

View reviewed changes

lakchote merged commit 1427992 into xero-merge-freeze May 28, 2024

lakchote deleted the lucien/fix-xero-tracking-categories branch May 28, 2024 06:38

github-actions bot mentioned this pull request May 30, 2024

Deploy Checklist: New Expensify 2024-05-30 #42872

Closed

95 tasks

eh2077 reviewed Dec 10, 2024

View reviewed changes

Conversation

lakchote commented May 24, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented May 24, 2024

Uh oh!

rlinoz commented May 24, 2024

Uh oh!

hungvu193 commented May 25, 2024

Uh oh!

lakchote commented May 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lakchote commented May 27, 2024

Uh oh!

hungvu193 commented May 27, 2024

Uh oh!

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented May 27, 2024

Uh oh!

hungvu193 commented May 27, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

hungvu193 commented May 27, 2024

Uh oh!

melvin-bot bot commented May 27, 2024

Uh oh!

melvin-bot bot commented May 27, 2024

Uh oh!

lakchote commented May 27, 2024

Uh oh!

github-actions bot commented May 27, 2024

Uh oh!

rlinoz left a comment

Choose a reason for hiding this comment

Uh oh!

stitesExpensify May 27, 2024

Choose a reason for hiding this comment

Uh oh!

lakchote May 28, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

OSBotify commented Jun 4, 2024

Uh oh!

eh2077 Dec 10, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lakchote commented May 27, 2024 •

edited

Loading