[CP Staging] Fix/46963 hide card reconciliation button by koko57 · Pull Request #46978 · Expensify/App

koko57 · 2024-08-07T15:01:27Z

Details

Fixed Issues

$ #46963
PROPOSAL: -

Tests

Expensify Card not enabled

Go to Workspaces, select a workspace
Enable Accounting if not enabled, do not enable Expensify Card (or disable it if enabled)
Navigate to Accounting
Connect to Sage Intacct (or any other connection) and upgrade the workspace to Control when asked
Verify that you don't see Card Reconciliation button

Expensify Card enabled

PREREQUISITES: all betas/workspaceFeed beta enabled

Go to Workspaces, select a workspace
Enable Accounting and Expensify Card in the More features page.
Navigate to Accounting
Connect to Sage Intacct and upgrade the workspace to Control when asked
Wait for the sync to finish
Click on Card reconciliation
Enable Continuous Reconciliation
Click on the Expensify Card settlement account link
Verify that there's no link to Reconciliation Account page in the Settlement Account page (it will be visible after toggling reconciliation which will be available after backend integration)

Verify that no errors appear in the JS console

Offline tests

QA Steps

Expensify Card not enabled

Go to Workspaces, select a workspace
Enable Accounting if not enabled, do not enable Expensify Card (or disable it if enabled)
Navigate to Accounting
Connect to Sage Intacct (or any other connection) and upgrade the workspace to Control when asked
Verify that you don't see Card Reconciliation button

Expensify Card enabled

PREREQUISITES: all betas/workspaceFeed beta enabled

Go to Workspaces, select a workspace
Enable Accounting and Expensify Card in the More features page.
Navigate to Accounting
Connect to Sage Intacct and upgrade the workspace to Control when asked
Wait for the sync to finish
Click on Card reconciliation
Enable Continuous Reconciliation
Click on the Expensify Card settlement account link
Verify that there's no link to Reconciliation Account page in the Settlement Account page (it will be visible after toggling reconciliation which will be available after backend integration)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny · 2024-08-07T15:08:01Z

src/pages/workspace/accounting/PolicyAccountingPage.tsx

+            },
+        ];
+
+        // TODO: remove after this beta feature is released


I dont think we need this comment, we will go through all the usecases of the beta when it needs to be removed

melvin-bot · 2024-08-07T15:16:55Z

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

allgandalf · 2024-08-07T15:23:08Z

Waiting for the tests to pass...

allgandalf · 2024-08-07T15:44: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

Details

MacOS: Chrome / Safari

Screen.Recording.2024-08-07.at.9.50.09.PM.mov

MacOS: Desktop

Screen.Recording.2024-08-07.at.9.59.48.PM.mov

Android: Native

Screen.Recording.2024-08-07.at.10.06.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-08-07.at.10.04.16.PM.mov

iOS: Native

Screen.Recording.2024-08-07.at.9.55.26.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-08-07.at.9.57.01.PM.mov

allgandalf · 2024-08-07T15:50:23Z

@koko57 , @mountiny if i have workspace feed beta enabled and expensify card disabled then also i see the Card reconciliation option, this shouldn't be the case right?, i should only be able to see that option when both workspace feed beta and Card reconciliation are enabled:

This also doesn't match the test outcome:

koko57 · 2024-08-07T15:53:10Z

@allgandalf yes, you're right, this should be visible only when card is enabled, I will add the condition

allgandalf · 2024-08-07T15:53:41Z

src/pages/workspace/accounting/PolicyAccountingPage.tsx

+        if (!canUseWorkspaceFeeds) {
+            configurationOptions.splice(2, 1);
+        }


I guess we should also check here if expensify card is enabled or not @koko57 .

Something like we do below:

App/src/pages/workspace/WorkspaceInitialPage.tsx

Lines 239 to 241 in 0a33186

if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED]) {

protectedCollectPolicyMenuItems.push({

yes, exactly will add it in a minute

@allgandalf fixed

allgandalf

Tests well on all platforms, LGTM

mountiny

Thanks!

…ion-button [CP Staging] Fix/46963 hide card reconciliation button (cherry picked from commit 2336ba8)

OSBotify · 2024-08-07T16:55:07Z

✋ 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-08-07T17:16:39Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 9.0.17-2 🚀

platform	result
🤖 android 🤖	failure ❌
🖥 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-08-07T22:06:10Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T04:55:47Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T20:07:11Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

koko57 added 2 commits August 7, 2024 16:47

fix: hide Card reconciliation for beta

3ff4201

fix: do not show the link when reconciliation is not enabled

36994e2

mountiny assigned koko57 Aug 7, 2024

mountiny changed the title ~~Fix/46963 hide card reconciliation button~~ [CP Staging] Fix/46963 hide card reconciliation button Aug 7, 2024

mountiny reviewed Aug 7, 2024

View reviewed changes

fix: remove unnecessary comment

08ffbd5

koko57 marked this pull request as ready for review August 7, 2024 15:16

koko57 requested a review from a team as a code owner August 7, 2024 15:16

melvin-bot bot requested a review from allgandalf August 7, 2024 15:16

melvin-bot bot removed the request for review from a team August 7, 2024 15:16

This was referenced Aug 7, 2024

[$250] [HOLD for payment 2024-08-14] Sage - "It's not here" error when clicking on the "Reconciliation account" link #46963

Closed

[Workspace Feeds] Expensify Card - Reconciliation account link directs to hmm not here page #46108

Closed

allgandalf reviewed Aug 7, 2024

View reviewed changes

fix: hide cardReconciliation button when cards not enabled

0469cd0

allgandalf approved these changes Aug 7, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny August 7, 2024 16:38

mountiny approved these changes Aug 7, 2024

View reviewed changes

mountiny merged commit 2336ba8 into Expensify:main Aug 7, 2024

OSBotify pushed a commit that referenced this pull request Aug 7, 2024

Merge pull request #46978 from koko57/fix/46963-hide-card-reconciliat…

cb16244

…ion-button [CP Staging] Fix/46963 hide card reconciliation button (cherry picked from commit 2336ba8)

github-actions bot mentioned this pull request Aug 7, 2024

Deploy Checklist: New Expensify 2024-08-06 #46849

Closed

83 tasks


	if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED]) {
	protectedCollectPolicyMenuItems.push({

Conversation

koko57 commented Aug 7, 2024 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

mountiny Aug 7, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Aug 7, 2024

Uh oh!

allgandalf commented Aug 7, 2024

Uh oh!

allgandalf commented Aug 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf commented Aug 7, 2024

Uh oh!

koko57 commented Aug 7, 2024

Uh oh!

allgandalf Aug 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

koko57 Aug 7, 2024

Choose a reason for hiding this comment

Uh oh!

koko57 Aug 7, 2024

Choose a reason for hiding this comment

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

koko57 commented Aug 7, 2024 •

edited by github-actions bot

Loading

allgandalf commented Aug 7, 2024 •

edited

Loading

allgandalf Aug 7, 2024 •

edited

Loading