Skip to content

[Android | iOS] Add borderRadius to mentions in chat#84556

Merged
puneetlath merged 27 commits into
Expensify:mainfrom
software-mansion-labs:war-in/add-border-radius-to-chat
Jun 15, 2026
Merged

[Android | iOS] Add borderRadius to mentions in chat#84556
puneetlath merged 27 commits into
Expensify:mainfrom
software-mansion-labs:war-in/add-border-radius-to-chat

Conversation

@war-in

@war-in war-in commented Mar 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

React Native doesn't support borderRadius on nested <Text> components (only the outermost <Text> gets it). This means mentions in chat messages render with sharp corners on native, even though the live markdown preview (which uses custom rendering) shows them with rounded corners.

This PR adds a React Native patch (react-native+0.83.1+034+nested-text-border-radius.patch) that enables borderRadius support for nested <Text> backgrounds on both iOS and Android:

  • C++ (shared): Adds a std::optional<Float> borderRadius field to TextAttributes, wired through BaseTextProps and attribute conversions.
  • Android: Introduces a custom DrawCommandSpan with ReactBackgroundDrawSpan that draws rounded-rect backgrounds behind text spans.
  • iOS: Adds a custom NSLayoutManager subclass (RCTTextLayoutManagerWithBorderRadius) that overrides fillBackgroundRectArray to draw rounded rectangles using UIBezierPath, with per-line corner rounding for multiline spans.

With this patch, mentions in chat now correctly render with borderRadius, matching the live markdown preview appearance.

Fixed Issues

$ #78873
PROPOSAL:

Tests

  1. Open any chat that contains mentions (e.g. @someone@somecompany.com or #room or @here)
  2. Verify that mentions in chat messages have rounded corners (borderRadius) on both iOS and Android
  3. Verify the rounded corners match the appearance in the live markdown preview (composer)
  4. Send a new message with a mention and verify it also renders with rounded corners
  5. Test with multiline messages containing mentions to verify per-line rounding works correctly

Offline tests

N/A - This is a native rendering change that doesn't depend on network state.

QA Steps

Same as tests

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
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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

Screenshot_20260306_141447_Expensify Dev (1)

Android: mWeb Chrome

N/A - patch only affects native rendering

iOS: Native image (6)
iOS: mWeb Safari

N/A - patch only affects native rendering

MacOS: Chrome / Safari

N/A - patch only affects native rendering

@github-actions

github-actions Bot commented Mar 9, 2026

Copy link
Copy Markdown
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

@war-in war-in changed the title [Android | iOS] Add borderRadius to mentions in chat [HOLD https://github.com/Expensify/App/pull/79962] [Android | iOS] Add borderRadius to mentions in chat Mar 9, 2026
@codecov

codecov Bot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/Image/BaseImage.native.tsx 54.54% <100.00%> (ø)
src/components/ImageSVG/index.android.tsx 100.00% <100.00%> (ø)
src/components/ImageSVG/index.ios.tsx 100.00% <100.00%> (ø)
src/hooks/useThemePreference.ts 100.00% <100.00%> (ø)
...omposerWithSuggestions/ComposerWithSuggestions.tsx 58.87% <100.00%> (ø)
.../SignInPageLayout/BackgroundImage/index.native.tsx 66.66% <ø> (ø)
...ts/AddressSearch/isCurrentTargetInsideContainer.ts 0.00% <0.00%> (ø)
src/components/Image/BaseImage.tsx 0.00% <0.00%> (ø)
src/components/PopoverProvider/index.tsx 0.00% <0.00%> (ø)
...equestStepScan/NavigationAwareCamera/WebCamera.tsx 0.00% <0.00%> (ø)
... and 5 more
... and 12 files with indirect coverage changes

@github-actions

github-actions Bot commented Mar 9, 2026

Copy link
Copy Markdown
Contributor

🚧 @puneetlath has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@war-in war-in changed the title [HOLD https://github.com/Expensify/App/pull/79962] [Android | iOS] Add borderRadius to mentions in chat [Android | iOS] Add borderRadius to mentions in chat Mar 23, 2026

@j-piasecki j-piasecki left a comment

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.

The implementation itself looks good to me!

Comment thread patches/react-native/react-native+0.83.1+036+nested-text-border-radius.patch Outdated
Comment thread patches/react-native/react-native+0.83.1+034+nested-text-border-radius.patch Outdated
Comment thread patches/react-native/react-native+0.83.1+034+nested-text-border-radius.patch Outdated
@war-in war-in marked this pull request as ready for review March 25, 2026 15:16
@war-in war-in requested a review from a team as a code owner March 25, 2026 15:16
@melvin-bot melvin-bot Bot requested a review from parasharrajat March 25, 2026 15:16
@melvin-bot

melvin-bot Bot commented Mar 25, 2026

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]

@melvin-bot melvin-bot Bot removed the request for review from a team March 25, 2026 15:16

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ff0fd4ac20

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread patches/react-native/react-native+0.83.1+036+nested-text-border-radius.patch Outdated
@war-in

war-in commented Apr 2, 2026

Copy link
Copy Markdown
Contributor Author

@parasharrajat kind bump 😄

@parasharrajat

Copy link
Copy Markdown
Member

Sure, I will check this asap.

@mateuuszzzzz

Copy link
Copy Markdown
Contributor

Kind bump 😅 cc: @parasharrajat

@parasharrajat

Copy link
Copy Markdown
Member

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

@war-in

war-in commented May 22, 2026

Copy link
Copy Markdown
Contributor Author

@puneetlath could you retrigger the build? 🙏 Looks like there are some issues with it (#84556 (comment))

@puneetlath

Copy link
Copy Markdown
Contributor

Sorry, just got back from OOO. Triggered a build now.

@github-actions

github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

🚧 @puneetlath has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

🚧 @puneetlath has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

🚧 @puneetlath has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@parasharrajat

This comment was marked as outdated.

@parasharrajat

This comment was marked as outdated.

@parasharrajat

Copy link
Copy Markdown
Member

Screenshots

🔲 iOS / native

Not able to build.

🔲 MacOS / Chrome

16.05.2026_22.02.23_REC.mp4

🔲 Android / native

image

@puneetlath puneetlath merged commit 1fae2f7 into Expensify:main Jun 15, 2026
23 checks passed
@OSBotify

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

Copy link
Copy Markdown
Contributor

🚧 @puneetlath has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.4.8-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 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