[Wave Collect] [Xero] More features text by mananjadhav · Pull Request #42662 · Expensify/App

mananjadhav · 2024-05-27T19:45:31Z

Details

Fixed Issues

$ #42644
PROPOSAL:

Tests

Tests

Connected Integration

Open any workspace with an existing accounting integration - say, Xero or QBO..
Click on More Features.
Go to Organize section and try clicking on any of the switches.
Verify that you see a modal with the following content.

Verify that you see the connected integration name in the title.
Verify that clicking cancel closes the modal.
Verify that click Manage settings takes you to the Accounting page.
Repeat the steps 3-7 for Integrate section and the following modal shows up.

Repeat all the steps with the Spanish language.

Not Connected Integration

Open a workspace that doesn't have the any accounting integration.
Click on More Features.
Go to organize section and try clicking on any of the switches.
Verity that you're able to toggle on and off, and accordingly able to see Categories, Taxes, Tags pages.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as QA Steps.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

With new copy

android-connection-modal.mov

Old Video

android-connection-modal.mov

Android: mWeb Chrome

With new copy

mweb-chrome-connection-modal.mov

Old Video

mweb-chrome-connection-modal.mov

iOS: Native

With new copy

ios-connection-modal.mov

Old Video

ios-connection-modal.mov

iOS: mWeb Safari

With new copy

mweb-safari-connection-modal.mov

Spanish Translations

Old Video

mweb-safari-connection-modal.mov

MacOS: Chrome / Safari

With new copy

web-connection-modal.mov

New Spanish Translations

Modal with off switch state

off-state-modal.mov

Old Video
https://github.com/Expensify/App/assets/3069065/29b5a8b1-7851-4ed7-8a18-d5cec097d366

web-connection-modal-2.mov

MacOS: Desktop

With new copy

desktop-connection-modal.mov

Old Video

desktop-connection-modal.mov

mananjadhav · 2024-05-27T19:47:38Z

web-connection-modal.mov

dubielzyk-expensify · 2024-05-28T01:46:57Z

This is looking so good so far, but I'll await final review for when the PR is ready 😄

hungvu193 · 2024-05-28T06:50:50Z

src/pages/workspace/WorkspaceMoreFeaturesPage.tsx

+                if (hasAccountingConnection) {
+                    setConnectionWarningModalState({
+                        isOpen: true,
+                        itemType: 'organize',
+                    });
+                    return;
+                }


We repeated this piece of code few times, I think we should reuse it with an useCallback?

I am not sure if it is necessary, we're not relying on the previous state that we really need to put it inside useCallback. The hasAccountingConnection is also dependent on the prop.

And about repetition, it's a setState call. I could wrap it inside the method but looks like an overkill.

I think we should, including Policy.enablePolicyCategories(policy?.id ?? '', isEnabled); line below.
Also can you complete the checklist please 😄 ?

Working through the checklist.

With enablePolicyCategories it might make sense. Let me check.

@lakchote Do you think it makes sense to move this code inside a useCallback?

I do agree with @mananjadhav, I don't think there's a benefit here to use useCallback(). It's not a computational intensive operation, we're just setting state. It can be tempting to use it to avoid repetition, but using these memorized functions come at a cost on intial render. Given the fact it's just setting state, I'd say it's a premature optimization scenario and we can keep it that way.

Happy to be proven wrong though, if you can give me arguments proving me otherwise @hungvu193 😄

I think that's fine though. We can keep it this way :)

…into xero-more-features-text

melvin-bot · 2024-05-28T09:01:50Z

@rojiphil 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-28T09:02:54Z

@rojiphil Please ignore this PR. @hungvu193 is already reviewing it.

mananjadhav · 2024-05-28T09:03:32Z

@Expensify/design For your review.

@lakchote @pecanoro if you folks can review the Spanish translations.

hungvu193 · 2024-05-28T09:16:20Z

@mananjadhav There will be an edge case where the modal is showing but we disconnect our Xero (or QBO) from other devices. Do you think it's worth fixing?

mananjadhav · 2024-05-28T09:32:12Z

@mananjadhav There will be an edge case where the modal is showing but we disconnect our Xero (or QBO) from other devices. Do you think it's worth fixing?

I don't think so. This behavior exists in all pages. Take Delete workspace for example.

shawnborton · 2024-05-28T09:38:04Z

Looking good to me!

hungvu193 · 2024-05-28T09:54:36Z

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

mChrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mSafari.mov

MacOS: Chrome / Safari

chrome.mov

MacOS: Desktop

desktop.mov

trjExpensify · 2024-05-28T10:01:51Z

Are we running with that copy? I thought we landed on this in the end:

mananjadhav · 2024-05-28T12:03:32Z

Ohh I wasn't aware. I am afk right now. But I can update the copy. I relied on the GH comment here.

So the ones attached are the final ones?

trjExpensify · 2024-05-28T12:28:45Z

Can you drop these in and then I'm tagging @Gonals @pecanoro for a second opinion!

