chore: Merge master into develop

[diegolmello]

Proposed changes

Sync master (4.71.2) hotfix history into develop ahead of the 4.72.0 release merge (#7314), which currently has conflicts.

Conflict resolution:

• Version files (package.json, android/app/build.gradle, ios/RocketChatRN/Info.plist, ios/ShareRocketChatRN/Info.plist, ios/RocketChatRN.xcodeproj/project.pbxproj) → resolved to develop (4.72.0).
• app/views/ChangePasscodeView.tsx and app/views/ScreenLockedView.tsx → kept develop's layout (rerere). Master's older centering CSS would reintroduce the regression fixed by regression: lock screen no longer appears full screen #7118.
• yarn.lock → resolved to develop (axios is at 0.30.3 on both branches; only diff was a stray flow-parser block).

Net diff against develop is a single trailing-newline cleanup in NotificationIntentHandler.kt.

After this lands, #7314 (develop → master for 4.72.0) should become conflict-free.

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
  • Improved notification routing system to better handle VoIP calls, video conference invitations, and push notifications.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: f5534655-faea-426a-a470-94e1df28e617

📥 Commits

Reviewing files that changed from the base of the PR and between 8b70425 and 4de9046.

📒 Files selected for processing (1)

• android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt

💤 Files with no reviewable changes (1)

• android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt

📜 Recent review details

⏰ 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). (2)

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

---

Walkthrough

Introduces NotificationIntentHandler to route incoming notification intents from MainActivity. The handler sequentially delegates to VoIP handling, then routes video-conference intents (with metadata and caller serialization), and finally processes regular notifications (with filtered JSON extraction and stacked-message clearing).

Changes

Notification Intent Routing

Layer / File(s)	Summary
Entry Point and Routing Logic android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt	handleIntent entry point sequentially routes intents to VoIP delegation, video-conference handling if flagged, or regular notification handling otherwise.
Video Conference Intent Handling android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt	handleVideoConfIntent extracts call metadata from extras, cancels existing notification by ID, serializes structured videoconf payload with nested caller object to JSON, stores via VideoConfModule.storePendingAction, and removes the videoConfAction flag.
Regular Notification Intent Handling android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt	handleNotificationIntent requires non-empty ejson extra, optionally clears stacked messages, serializes supported Intent extras into JSON while filtering unsupported types, and persists via PushNotificationModule.storePendingNotification with error logging.

Sequence Diagram

sequenceDiagram
  participant MainActivity
  participant NotificationIntentHandler
  participant VoipNotification
  participant VideoConfModule
  participant PushNotificationModule
  MainActivity->>NotificationIntentHandler: handleIntent(context, intent)
  NotificationIntentHandler->>VoipNotification: handleMainActivityVoipIntent(context, intent)
  alt VoIP handled
    VoipNotification-->>NotificationIntentHandler: true
  else Check video-conf action
    VoipNotification-->>NotificationIntentHandler: false
    alt videoConfAction flag set
      NotificationIntentHandler->>VideoConfModule: handleVideoConfIntent
    else Regular notification
      NotificationIntentHandler->>PushNotificationModule: handleNotificationIntent
    end
  end

Loading

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Suggested labels

type: chore

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The PR title accurately reflects the primary objective: merging master branch hotfix history into develop. While the actual code change is a trailing newline cleanup in NotificationIntentHandler.kt, this is a secondary artifact of a merge conflict resolution, not the main intent of the PR.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

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

---

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

• X
• Mastodon
• Reddit
• LinkedIn

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

[diegolmello]

Closing — wrong direction. Conflicts will be resolved on the 4.72.0-master release branch instead.