From caa97737c7e09658f45281ea9830a0ef409bbc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukast@status.im>
Date: Fri, 3 May 2024 12:25:59 +0200
Subject: [PATCH] fix(ui-test): fix sporadic failures to load
 CreateChannelPopupPage

thus also fixing the failing `tests/ui` in CI
---
 .../models/ChannelPermissionsModelEditor.qml  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/ui/app/AppLayouts/Communities/models/ChannelPermissionsModelEditor.qml b/ui/app/AppLayouts/Communities/models/ChannelPermissionsModelEditor.qml
index 79ec292348..58e2b2594e 100644
--- a/ui/app/AppLayouts/Communities/models/ChannelPermissionsModelEditor.qml
+++ b/ui/app/AppLayouts/Communities/models/ChannelPermissionsModelEditor.qml
@@ -246,26 +246,25 @@ QtObject {
             }
         }
         
+        readonly property var filteredPermissionsModel: SortFilterProxyModel {
+            sourceModel: root.permissionsModel
+
+            filters: [
+                FastExpressionFilter {
+                    function filterPredicate(id, permissionType) {
+                        return !PermissionTypes.isCommunityPermission(permissionType) && root.permissionsModel.belongsToChat(id, root.channelId)
+                    }
+                    expression: {
+                        return filterPredicate(model.id, model.permissionType)
+                    }
+                    expectedRoles: [ "id", "permissionType" ]
+                }
+            ]
+        }
 
         // Channel permissions model containing the temporarely edited permissions
         property WritableProxyModel channelPermissionsModel: WritableProxyModel {
-            sourceModel: SortFilterProxyModel {
-                id: filteredPermissionsModel
-
-                sourceModel: root.permissionsModel
-
-                filters: [
-                    FastExpressionFilter {
-                        function filterPredicate(id, permissionType) {
-                            return !PermissionTypes.isCommunityPermission(permissionType) && root.permissionsModel.belongsToChat(id, root.channelId)
-                        }
-                        expression: {
-                            return filterPredicate(model.id, model.permissionType)
-                        }
-                        expectedRoles: [ "id", "permissionType" ]
-                    }
-                ]
-            }
+            sourceModel: filteredPermissionsModel
         }
 
         // Channels model containing the temporarely edited channel