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

fix: Workspace - RBR is aligned to top of WS bar. #42017

Merged
merged 5 commits into from
May 29, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented May 11, 2024

Details

Fixed Issues

$ #41609
PROPOSAL: #41609 (comment)

Tests

  1. Go to profile settings > troubleshoot > turn on Simulate failing network requests
  2. Go to profile settings > workspaces > select a workspace > update few things until any error is shown
  3. Go back to workspaces page > verify the RBR is aligned to centre in the row
  • Verify that no errors appear in the JS console

Offline tests

  1. Go to profile settings > troubleshoot > turn on Simulate failing network requests
  2. Go to profile settings > workspaces > select a workspace > update few things until any error is shown
  3. Go back to workspaces page > verify the RBR is aligned to centre in the row

QA Steps

  1. Go to profile settings > troubleshoot > turn on Simulate failing network requests
  2. Go to profile settings > workspaces > select a workspace > update few things until any error is shown
  3. Go back to workspaces page > verify the RBR is aligned to centre in the row
  • 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_native

Android: mWeb Chrome

android_chrome

iOS: Native

ios_native

iOS: mWeb Safari

ios_safari

MacOS: Chrome / Safari web_chrome
MacOS: Desktop
desktop_app.mp4

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
@Krishna2323 Krishna2323 requested review from a team as code owners May 11, 2024 05:05
@melvin-bot melvin-bot bot requested review from thesahindia and removed request for a team May 11, 2024 05:05
Copy link

melvin-bot bot commented May 11, 2024

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

@dubielzyk-expensify
Copy link
Contributor

The RBR now looks right vertically but I always thought it was gonna be aligned to the right side of this row next to the ··· (overflow icon). It looks a bit floating in the middle here.

So my take would be anchoring it over to the right, but I'll let @Expensify/design chime in further
CleanShot 2024-05-13 at 08 21 22@2x

@shawnborton
Copy link
Contributor

Yeah, I agree with Jon - I would think the RBR would be right next to the three dots icon with a 8-12px gap.

@Krishna2323
Copy link
Contributor Author

@dubielzyk-expensify @shawnborton, thoughts on this? IMO this looks weird.
Monosnap (150) New Expensify 2024-05-16 23-32-11

@shawnborton
Copy link
Contributor

Why isn't the RBR on the left side of the three dots? And we'd need to adjust the columns so that everything lines up even when there is the GBR there.

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented May 16, 2024

@shawnborton, I placed RBR to the right of three dots, I guess this is what we wanted according to this comment. IMO what we have currently looks good, because if we place the RBR on the right of three dots, the alignment will look weird or even if we align the three dots, the rows with now RBR will have extra margin right for no reason.

@shawnborton
Copy link
Contributor

I think Jon means just to move the RBR closer to the three dots icon, much like we do for things like push rows:
image

@Krishna2323
Copy link
Contributor Author

Sorry for that, I totally misunderstood that.

@shawnborton
Copy link
Contributor

All good!

@Krishna2323
Copy link
Contributor Author

@shawnborton, does this look correct, no margin right has been applied to RBR icon because the actual three dot icon width is 5px but the icon container takes 40px, so we already have 40px-5px/2=17.5px margin on both sides of three dot icon. If we need 12px or 8px we can apply negative margin right to RBR.

Monosnap (150) New Expensify 2024-05-16 23-58-02

@shawnborton
Copy link
Contributor

I've always found it super weird that we gave the rows this kind of padding:
CleanShot 2024-05-16 at 14 37 22@2x

Where the right side has no padding, but left/top/bottom do. I think if you are open to it, we should:

  • just use a clean 20px of padding on each row
  • remove the 40px bounding box around the three dots icon, but increase the hit slop so we can increase the tappable area
  • place the RBR icon next to the three dots, and put a gap of 12px between the two CleanShot 2024-05-16 at 14 40 14@2x

Thoughts on that approach?

