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.

Sign up for GitHub

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

Jump to bottom

[CP Staging] Fix: Android edge-to-edge related inset/padding issues #53223

Merged
merged 33 commits into from
Nov 28, 2024
Merged

[CP Staging] Fix: Android edge-to-edge related inset/padding issues #53223

merged 33 commits into from
Nov 28, 2024

Conversation

chrispader
Copy link
Contributor

@chrispader chrispader commented Nov 27, 2024 •
edited
Loading

@mountiny

Explanation of Change

Fixes issues related to the recent merge of #52392. This PR adds missing styles for respecting the safe area (on Android). Where necessary, extra padding/margin styles were added. This PR also includes some minor code improvements and re-structuring in styles/StyleUtils.

Fixed Issues

$ #53161
$ #53205
$ #53190
$ #53215

PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

New chat/room screens

  1. Press FAB
  2. Go to "Start chat"
  3. Add multiple people to a group
  4. Confirm the "Next" button is placed correctly
  5. Switch the tab to "Room"
  6. Make sure the "Create room" button is aligned correctly

Submit/track expense (IOU)

  1. Press FAB
  2. Go to "Submit expense"
  3. Enter an amount
  4. Choose an recipient
  5. Make sure the "Submit x $" button is aligned correctly

Video attachments

  1. Go to a report with a video attachment and open it
  2. Make sure the video players timeline is editable

Sidebar

  1. Make sure you have enough chats/reports in the sidebar to fill the whole scroll view
  2. Check whether there is unnecessary extra padding when scrolling to the end

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@mountiny mountiny self-requested a review November 27, 2024 17:29
@mountiny mountiny changed the title Fix: Android edge-to-edge related inset/padding issues [CP Staging] Fix: Android edge-to-edge related inset/padding issues Nov 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

🚧 @mountiny has triggered a test build. You can view the workflow run here.

@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@c3024
Copy link
Contributor

c3024 commented Nov 27, 2024

There is no bottom margin on confirm button for group chat on Desktop Chrome with this branch.

Screenshot 2024-11-28 at 12 00 47 AM

@chrispader
Copy link
Contributor Author

There is no bottom margin on confirm button for group chat on Desktop Chrome with this branch.

@c3024 please try again, i didn't yet push all commits sorry

@chrispader chrispader marked this pull request as ready for review November 27, 2024 18:41
@chrispader chrispader requested review from a team as code owners November 27, 2024 18:41
@melvin-bot melvin-bot bot requested review from mollfpr and removed request for a team November 27, 2024 18:41
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Nov 27, 2024

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

@chrispader chrispader changed the title [CP Staging] Fix: Android edge-to-edge related inset/padding issues [CP Staging] [WIP] Fix: Android edge-to-edge related inset/padding issues Nov 27, 2024
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Nov 27, 2024

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@github-actions GitHub Actions
Copy link
Contributor

🚧 @mountiny has triggered a test build. You can view the workflow run here.

@chrispader chrispader changed the title [CP Staging] [WIP] Fix: Android edge-to-edge related inset/padding issues [CP Staging] Fix: Android edge-to-edge related inset/padding issues Nov 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

🧪🧪 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/53223/index.html ❌ FAILED ❌
Android The QR code can't be generated, because the iOS build failed
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/53223/NewExpensify.dmg https://53223.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@chrispader
Copy link
Contributor Author

BUG

Menu overlapping with device buttons

I couldn't repro myself, but should be fixed now.

@allroundexperts
Copy link
Contributor

@chrispader Lint failures.

@chrispader
Copy link
Contributor Author

@chrispader Lint failures.

just fixed

@allroundexperts
Copy link
Contributor

This is still the same. Do you have physical buttons in your android?

Screenshot 2024-11-28 at 2 25 22 PM

@chrispader
Copy link
Contributor Author

Cannot reproduce :/

Nov 28 2024 Expensify Dev Screenshot (1)

@kirillzyusko
Copy link
Contributor

Cannot reproduce :/

Not reproducible on Pixel 7 Pro (Android 15)

Let me try Xiaomi Redmi Note 5 Pro (Android 9)

mountiny
mountiny approved these changes Nov 28, 2024
View reviewed changes
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

The remaining issues feel like a minor user interface programs on android since we are not creating new android release for a production I think it's okay to move this fix to staging and then focus on the general fix for these safe area issues

Users are not blocked from taking the actions hence I don't think it should block the deploy

@kirillzyusko
Copy link
Contributor

Can not reproduce on my physical devcies:

Pixel 7 Pro Xiaomi Redmi Note 5 Pro
telegram-cloud-photo-size-2-5350372745428459289-y telegram-cloud-photo-size-2-5350372745428459262-y

@mountiny
Copy link
Contributor

@allroundexperts basically approved with just one pending comment so I will go ahead with this merge. Chris and Kiryl cannot reproduce

@mountiny mountiny merged commit 6430cd7 into Expensify:main Nov 28, 2024
15 of 16 checks passed
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Nov 28, 2024

@mountiny 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.

@melvin-bot melvin-bot bot added the Emergency label Nov 28, 2024
@mountiny
Copy link
Contributor

ESLint failing because of the useOnyx migration which we wont do in this CP PR

OSBotify pushed a commit that referenced this pull request Nov 28, 2024
@mountiny @OSBotify
Merge pull request #53223 from margelo/@chrispader/fix-53161
0dbb67e 
[CP Staging] Fix: Android edge-to-edge related inset/padding issues

(cherry picked from commit 6430cd7)

(CP triggered by mountiny)
@github-actions github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Nov 28, 2024
@mountiny mountiny mentioned this pull request Nov 28, 2024
Merged
50 tasks
@github-actions github-actions bot mentioned this pull request Nov 28, 2024
Closed
75 tasks
@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.

@github-actions GitHub Actions
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.67-8 🚀

platform result
🤖 android 🤖 false ❌
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 success ✅
🍎🔄 iOS HybridApp 🍎🔄 success ✅

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

@github-actions GitHub Actions
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.67-9 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 failure ❌
🍎🔄 iOS HybridApp 🍎🔄 failure ❌

This was referenced Nov 28, 2024
Closed
Closed
Closed
Closed
@neonbhai neonbhai mentioned this pull request Nov 28, 2024
Closed
8 tasks
fedirjh
fedirjh reviewed Dec 11, 2024
View reviewed changes
src/pages/NewChatPage.tsx
@@ -252,14 +252,27 @@ function NewChatPage() {
return (
<Button
onPress={() => toggleOption(item)}
style={[styles.pl2]}
style={[styles.pl2, insets.bottom ? styles.mb5 : undefined]}
Copy link
Contributor

Choose a reason for hiding this comment

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

This change has introduced a regression in #53261 , there is no need to add the extra margin.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fedirjh fedirjh fedirjh left review comments

@kirillzyusko kirillzyusko kirillzyusko left review comments

@mountiny mountiny mountiny approved these changes

@allroundexperts allroundexperts Awaiting requested review from allroundexperts

@c3024 c3024 Awaiting requested review from c3024

Assignees

@chrispader chrispader

Labels
CP Staging marks PRs that have been CP'd to staging Ready To Build
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@chrispader @c3024 @allroundexperts @mountiny @kirillzyusko @OSBotify @fedirjh