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

[Wave Collect] [Xero] Fix padding issue in ConnectionLayout #41561

Merged
merged 8 commits into from
May 6, 2024

Conversation

hungvu193
Copy link
Contributor

@hungvu193 hungvu193 commented May 3, 2024

Details

Fix ConnectionLayout padding issue

Fixed Issues

$ #41560
PROPOSAL: N/A

Tests

  1. Go to any page that using ConnectionLayout component (ie: XeroAdvancePage, XeroCustomerConfigurationPage)
  2. Verify that spacing (padding) matches with the design docs.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as Tests.

  • Verify that no errors appear in the JS console

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 Screenshot 2024-05-03 at 16 22 07
iOS: Native Screenshot 2024-05-03 at 16 30 23
iOS: mWeb Safari Screenshot 2024-05-03 at 16 21 19
MacOS: Chrome / Safari
Screen.Recording.2024-05-03.at.15.37.41.mov
MacOS: Desktop Screenshot 2024-05-03 at 16 30 54

@hungvu193 hungvu193 marked this pull request as ready for review May 3, 2024 08:38
@hungvu193 hungvu193 requested a review from a team as a code owner May 3, 2024 08:38
@melvin-bot melvin-bot bot requested review from getusha and removed request for a team May 3, 2024 08:38
Copy link

melvin-bot bot commented May 3, 2024

@getusha 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
Copy link
Contributor

lakchote commented May 3, 2024

@Expensify/design could you please review the Import and Advanced Xero screens?

We should have tagged you beforehand on the related PRs (that's my fault - and I'm sorry for that). Since the external agency working on this was OOO this entire week, C+ contributors have been hard at work to gain a good momentum to comply with the external commit in June.

But still, let's not sacrifice quality for speed. Quality is our differentiator ultimately, and so we need your expert eyes on this!

Thank you

@hungvu193 hungvu193 changed the title Fix padding issue in ConnectionLayout [Wave Collect] [Xero] Fix padding issue in ConnectionLayout May 3, 2024
Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

rest looks good!

src/components/ConnectionLayout.tsx Show resolved Hide resolved
Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

LGTM!

Screen.Recording.2024-05-03.at.15.38.28.mov

Copy link

melvin-bot bot commented May 3, 2024

We did not find an internal engineer to review this PR, trying to assign a random engineer to #41560 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@rushatgabhane
Copy link
Member

rushatgabhane commented May 3, 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

iOS: Native
Screen.Recording.2024-05-03.at.16.12.21.mov
iOS: mWeb Safari image image
Screen.Recording.2024-05-03.at.15.44.15.mov
MacOS: Chrome / Safari image image image image
MacOS: Desktop

@rushatgabhane
Copy link
Member

@hungvu193 please fix lint

@hungvu193
Copy link
Contributor Author

@hungvu193 please fix lint

Fixed!

@shawnborton
Copy link
Contributor

I don't think "Other integrations" is supposed to be bold:
CleanShot 2024-05-03 at 07 42 00@2x

This is what we have in Figma and the design doc:
CleanShot 2024-05-03 at 07 42 41@2x

@shawnborton
Copy link
Contributor

cc @lakchote - let me know the best place to address my comment above.

@lakchote
Copy link
Contributor

lakchote commented May 3, 2024

cc @lakchote - let me know the best place to address my comment above.

Thanks @shawnborton, here would be the place to centralize your reviews/requested changes for the Import, Advanced, and main Xero Accounting screens.

So, you're in the right place.

@shawnborton
Copy link
Contributor

Also looks like the organization name is bold:
image

But it shouldn't be based on the Figma/design doc screens:
image

@shawnborton
Copy link
Contributor

Otherwise I think it looks pretty good to me.

@rushatgabhane
Copy link
Member

@hungvu193 could you please make the above changes ^

I know they aren't related to this PR, so you can open a new issue or make them here if they're quick

@hungvu193
Copy link
Contributor Author

hungvu193 commented May 5, 2024

@hungvu193 could you please make the above changes ^

I know they aren't related to this PR, so you can open a new issue or make them here if they're quick

Np, I updated it.

Screenshot 2024-05-05 at 19 56 56

@lakchote lakchote merged commit 0c2d513 into Expensify:main May 6, 2024
15 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented May 6, 2024

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@shawnborton
Copy link
Contributor

@lakchote just to confirm, where will you be addressing the feedback I posted above? Thanks!

@lakchote
Copy link
Contributor

lakchote commented May 6, 2024

@lakchote just to confirm, where will you be addressing the feedback I posted above? Thanks!

It looks like it was addressed (the Xero organization should not be bold), here.

However by giving it a second look, the Other organisations modification (it shouldn't be bold too) slip away and I apologize for that.

I'm going to address this in my PR here, thank you!

@shawnborton
Copy link
Contributor

Sounds good, please tag me for review over there. Do you know which PR introduced the breaking change (going from regular weight to bold) in the first place?

@lakchote
Copy link
Contributor

lakchote commented May 6, 2024

Sounds good, please tag me for review over there. Do you know which PR introduced the breaking change (going from regular weight to bold) in the first place?

It comes from this PR, I've proceeded with the merge and I should have tagged you. We were in a rush as this PR blocked every other single PR related to Xero, still we should follow the normal process (it's now printed in my brain, don't worry 😄).

@OSBotify
Copy link
Contributor

OSBotify commented May 9, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

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.

None yet

5 participants