fix(CommunityPermissionsSettingsPanel): fixing duplicates detection a…

…nd permission updating It's integral part of #10166 but not pushed together by mistake.
status-im · Apr 5, 2023 · 9f3d351 · 9f3d351
1 parent ac01824
commit 9f3d351
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityPermissionsSettingsPanel.qml
@@ -213,8 +213,11 @@ SettingsPageLayout {
 
                     const same = (a, b) => ModelUtils.checkEqualitySet(a, b, ["key"])
 
-                    if (holdings.rowCount() === 0 && dirtyValues.holdingsRequired)
-                        continue
+                    if (holdings.rowCount() === 0)
+                        if (dirtyValues.holdingsRequired)
+                            continue
+                        else
+                            return true
 
                     if (holdings.rowCount() !== 0 && !dirtyValues.holdingsRequired)
                         continue
@@ -269,9 +272,11 @@ SettingsPageLayout {
                 target: d
 
                 function onSaveChanges() {
-                    const holdings = ModelUtils.modelToArray(
-                                       dirtyValues.selectedHoldingsModel,
-                                       ["key", "type", "amount"])
+                    const holdings = dirtyValues.holdingsRequired ?
+                                       ModelUtils.modelToArray(
+                                           dirtyValues.selectedHoldingsModel,
+                                           ["key", "type", "amount"])
+                                     : []
 
                     const channels = ModelUtils.modelToArray(
                                        dirtyValues.selectedChannelsModel, ["key"])