75634:macOS Safari - Conversation - digit:emoji: displays corrupted characters in Safari by abbasifaizan70 · Pull Request #77304 · Expensify/App

abbasifaizan70 · 2025-12-10T23:48:07Z

Explanation of Change

This PR resolves an issue in Safari where adding an emoji after a digit results in corrupted characters.

Fixed Issues

$ #75634
PROPOSAL: #75634 (comment)

Tests

Testing Steps for New Message

Navigate to the web app in Safari
Open any existing conversation or start a new one
In the compose box, type a digit (e.g., 1, 234, 5)
Without adding a space, type an emoji shortcode (e.g., 😄, ❤️, 👍)
Press Enter or click Send
In the compose box, type a digit (e.g., 1, 234, 5)
Without adding a space, open the emoji picker and select an emoji
Press Enter or click Send
The message displays correctly with the digit followed by the emoji (e.g., 1😄, 234❤️)
No corrupted characters, malformed Unicode sequences, or keycap emoji conversion

Testing Steps for Edit Message

Navigate to the web app in Safari
Open any existing conversation that has a message you can edit
Click on an existing message and select "Edit" from the context menu
Clear the existing text and type a digit (e.g., 1, 234, 5)
Without adding a space, type an emoji shortcode (e.g., 😄, ❤️, 👍)
Press Enter or click the checkmark to save changes
Verify the edited message displays correctly with the digit followed by the emoji (e.g., 1😄, 234❤️)
Edit another message, type a digit (e.g., 1, 234, 5)
Without adding a space, open the emoji picker and select an emoji
Press Enter or click the checkmark to save changes
Verify the edited message displays correctly with the digit followed by the emoji
No corrupted characters, malformed Unicode sequences, or keycap emoji conversion

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

Screenshots/Videos

Android: Native

Screen.Recording.2025-12-11.at.5.07.12.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-12-11.at.4.56.56.PM.mov

iOS: Native

New message

Screen.Recording.2025-12-11.at.5.05.06.PM.mov

Edit message

Screen.Recording.2025-12-19.at.1.59.29.AM.mov

iOS: mWeb Safari

New message

Screen.Recording.2025-12-11.at.4.56.56.PM.mov

Edit message

Screen.Recording.2025-12-13.at.5.44.20.AM.mov

MacOS: Chrome / Safari

Safari:

New message

Screen.Recording.2025-12-11.at.4.37.11.AM.mov

Edit message

Screen.Recording.2025-12-13.at.3.44.58.AM.mov

Chrome:

New message

Screen.Recording.2025-12-11.at.4.39.07.AM.mov

Edit message

Screen.Recording.2025-12-13.at.3.45.57.AM.mov

…haracters in Safari

codecov · 2025-12-10T23:56:49Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/CONST/index.ts	`83.47% <ø> (-3.01%)`	⬇️
...omposerWithSuggestions/ComposerWithSuggestions.tsx	`58.36% <100.00%> (+0.41%)`	⬆️
.../pages/home/report/ReportActionItemMessageEdit.tsx	`56.10% <60.00%> (+0.14%)`	⬆️
src/libs/EmojiUtils.tsx	`62.67% <70.00%> (+0.25%)`	⬆️
... and 472 files with indirect coverage changes

melvin-bot · 2025-12-11T13:39:06Z

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

Krishna2323 · 2025-12-12T18:43:49Z

@abbasifaizan70 could you please add automated test coverage for the changes? Thanks!

Krishna2323 · 2025-12-12T19:00:51Z

@abbasifaizan70 the changes does not work when editing messages, we also need to update ReportActionItemMessageEdit.

abbasifaizan70 · 2025-12-13T18:04:17Z

@Krishna2323 updated the Edit case and added automated test cases. Thanks

abbasifaizan70 · 2025-12-17T21:11:51Z

@Krishna2323 resolved feedback. Please have a look. Thanks

Krishna2323 · 2025-12-18T07:34:01Z

@abbasifaizan70 could you please also update the testing steps for edit composer? Thanks!

Krishna2323 · 2025-12-18T13:34:00Z

+                const textBeforeCursor = emojiConvertedText.substring(0, cursorPosition);
+                const textWithZWNJBeforeCursor = insertZWNJBetweenDigitAndEmoji(textBeforeCursor);
+                zwnjOffset = textWithZWNJBeforeCursor.length - textBeforeCursor.length;
+            }


@abbasifaizan70 this block can be refactored since it’s duplicated in both components. Apart from this, everything looks good. Let me know once you’ve refactored it, and I’ll approve.

Krishna2323 · 2025-12-18T13:44:29Z

@abbasifaizan70 android app crashes when editing the message:

Monosnap.screencast.2025-12-18.19-12-34.mp4

abbasifaizan70 · 2025-12-18T13:45:43Z

@abbasifaizan70 android app crashes when editing the message:

Monosnap.screencast.2025-12-18.19-12-34.mp4

sure i am looking to fix all feedback.

…on-safari

abbasifaizan70 · 2025-12-18T21:05:06Z

Screen.Recording.2025-12-19.at.1.59.29.AM.mov

@Krishna2323 check please. Updated test steps for edit composer. Thanks

