[CP Staging] Fix: align badge in workspace list #40599

dragnoir · 2024-04-19T17:45:42Z

Details

This PR fixes the misalignment of the badge inside a row in workspace list.

Fixed Issues

$ #40524
PROPOSAL: #40524 (comment)

Tests

Open a workspace join link that we aren't a member of this (workspace from gmail account)
Check the workspace type name

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open a workspace join link that we aren't a member of this (workspace from gmail account)
Check the workspace type name

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-19T17:45:47Z

@cubuspl42 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 · 2024-04-19T18:42:59Z

src/styles/index.ts

@@ -3207,6 +3207,20 @@ const styles = (theme: ThemeColors) =>
            marginLeft: 3,
        },

+        WorkspaceRightColumn: {
+            marginLeft: 99,


Hmm why are we taking this kind of approach with hard-coded values instead of just using flex to fill up space?

Where did you get 99 from?

width of the badge

the value was 40 which is the with of the 3 dots menu

I can use 100 or any higher value

At the table header, we have a non-visible 4th column, all the 1st 3 columns use flex to stretch on the space equally. and we do hard-coded spacing for the 4th column to make sure it takes the lowest space.

I set the value to 100 to fit the badge in some cases and the 3 dots menu.

Hmm but you can tell that the columns in the header don't perfectly match up with the content below. Owner looks like it's too far to the left for instance, compared to the content below it.

Why wouldn't that invisible 4th column header just match the width of the 4th column in the table?

This is a screenshot from stagging

As you can see, under Owner, the content has some margins, that push the content to the right a bit, and this is why you see

the header don't perfectly match up with the content below

this is why 100px

Right, but if there is no badge present, that means we just have a bunch of dead space?

Yes and No

Yes because technically it's true.

No because the space is already empty:

and if you think we need the space in small screens, the layout change on small screens to

So I think it's not a wasted space.

But if you want, I can create a logic to find out if there well be a badge for Request, then adjust this value 100/40

shawnborton · 2024-04-19T18:43:13Z

src/styles/index.ts

+        },
+
+        workspaceThreeDotMenu: {
+            marginLeft: 59,


Where does 59 come from?

99 (badge width) - 40 (3 dots width)

shawnborton · 2024-04-19T19:15:17Z

src/styles/index.ts

@@ -3207,6 +3207,20 @@ const styles = (theme: ThemeColors) =>
            marginLeft: 3,
        },

+        WorkspaceRightColumn: {
+            marginLeft: 100,


Can you show me exactly what this looks like? I don't understand why we are hard coding so much margin. Does that mean we have 100px of space that can only be occupied by margin? How does that work when the viewport is bigger or smaller? It just feels like these hard coded margins are a hack and don't provide good responsiveness.

mountiny

I agree with @shawnborton that this logic feels fragile, I can assure you that if someone changes the width of the badge or adds a badge of a different width, they will bring this bug back.

Could you please try to find solution which wont depend on the width of the badge?

mountiny · 2024-04-19T22:29:36Z

src/styles/index.ts

@@ -3207,6 +3207,20 @@ const styles = (theme: ThemeColors) =>
            marginLeft: 3,
        },

