fix editing just emoji cuts top part android #19798

kushu7 · 2023-05-30T06:10:19Z

Details

Fixed Issues

$ #19605
PROPOSAL: #19605 (comment)

Tests

Go to android
Go to any chat
Send just emoji
Now edit the message and add more emoji and save it (Do not add any text)
Notice that now emoji preview is not getting cut off.

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Go to android
Go to any chat
Send just emoji
Now edit the message and add more emoji and save it (Do not add any text)
Notice that now emoji preview is not getting cut off.

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 / Chrome
- iOS / native
- iOS / 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 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 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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

github-actions · 2023-05-30T06:10:34Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

melvin-bot · 2023-05-30T06:10:51Z

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

kushu7 · 2023-05-30T06:11:46Z

I have read the CLA Document and I hereby sign the CLA

kushu7 · 2023-05-30T06:18:06Z

recheck

cristipaval · 2023-05-31T17:30:35Z

@kushu7 you should have added the entire link to the Fixed issues instead of the issue number. This way Melvin knows who to assign as reviewers (the same persons who are assigned the issue).

cristipaval · 2023-05-31T17:33:41Z

The PR is ready for review, @mananjadhav

cristipaval · 2023-05-31T17:34:31Z

Hey @kushu7 you're all set with the CLA now. But it seems that Lint is complaining. Could you please take care of that?

mananjadhav · 2023-05-31T18:00:16Z

Thanks @cristipaval. ~~@kushu7 Can you please fix the lint issue as commented earlier?~~ I just the commit.

kushu7 · 2023-05-31T18:01:18Z

@kushu7 you should have added the entire link to the Fixed issues instead of the issue number. This way Melvin knows who to assign as reviewers (the same persons who are assigned the issue).

Sure will take care next time.

Thanks @cristipaval. @kushu7 Can you please fix the lint issue as commented earlier?

Just fixed linting error

mananjadhav · 2023-05-31T19:17:07Z

src/pages/home/report/ReportActionItemFragment.js

@@ -129,7 +129,7 @@ const ReportActionItemFragment = (props) => {
                        >
                            <Text
                                selectable={false}
-                                style={[styles.w1, styles.userSelectNone]}
+                                style={[EmojiUtils.containsOnlyEmojis(text) ? styles.onlyEmojisTextLineHeight : undefined, styles.w1, styles.userSelectNone]}


@kushu7 I can see EmojiUtils.containsOnlyEmojis(text) already being called in the parent Text EMOJI_TEXT_FONT. Can we take this method outside the return to be called only once, and the boolean result at both the places?

kushu7 · 2023-06-01T02:37:32Z

@mananjadhav I have pushed the changes, please review again.

mananjadhav

Changes look good, checklist coming up in a few mins.

mananjadhav · 2023-06-01T04:38:55Z

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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Web

web-emojis-line-height.mov

Mobile Web - Chrome

mweb-chrome-emojis-line-height.mov

Mobile Web - Safari

mweb-safari-emojis-line-height.mov

Desktop

desktop-emojis-line-height.mov

iOS

ios-emojis-line-height.mov

Android

Before Fix

After Fix

android-emojis-line-height.mov

Change works well, @cristipaval All yours.

OSBotify · 2023-06-02T08:43:18Z

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

OSBotify · 2023-06-02T12:40:22Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.23-0 🚀

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

OSBotify · 2023-06-02T13:19:53Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 1.3.23-0 🚀

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

OSBotify · 2023-06-05T19:05:23Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.23-7 🚀

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

OSBotify · 2023-06-05T19:29:59Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.23-7 🚀

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

fix editing just emoji cuts top part android

35ca958

kushu7 requested a review from a team as a code owner May 30, 2023 06:10

melvin-bot bot requested review from marcaaron and removed request for a team May 30, 2023 06:10

cristipaval requested review from mananjadhav and cristipaval and removed request for marcaaron May 31, 2023 17:27

fixed prettier

6d354e7

mananjadhav reviewed May 31, 2023

View reviewed changes

use common variable for same condition check

d81b8a7

kushu7 requested a review from mananjadhav May 31, 2023 19:26

mananjadhav approved these changes Jun 1, 2023

View reviewed changes

cristipaval approved these changes Jun 1, 2023

View reviewed changes

cristipaval merged commit 8acc630 into Expensify:main Jun 2, 2023

OSBotify mentioned this pull request Jun 2, 2023

Deploy Checklist: New Expensify 2023-06-02 #20042

Closed

32 tasks

melvin-bot bot mentioned this pull request Jun 5, 2023

[HOLD for payment 2023-06-12] [$1000] Editing just emoji on a chat cuts the top part on android #19605

Closed

6 tasks

kushu7 deleted the fix-19605 branch June 11, 2023 05:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix editing just emoji cuts top part android #19798

fix editing just emoji cuts top part android #19798

kushu7 commented May 30, 2023 •

edited by cristipaval

Loading

github-actions bot commented May 30, 2023 •

edited

Loading

melvin-bot bot commented May 30, 2023

kushu7 commented May 30, 2023

kushu7 commented May 30, 2023

cristipaval commented May 31, 2023

cristipaval commented May 31, 2023

cristipaval commented May 31, 2023 •

edited

Loading

mananjadhav commented May 31, 2023 •

edited

Loading

kushu7 commented May 31, 2023 •

edited

Loading

mananjadhav May 31, 2023

kushu7 May 31, 2023

kushu7 commented Jun 1, 2023

mananjadhav left a comment

mananjadhav commented Jun 1, 2023 •

edited

Loading

OSBotify commented Jun 2, 2023

OSBotify commented Jun 2, 2023

OSBotify commented Jun 2, 2023

OSBotify commented Jun 5, 2023

OSBotify commented Jun 5, 2023

fix editing just emoji cuts top part android #19798

fix editing just emoji cuts top part android #19798

Conversation

kushu7 commented May 30, 2023 • edited by cristipaval Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented May 30, 2023 • edited Loading

melvin-bot bot commented May 30, 2023

kushu7 commented May 30, 2023

kushu7 commented May 30, 2023

cristipaval commented May 31, 2023

cristipaval commented May 31, 2023

cristipaval commented May 31, 2023 • edited Loading

mananjadhav commented May 31, 2023 • edited Loading

kushu7 commented May 31, 2023 • edited Loading

mananjadhav May 31, 2023

Choose a reason for hiding this comment

kushu7 May 31, 2023

Choose a reason for hiding this comment

kushu7 commented Jun 1, 2023

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav commented Jun 1, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Jun 2, 2023

OSBotify commented Jun 2, 2023

OSBotify commented Jun 2, 2023

OSBotify commented Jun 5, 2023

OSBotify commented Jun 5, 2023

kushu7 commented May 30, 2023 •

edited by cristipaval

Loading

github-actions bot commented May 30, 2023 •

edited

Loading

cristipaval commented May 31, 2023 •

edited

Loading

mananjadhav commented May 31, 2023 •

edited

Loading

kushu7 commented May 31, 2023 •

edited

Loading

mananjadhav commented Jun 1, 2023 •

edited

Loading