[Wave Collect] [Xero/QBO] Update educational messages by mananjadhav · Pull Request #42487 · Expensify/App

mananjadhav · 2024-05-22T18:40:17Z

Details

Fixed Issues

$ #42456
PROPOSAL:

Tests

Precondition:

Have workspaces with accounting and QBO or Xero integration enabled.

Test Steps: QBO

Open the workspace with QBO integration enabled.
From the menu list, click on Categories.
Verify it shows the content for categories with QBO link.
Repeat the same for Tags and Taxes.

Test Steps: Xero

Open the workspace with Xero integration enabled.
From the menu list, click on Categories.
Verify it shows the content for categories with Xero link.
Repeat the same for Tags and Taxes.

These options can't be changed when [integrated with other systems]

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-xero-qbo-educational-messages.mov

Android: mWeb Chrome

mweb-chrome-xero-qbo-educational-messages.mov

iOS: Native

ios-xero-qbo-educational-messages.mov

iOS: mWeb Safari

mweb-safari-xero-qbo-educational-messages.mov

MacOS: Chrome / Safari

QBO Educational Messages EN

QBO Educational Messages ES

Xero Educational Messages EN

Xero Educational Messages ES

No Integration

More Features

MacOS: Desktop

desktop-xero-qbo-educational-message.mov

melvin-bot · 2024-05-22T20:00:18Z

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

mananjadhav · 2024-05-22T20:00:31Z

@rushatgabhane @hungvu193 @lakchote This is ready for review.

mananjadhav · 2024-05-22T20:00:45Z

@dukenv0307 Please ignore this PR.

mananjadhav · 2024-05-22T20:01:19Z

Tagging @Expensify/design and @trjExpensify to verify the content and the styling.

trjExpensify · 2024-05-22T21:37:25Z

One more for the Accounting feature @mananjadhav, coming from here.

@Expensify/design when you review this PR, let us know if you want the spacing to be different. I think it looks good to me though. 👍 CC: @kevinksullivan

trjExpensify · 2024-05-22T21:41:21Z

I think we're missing a period at the end of each of these sentences:

Compare that to the "default" when not connected to accounting for example:

dubielzyk-expensify · 2024-05-23T03:02:04Z

The Settings button here should span the whole width. It looks 50% here:

@Expensify/design when you review this PR, let us know if you want the spacing to be different. I think it looks good to me though. 👍 CC: @kevinksullivan

Spacing wise I think it looks good, but I added an alternative way of doing this in Slack, but feel free to follow that up there

shawnborton · 2024-05-23T09:10:09Z

Good catch on the button width. Could have sworn we fixed that previously, so maybe we need a fresh pull of main or something?

trjExpensify · 2024-05-23T11:00:47Z

Good catch on the button width. Could have sworn we fixed that previously, so maybe we need a fresh pull of main or something?

Yeah, @s77rt didn't you fix those? 🤔

trjExpensify · 2024-05-23T11:06:51Z

@mananjadhav for the messages on the More features page, looks like we're going to change direction and not add those messages in-line anymore, but rather go with an approach whereby:

Tap/clicking on a locked toggle shows an alert modal (bottom drawer on mobile/centered modal on web)
The confirmation button takes you to the Accounting page to manage the integration settings

We're discussing and finalising copy here for context. If you'd prefer to revert the More features portion out of this PR and follow-up with it separately, we can do that too. 👍

s77rt · 2024-05-23T11:41:30Z

The button width should be fixed already. Merging main should fix this.

trjExpensify · 2024-05-23T17:34:27Z

@mananjadhav for the messages on the More features page, looks like we're going to change direction and not add those messages in-line anymore, but rather go with an approach whereby:

Tap/clicking on a locked toggle shows an alert modal (bottom drawer on mobile/centered modal on web)

The confirmation button takes you to the Accounting page to manage the integration settings

We're discussing and finalising copy here for context. If you'd prefer to revert the More features portion out of this PR and follow-up with it separately, we can do that too. 👍

Modal copy finalised for you, Manan:

mananjadhav · 2024-05-29T13:34:44Z

@s77rt Updated.

s77rt · 2024-05-29T13:37:49Z

src/pages/workspace/tags/WorkspaceTagsPage.tsx

                    danger
                />
-                {!isSmallScreenWidth && getHeaderText()}
+                {!isSmallScreenWidth || (tagList.length === 0 && !isLoading) && getHeaderText()}


Can you do same for the categories too?

Or can we remove the condition isSmallScreenWidth?

The isSmallScreenWidth check is added later in the SelectionScreen listHeaderComponent. It seems it was added intentionally. So not sure about that.

src/pages/workspace/taxes/WorkspaceTaxesPage.tsx

hungvu193

LGTM 🚀

s77rt · 2024-05-29T14:07:55Z

src/pages/workspace/tags/WorkspaceTagsPage.tsx

                    danger
                />
-                {!isSmallScreenWidth && getHeaderText()}
+                {(!isSmallScreenWidth || (tagList.length === 0 && !isLoading)) && getHeaderText()}


Suggested change

{(!isSmallScreenWidth || (tagList.length === 0 && !isLoading)) && getHeaderText()}

{(!isSmallScreenWidth || tagList.length === 0 || isLoading) && getHeaderText()}

s77rt · 2024-05-29T14:15:03Z

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

Networking issue

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

shawnborton · 2024-05-30T05:42:51Z

