From 2e8dfc4120cfa345965fcd8236449673127b15ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= <larkox@gmail.com>
Date: Thu, 9 Mar 2023 17:54:28 +0100
Subject: [PATCH] Consider ExperimentalGroupUnreadChannels for unreads on top
 (#7191)

---
 .../categories_list/categories/index.ts       | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/screens/home/channel_list/categories_list/categories/index.ts b/app/screens/home/channel_list/categories_list/categories/index.ts
index 370932e6c..ed8cf5107 100644
--- a/app/screens/home/channel_list/categories_list/categories/index.ts
+++ b/app/screens/home/channel_list/categories_list/categories/index.ts
@@ -4,13 +4,13 @@
 import {withDatabase} from '@nozbe/watermelondb/DatabaseProvider';
 import withObservables from '@nozbe/with-observables';
 import {of as of$} from 'rxjs';
-import {switchMap} from 'rxjs/operators';
+import {switchMap, combineLatestWith} from 'rxjs/operators';
 
 import {Preferences} from '@constants';
-import {getSidebarPreferenceAsBool} from '@helpers/api/preference';
+import {getPreferenceValue} from '@helpers/api/preference';
 import {queryCategoriesByTeamIds} from '@queries/servers/categories';
 import {querySidebarPreferences} from '@queries/servers/preference';
-import {observeCurrentTeamId, observeOnlyUnreads} from '@queries/servers/system';
+import {observeConfigBooleanValue, observeCurrentTeamId, observeOnlyUnreads} from '@queries/servers/system';
 
 import Categories from './categories';
 
@@ -23,12 +23,24 @@ const enhanced = withObservables(
         const currentTeamId = observeCurrentTeamId(database);
         const categories = currentTeamId.pipe(switchMap((ctid) => queryCategoriesByTeamIds(database, [ctid]).observeWithColumns(['sort_order'])));
 
-        const unreadsOnTop = querySidebarPreferences(database, Preferences.CHANNEL_SIDEBAR_GROUP_UNREADS).
+        const unreadsOnTopUserPreference = querySidebarPreferences(database, Preferences.CHANNEL_SIDEBAR_GROUP_UNREADS).
             observeWithColumns(['value']).
             pipe(
-                switchMap((prefs: PreferenceModel[]) => of$(getSidebarPreferenceAsBool(prefs, Preferences.CHANNEL_SIDEBAR_GROUP_UNREADS))),
+                switchMap((prefs: PreferenceModel[]) => of$(getPreferenceValue<string>(prefs, Preferences.CATEGORIES.SIDEBAR_SETTINGS, Preferences.CHANNEL_SIDEBAR_GROUP_UNREADS))),
             );
 
+        const unreadsOnTopServerPreference = observeConfigBooleanValue(database, 'ExperimentalGroupUnreadChannels');
+
+        const unreadsOnTop = unreadsOnTopServerPreference.pipe(
+            combineLatestWith(unreadsOnTopUserPreference),
+            switchMap(([s, u]) => {
+                if (!u) {
+                    return of$(s);
+                }
+
+                return of$(u !== 'false');
+            }),
+        );
         return {
             categories,
             onlyUnreads: observeOnlyUnreads(database),