Not so fast...
To enable or disable this feature change your accounting import settings.
[Manage settings]
[Cancel]

No tan rápido...
Para activar o desactivar esta función, cambie la configuración de importación contable.
[Gestionar la configuración]
[Cancelar]

Not so fast...
To enable or disable this feature change your accounting import settings.
[Manage settings]
[Cancel]

No tan rápido...
Desconecte su conexión contable del espacio de trabajo si desea desactivar la Contabilidad.
[Gestionar la configuración]
[Cancelar]

mananjadhav · 2024-05-28T12:39:14Z

I've updated the videos with the new copy. For Spanish I've only posted for Web and mWeb Safari.

hungvu193

LGTM 🚀
All yours @lakchote

lakchote · 2024-05-28T13:23:10Z

Let's wait for @Gonals and @pecanoro final opinion on the translations provided here, and I'll merge if they validate!

Gonals · 2024-05-28T13:35:53Z

I believe our standard is to not treat the user as "usted", so a slight change:

Not so fast...
To enable or disable this feature change your accounting import settings.
[Manage settings]
[Cancel]

No tan rápido...
Para activar o desactivar esta función, cambia la configuración de importación contable.
[Gestionar la configuración]
[Cancelar]

Not so fast...
To enable or disable this feature change your accounting import settings.
[Manage settings]
[Cancel]

No tan rápido...
Desconecta tu conexión contable del espacio de trabajo si deseas desactivar la Contabilidad.
[Gestionar la configuración]
[Cancelar]

Plus, is the second English one wrong? It seems like a duplicate of the first one 😕

mananjadhav · 2024-05-28T13:57:20Z

Thanks for the copy @Gonals. Can you and @trjExpensify check, I've updated. And yes the second copy in English is duplicated. It is actually Disconnect your accounting connection from the workspace if you want to disable Accounting.

Gonals · 2024-05-28T14:02:44Z

Ah, let's capitalize Contabilidad, then

mananjadhav · 2024-05-28T14:08:01Z

@Gonals Done.

OSBotify · 2024-05-30T21:56:05Z

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

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

🚀 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 7 commits May 28, 2024 00:23

feat: add lock icon for switch

a082fc4

feat: state modal

e68aba9

feat: added features modal

1e6dc10

refactor: modal state

4ed381b

refactor: language format

8033a8c

refactor: language and connection name

9dab55a

style: prettier fixes

b4f8164

mananjadhav changed the base branch from main to xero-merge-freeze May 27, 2024 19:45

hungvu193 reviewed May 28, 2024

View reviewed changes

mananjadhav added 5 commits May 28, 2024 13:49

Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App …

c857d39

…into xero-more-features-text

feat: added es translations

9ebe047

refactor: remove title

835e953

fix: added dependency

369f92e

style: lint fixes

90f0c0f

mananjadhav marked this pull request as ready for review May 28, 2024 09:01

mananjadhav requested a review from a team as a code owner May 28, 2024 09:01

melvin-bot bot requested review from rojiphil and removed request for a team May 28, 2024 09:01

fix: update copy

a38c2ee

refactor: remove unused var

c2c741b

fix: spanish copy

0c0b5d1

style: lint fixes

59770a4

mananjadhav requested review from hungvu193 and lakchote May 28, 2024 12:40

hungvu193 approved these changes May 28, 2024

View reviewed changes

lakchote approved these changes May 28, 2024

View reviewed changes

fix: spanish copy

a2ffb3b

Gonals self-requested a review May 28, 2024 14:03

fix: captilize

e610704

Gonals approved these changes May 28, 2024

View reviewed changes

lakchote merged commit 17e6948 into Expensify:xero-merge-freeze May 28, 2024

hungvu193 mentioned this pull request May 30, 2024

[Wave Collect] [Xero/QBO] Update educational messages #42487

Merged

50 tasks

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

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

Closed

95 tasks

izarutskaya mentioned this pull request May 31, 2024

[HOLD for payment 2024-06-13] More feature Popup - Text under "not so fast" quickly disappears & slightly shrinks popup #42903

Closed

6 tasks

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

[HOLD for payment 2024-06-13] [HOLD for payment 2024-06-11] [Wave Collect] [Xero] Implement the More Features change #42644

Closed

Conversation

mananjadhav commented May 27, 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!

mananjadhav commented May 27, 2024

Uh oh!

dubielzyk-expensify commented May 28, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

hungvu193 commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

shawnborton commented May 28, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

trjExpensify commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

trjExpensify commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

lakchote commented May 28, 2024

Uh oh!

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

Uh oh!

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

Gonals commented May 28, 2024

Uh oh!

mananjadhav commented May 28, 2024

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

OSBotify commented May 30, 2024

Uh oh!

OSBotify commented Jun 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

mananjadhav commented May 27, 2024 •

edited

Loading

hungvu193 commented May 28, 2024 •

edited

Loading

Gonals commented May 28, 2024 •

edited

Loading