FIX the logic to check if there is an accounting connection in the workspace #42613

hayata-suenaga · 2024-05-24T23:52:56Z

Details

This PR:

fixes the logic to determine if there is an accounting connection
uses the PolicyUtils method to check if there is an accounting connection
hide Delete rate button on Taxes page if there is an accounting connection

Fixed Issues

$ #42565
PROPOSAL: N/A

Tests / QA Steps

Create a workspace if you don't have one already
Enable Accounting on More Features page of the Workspace Editor
Connect to UK QBO (so that you can enable Tax import in the next step)
Enable Tax import on the Import page once you connect to QBO
Check that you cannot add or delete categories, tags and taxes
Disconnect from QBO on the Accounting page
Check that you can add, delete, enable and disable categories, tags and taxes

Offline tests

N/A

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-05-24T23:53:00Z

@aimane-chnaif 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]

…ction

hayata-suenaga · 2024-05-25T01:35:25Z

Confirming that we want to hide the Delete rate button when there is an accounting connection.
But meanwhile, please review the PR 🙇

aimane-chnaif · 2024-05-27T21:45:02Z

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

Screen.Recording.2024-05-28.at.11.56.07.AM.mov

Screen.Recording.2024-05-29.at.10.37.08.PM.mov

MacOS: Desktop

aimane-chnaif · 2024-05-27T21:45:16Z

There's conflict

trjExpensify · 2024-05-28T12:32:59Z

Confirming that we want to hide the Delete rate button when there is an accounting connection.

You're talking about imported tax rates, yeah? If so, yes, you shouldn't be able to add or delete tax rates when connected to an accounting solution. You have to manage the rates in the accounting solution directly.

aimane-chnaif · 2024-05-28T18:38:33Z

src/libs/PolicyUtils.ts

