Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display error messages for Xero Import page #41917

Conversation

SzymczakJ
Copy link
Contributor

@SzymczakJ SzymczakJ commented May 9, 2024

Details

This PR adds error messages for Xero Import page.

Fixed Issues

$ #41843
PROPOSAL: N/A

Tests

  1. With a Workspace with a Xero connection
  2. Turn on offline mode on troubleshoot page
  3. Go to Import page
  4. Turn on/off some of the import page items
  5. Verify that the XeroImportPage looks like this(there's fade on changed items):
Screenshot 2024-05-13 at 17 02 53
  1. Go into one of the XeroImportPage subpages that got changed and Verify that it looks like this:
Screenshot 2024-05-13 at 17 03 06
  1. Turn on simulate failing network requests on troubleshoot page and turn off offline mode
  2. Go to Import page and turn on/off some of the import page items
  3. Verify that the XeroImportPage looks like this(there's red brick road indicator):
Screenshot 2024-05-13 at 17 06 19
  1. Go into one of the XeroImportPage subpages that got changed and Verify that it looks like this:
Screenshot 2024-05-13 at 17 06 34

Offline tests

QA Steps

Same as 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 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.mov
Android: mWeb Chrome
androidweb.mov
iOS: Native https://github.com/Expensify/App/assets/88395093/8d1066f0-b09d-46c6-99ea-98d698018efa
iOS: mWeb Safari
iosweb.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@SzymczakJ SzymczakJ changed the base branch from main to xero-merge-freeze May 9, 2024 14:54
@lakchote
Copy link
Contributor

lakchote commented May 9, 2024

@Expensify/design could you please review these error messages if they look good to you?

@shawnborton
Copy link
Contributor

Before we merge this, should we wait until @narefyev91's PR here is merged? That will give us the updated error style that we want.

@lakchote
Copy link
Contributor

lakchote commented May 9, 2024

@trjExpensify this PR will add error messages to the main Import page.

@SzymczakJ asked me if we should add error messages to the sub page of the Import page also?
It'd look like this below:
image

Could we have your opinion on this?

@shawnborton
Copy link
Contributor

That error style seems way off btw - if we do go with an error on this page, it should stretch to the full width of that view and sit underneath the toggle row:
image

@trjExpensify
Copy link
Contributor

@SzymczakJ asked me if we should add error messages to the sub page of the Import page also?
It'd look like this below:

I think there's typically only one place the error message is and that's at the end of the brick road. So if that's on the Tracking Categories page because of a problem with the import toggle, it should only be there. The "red dots" of the red brick road lead to it.

@SzymczakJ
Copy link
Contributor Author

SzymczakJ commented May 10, 2024

@trjExpensify so you suggest that we shouldn't show error messages on Xero Import Page and instead of that show error messages on Import Page subpages(and show only red dot on Import page).
It would look something like that:
image
image

cc @trjExpensify @lakchote @shawnborton

@trjExpensify
Copy link
Contributor

@trjExpensify so you suggest that we shouldn't show error messages on Xero Import Page and instead of that show error messages on Import Page subpages(and show only red dot on Import page). It would look something like that: image image

cc @trjExpensify @lakchote @shawnborton

Yes exactly, because the end of the red brick road is one page deeper and the end of the road is where the error message appears. 👍

@SzymczakJ SzymczakJ changed the base branch from xero-merge-freeze to main May 13, 2024 14:51
@SzymczakJ
Copy link
Contributor Author

I've addressed your review comments @Expensify/design, could you please review this? 🙏
Current version of screens is in the test steps
cc @shawnborton @trjExpensify

@shawnborton
Copy link
Contributor

Cool, I think that feels pretty good to me.

import CONST from '@src/CONST';

function XeroTaxesConfigurationPage({policy}: WithPolicyProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const policyID = policy?.id ?? '';
const {importTaxRates, pendingFields} = policy?.connections?.xero?.config ?? {};
const xeroConfig = policy?.connections?.xero?.config;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const xeroConfig = policy?.connections?.xero?.config;
const xeroConfig = policy?.connections?.xero?.config ?? {};

And you don't have to add empty object in each place later

<ToggleSettingOptionRow
title={translate('workspace.accounting.import')}
switchAccessibilityLabel={translate('workspace.xero.trackingCategories')}
isActive={!!isSwitchOn}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no need to use !! as it is Booelan already

const xeroConfig = policy?.connections?.xero?.config;
const {importTrackingCategories} = policy?.connections?.xero?.config ?? {};

const isSwitchOn = Boolean(importTrackingCategories);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const isSwitchOn = Boolean(importTrackingCategories);
const isSwitchOn = !!importTrackingCategories;

@@ -22,7 +21,10 @@ function XeroTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const policyID = policy?.id ?? '';
const {importTrackingCategories, pendingFields} = policy?.connections?.xero?.config ?? {};
const xeroConfig = policy?.connections?.xero?.config;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same suggestion as above

wrapperStyle={styles.sectionMenuItemTopDescription}
/>
}
isActive={!!isSwitchOn}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

@@ -23,6 +23,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
const policyID = route.params.policyID ?? '';
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
const toggleSubtitle = isConnectedToAccounting ? `${translate('workspace.categories.needCategoryForExportToIntegration')} ${translate('workspace.accounting.qbo')}` : '';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it correct? We check here for any connection(may be xero) and display qbo text

@SzymczakJ SzymczakJ marked this pull request as ready for review May 14, 2024 09:33
@SzymczakJ SzymczakJ requested a review from a team as a code owner May 14, 2024 09:33
@melvin-bot melvin-bot bot requested review from fedirjh and removed request for a team May 14, 2024 09:34
Copy link

melvin-bot bot commented May 14, 2024

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

Copy link
Contributor

@filip-solecki filip-solecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fedirjh
Copy link
Contributor

fedirjh commented May 15, 2024

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 Screenshot 2024-05-15 at 4 02 47 AM Screenshot 2024-05-15 at 4 02 52 AM Screenshot 2024-05-15 at 4 04 00 AM Screenshot 2024-05-15 at 4 04 06 AM
Android: mWeb Chrome Screenshot 2024-05-15 at 4 06 20 AM Screenshot 2024-05-15 at 4 07 38 AM Screenshot 2024-05-15 at 4 07 41 AM
iOS: Native Screenshot 2024-05-15 at 3 51 50 AM Screenshot 2024-05-15 at 3 51 54 AM Screenshot 2024-05-15 at 3 52 03 AM
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-15.at.03.51.14.mp4
iOS: mWeb Safari Screenshot 2024-05-15 at 3 55 15 AM Screenshot 2024-05-15 at 3 55 19 AM Screenshot 2024-05-15 at 3 55 54 AM Screenshot 2024-05-15 at 3 56 01 AM
MacOS: Chrome / Safari Screenshot 2024-05-15 at 3 33 18 AM Screenshot 2024-05-15 at 3 33 23 AM Screenshot 2024-05-15 at 3 37 12 AM Screenshot 2024-05-15 at 3 37 17 AM Screenshot 2024-05-15 at 3 37 28 AM Screenshot 2024-05-15 at 3 37 31 AM
MacOS: Desktop Screenshot 2024-05-15 at 4 10 06 AM Screenshot 2024-05-15 at 4 10 10 AM Screenshot 2024-05-15 at 4 10 14 AM Screenshot 2024-05-15 at 4 11 06 AM Screenshot 2024-05-15 at 4 11 10 AM

@melvin-bot melvin-bot bot requested a review from lakchote May 15, 2024 03:16
@lakchote lakchote merged commit 8e76163 into Expensify:main May 15, 2024
17 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/lakchote in version: 1.4.74-0 🚀

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

@Julesssss
Copy link
Contributor

FYI, a bug was raised where the RBR error isn't always displayed. As this is a new feature I'm not marking it as a blocker though.

@@ -44,7 +53,9 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
<View style={styles.flexGrow1}>
<ToggleSettingOptionRow
title={translate('workspace.categories.requiresCategory')}
subtitle={isConnectedToAccounting ? `${translate('workspace.categories.needCategoryForExportToIntegration')} ${translate('workspace.accounting.qbo')}` : ''}
titleStyle={styles.textStrong}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hayata-suenaga
Copy link
Contributor

@SzymczakJ, thank you for the PR 🙇

I have a question about a change you made in this PR:

I realized that you introduced a new prop to ToggleSettingOptionRow called titleStyle. I also see that you used this prop to pass textStrong style object to several places.

This seems to have caused several texts becoming bold when they're not supposed to. I was wondering if there was a reason that you made this design change? 😄

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.4.74-6 🚀

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

@SzymczakJ
Copy link
Contributor Author

SzymczakJ commented May 23, 2024

@hayata-suenaga sorry for missing your message and causing design regressions 😅. I didn't mean to change anything in designs, I just wanted to refactor the <ToggleSettingOptionRow />.
<ToggleSettingOptionRow /> was actually adding bold style with styles.textMicroBold when shouldPlaceSubtitleBelowSwitch was false or undefined. I didn't want the <ToggleSettingOptionRow /> titleText style to be dependent on shouldPlaceSubtitleBelowSwitch(which was causing me some trouble). I made <ToggleSettingOptionRow /> accept the titleStyle prop and passed styles.textStrong when the styles.textMicroBold would be applied before(because these were the only styles that were missing after deleting styles.textMicroBold).
tl:dr I think the bold text was there before my PR got merged, but correct me if I'm wrong 🙇

@hayata-suenaga
Copy link
Contributor

tl:dr I think the bold text was there before my PR got merged, but correct me if I'm wrong 🙇

that's fair I think the timing of removing the bold style and this PR probably coincided 😅 Anyway, thank you for your work @SzymczakJ!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants