Skip to content

update drop shadows on modals to match active theme#59271

Merged
mjasikowski merged 5 commits into
Expensify:mainfrom
Shahidullah-Muffakir:fix/59196-modal-drop-shadow
Apr 7, 2025
Merged

update drop shadows on modals to match active theme#59271
mjasikowski merged 5 commits into
Expensify:mainfrom
Shahidullah-Muffakir:fix/59196-modal-drop-shadow

Conversation

@Shahidullah-Muffakir

@Shahidullah-Muffakir Shahidullah-Muffakir commented Mar 28, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #59196
PROPOSAL: #59196 (comment)

Tests

  1. Open the ND.
  2. Open different modals and verify that the new box-shadow is applied based on the active theme.
  3. Change the theme and observe the differences in box-shadow.
  4. Test the following modals:
    • Click the global create (+) button and verify that the popover has the correct box-shadow.
    • Click the (+) inside any chat and verify the new box-shadow.
    • Open the emoji picker modal and verify the new box-shadow.
    • Go to Reports, click the search input, and verify the box-shadow.
    • Press Cmd + D to open the test tools menu and verify the box-shadow.
    • Click the three dots on any message in a chat, select Delete, and verify that the delete confirmation modal has the correct box-shadow.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests.

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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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

Dark Mode:

Screen.20Recording.202025-04-03.20at.209.mp4
Android: mWeb Chrome

Light Mode:

Screen.Recording.2025-04-04.at.10.45.07.PM.mov

Dark Mode:

Screen.Recording.2025-04-03.at.9.43.01.AM.mov
iOS: Native

Light mode:

Screen.Recording.2025-04-04.at.10.35.17.PM.mov

Dark mode:

Screen.Recording.2025-04-04.at.10.36.32.PM.mov
iOS: mWeb Safari

Light mode:

Screen.Recording.2025-04-04.at.10.23.49.PM.mov

Dark mode:

Screen.Recording.2025-04-04.at.10.25.54.PM.mov
MacOS: Chrome / Safari

Light mode:

Screen.Recording.2025-04-04.at.10.49.25.PM.mov

Dark mode:

macos.20web.20dark.mp4
MacOS: Desktop

Light Mode:

Screen.20Recording.202025-04-04.20at.2010-2.mp4

Dark mode:

Screen.20Recording.202025-03-29.20at.205.mp4

@Shahidullah-Muffakir Shahidullah-Muffakir requested review from a team as code owners March 28, 2025 03:12
@melvin-bot melvin-bot Bot requested review from parasharrajat and removed request for a team March 28, 2025 03:12
@melvin-bot

melvin-bot Bot commented Mar 28, 2025

Copy link
Copy Markdown

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

@Shahidullah-Muffakir Shahidullah-Muffakir marked this pull request as draft March 28, 2025 03:12
styles.pt2,
{top: 8 - BORDER_WIDTH, left: leftPopoverHorizontalPosition, right: rightPopoverHorizontalPosition},
{boxShadow: variables.popoverMenuShadow},
{boxShadow: `${variables.shadowPreset} ${theme.shadow}`},

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Rather than needing to always write two things here (shadowPreset and shadow), is there a way we can combine this into just one variable? Like even if in the individual theme files, like in dark.ts for example, we just did this: shadow: '0px 4px 12px 0px rgba(2,18,4,0.24)',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Create a util for this and use it everywhere?

@Shahidullah-Muffakir Shahidullah-Muffakir Mar 28, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good point, I think defining the complete box-shadow directly in the theme files is a better idea, cleaner and avoids string concatenation, like:

shadow: '0px 4px 12px 0px rgba(2,18,4,0.24)' and
shadow: '0px 4px 12px 0px rgba(2,18,4,0.6)'.

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

Hi @Expensify/design , just to confirm, are these changes only for macOS Web and the desktop app? On mobile, we use the bottom-docked modal, which currently doesn’t have any box-shadow. Do we need to make any changes there? Thank you.

Screen.20Recording.202025-03-29.20at.205-3.mp4

@Shahidullah-Muffakir Shahidullah-Muffakir marked this pull request as ready for review March 29, 2025 01:07
@parasharrajat

Copy link
Copy Markdown
Member

Also, we updated the shadow for Menus like FAB, Plus menu on chat. Please also confirm this. @Expensify/design

@shawnborton

Copy link
Copy Markdown
Contributor

Yup, confirming that we want to update all of those places.

On mobile, we use the bottom-docked modal, which currently doesn’t have any box-shadow.

Yup, pretty sure we want to add it here too on mobile. Does that sound right @Expensify/design? Basically if it's a popover/modal of any sort, it should get the shadow.

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Yep, that sounds right. Anything that's elevated over the content like that so that should be changed as well 👍

@parasharrajat

Copy link
Copy Markdown
Member

One point to mention is that the bottom-docked modal only has the top edge visible. Will this shadow work for that? Is it expanding on all edges?

@parasharrajat

Copy link
Copy Markdown
Member

@Shahidullah-Muffakir Can you please update all of these?

@shawnborton

Copy link
Copy Markdown
Contributor

Yes, the same shadow should work just fine there. Let's try it out at least.

@dannymcclain

Copy link
Copy Markdown
Contributor

Agree with the rest of the design team above 👍

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

Thank you for confirming, will add the changes.

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

PR is ready for review now.
CC: @parasharrajat @Expensify/design

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Have you updated the screenshots in the original post? The shadow looks very harsh here:

CleanShot 2025-04-03 at 14 37 18@2x

@Shahidullah-Muffakir

Shahidullah-Muffakir commented Apr 3, 2025

Copy link
Copy Markdown
Contributor Author

Have you updated the screenshots in the original post? The shadow looks very harsh here:

The last commit includes changes for the mobile view only, and I added screenshots for that.
The screenshot you attached is from the desktop view, which remains unchanged from the first commit and already uses the new boxShadow '0px 4px 12px 0px rgba(2,18,4,0.6)'.

@shawnborton

Copy link
Copy Markdown
Contributor

Hmm just to clarify, is this new shadow being applied everywhere (web, desktop, mobile, etc) or not?

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

Hmm just to clarify, is this new shadow being applied everywhere (web, desktop, mobile, etc) or not?

Yes, everywhere.

@shawnborton

Copy link
Copy Markdown
Contributor

Great! @parasharrajat time for final review?

@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

The last commit includes changes for the mobile view only, and I added screenshots for that.

The shadow seems overly harsh on iOS as well though!?
CleanShot 2025-04-03 at 18 26 57@2x

Could we apply the shadow everywhere or at least in a consistent place on all platforms?

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

Sorry @dubielzyk-expensify, I didn’t fully understand.
In the mobile view, we use a bottom-docked modal instead of a popover for confirmation modals, the emoji selector, and other modals.
We applied the same box-shadow used in popover modals on the desktop view to these modals in the mobile view as well.
For example, in the screenshots attached, the box-shadow of the emoji picker modal is now the same on both mobile and desktop views.
Could you clarify what exactly needs to be updated?

@parasharrajat

Copy link
Copy Markdown
Member

I will start the review when we have finalized the shadow.

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

considering the above comments, it looks like we're aligned and good to proceed.

@parasharrajat

Copy link
Copy Markdown
Member

@Shahidullah-Muffakir Can you confirm if attached videos are uptodate?

@parasharrajat

Copy link
Copy Markdown
Member

@dubielzyk-expensify Can you confirm if the shadow is as per your expectations on all platforms?

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

@Shahidullah-Muffakir Can you confirm if attached videos are uptodate?

Yes, all the videos are as per the final changes.

@shawnborton

Copy link
Copy Markdown
Contributor

This definitely looks wrong:
CleanShot 2025-04-04 at 16 16 59@2x

And that's a video from the original post above. How can we fix and move forward? It definitely does not look anything like our mockups.

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

@shawnborton
Hmm, that’s odd. As you can see, the same box-shadow from the OP (rgba(2, 18, 4, 0.6) 0px 4px 12px) is applied.
Not sure what might be causing the difference

Screenshot 2025-04-04 at 7 54 07 PM

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

@dubielzyk-expensify
The shadow given in OP is darker in light mode (0.6) and lighter in dark mode (0.24). Was it meant to be 0.24 in light mode?

OP:
Screenshot 2025-04-04 at 8 07 42 PM

CC: @Expensify/design

@dannymcclain

Copy link
Copy Markdown
Contributor

@Shahidullah-Muffakir Ah! Looking into our Figma variables, I think that should be 0.06 instead of 0.6 for light mode.

CleanShot 2025-04-04 at 09 51 12@2x

cc @Expensify/design to confirm, but I'm pretty sure that's where the mismatch is coming from.

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

@dannymcclain
I should’ve noticed that, thanks for the clarification!

@dannymcclain

Copy link
Copy Markdown
Contributor

No worries! I went ahead and updated the description on the linked issue to reflect the correct opacity level as well 👍

@parasharrajat

parasharrajat commented Apr 4, 2025

Copy link
Copy Markdown
Member

@Shahidullah-Muffakir Can you please update vids on the description for design team and ping me here when done?

@Shahidullah-Muffakir

Copy link
Copy Markdown
Contributor Author

@Shahidullah-Muffakir Can you please update vids on the description for design team and ping me here when done?

I've updated the videos. @Expensify/design can review them now.

@dannymcclain

Copy link
Copy Markdown
Contributor

Awesome that is looking way more like what we want! Sorry about that typo! Would love to give the rest of the @Expensify/design team a chance to check it out too.

@parasharrajat

parasharrajat commented Apr 6, 2025

Copy link
Copy Markdown
Member

Screenshots

🔲 iOS / native

06.04.2025_19.49.47_REC.mp4

🔲 iOS / Safari

06.04.2025_19.51.21_REC.mp4

🔲 MacOS / Desktop

06.04.2025_19.52.31_REC.mp4

🔲 MacOS / Chrome

06.04.2025_19.39.06_REC.mp4

🔲 Android / Chrome

06.04.2025_19.37.42_REC.mp4

🔲 Android / native

06.04.2025_19.36.20_REC.mp4

@parasharrajat parasharrajat left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot Bot requested a review from mjasikowski April 6, 2025 14:23
@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

Awesome that is looking way more like what we want! Sorry about that typo! Would love to give the rest of the @Expensify/design team a chance to check it out too.

Thanks Danny and that was totally MY typo so sorry for that!

The screenshots above are looking great. @Expensify/design for gut check!

@shawnborton

Copy link
Copy Markdown
Contributor

Ah yes great sleuthing Danny, that was indeed the culprit!

@parasharrajat shouldn't there be videos in your reviewer checklist? Thanks!

@parasharrajat

Copy link
Copy Markdown
Member

@shawnborton I post them before the list. #59271 (comment)

@shawnborton

Copy link
Copy Markdown
Contributor

Ah okay I see them now, oops.

I think we're good to merge then @mjasikowski

@mjasikowski mjasikowski merged commit f062eb3 into Expensify:main Apr 7, 2025
@OSBotify

OSBotify commented Apr 7, 2025

Copy link
Copy Markdown
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.

@github-actions

github-actions Bot commented Apr 7, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.1.24-2 🚀

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

@github-actions

github-actions Bot commented Apr 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

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

@github-actions

github-actions Bot commented Apr 9, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.24-10 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 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.

7 participants