@@ -290,7 +290,7 @@ function extractPolicyIDFromPath(path: string) {
 * Whether the policy has active accounting integration connections
 */
 function hasAccountingConnections(policy: OnyxEntry<Policy>) {
-    return Boolean(policy?.connections);
+    return Object.keys(policy?.connections ?? {}).length !== 0;


Suggested change

return Object.keys(policy?.connections ?? {}).length !== 0;

return !isEmptyObject(policy?.connections);

Example usage:

App/src/pages/workspace/accounting/PolicyAccountingPage.tsx

Line 145 in e9a2cd5

if (isEmptyObject(policy?.connections) && !isSyncInProgress) {

aimane-chnaif · 2024-05-28T19:03:39Z

"Add rate" button still shows after "Enable Tax import on the Import page once you connect to QBO"

Screen.Recording.2024-05-28.at.12.02.05.PM.mov

hayata-suenaga · 2024-05-30T00:56:41Z

Tested well on my end

Screen.Recording.2024-05-29.at.5.54.27.PM.mov

hayata-suenaga · 2024-05-30T00:57:53Z

@aimane-chnaif, this is ready for another review 🙇

aimane-chnaif · 2024-05-30T05:14:45Z

Looks good. Testing shortly

aimane-chnaif · 2024-05-30T05:50:14Z

2 things:

still able to delete tax rate when connected
Is this copy correct when connected? Add tax names, rates, and set defaults.
Asking because categories/tags descriptions are different - The categories/tags below are imported from your Quickbooks Online settings

trjExpensify · 2024-05-30T09:49:02Z

@aimane-chnaif on this:

Is this copy correct when connected? Add tax names, rates, and set defaults.
Asking because categories/tags descriptions are different - The categories/tags below are imported from your Quickbooks Online settings

We should have fixed this here and merged it into the the Xero merge freeze branch. CC: @mananjadhav @lakchote

trjExpensify · 2024-05-30T09:56:20Z

On this one:

still able to delete tax rate when connected

Is it specifically that Delete tax is still available from the RHP's overflow menu of the tax rate value when connected? As per Hayata's video here, he was able to remove it from the bulk select menu in the table?

lakchote · 2024-05-30T10:07:03Z

@aimane-chnaif on this:

Is this copy correct when connected? Add tax names, rates, and set defaults.
Asking because categories/tags descriptions are different - The categories/tags below are imported from your Quickbooks Online settings

We should have fixed this here and merged it into the the Xero merge freeze branch. CC: @mananjadhav @lakchote

Yes, this is fixed in the freeze branch.

aimane-chnaif · 2024-05-30T18:03:00Z

@trjExpensify please check this video for repro step.

Screen.Recording.2024-05-30.at.11.01.13.AM.mov

@hayata-suenaga there's conflict

trjExpensify · 2024-05-30T19:08:29Z

@trjExpensify please check this video for repro step.

Okay yes, that confirms that the Delete option has been removed from the main page table as a bulk action but not in the overflow menu of the individual tax rate in the RHP.

Here's the diff

Disable tax deletion if connected to accounting

aimane-chnaif · 2024-05-31T03:36:01Z

conflicts!

melvin-bot · 2024-05-31T03:36:08Z

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

lakchote · 2024-05-31T11:20:45Z

@marcaaron I'm proceeding with the review and the merge as I have context on this and we need to get this deployed as soon as possible (context).

OSBotify · 2024-05-31T12:02:04Z

✋ 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-06-06T12:35:21Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

fix: the logic to check if there is an accounting connection

5bd8959

hayata-suenaga self-assigned this May 24, 2024

hayata-suenaga requested a review from a team as a code owner May 24, 2024 23:52

melvin-bot bot removed the request for review from a team May 24, 2024 23:52

melvin-bot bot requested a review from aimane-chnaif May 24, 2024 23:53

Hayata Suenaga added 3 commits May 24, 2024 16:54

chore: use the util function to check if there is an accounting conne…

f7281db

…ction

refactor: rename a boolean variable

307a361

fix: hide "Delete rate" button when there is an accounting connection

92cb58f

Merge branch 'main' into hayata-display-delete-button

afe43f9

aimane-chnaif reviewed May 28, 2024

View reviewed changes

Hayata Suenaga added 3 commits May 29, 2024 17:30

Merge branch 'main' into hayata-display-delete-button

15bfe46

chore: use an existing function to check if the object is empty or not

455d50a

fix: the boolean logic

7418175

hayata-suenaga requested a review from aimane-chnaif May 30, 2024 00:56

fix: hide add rate button

a229004

disable tax deletion if connected to accounting

456003d

s77rt mentioned this pull request May 30, 2024

Disable tax deletion if connected to accounting #42881

Merged

50 tasks

Merge pull request #42881 from s77rt/s77rt-display-delete-button

f28ed6d

Disable tax deletion if connected to accounting

aimane-chnaif approved these changes May 31, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron May 31, 2024 03:36

Merge branch 'main' into hayata-display-delete-button

97be907

lakchote previously approved these changes May 31, 2024

View reviewed changes

fix prettier

69ae5cf

lakchote dismissed their stale review via 69ae5cf May 31, 2024 11:23

lakchote approved these changes May 31, 2024

View reviewed changes

lakchote merged commit da6cafd into main May 31, 2024
16 checks passed

lakchote deleted the hayata-display-delete-button branch May 31, 2024 11:53

trjExpensify mentioned this pull request May 31, 2024

Workspace - "Add" and "Delete" options aren't visible after disconnecting Xero #42920

Closed

6 tasks

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

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

melvin-bot bot mentioned this pull request Jun 6, 2024

[HOLD for payment 2024-06-13] [Xero] [QBO] Inconsistencies with Add and Delete actions after disconnecting Xero or QBO #42565

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FIX the logic to check if there is an accounting connection in the workspace #42613

FIX the logic to check if there is an accounting connection in the workspace #42613

hayata-suenaga commented May 24, 2024 •

edited

Loading

melvin-bot bot commented May 24, 2024

hayata-suenaga commented May 25, 2024

aimane-chnaif commented May 27, 2024 •

edited

Loading

aimane-chnaif commented May 27, 2024

trjExpensify commented May 28, 2024

aimane-chnaif May 28, 2024

aimane-chnaif commented May 28, 2024

hayata-suenaga commented May 30, 2024

hayata-suenaga commented May 30, 2024

aimane-chnaif commented May 30, 2024

aimane-chnaif commented May 30, 2024

trjExpensify commented May 30, 2024

trjExpensify commented May 30, 2024

lakchote commented May 30, 2024

aimane-chnaif commented May 30, 2024

trjExpensify commented May 30, 2024

aimane-chnaif commented May 31, 2024

melvin-bot bot commented May 31, 2024

lakchote commented May 31, 2024

OSBotify commented May 31, 2024

OSBotify commented Jun 6, 2024

	return Object.keys(policy?.connections ?? {}).length !== 0;
	return !isEmptyObject(policy?.connections);

FIX the logic to check if there is an accounting connection in the workspace #42613

FIX the logic to check if there is an accounting connection in the workspace #42613

Conversation

hayata-suenaga commented May 24, 2024 • edited Loading

Details

Fixed Issues

Tests / QA Steps

Offline tests

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 24, 2024

hayata-suenaga commented May 25, 2024

aimane-chnaif commented May 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

aimane-chnaif commented May 27, 2024

trjExpensify commented May 28, 2024

aimane-chnaif May 28, 2024

Choose a reason for hiding this comment

aimane-chnaif commented May 28, 2024

hayata-suenaga commented May 30, 2024

hayata-suenaga commented May 30, 2024

aimane-chnaif commented May 30, 2024

aimane-chnaif commented May 30, 2024

trjExpensify commented May 30, 2024

trjExpensify commented May 30, 2024

lakchote commented May 30, 2024

aimane-chnaif commented May 30, 2024

trjExpensify commented May 30, 2024

aimane-chnaif commented May 31, 2024

melvin-bot bot commented May 31, 2024

lakchote commented May 31, 2024

OSBotify commented May 31, 2024

OSBotify commented Jun 6, 2024

hayata-suenaga commented May 24, 2024 •

edited

Loading

aimane-chnaif commented May 27, 2024 •

edited

Loading