Skip to content

chore: Merge 4.69.0 into single-server#6966

Merged
diegolmello merged 18 commits intosingle-serverfrom
4.69.0-single-server
Feb 4, 2026
Merged

chore: Merge 4.69.0 into single-server#6966
diegolmello merged 18 commits intosingle-serverfrom
4.69.0-single-server

Conversation

@diegolmello
Copy link
Member

@diegolmello diegolmello commented Feb 4, 2026

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

  • Bug Fixes

    • Reverted app version from 4.69.0 to 4.68.2
    • Removed Firebase configuration to resolve service issues
    • Made header display non-interactive
  • Chores

    • Updated default server configuration
    • Simplified server discovery on app startup

diegolmello and others added 18 commits January 6, 2026 14:52
* fix: formatting base64 images wrong

* chore: add base64 avatar storybook case

* chore: improve unit tests of getAvatarUrl

* chore: format code and fix lint issues [skip ci]

* fix: unit test

* cleanup

---------

Co-authored-by: OtavioStasiak <OtavioStasiak@users.noreply.github.com>
* fix: hide elements instead of conditional render

* chore: update snapshot test

* fix: remove useMemo

* chore: add case on storybook

* fix: snapshot test

* chore: format code and fix lint issues [skip ci]

---------

Co-authored-by: OtavioStasiak <OtavioStasiak@users.noreply.github.com>
@diegolmello diegolmello changed the base branch from develop to single-server February 4, 2026 14:09
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 4, 2026

Caution

Review failed

The pull request is closed.

Walkthrough

Version is downgraded from 4.69.0 to 4.68.2 across build files and manifests. Firebase configuration files are removed. Server initialization logic is refactored to use a single hardcoded server from app.json instead of dynamic discovery. The NewServerView navigation screen is disabled, and the rooms list header loses interactive functionality.

Changes

Cohort / File(s) Summary
Version downgrade
android/app/build.gradle, package.json, ios/RocketChatRN/Info.plist, ios/ShareRocketChatRN/Info.plist, ios/RocketChatRN.xcodeproj/project.pbxproj
Updated application version from 4.69.0 to 4.68.2 across Android, iOS, and root package manifests.
Firebase configuration removal
android/app/google-services.json, ios/GoogleService-Info.plist
Deleted Firebase/Google services configuration files for both Android and iOS platforms.
Server configuration consolidation
app.json, app/sagas/init.js, app/sagas/login.js
Added hardcoded server URL "https://open.rocket.chat" to app.json; refactored init and login sagas to read server from appConfig and dispatch serverRequest instead of dynamic server discovery; simplified logout flow.
Navigation and UI changes
app/stacks/OutsideStack.tsx, app/views/RoomsListView/components/Header.tsx
Commented out NewServerView import and route in navigation stack; removed TouchableOpacity interactivity from rooms list header, making it a static View.
Build and signing configuration
android/gradle.properties, ios/RocketChatRN.xcodeproj/project.pbxproj
Consolidated hermesEnabled property, downgraded VERSIONCODE from 999999999 to 1, added keystore credentials; updated iOS code signing from Automatic to Manual with explicit team identifiers and provisioning profiles; added pod manifest consistency check build phase.
Debug and utility cleanup
android/app/src/debug/res/values/strings.xml, android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt, patches/@discord+bottom-sheet+4.6.1.patch, patches/expo-file-system+18.1.7.patch
Removed debug app_name and share_extension_name strings; trimmed trailing newline from Kotlin file; patched bottom-sheet animation duration and reduced-motion handling; refactored expo-file-system OkHttpClient to use static companion object.

Sequence Diagram

sequenceDiagram
    participant AppInit as App Init<br/>(initSaga)
    participant AppConfig as appConfig<br/>(app.json)
    participant Storage as Local Storage
    participant Server as Server Action
    participant AppState as App State

    rect rgba(100, 150, 200, 0.5)
    Note over AppInit: Old Flow - Dynamic Discovery
    AppInit->>Storage: Read CURRENT_SERVER
    Storage-->>AppInit: (legacy server data)
    AppInit->>Storage: Query servers DB
    Storage-->>AppInit: Multiple servers
    AppInit->>AppState: selectServerRequest(servers[...])
    end

    rect rgba(150, 200, 100, 0.5)
    Note over AppInit: New Flow - Single Server Config
    AppInit->>AppConfig: Read server URL
    AppConfig-->>AppInit: https://open.rocket.chat
    AppInit->>Storage: Read userId for this server
    alt userId found
        Storage-->>AppInit: userId
        AppInit->>AppState: selectServerRequest(server, version)
    else userId not found
        Storage-->>AppInit: null
        AppInit->>Server: serverRequest(appConfig.server)
        Server-->>AppInit: initiated
        AppInit->>AppState: appStart(ROOT_OUTSIDE)
    end
    end
Loading

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~60 minutes

Possibly related PRs

Poem

🐰 One server now, no more to roam,
The config's home, app.json's home!
Firebase gone, the paths are clear,
A simpler build, we celebrate here! 🎉
Version bumped down (4.68.2 pride),
The app flows streamlined, side by side ✨

✨ 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.69.0-single-server

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 diegolmello merged commit d9fdd09 into single-server Feb 4, 2026
4 of 6 checks passed
@diegolmello diegolmello deleted the 4.69.0-single-server branch February 4, 2026 14:10
@diegolmello diegolmello requested a deployment to experimental_ios_build February 4, 2026 14:11 — with GitHub Actions Waiting
@diegolmello diegolmello requested a deployment to official_android_build February 4, 2026 14:11 — with GitHub Actions Waiting
@diegolmello diegolmello requested a deployment to experimental_android_build February 4, 2026 14:11 — with GitHub Actions Waiting
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.

3 participants