+        WorkspaceRightColumn: {


Suggested change

WorkspaceRightColumn: {

workspaceRightColumn: {

dragnoir · 2024-04-20T10:16:42Z

@mountiny @shawnborton This layout and the way to use content width value was there, I didn't create it. I just changed the value from 40 to 100. 40 was the width of the 3 dots menu.

The idea from this aspect, is to use 4 columns keeping the 4th one small as possible.

To solve the issue you mentioned, we have 2 main solutions:

1- Use flex for the 4th column as it's been used for the other 3 columns

This solution creates 4 equal columns, equal in width. The issue here there will be a more empty space between the "Workspace type" and the final 4th column.

2- change the table to only 3 columns

where the action will be part of the 3rd column but aligned to the right.

What do you think? I like solution 2

mountiny · 2024-04-20T16:17:38Z

@dragnoir I think the option 2 is quite elegant, how does it scale on other screensizes?

dragnoir · 2024-04-20T18:58:08Z

@dragnoir I think the option 2 is quite elegant, how does it scale on other screensizes?

Same, I will update the layout to keep it as it us now (fixed)

mountiny · 2024-04-20T19:11:39Z

Lets watch out to make sure the style changes will not influence any other components

dragnoir · 2024-04-20T20:52:14Z

@mountiny bad news, we can't use solution 2, in very tight screens, this UI bug will happen

It happens because we made the Workspace type + the action in one column.

I think it's better to keep the 4th column with a max width equal to 100px. What do you see?

below a screenshot from the solution with 100 and in the same tight screen:

mountiny · 2024-04-20T21:28:35Z

Ah alright, that I guess makes sense.

I dont think we should be doing some major styling changes in cherry pick PR, so since as you mentioned this fragile pixel logic existed before, I think we could just update it for now to fix the styling in staging, but follow up with exploration on how to make this styling responsive without the esoteric pixel math

dragnoir · 2024-04-20T21:49:36Z

@cubuspl42 you can review the code, please.

mountiny · 2024-04-21T10:04:58Z

Asking for a C+ who is available now

allroundexperts · 2024-04-21T10:05:20Z

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allroundexperts · 2024-04-21T10:38:17Z

BUG

Invite badge overlapping with workspace name on small screens

allroundexperts · 2024-04-21T10:41:24Z

Same is happening on iOS safari:

dragnoir · 2024-04-21T10:51:10Z

Fixing now..

dragnoir · 2024-04-21T11:37:01Z

@allroundexperts fixed

allroundexperts

Works good!

allroundexperts · 2024-04-21T12:48:39Z

@dragnoir Found another bug. The types are not aligned.

allroundexperts

Found another bug.

dragnoir · 2024-04-21T13:02:31Z

@allroundexperts fixed

allroundexperts

Works good now. Thank you!

mountiny

I think this is good to fix the deploy blocker, but as mentioned before, we should look into removing this pixel-based logic for styles because it will break again soon.

mountiny · 2024-04-21T19:13:16Z

I will wait for Monday morning for @shawnborton to review but since this is a deploy blocker I would merge it past 10am CET to unblock deploy

github-actions · 2024-04-21T21:57:28Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/40599/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/40599/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/40599/NewExpensify.dmg	https://40599.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mountiny · 2024-04-21T22:05:58Z

Based on NewDot, Shawn is in the US so to make sure we can deploy sooner than later, I am going to go ahead with the merge here, I have tested as well and it looks good (do not worry about the blinking that is my local thing)
https://github.com/Expensify/App/assets/36083550/4d3d6822-4587-49f0-9fe7-1b78811fcce4

OSBotify · 2024-04-21T22:14:08Z

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

[CP Staging] Fix: align badge in workspace list (cherry picked from commit 0f30b3d)

Beamanator · 2024-04-22T07:54:02Z

🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 1.4.63-18 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

shawnborton · 2024-04-22T12:22:38Z

Cool, I think that looks good. Only minor comment is that the overflow icon (three dots) on mobile feels like it's not quite as far to the right as it should be?

I should have caught this sooner but it's strange that we're wrapping the overflow icon in a 40x40 wrapper and then sending that wrapper to the edge of the view. I think that's what's causing the weirdness above:

Ideally the icon should just be 20x20 and there should be even 20px padding both vertically and horizontally on the entire row:

None of that was caused by @dragnoir - but just noting in case we want to do a follow up PR to clean that stuff up.

OSBotify · 2024-04-22T15:03:22Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

Fix: align badge in workspace list

57c59e8

dragnoir requested review from a team as code owners April 19, 2024 17:45

melvin-bot bot requested review from cubuspl42 and removed request for a team April 19, 2024 17:45

shawnborton reviewed Apr 19, 2024

View reviewed changes

make values base4

2b4e55a

shawnborton reviewed Apr 19, 2024

View reviewed changes

shawnborton added the Ready To Build label Apr 19, 2024

This comment has been minimized.

Sign in to view

mountiny changed the title ~~Fix: align badge in workspace list~~ [CP Staging] Fix: align badge in workspace list Apr 19, 2024

mountiny assigned dragnoir Apr 19, 2024

mountiny reviewed Apr 19, 2024

View reviewed changes

fix typo

8bdb014

ts fix

2e52103

mountiny removed the request for review from cubuspl42 April 21, 2024 10:04

mountiny requested a review from allroundexperts April 21, 2024 10:05

fix margin

db8c442

allroundexperts approved these changes Apr 21, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny April 21, 2024 12:40

allroundexperts suggested changes Apr 21, 2024

View reviewed changes

fix spacing

24db85d

allroundexperts approved these changes Apr 21, 2024

View reviewed changes

mountiny approved these changes Apr 21, 2024

View reviewed changes

mountiny merged commit 0f30b3d into Expensify:main Apr 21, 2024
16 checks passed

mountiny mentioned this pull request Apr 21, 2024

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

OSBotify pushed a commit that referenced this pull request Apr 22, 2024

Merge pull request #40599 from dragnoir/40524-fix

b3a2817

[CP Staging] Fix: align badge in workspace list (cherry picked from commit 0f30b3d)

[CP Staging] Fix: align badge in workspace list #40599

[CP Staging] Fix: align badge in workspace list #40599

Conversation

dragnoir commented Apr 19, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dragnoir commented Apr 20, 2024

1- Use flex for the 4th column as it's been used for the other 3 columns

2- change the table to only 3 columns

mountiny commented Apr 20, 2024

dragnoir commented Apr 20, 2024

mountiny commented Apr 20, 2024

dragnoir commented Apr 20, 2024

mountiny commented Apr 20, 2024

dragnoir commented Apr 20, 2024

mountiny commented Apr 21, 2024

allroundexperts commented Apr 21, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts commented Apr 21, 2024

allroundexperts commented Apr 21, 2024

dragnoir commented Apr 21, 2024

dragnoir commented Apr 21, 2024

allroundexperts left a comment

Choose a reason for hiding this comment

allroundexperts commented Apr 21, 2024

allroundexperts left a comment

Choose a reason for hiding this comment

dragnoir commented Apr 21, 2024

allroundexperts left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Apr 21, 2024

github-actions bot commented Apr 21, 2024

mountiny commented Apr 21, 2024

OSBotify commented Apr 21, 2024

Beamanator commented Apr 22, 2024

shawnborton commented Apr 22, 2024

OSBotify commented Apr 22, 2024

allroundexperts commented Apr 21, 2024 •

edited

Loading