Can we get some updated screenshots/videos please? Happy to do the final design review once I see them!

lakchote · 2024-05-30T06:14:22Z

Can we get some updated screenshots/videos please? Happy to do the final design review once I see them!

@shawnborton I think the last ones from @s77rt are updated/the latest

shawnborton · 2024-05-30T06:17:39Z

@s77rt can you please update them to actually show the educational message flow? Or am I missing something perhaps?

hungvu193 · 2024-05-30T06:44:03Z

Here you are @shawnborton
For some reason, I can't connect to QBO at the moment.

Screen.Recording.2024-05-30.at.13.43.11.mov

shawnborton · 2024-05-30T06:49:26Z

Cool, that looks good. Are we still doing the modal pattern as well, like this?

hungvu193 · 2024-05-30T06:51:55Z

Cool, that looks good. Are we still doing the modal pattern as well, like this?

Yeah, we are. It was handled separately in this PR.

shawnborton · 2024-05-30T06:53:41Z

Ah okay, apologies for the confusion. Consider this approved from a design-perspective then!

hungvu193 · 2024-05-30T06:54:54Z

All yours @lakchote

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

🚀 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:05Z

🚀 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:07Z

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

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

mananjadhav added 2 commits May 23, 2024 00:01

fix: replace connection name

539c063

feat: added content for taxes page

0dea1e1

mananjadhav changed the base branch from main to xero-merge-freeze May 22, 2024 18:40

mananjadhav added 6 commits May 23, 2024 00:13

fix: update translate path

d46d6f6

feat: footer text for more features

3cb3179

feat: added content for more features

3bf7309

fix: add margin

9cb30ef

refactor: prettier fix

83f4c84

fix: update styling

6204f36

mananjadhav marked this pull request as ready for review May 22, 2024 20:00

mananjadhav requested a review from a team as a code owner May 22, 2024 20:00

melvin-bot bot requested review from dukenv0307 and removed request for a team May 22, 2024 20:00

trjExpensify requested a review from a team May 22, 2024 21:35

trjExpensify assigned mananjadhav May 22, 2024

trjExpensify requested review from rushatgabhane and removed request for dukenv0307 May 22, 2024 23:39

lakchote self-requested a review May 23, 2024 06:28

mananjadhav requested a review from s77rt May 29, 2024 13:35

s77rt reviewed May 29, 2024

View reviewed changes

hungvu193 reviewed May 29, 2024

View reviewed changes

src/pages/workspace/taxes/WorkspaceTaxesPage.tsx Outdated Show resolved Hide resolved

mananjadhav added 2 commits May 29, 2024 19:19

fix: show text in empty state

7151030

fix: boolean check

ab8563b

mananjadhav requested review from hungvu193 and s77rt May 29, 2024 13:53

hungvu193 approved these changes May 29, 2024

View reviewed changes

melvin-bot bot requested a review from lakchote May 29, 2024 13:55

s77rt suggested changes May 29, 2024

View reviewed changes

refactor: simplify condition

ed9b9a9

s77rt approved these changes May 29, 2024

View reviewed changes

lakchote approved these changes May 30, 2024

View reviewed changes

lakchote merged commit 27b69f0 into Expensify:xero-merge-freeze May 30, 2024

trjExpensify mentioned this pull request May 30, 2024

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

Merged

48 tasks

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

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

Closed

95 tasks

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

[HOLD for payment 2024-06-11] [Wave Collect] [Xero] Clean-up the educational messages when connected to QBO/Xero #42456

Closed

	{(!isSmallScreenWidth \|\| (tagList.length === 0 && !isLoading)) && getHeaderText()}
	{(!isSmallScreenWidth \|\| tagList.length === 0 \|\| isLoading) && getHeaderText()}

Conversation

mananjadhav commented May 22, 2024 • edited 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!

melvin-bot bot commented May 22, 2024

Uh oh!

mananjadhav commented May 22, 2024

Uh oh!

mananjadhav commented May 22, 2024

Uh oh!

mananjadhav commented May 22, 2024

Uh oh!

trjExpensify commented May 22, 2024

Uh oh!

trjExpensify commented May 22, 2024

Uh oh!

dubielzyk-expensify commented May 23, 2024

Uh oh!

shawnborton commented May 23, 2024

Uh oh!

trjExpensify commented May 23, 2024

Uh oh!

trjExpensify commented May 23, 2024

Uh oh!

s77rt commented May 23, 2024

Uh oh!

trjExpensify commented May 23, 2024

Uh oh!

mananjadhav commented May 29, 2024

Uh oh!

s77rt May 29, 2024

Choose a reason for hiding this comment

Uh oh!

s77rt May 29, 2024

Choose a reason for hiding this comment

Uh oh!

mananjadhav May 29, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

s77rt May 29, 2024

Choose a reason for hiding this comment

Uh oh!

mananjadhav May 29, 2024

Choose a reason for hiding this comment

Uh oh!

s77rt commented May 29, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

shawnborton commented May 30, 2024

Uh oh!

lakchote commented May 30, 2024

Uh oh!

shawnborton commented May 30, 2024

Uh oh!

hungvu193 commented May 30, 2024

Uh oh!

shawnborton commented May 30, 2024

Uh oh!

hungvu193 commented May 30, 2024

Uh oh!

shawnborton commented May 30, 2024

Uh oh!

hungvu193 commented May 30, 2024

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

mananjadhav commented May 22, 2024 •

edited

Loading