chore: Merge 4.70.0 into master

.github/actions/build-ios/action.yml

@@ -53,7 +53,7 @@ runs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.4'
+        xcode-version: '26.2.0'
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/actions/upload-ios/action.yml

@@ -91,7 +91,7 @@ runs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.2'
+        xcode-version: '26.2.0'
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/workflows/build-ios.yml

@@ -22,7 +22,7 @@ jobs:
 
   build-ios:
     name: Build
-    runs-on: macos-15
+    runs-on: macos-26
     needs: [build-hold]
     if: ${{ inputs.type == 'experimental' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
     steps:
@@ -62,7 +62,7 @@ jobs:
 
   upload-ios:
     name: Upload
-    runs-on: macos-15
+    runs-on: macos-26
     needs: [build-ios]
     if: ${{ inputs.type == 'experimental' && (always() && (needs.build-ios.result == 'success')) }}
     steps:

.github/workflows/build-official-ios.yml

@@ -22,7 +22,7 @@ jobs:
 
   build-ios:
     name: Build
-    runs-on: macos-15
+    runs-on: macos-26
     needs: [build-hold]
     if: ${{ inputs.type == 'official' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
     steps:
@@ -72,7 +72,7 @@ jobs:
 
   upload-ios:
     name: Upload
-    runs-on: macos-15
+    runs-on: macos-26
     needs: [upload-hold]
     if: ${{ inputs.type == 'official' && (always() && (needs.upload-hold.result == 'success' || needs.upload-hold.result == 'skipped')) }}
     steps:

.github/workflows/e2e-build-ios.yml

@@ -22,7 +22,7 @@ on:
 
 jobs:
   ios-build:
-    runs-on: macos-15
+    runs-on: macos-26
 
     steps:
       - name: Checkout repository
@@ -34,7 +34,7 @@ jobs:
       - name: Set up Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '16.4'
+          xcode-version: '26.2.0'
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

.github/workflows/prettier.yml

@@ -46,5 +46,5 @@ jobs:
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor }}@users.noreply.github.com"
           git add .
-          git commit -m "chore: format code and fix lint issues [skip ci]"
+          git commit -m "chore: format code and fix lint issues"
           git push origin ${{ github.ref_name }}

.maestro/helpers/login-with-deeplink.yaml

@@ -10,6 +10,9 @@ tags:
       true: CLEAR_STATE
     commands:
       - clearState: chat.rocket.reactnative
+- setPermissions:
+    permissions:
+      all: allow
 - evalScript: ${output.login = output.utils.login(USERNAME, PASSWORD)}
 - runFlow:
     file: 'open-deeplink.yaml'
@@ -24,24 +27,6 @@ tags:
             visible: '.*Pixel Launcher.*'
           commands:
             - tapOn: 'Close App'
-      - extendedWaitUntil:
-          visible:
-            text: '.*Allow.*'
-          timeout: 30000
-          optional: true
-      - tapOn:
-          text: '.*Allow.*'
-          optional: true
-      - assertNotVisible:
-          text: '.*Allow.*'
-          optional: true
-- runFlow:
-    when:
-      visible: '.*Would like to send you notifications.*'
-      platform: iOS
-    commands:
-      - tapOn:
-          point: 65%,60%
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-view'

.maestro/tests/room/ignoreuser.yaml

@@ -89,7 +89,8 @@ tags:
       id: 'username-header-${output.otherUser.username}'
     timeout: 60000
 - tapOn:
-    id: 'username-header-${output.otherUser.username}'
+    text: ${output.otherUser.username}
+    index: 1
     retryTapIfNoChange: true
 - extendedWaitUntil:
     visible:
@@ -210,7 +211,9 @@ tags:
     visible:
       text: ${output.otherUser.username}
     timeout: 60000
-- tapOn: ${output.otherUser.username}
+- tapOn:
+    text: ${output.otherUser.username}
+    index: 1
 - extendedWaitUntil:
     visible:
       id: 'room-info-view'

.maestro/tests/room/search-member.yaml

@@ -0,0 +1,91 @@
+appId: chat.rocket.reactnative
+name: Search Member
+onFlowStart:
+  - runFlow: '../../helpers/setup.yaml'
+tags:
+  - test-13
+
+---
+- evalScript: ${output.user = output.utils.createUser()}
+
+- runFlow:
+    file: '../../helpers/login-with-deeplink.yaml'
+    env:
+      USERNAME: ${output.user.username}
+      PASSWORD: ${output.user.password}
+
+- runFlow:
+    file: '../../helpers/navigate-to-room.yaml'
+    env:
+      ROOM: 'general'
+- tapOn:
+    id: room-header
+- extendedWaitUntil:
+    visible:
+      id: 'room-actions-view'
+    timeout: 60000
+- tapOn:
+    id: 'room-actions-members'
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-search'
+    timeout: 60000
+
+# should search in all users
+- tapOn:
+    id: room-members-view-search
+- inputText: rohit.bansal
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-item-rohit.bansal'
+    timeout: 60000
+
+# use online status and it should use the text filter
+- tapOn:
+    id: room-members-view-filter
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-toggle-status-online'
+    timeout: 60000
+- tapOn:
+    id: room-members-view-toggle-status-online
+- extendedWaitUntil:
+    visible:
+      text: 'No members found'
+    timeout: 60000
+
+# use all status again and it should use text filter
+- tapOn:
+    id: room-members-view-filter
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-toggle-status-all'
+    timeout: 60000
+- tapOn:
+    id: room-members-view-toggle-status-all
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-item-rohit.bansal'
+    timeout: 60000
+- tapOn:
+    id: clear-text-input
+
+- evalScript: ${output.secondUser = output.utils.createUser()}
+
+# should search for new user in all list
+- tapOn:
+    id: room-members-view-search
+- inputText: ${output.secondUser.username}
+- extendedWaitUntil:
+    visible:
+      id: 'room-members-view-item-${output.secondUser.username}'
+    timeout: 60000
+
+# Verify "No members found" message appears correctly when search returns no results
+- tapOn:
+    id: room-members-view-search
+- inputText: nonexistentuser12345
+- extendedWaitUntil:
+    visible:
+      text: 'No members found'
+    timeout: 60000

android/app/build.gradle

@@ -90,7 +90,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.69.0"
+        versionName "4.70.0"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
         resValue "string", "rn_config_reader_custom_package", "chat.rocket.reactnative"

android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt

@@ -20,6 +20,7 @@ import chat.rocket.reactnative.storage.MMKVKeyManager;
 import chat.rocket.reactnative.storage.SecureStoragePackage;
 import chat.rocket.reactnative.notification.VideoConfTurboPackage
 import chat.rocket.reactnative.notification.PushNotificationTurboPackage
+import chat.rocket.reactnative.scroll.InvertedScrollPackage
 
 /**
  * Main Application class.
@@ -44,6 +45,7 @@ open class MainApplication : Application(), ReactApplication {
               add(VideoConfTurboPackage())
               add(PushNotificationTurboPackage())
               add(SecureStoragePackage())
+              add(InvertedScrollPackage())
             }
 
         override fun getJSMainModuleName(): String = "index"

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

@@ -93,6 +93,20 @@ class NotificationIntentHandler {
             }
 
             try {
+                val notId = extras.getString("notId")
+
+                // Clear the notification messages from the static map to prevent stacking
+                if (!notId.isNullOrEmpty()) {
+                    try {
+                        val notIdInt = notId.toIntOrNull()
+                        if (notIdInt != null) {
+                            CustomPushNotification.clearMessages(notIdInt)
+                        }
+                    } catch (e: Exception) {
+                        Log.e(TAG, "Error clearing notification messages for ID $notId: ${e.message}", e)
+                    }
+                }
+
                 // Extract all notification data from Intent extras
                 // Only include serializable types to avoid JSON serialization errors
                 val notificationData = mutableMapOf<String, Any?>()

android/app/src/main/java/chat/rocket/reactnative/scroll/InvertedScrollContentView.java

@@ -0,0 +1,23 @@
+package chat.rocket.reactnative.scroll;
+
+import android.view.View;
+import com.facebook.react.views.view.ReactViewGroup;
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * Content view for inverted FlatLists. Reports its children to accessibility in reversed order so
+ * TalkBack traversal matches the visual order (newest-first) when used inside InvertedScrollView.
+ */
+public class InvertedScrollContentView extends ReactViewGroup {
+
+  public InvertedScrollContentView(android.content.Context context) {
+    super(context);
+  }
+
+  @Override
+  public void addChildrenForAccessibility(ArrayList<View> outChildren) {
+    super.addChildrenForAccessibility(outChildren);
+    Collections.reverse(outChildren);
+  }
+}

android/app/src/main/java/chat/rocket/reactnative/scroll/InvertedScrollContentViewManager.java

@@ -0,0 +1,25 @@
+package chat.rocket.reactnative.scroll;
+
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.views.view.ReactViewManager;
+
+/**
+ * View manager for InvertedScrollContentView. Behaves like a View but reports children in reversed
+ * order for accessibility so TalkBack matches the visual order in inverted lists.
+ */
+@ReactModule(name = InvertedScrollContentViewManager.REACT_CLASS)
+public class InvertedScrollContentViewManager extends ReactViewManager {
+
+  public static final String REACT_CLASS = "InvertedScrollContentView";
+
+  @Override
+  public String getName() {
+    return REACT_CLASS;
+  }
+
+  @Override
+  public InvertedScrollContentView createViewInstance(ThemedReactContext context) {
+    return new InvertedScrollContentView(context);
+  }
+}

android/app/src/main/java/chat/rocket/reactnative/scroll/InvertedScrollPackage.java

@@ -0,0 +1,24 @@
+package chat.rocket.reactnative.scroll;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import java.util.Collections;
+import java.util.List;
+
+public class InvertedScrollPackage implements ReactPackage {
+
+  @Override
+  public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+    List<ViewManager> managers = new java.util.ArrayList<>();
+    managers.add(new InvertedScrollViewManager());
+    managers.add(new InvertedScrollContentViewManager());
+    return managers;
+  }
+}

android/app/src/main/java/chat/rocket/reactnative/scroll/InvertedScrollView.java

@@ -0,0 +1,36 @@
+package chat.rocket.reactnative.scroll;
+
+import android.view.View;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.views.scroll.ReactScrollView;
+import java.util.ArrayList;
+import java.util.Collections;
+
+// When a FlatList is inverted (inverted={true}), React Native uses scaleY: -1 transform which
+// visually inverts the list but Android still reports children in array order. This view overrides
+// addChildrenForAccessibility to reverse the order so TalkBack matches the visual order.
+
+public class InvertedScrollView extends ReactScrollView {
+
+  private boolean mIsInvertedVirtualizedList = false;
+
+  public InvertedScrollView(ReactContext context) {
+    super(context);
+  }
+
+
+  // Set whether this ScrollView is used for an inverted virtualized list. When true, we reverse the
+  // accessibility traversal order to match the visual order.
+
+  public void setIsInvertedVirtualizedList(boolean isInverted) {
+    mIsInvertedVirtualizedList = isInverted;
+  }
+
+  @Override
+  public void addChildrenForAccessibility(ArrayList<View> outChildren) {
+    super.addChildrenForAccessibility(outChildren);
+    if (mIsInvertedVirtualizedList) {
+      Collections.reverse(outChildren);
+    }
+  }
+}