chore: Merge 4.68.1 into master by diegolmello · Pull Request #6895 · RocketChat/Rocket.Chat.ReactNative

diegolmello · 2026-01-07T18:54:28Z

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

Bugfix (non-breaking change which fixes an issue)
Improvement (non-breaking change which improves a current function)
New feature (non-breaking change which adds functionality)
Documentation update (if none of the other choices apply)

Checklist

I have read the CONTRIBUTING doc
I have signed the CLA
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works (if applicable)
I have added necessary documentation (if applicable)
Any dependent changes have been merged and published in downstream modules

Further comments

Summary by CodeRabbit

Chores
- Updated application version to 4.68.1 across all platforms
Style
- Enhanced layout flexibility in message display component

_{✏️ Tip: You can customize this high-level summary in your review settings.}

coderabbitai · 2026-01-07T18:54:42Z

Walkthrough

This PR updates the app version from 4.67.1 to 4.68.1 across Android, iOS, and package configuration files, and adds a flex: 1 style to a layout component in the Message component.

Changes

Cohort / File(s)	Summary
Version Bump — Android & Package `android/app/build.gradle`, `package.json`	Updated versionName and version from 4.67.1 to 4.68.1
Version Bump — iOS Configuration `ios/RocketChatRN.xcodeproj/project.pbxproj`, `ios/RocketChatRN/Info.plist`, `ios/ShareRocketChatRN/Info.plist`	Updated MARKETING_VERSION and CFBundleShortVersionString from 4.67.1 to 4.68.1 across Debug/Release build configurations and app/share targets
UI Layout Adjustment `app/containers/message/Message.tsx`	Added style prop (flex: 1) to A11y.Index component for layout refinement

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

RocketChat/Rocket.Chat.ReactNative#6883: Updates the same version-related fields across Android, iOS, and package.json configuration files.
RocketChat/Rocket.Chat.ReactNative#6886: Modifies the same Message.tsx component by adding a style prop to A11y.Index for layout adjustment.
RocketChat/Rocket.Chat.ReactNative#6714: Performs identical version-bump changes across the same build and configuration files.

Suggested reviewers

OtavioStasiak

Poem

🐰 A version hops from point-six to point-eight,
Through Android, iOS, and JSON so great,
With flex: one tiny style we now apply,
The Message component sits perfect and spry! ✨

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title 'chore: Merge 4.68.1 into master' directly describes the main purpose of the pull request—merging version 4.68.1 into the master branch, which aligns with all the version bumps across multiple configuration files.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch 4.68.1-master

📜 Recent review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 25e2d07 and 8fafbc4.

⛔ Files ignored due to path filters (1)

app/containers/message/__snapshots__/Message.test.tsx.snap is excluded by !**/*.snap

📒 Files selected for processing (6)

android/app/build.gradle
app/containers/message/Message.tsx
ios/RocketChatRN.xcodeproj/project.pbxproj
ios/RocketChatRN/Info.plist
ios/ShareRocketChatRN/Info.plist
package.json

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)

GitHub Check: ESLint and Test / run-eslint-and-test

🔇 Additional comments (6)

package.json (1)

3-3: LGTM! Version bump is consistent across platforms.

The version update from 4.67.1 to 4.68.1 aligns with the corresponding updates in Android and iOS configuration files.

ios/ShareRocketChatRN/Info.plist (1)

29-29: LGTM! iOS share extension version updated correctly.

The CFBundleShortVersionString has been updated to match the new version 4.68.1, consistent with the main app and other platform configurations.

android/app/build.gradle (1)

93-93: LGTM! Android version updated correctly.

The versionName has been updated to 4.68.1, consistent with the version bumps across iOS and package.json.

ios/RocketChatRN/Info.plist (1)

31-31: LGTM! iOS main app version updated correctly.

The CFBundleShortVersionString has been updated to 4.68.1, maintaining consistency with all other platform version configurations.

app/containers/message/Message.tsx (1)

170-171: Layout fix looks good, API compatibility verified.

The addition of flex: 1 style to the A11y.Index component properly fixes the thread preview layout by ensuring it expands to fill available space. The style prop is fully supported by the A11y.Index component from react-native-a11y-order, and this pattern is already used elsewhere in the codebase (e.g., IncomingCallNotification). The change is appropriately scoped and follows established conventions.

ios/RocketChatRN.xcodeproj/project.pbxproj (1)

3009-3009: LGTM! Version bump applied correctly.

The MARKETING_VERSION has been updated to 4.68.1 consistently for both Debug and Release configurations of the NotificationService target, aligning with the PR objectives.

Also applies to: 3062-3062

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

diegolmello added 5 commits January 5, 2026 15:41

chore: Bump version to 4.69.0 (#6883)

8337ab7

Set version to 4.68.1

9439677

fix: message thread preview style (#6886)

41c96df

Merge branch 'develop' into 4.68.1

b01b793

Merge branch 'master' into 4.68.1

8fafbc4

diegolmello had a problem deploying to approve_e2e_testing January 7, 2026 18:54 — with GitHub Actions Failure

diegolmello had a problem deploying to official_ios_build January 7, 2026 18:57 — with GitHub Actions Failure

diegolmello had a problem deploying to official_android_build January 7, 2026 18:57 — with GitHub Actions Failure

diegolmello had a problem deploying to experimental_ios_build January 7, 2026 18:57 — with GitHub Actions Failure

diegolmello had a problem deploying to experimental_android_build January 7, 2026 18:57 — with GitHub Actions Failure

diegolmello merged commit 9a472ea into master Jan 7, 2026
7 of 17 checks passed

diegolmello deleted the 4.68.1-master branch January 7, 2026 19:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Merge 4.68.1 into master#6895

chore: Merge 4.68.1 into master#6895
diegolmello merged 5 commits intomasterfrom
4.68.1-master

diegolmello commented Jan 7, 2026 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Jan 7, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

diegolmello commented Jan 7, 2026 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

Checklist

Further comments

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

diegolmello commented Jan 7, 2026 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jan 7, 2026 •

edited

Loading