Krishna2323 · 2025-12-27T02:43:32Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- 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 there are no new alerts related to the canBeMissing param for useOnyx
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 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 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 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.ts 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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

web_safarii.mp4

abbasifaizan70 · 2025-12-27T19:50:57Z

@Krishna2323 Please have a look. I moved regex into CONST. Thanks.

Krishna2323

LGTM! 🚀

Beamanator

Looks great to me! But would be even slightly better to explain a bit more about the terms that people may not know much about

abbasifaizan70 · 2025-12-29T16:43:25Z

@Beamanator Added detailed comment about ZWNJ. Please have a look. Thanks

Beamanator

Looks great to me! Thanks!

OSBotify · 2025-12-29T17:26:43Z

✋ 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 · 2025-12-30T15:19:41Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.2.89-1 🚀

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

OSBotify · 2025-12-31T18:33:37Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.2.89-6 🚀

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

75634:macOS Safari - Conversation - digit:emoji: displays corrupted c…

4a78156

…haracters in Safari

melvin-bot Bot assigned abbasifaizan70 Dec 10, 2025

fixed spelling issue

543acd2

abbasifaizan70 marked this pull request as ready for review December 11, 2025 13:38

abbasifaizan70 requested review from a team as code owners December 11, 2025 13:38

melvin-bot Bot requested review from Krishna2323 and heyjennahay and removed request for a team and heyjennahay December 11, 2025 13:39

abbasifaizan70 mentioned this pull request Dec 11, 2025

[Due for payment 2026-02-27] [$500] macOS Safari - Conversation - digit:emoji: displays corrupted characters in Safari #75634

Closed

9 tasks

abbasifaizan70 added 2 commits December 13, 2025 05:54

Added emoji fix on edit message flow & added test cases

181938f

fixed spelling issue

be9d2e3

Krishna2323 suggested changes Dec 17, 2025

View reviewed changes

Comment thread src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx Outdated

Comment thread src/pages/home/report/ReportActionItemMessageEdit.tsx

abbasifaizan70 added 2 commits December 18, 2025 01:40

resolved feedbacks

a98c823

fixed lint issue

049a7de

Krishna2323 suggested changes Dec 18, 2025

View reviewed changes

abbasifaizan70 and others added 2 commits December 19, 2025 00:45

Merge branch 'Expensify:main' into 75634-fixed-emoji-corrupted-issue-…

b3e2bc7

…on-safari

refactor code

d4413da

abbasifaizan70 requested a review from Krishna2323 December 18, 2025 21:05

Krishna2323 suggested changes Dec 27, 2025

View reviewed changes

Comment thread src/libs/EmojiUtils.tsx Outdated

Added regex into const

59932fa

Krishna2323 approved these changes Dec 29, 2025

View reviewed changes

melvin-bot Bot requested a review from Beamanator December 29, 2025 04:11

Beamanator reviewed Dec 29, 2025

View reviewed changes

Comment thread src/libs/EmojiUtils.tsx Outdated

Beamanator previously approved these changes Dec 29, 2025

View reviewed changes

Added details of ZNWJ in comment

1ce186c

abbasifaizan70 dismissed Beamanator’s stale review via 1ce186c December 29, 2025 16:42

Beamanator approved these changes Dec 29, 2025

View reviewed changes

Beamanator merged commit 8fbc797 into Expensify:main Dec 29, 2025
31 checks passed

OSBotify mentioned this pull request Dec 30, 2025

Deploy Checklist: New Expensify 2025-12-30 #78583

Closed

56 tasks

trjExpensify mentioned this pull request Jan 12, 2026

Fix Safari emoji corruption bug by inserting ZWNJ between digits/symbols (#, *) and emojis #79265

Merged

53 tasks

Conversation

abbasifaizan70 commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Testing Steps for New Message

Testing Steps for Edit Message

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

New message

Edit message

New message

Edit message

Safari:

New message

Edit message

Chrome:

New message

Edit message

Uh oh!

codecov Bot commented Dec 10, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Dec 11, 2025

Uh oh!

Krishna2323 commented Dec 12, 2025

Uh oh!

Krishna2323 commented Dec 12, 2025

Uh oh!

abbasifaizan70 commented Dec 13, 2025

Uh oh!

Uh oh!

Uh oh!

abbasifaizan70 commented Dec 17, 2025

Uh oh!

Krishna2323 commented Dec 18, 2025

Uh oh!

Krishna2323 Dec 18, 2025

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Dec 18, 2025

Uh oh!

abbasifaizan70 commented Dec 18, 2025

Uh oh!

abbasifaizan70 commented Dec 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Krishna2323 commented Dec 27, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

abbasifaizan70 commented Dec 27, 2025

Uh oh!

Krishna2323 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

abbasifaizan70 commented Dec 29, 2025

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Dec 29, 2025

Uh oh!

OSBotify commented Dec 30, 2025

Uh oh!

OSBotify commented Dec 31, 2025

Uh oh!

Reviewers

Assignees

Labels

abbasifaizan70 commented Dec 10, 2025 •

edited

Loading

codecov Bot commented Dec 10, 2025 •

edited by github-actions Bot

Loading

abbasifaizan70 commented Dec 18, 2025 •

edited

Loading