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

Add row to workspace chat in Workspace #52449

Open
wants to merge 20 commits into
base: main
Choose a base branch
from

Conversation

nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented Nov 13, 2024

Explanation of Change

Fixed Issues

$ #51851
PROPOSAL: #51851 (comment)

Tests

  1. Login to the app
  2. Go to workspace list
  3. Click on a workspace
  4. Verify that: Submit expenses using your workspace chat below: is displayed in the bottom left
  5. Click on workspace in the bottom left
  6. Verify that: redirect to workspace chat
  • Verify that no errors appear in the JS console

Offline tests

same as above

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

same as above

  • 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 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
android.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari
Screen.Recording.2024-11-13.at.15.14.47.mov
MacOS: Desktop
desktop.mov

@nkdengineer nkdengineer marked this pull request as ready for review November 13, 2024 16:11
@nkdengineer nkdengineer requested review from a team as code owners November 13, 2024 16:11
@melvin-bot melvin-bot bot requested review from s77rt and removed request for a team November 13, 2024 16:11
Copy link

melvin-bot bot commented Nov 13, 2024

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

@shawnborton
Copy link
Contributor

Can we use the same exact margin/padding that we have in the Inbox LHN?

Workspace LHN Inbox LHN
CleanShot 2024-11-13 at 17 15 56@2x CleanShot 2024-11-13 at 17 15 23@2x

src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Nov 13, 2024

Bug: The offline indicator should be at the bottom

Screenshot 2024-11-13 at 5 47 06 PM

@nkdengineer
Copy link
Contributor Author

Bug: The offline indicator should be at the bottom

@s77rt Fixed this bug.

@s77rt
Copy link
Contributor

s77rt commented Nov 19, 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 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
Android: mWeb Chrome mweb-chrome
iOS: Native ios
iOS: mWeb Safari mweb-safari
MacOS: Chrome / Safari web
MacOS: Desktop desktop

src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
src/languages/en.ts Outdated Show resolved Hide resolved
src/styles/index.ts Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Nov 19, 2024

Bug: Workspace created offline should have the chat menu item row with opacity reduced

Screenshot 2024-11-19 at 11 37 23 AM

@dannymcclain
Copy link
Contributor

@Expensify/design do we want this label to be aligned with the workspace avatar?

CleanShot 2024-11-19 at 07 58 42@2x

Looks like right now it's aligned with the icons from the menu items.

CleanShot 2024-11-19 at 08 00 06@2x

@nkdengineer
Copy link
Contributor Author

Can we use the same exact margin/padding that we have in the Inbox LHN?

@shawnborton What do you think? This is the reason why I added another margin/padding initially.

@nkdengineer
Copy link
Contributor Author

@s77rt Should we also grey out the submit expense text?

@s77rt
Copy link
Contributor

s77rt commented Nov 19, 2024

Overall looks good to me. I will retest and approve the PR after the design concerns are addressed.

Should we also grey out the submit expense text?

I don't have a strong preference, will let this to the design team as well

@s77rt
Copy link
Contributor

s77rt commented Nov 19, 2024

There is just this "bug?" that I noticed but it exists in the app already (e.g. deep link from chat): If you put the workspace switcher on workspace A and go to workspace B and click on the row. The chat will be open without changing the workspace.

Screen.Recording.2024-11-19.at.5.06.33.PM.mov

@shawnborton
Copy link
Contributor

I would think that label should be aligned with the workspace avatar right? That's what our mock has at least:
image

@shawnborton
Copy link
Contributor

Should we also grey out the submit expense text?

For offline, I don't think we should "gray out" the text above the interactive element, we should only "gray out" the interactive element itself.

@dannymcclain
Copy link
Contributor

Agree with both of your comments Shawn!

@nkdengineer
Copy link
Contributor Author

Feels better! I think we should also reduce the margin between the label and the row, maybe drop it down to just 4px of margin or something?

Also updated the marigin.

Copy link
Contributor

🚧 @shawnborton has triggered a test build. You can view the workflow run here.

Copy link
Contributor

@dannymcclain
Copy link
Contributor

I think this is looking better, but I'd like Shawn to confirm. As far as I can tell it looks similar to the Inbox presentation.

@shawnborton
Copy link
Contributor

I'm still seeing 12px of margin on top of the row instead of 4px:
CleanShot 2024-11-22 at 12 14 12@2x

Otherwise it looks good to me!

@dannymcclain
Copy link
Contributor

Ahh it looks like the border on hover is still not quite there.

CleanShot 2024-11-22 at 11 12 51@2x

@nkdengineer
Copy link
Contributor Author

I'm still seeing 12px of margin on top of the row instead of 4px:

@shawnborton I updated.

@nkdengineer
Copy link
Contributor Author

Ahh it looks like the border on hover is still not quite there.

@dannymcclain What is the expect here? I see the current hover style is the same as LHN item.

@shawnborton
Copy link
Contributor

The border color around the avatar should match the row's background color. They aren't the same right now but they should be.

@dannymcclain
Copy link
Contributor

🤔 I'm seeing them as very slightly different. @shawnborton are you seeing something different?

image

Also I noticed some of my workspaces don't show the avatar at all, is that a known thing?

Header Header Header
CleanShot 2024-11-22 at 11 30 22@2x CleanShot 2024-11-22 at 11 30 36@2x CleanShot 2024-11-22 at 11 30 53@2x

@shawnborton
Copy link
Contributor

Ah no, I am saying I totally agree with you re: the border color not matching the background color of the row when hovered.

@nkdengineer
Copy link
Contributor Author

@shawnborton This looks like this right? I updated to fix this (previous here I updated the background color but it's the wrong place 😄 )

Screenshot 2024-11-23 at 00 42 34

@shawnborton
Copy link
Contributor

That looks better!

@s77rt @grgia let's get this one into final review 👍

src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
src/pages/workspace/WorkspaceInitialPage.tsx Outdated Show resolved Hide resolved
@s77rt
Copy link
Contributor

s77rt commented Nov 22, 2024

The press state has a ring (the background color of the subscript does not match)

Screenshot 2024-11-22 at 7 32 44 PM

@dannymcclain
Copy link
Contributor

The press state has a ring (the background color of the subscript does not match)

Nice catch!

@nkdengineer
Copy link
Contributor Author

@s77rt Removed the unused style and fixed the bug above.

Comment on lines 646 to 647
// eslint-disable-next-line no-nested-ternary
backgroundColor={pressed ? theme.buttonHoveredBG : isHovered ? theme.hoverComponentBG : undefined}
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's fix this instead of silencing the lint

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@s77rt Fixed.

grgia
grgia previously approved these changes Nov 22, 2024
Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

LGTM, let's have design do final confirmation once tests pass

src/components/MenuItem.tsx Outdated Show resolved Hide resolved
src/components/MenuItem.tsx Outdated Show resolved Hide resolved
@melvin-bot melvin-bot bot requested a review from grgia November 22, 2024 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants