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

[CP Staging] Fix icons after regression #38275

Merged
merged 11 commits into from
Mar 14, 2024

Conversation

narefyev91
Copy link
Contributor

@narefyev91 narefyev91 commented Mar 14, 2024

Details

Fix button for distance and quick actions for messages

Fixed Issues

$ #38266
$ #38264
$ #38284
$ #38291
PROPOSAL:

Tests

Checking quick actions:

  1. Go to any chat
  2. Send a message
  3. Hover over the message for the action menu to appear

Checking distance button:

  1. Go to https://staging.new.expensify.com/
  2. Tap fab ---Request money--Distance
  3. Enter start and stop point
  4. Note Add stop button

Checking rotate button:

  1. Access staging.new.expensify.com
  2. Sign into any account
  3. Go to Profile Pic or WS Pic and tap on Upload
  4. Observe the rotate button
  • Verify that no errors appear in the JS console

Offline tests

Checking quick actions:

  1. Go to any chat
  2. Send a message
  3. Hover over the message for the action menu to appear

Checking distance button:

  1. Go to https://staging.new.expensify.com/
  2. Tap fab ---Request money--Distance
  3. Enter start and stop point
  4. Note Add stop button

Checking rotate button:

  1. Access staging.new.expensify.com
  2. Sign into any account
  3. Go to Profile Pic or WS Pic and tap on Upload
  4. Observe the rotate button

QA Steps

Checking quick actions:

  1. Go to any chat
  2. Send a message
  3. Hover over the message for the action menu to appear

Checking distance button:

  1. Go to https://staging.new.expensify.com/
  2. Tap fab ---Request money--Distance
  3. Enter start and stop point
  4. Note Add stop button

Checking rotate button:

  1. Access staging.new.expensify.com
  2. Sign into any account
  3. Go to Profile Pic or WS Pic and tap on Upload
  4. Observe the rotate button
  • 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

android1
android2
android

Android: mWeb Chrome

android-web
android-web2
android-web3

iOS: Native

ios1
ios2
ios4

iOS: mWeb Safari

ios-web1
ios-web2
ios-web4

MacOS: Chrome / Safari web1 web2 Screenshot 2024-03-14 at 15 10 39
MacOS: Desktop desktop1 desktop2 Screenshot 2024-03-14 at 15 10 39

@narefyev91 narefyev91 requested a review from a team as a code owner March 14, 2024 08:39
@melvin-bot melvin-bot bot requested review from s77rt and removed request for a team March 14, 2024 08:39
Copy link

melvin-bot bot commented Mar 14, 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]

@narefyev91
Copy link
Contributor Author

narefyev91 commented Mar 14, 2024

@Expensify/design @shawnborton please take a look:
Quick actions - looks now the same as on prod
Distance button - updated alignment
Rotate button - add default min-width to prevent button be squeezed by flex

@narefyev91
Copy link
Contributor Author

cc @luacmartins

Copy link
Contributor

@MonilBhavsar MonilBhavsar left a comment

Choose a reason for hiding this comment

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

The rotate icon svg is 16x16. Should we update it to 20x20?

@narefyev91
Copy link
Contributor Author

The rotate icon svg is 16x16. Should we update it to 20x20?

I think no - button is specified as medium - and icon should be medium as well.

@shawnborton
Copy link
Contributor

Thanks for the fixes @narefyev91 !

I agree that in default sized buttons that also have a label, we want the icon to be 16x16.

However, if the button only has an icon, it looks like the icon should be 20x20. Does that sound right @Expensify/design ?

@MonilBhavsar MonilBhavsar changed the title Fix icons after regression [CP Staging] Fix icons after regression Mar 14, 2024
@narefyev91
Copy link
Contributor Author

Thanks for the fixes @narefyev91 !

I agree that in default sized buttons that also have a label, we want the icon to be 16x16.

However, if the button only has an icon, it looks like the icon should be 20x20. Does that sound right @Expensify/design ?

Ohh yup you right - double checked other icons - and in default state we using 20x20 - just made changes for this current one

@MonilBhavsar
Copy link
Contributor

MonilBhavsar commented Mar 14, 2024

The dimensions of button are different somehow. I think we want them as a common ratio?

Dev(this branch)

Screenshot 2024-03-14 at 6 58 46 PM

Production

Screenshot 2024-03-14 at 6 59 14 PM

@shawnborton
Copy link
Contributor

I actually think ideally, that button would be perfectly round at 40x40. Basically that's what we want to do for "icon buttons" - a button that just has an icon and no label. It should be perfectly round, and at the 40x40 size, the icon should be 20x20.

@MonilBhavsar
Copy link
Contributor

That would be good. Thanks Shawn for the thought!

@dannymcclain
Copy link
Contributor

Agree with everything Shawn said! We tread our "icon buttons" a little differently than regular buttons. Tried to whip up some quick specs real fast:

image

@shawnborton
Copy link
Contributor

<3 LOVE IT

@narefyev91
Copy link
Contributor Author

bank account custom button - moves back to prod view
Screenshot 2024-03-14 at 15 20 36

@shawnborton
Copy link
Contributor

Looks like it's slightly off still:
CleanShot 2024-03-14 at 10 16 15@2x

@narefyev91
Copy link
Contributor Author

narefyev91 commented Mar 14, 2024

Looks like it's slightly off still: CleanShot 2024-03-14 at 10 16 15@2x

but the same is on the prod @shawnborton

@shawnborton
Copy link
Contributor

Got it, let's fix it then. We shouldn't touch the non-green option row, just make the green option row match what is below it.

@dannymcclain
Copy link
Contributor

Looks like the icons are not aligned the same either. 😬

CleanShot 2024-03-14 at 09 23 37@2x

@narefyev91
Copy link
Contributor Author

updated button component to support styles for just only icon passed
Screenshot 2024-03-14 at 15 55 07
Screenshot 2024-03-14 at 15 55 16

@shawnborton
Copy link
Contributor

updated button component to support styles for just only icon passed

Those look good to me.

@s77rt
Copy link
Contributor

s77rt commented Mar 14, 2024

quick action icons not same size
Screenshot 2024-03-14 at 3 44 19 PM
Screenshot 2024-03-14 at 3 44 25 PM
Screenshot 2024-03-14 at 3 44 51 PM

@narefyev91
Copy link
Contributor Author

narefyev91 commented Mar 14, 2024

quick action icons not same size Screenshot 2024-03-14 at 3 44 19 PM Screenshot 2024-03-14 at 3 44 25 PM Screenshot 2024-03-14 at 3 44 51 PM

@shawnborton which size should be these icons?

@s77rt
Copy link
Contributor

s77rt commented Mar 14, 2024

One more inconsistency in the spacing between the buttons, some use styles.mr3 others use styles.pr2
Screenshot 2024-03-14 at 5 58 06 PM
Screenshot 2024-03-14 at 5 58 10 PM

What's the correct spacing here? @Expensify/design

@narefyev91
Copy link
Contributor Author

WorkspaceCategoriesPage

done

@s77rt
Copy link
Contributor

s77rt commented Mar 14, 2024

@narefyev91 Push the changes 😅

@narefyev91
Copy link
Contributor Author

@narefyev91 Push the changes 😅

lol - i already pushed them

@s77rt
Copy link
Contributor

s77rt commented Mar 14, 2024

Github UI tricked me 😂

Copy link
Contributor

@s77rt s77rt 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 but let's hold merge until this is resolved #38275 (comment)

@narefyev91
Copy link
Contributor Author

One more inconsistency in the spacing between the buttons, some use styles.mr3 others use styles.pr2 Screenshot 2024-03-14 at 5 58 06 PM Screenshot 2024-03-14 at 5 58 10 PM

What's the correct spacing here? @Expensify/design

cc @shawnborton can you please give correct spacing here

@dannymcclain
Copy link
Contributor

It depends on the size of the button, but here are the specs:

image

@narefyev91
Copy link
Contributor Author

It depends on the size of the button, but here are the specs:

image

@dannymcclain we talking about gap between 2 buttons Button1 and Button2 - how much space should be between them?

@narefyev91
Copy link
Contributor Author

@dannymcclain #38275 (comment) - you see that on both screens - gap between Add rate and settings is not the same as between Add tag and settings. One of them has incorrect margin/padding. We need to know - which one is correct

@dannymcclain
Copy link
Contributor

@narefyev91 LOL my bad!! I totally see what you're talking about now 😂

The correct spacing is 12px as far as I know.

@narefyev91
Copy link
Contributor Author

narefyev91 commented Mar 14, 2024

Screenshot 2024-03-14 at 19 36 54

should be 12 px between buttons.
@s77rt its fixed for both tags and categories pages as well

@s77rt
Copy link
Contributor

s77rt commented Mar 14, 2024

@luacmartins This is ready for merge

@luacmartins luacmartins merged commit 5f086a9 into Expensify:main Mar 14, 2024
15 checks passed
@melvin-bot melvin-bot bot added the Emergency label Mar 14, 2024
Copy link

melvin-bot bot commented Mar 14, 2024

@luacmartins looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@mountiny
Copy link
Contributor

Not emergency

OSBotify pushed a commit that referenced this pull request Mar 14, 2024
[CP Staging] Fix icons after regression

(cherry picked from commit 5f086a9)
@luacmartins
Copy link
Contributor

Tests were passing
Screenshot 2024-03-14 at 11 51 42 AM

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.52-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.

8 participants