@Krishna2323
Copy link
Contributor Author

@shawnborton, I removed the fixed width and height and tried to increase the pressable area by using hitSlop, but that doesn't seem to be working on the web. The pressable area remains the same as the width and height of the element. I guess thats why we have fixed width and height of 40px.

@shawnborton
Copy link
Contributor

I think that's probably fine on web though?

@Krishna2323
Copy link
Contributor Author

@thesahindia @shawnborton, I'm not sure what we should do here. The three-dot menu is used on many pages, and removing the fixed width and height will also affect the margins of those pages. Should we remove the margin for this specific page (workspaces list page)?

tdm_attachment tdm_edit_waypoint

@shawnborton
Copy link
Contributor

Okay, so maybe we just leave that as-is, but:

  • let's add the 20px of padding to the entire workspace row on desktop
  • let's just make the red dot like 4-8px away from the three dots container

Can we move forward with that and see how it looks? Thanks!

@Krishna2323
Copy link
Contributor Author

@Expensify/design,

20px padding for list row & 4px gap between RBR and three dot icon:

wlp_rbr_4px

20px padding for list row & 8px gap between RBR and three dot icon:

wlp_rbr_8px

@shawnborton
Copy link
Contributor

Nice! I like the first one (4px gap) the most, curious if others feel strongly. Thanks for sharing both mocks.

@dannymcclain
Copy link
Contributor

Nice! I like the first one (4px gap) the most, curious if others feel strongly.

I like that one too.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
@Krishna2323
Copy link
Contributor Author

Krishna2323 commented May 22, 2024

@thesahindia, you can start reviewing.

@Expensify/design, could you please confirm one last thing? There was no margin between the workspace name and RBR before. I have added 8px margin. Does that look correct? The reason for adding 8px is that the requested container also uses the same margin. You can see that in the screenshots below for the small width and the last workspace.

Small Narrow Full
fix_web_small fix_web_narrow fix_web
fix_web_requested fix_web_requested_narrow fix_web_requested_small

@dannymcclain
Copy link
Contributor

There was no margin between the workspace name and RBR before. I have added an 8px margin. Does that look correct? The reason for adding 8px is that the requested container also uses the same margin.

@Krishna2323 Yeah I think it makes sense to have that margin, so what you have does look correct to me.

@shawnborton
Copy link
Contributor

Yup, I agree with that

@thesahindia
Copy link
Member

@Krishna2323, please update the screenshots.

@thesahindia
Copy link
Member

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-23 at 9 12 11 PM
Android: mWeb Chrome Screenshot 2024-05-23 at 9 15 15 PM
iOS: Native Screenshot 2024-05-23 at 8 42 04 PM
iOS: mWeb Safari Screenshot 2024-05-23 at 8 49 21 PM
MacOS: Chrome / Safari Screenshot 2024-05-23 at 8 13 37 PM
MacOS: Desktop Screenshot 2024-05-23 at 8 16 17 PM

Copy link
Member

@thesahindia thesahindia left a comment

Choose a reason for hiding this comment

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

Looks good!

@melvin-bot melvin-bot bot requested a review from MonilBhavsar May 23, 2024 15:49
@MonilBhavsar
Copy link
Contributor

Thanks Design team for the help here 🙇 Looking great

@MonilBhavsar
Copy link
Contributor

We can let this out next week considering merge slush

@MonilBhavsar MonilBhavsar merged commit e5ec7be into Expensify:main May 29, 2024
16 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/MonilBhavsar in version: 1.4.77-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

@@ -142,9 +142,9 @@ function WorkspacesListRow({
const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;

const ThreeDotMenuOrPendingIcon = (
<View style={[isNarrow && styles.mr5]}>
<View style={[styles.flexRow]}>
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not really the culprit PR of #44639.
However if we don't add limit width here and with the flex1 style of Badge wrapper View, it will cause #44639.
More detail in this proposal RCA:
#44639 (comment)

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.

8 participants