fix: iOS&Android - Troubleshoot menu cut in top and bottom after enabling and disabling "Use profiling".#58061
Conversation
…ling and disabling "Use profiling". Signed-off-by: krishna2323 <belivethatkg@gmail.com>
melvin-bot
bot
requested review from
parasharrajat
and removed request for
a team
|
@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] |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@Expensify/design, could you please check the screenshots section? For small screen width devices we are now using |
src/components/TestToolsModal.tsx
Outdated
| <View style={[StyleUtils.getTestToolsModalStyle(windowWidth)]}> | ||
| <ScrollView | ||
| contentContainerStyle={[StyleUtils.getTestToolsModalStyle(windowWidth), isSmallScreenWidth && {...styles.w100, ...styles.pv0}]} | ||
| style={{maxHeight: windowHeight - 250}} |
There was a problem hiding this comment.
Use a styleUtil and create a variable for 250.
src/components/TestToolsModal.tsx
Outdated
| <Modal | ||
| isVisible={!!isTestToolsModalOpen} | ||
| type={CONST.MODAL.MODAL_TYPE.CENTERED_SMALL} | ||
| type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_SMALL} |
There was a problem hiding this comment.
Why can't we use ShouldUseNarrowlayout?
There was a problem hiding this comment.
@parasharrajat, it is also used in PopoverMenu, so I just tried to follow it.
App/src/components/PopoverMenu.tsx
Lines 194 to 196 in b4264ca
There was a problem hiding this comment.
Please use ShouldUseNarrowlayout
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@Krishna2323 Please merge main and resolve conflicts. |
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@parasharrajat done. |
|
@Krishna2323 Can you please merge the main again? I am seeing changes between this PR and staging. Can you try to see why they are different? |
|
@Krishna2323 Can you please update the test steps to mention that On Mobile, it is bottom-docked modal and on web, it is centered. Please mention all platforms clearly. |
| > | ||
| <View style={[StyleUtils.getTestToolsModalStyle(windowWidth)]}> | ||
| <ScrollView | ||
| contentContainerStyle={[StyleUtils.getTestToolsModalStyle(windowWidth), shouldUseNarrowLayout && {...styles.w100, ...styles.pv0}]} |
There was a problem hiding this comment.
On the web, we have padding of 20, and on mobile, it is 0. Can you keep vertical padding?
There was a problem hiding this comment.
Let's leave it. It will take up more space.
|
@Expensify/design can you please review this as it is a design change? Do you agree with the bottom-docked modal on mobile view and centered on the web? It was centered before on each platform, we changed it to bottom-docked on mobile view. |
|
Centered alert modals on web typically translate to bottom-docked modals on mobile, so I am super down with that change. |
|
However, the placement of this "Open modal" button feels pretty bad to me: But I don't see that in other videos, so before I leave any suggestions, is that button something that will persist or not? |
Agree—that's how we usually do things so I'm into it. |
|
@shawnborton that button is temporary for testing purpose. It won't ship to app. This modal opens with a shortcut and 4 finger gesture. |
|
Okay good to know! The modal placement looks fine though. |
|
Seeing a scrollbar without a rounded border radius and more gap on the centered modal on web.
|
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
|
@parasharrajat, I don't see any extra gap on centered modal: Monosnap.screencast.2025-03-15.20-30-08.mp4 |
|
Compare the heights of the modal on the web between this PR and staging. Gap from the edge of screens to the edge of modal. |
This comment was marked as off-topic.
This comment was marked as off-topic.
| <ScrollView | ||
| contentContainerStyle={[StyleUtils.getTestToolsModalStyle(windowWidth), shouldUseNarrowLayout && {...styles.w100, ...styles.pv0}]} | ||
| style={{maxHeight: windowHeight - variables.modalBackdropMinHeight}} | ||
| > |
There was a problem hiding this comment.
Compare the heights of the modal on the web between this PR and staging. Gap from the edge of screens to the edge of modal.
@parasharrajat, its because of this line, we have a max height which has changed the height of the modal. Should we change that? I think its safer to keep this on we also.
There was a problem hiding this comment.
What if restrict it based on percentage like 25% instead of 250px. Which one look better?
See this how it looks currently on mweb safari. I believe there is plenty of space above.
15.03.2025_23.10.07_REC.mp4
There was a problem hiding this comment.
@parasharrajat, I think that's a great idea and looks good, I have updated the code.
Monosnap.screencast.2025-03-16.02-18-12.mp4
There was a problem hiding this comment.
Let's have design confirm this one
There was a problem hiding this comment.
If it only influences that specific modal then that's okay with me. I'll let the other designers chime in too @Expensify/design
There was a problem hiding this comment.
Yup, that works for me too 👍
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
src/components/PopoverMenu.tsx
Outdated
| const menuContainerStyle = useMemo(() => { | ||
| if (isSmallScreenWidth) { | ||
| return shouldEnableMaxHeight ? {maxHeight: windowHeight - 250} : {}; | ||
| return shouldEnableMaxHeight ? {maxHeight: windowHeight * variables.modalContentMaxHeightPercentage} : {}; |
There was a problem hiding this comment.
Revert this change. We don't have to change the menus.
src/styles/variables.ts
Outdated
| modalTopBigIconHeight: 244, | ||
| modalWordmarkWidth: 154, | ||
| modalWordmarkHeight: 37, | ||
| modalContentMaxHeightPercentage: 0.75, |
There was a problem hiding this comment.
Move it to component file as and keep as a constant.
const modalContentMaxHeightPercentage = 0.75
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Screenshots🔲 iOS / native17.03.2025_12.58.43_REC.mp4🔲 iOS / Safari16.03.2025_20.22.48_REC.mp4🔲 MacOS / Desktop
🔲 MacOS / Chrome
🔲 Android / Chrome17.03.2025_13.00.39_REC.mp4🔲 Android / native17.03.2025_12.56.34_REC.mp4 |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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 Copylabel 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
grgia
left a comment
grgia
left a comment
There was a problem hiding this comment.
looking good, minor comment.
| return isAuthenticated ? ROUTES.SETTINGS_CONSOLE.getRoute(activeRoute) : ROUTES.PUBLIC_CONSOLE_DEBUG.getRoute(activeRoute); | ||
| } | ||
|
|
||
| const modalContentMaxHeightPercentage = 0.75; |
There was a problem hiding this comment.
Shall we move this const to variables?
There was a problem hiding this comment.
@parasharrajat thinks it's better to keep that inside the component, which is why it was moved from the variables file to the component. #58061 (comment)
There was a problem hiding this comment.
This variable is not used across the app and we only use 75% max height for this modal so I kept it here.
There was a problem hiding this comment.
That makes sense, but I see Variables as less of repeatable const and more as a lib for tracking hardcoded design values. ie. sizes for images might only be used 1x but we store in there. How do you see it?
| <ScrollView | ||
| contentContainerStyle={[StyleUtils.getTestToolsModalStyle(windowWidth), shouldUseNarrowLayout && {...styles.w100, ...styles.pv0}]} | ||
| style={{maxHeight: windowHeight - variables.modalBackdropMinHeight}} | ||
| > |
There was a problem hiding this comment.
Let's have design confirm this one
|
@Expensify/design Can you please confirm #58061 (comment)? |
|
Left a comment. I'll let the other designers chime in as well. |
|
@parasharrajat could you confirm we're ready to merge this pending the result of all convos? |
|
Yeah all good on my end too 👍 |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/grgia in version: 9.1.21-0 🚀
|
|
🚀 Deployed to production by https://github.com/grgia in version: 9.1.21-3 🚀
|
7 participants
Explanation of Change
Fixed Issues
$ #57350
PROPOSAL: #57350 (comment)
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4