From 0da1b5c6a434a71e78181e89f23e90d686798d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Wed, 9 Aug 2023 19:52:37 +0200
Subject: [PATCH 01/13] MM-50354 - do not show push disabled notification once
 acknowledged

---
 app/actions/app/global.ts                     |  8 ++++
 app/constants/database.ts                     |  1 +
 app/managers/session_manager.ts               |  6 ++-
 app/queries/app/global.ts                     | 16 +++++++
 .../categories_list/header/header.test.tsx    |  1 +
 .../categories_list/header/header.tsx         |  6 ++-
 .../categories_list/header/index.ts           | 12 +++++-
 .../servers/servers_list/server_item/index.ts |  4 +-
 .../servers_list/server_item/server_item.tsx  |  4 +-
 app/utils/helpers.ts                          | 42 +++++++++++++++++++
 app/utils/push_proxy.ts                       | 28 +++++++++++--
 11 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/app/actions/app/global.ts b/app/actions/app/global.ts
index bb98cd5db..c258ba8a3 100644
--- a/app/actions/app/global.ts
+++ b/app/actions/app/global.ts
@@ -77,3 +77,11 @@ export const removeLastViewedChannelIdAndServer = async () => {
 export const removeLastViewedThreadIdAndServer = async () => {
     return storeGlobal(GLOBAL_IDENTIFIERS.LAST_VIEWED_THREAD, null, false);
 };
+
+export const storePushDisabledInServerAcknowledged = async (serverUrl: string) => {
+    return storeGlobal(`${GLOBAL_IDENTIFIERS.PUSH_DISABLED_ACK}${serverUrl}`, 'true', false);
+};
+
+export const removePushDisabledInServerAcknowledged = async (serverUrl: string) => {
+    return storeGlobal(`${GLOBAL_IDENTIFIERS.PUSH_DISABLED_ACK}${serverUrl}`, null, false);
+};
diff --git a/app/constants/database.ts b/app/constants/database.ts
index f14d22a62..d302c280a 100644
--- a/app/constants/database.ts
+++ b/app/constants/database.ts
@@ -82,6 +82,7 @@ export const GLOBAL_IDENTIFIERS = {
     ONBOARDING: 'onboarding',
     LAST_VIEWED_CHANNEL: 'lastViewedChannel',
     LAST_VIEWED_THREAD: 'lastViewedThread',
+    PUSH_DISABLED_ACK: 'pushDisabledAck',
 };
 
 export enum OperationType {
diff --git a/app/managers/session_manager.ts b/app/managers/session_manager.ts
index 0e21ca4a4..c79a69cff 100644
--- a/app/managers/session_manager.ts
+++ b/app/managers/session_manager.ts
@@ -5,7 +5,7 @@ import CookieManager, {type Cookie} from '@react-native-cookies/cookies';
 import {AppState, type AppStateStatus, DeviceEventEmitter, Platform} from 'react-native';
 import FastImage from 'react-native-fast-image';
 
-import {storeOnboardingViewedValue} from '@actions/app/global';
+import {removePushDisabledInServerAcknowledged, storeOnboardingViewedValue} from '@actions/app/global';
 import {cancelSessionNotification, logout, scheduleSessionNotification} from '@actions/remote/session';
 import {Events, Launch} from '@constants';
 import DatabaseManager from '@database/manager';
@@ -21,7 +21,7 @@ import {getCurrentUser} from '@queries/servers/user';
 import {getThemeFromState} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 import {deleteFileCache, deleteFileCacheByDir} from '@utils/file';
-import {isMainActivity} from '@utils/helpers';
+import {extractCleanDomain, isMainActivity} from '@utils/helpers';
 import {addNewServer} from '@utils/server';
 
 import type {LaunchType} from '@typings/launch';
@@ -168,6 +168,8 @@ class SessionManager {
 
         await this.terminateSession(serverUrl, removeServer);
 
+        await removePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl));
+
         if (activeServerUrl === serverUrl) {
             let displayName = '';
             let launchType: LaunchType = Launch.AddServer;
diff --git a/app/queries/app/global.ts b/app/queries/app/global.ts
index 9784c6124..e1ff99bb8 100644
--- a/app/queries/app/global.ts
+++ b/app/queries/app/global.ts
@@ -55,6 +55,22 @@ export const getDontAskForReview = async () => {
     return Boolean(records?.[0]?.value);
 };
 
+export const getPushDisabledInServerAcknowledged = async (serverDomainString: string) => {
+    const records = await queryGlobalValue(`${GLOBAL_IDENTIFIERS.PUSH_DISABLED_ACK}${serverDomainString}`)?.fetch();
+    return Boolean(records?.[0]?.value);
+};
+
+export const observePushDisabledInServerAcknowledged = (serverDomainString: string) => {
+    const query = queryGlobalValue(`${GLOBAL_IDENTIFIERS.PUSH_DISABLED_ACK}${serverDomainString}`);
+    if (!query) {
+        return of$(false);
+    }
+    return query.observe().pipe(
+        switchMap((result) => (result.length ? result[0].observe() : of$(false))),
+        switchMap((v) => of$(Boolean(v))),
+    );
+};
+
 export const getFirstLaunch = async () => {
     const records = await queryGlobalValue(GLOBAL_IDENTIFIERS.FIRST_LAUNCH)?.fetch();
     if (!records?.[0]?.value) {
diff --git a/app/screens/home/channel_list/categories_list/header/header.test.tsx b/app/screens/home/channel_list/categories_list/header/header.test.tsx
index 2832e7f3d..af40f111a 100644
--- a/app/screens/home/channel_list/categories_list/header/header.test.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.test.tsx
@@ -17,6 +17,7 @@ describe('components/channel_list/header', () => {
                 canJoinChannels={true}
                 canInvitePeople={true}
                 displayName={'Test!'}
+                pushDisabledAck={true}
             />,
         );
 
diff --git a/app/screens/home/channel_list/categories_list/header/header.tsx b/app/screens/home/channel_list/categories_list/header/header.tsx
index 4cec3fde3..fb1528d9b 100644
--- a/app/screens/home/channel_list/categories_list/header/header.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.tsx
@@ -38,6 +38,7 @@ type Props = {
     iconPad?: boolean;
     onHeaderPress?: () => void;
     pushProxyStatus: string;
+    pushDisabledAck: boolean;
 }
 
 const getStyles = makeStyleSheetFromTheme((theme: Theme) => ({
@@ -111,6 +112,7 @@ const ChannelListHeader = ({
     iconPad,
     onHeaderPress,
     pushProxyStatus,
+    pushDisabledAck,
 }: Props) => {
     const theme = useTheme();
     const isTablet = useIsTablet();
@@ -166,7 +168,7 @@ const ChannelListHeader = ({
 
     const onPushAlertPress = useCallback(() => {
         if (pushProxyStatus === PUSH_PROXY_STATUS_NOT_AVAILABLE) {
-            alertPushProxyError(intl);
+            alertPushProxyError(intl, serverUrl);
         } else {
             alertPushProxyUnknown(intl);
         }
@@ -206,7 +208,7 @@ const ChannelListHeader = ({
                         >
                             {serverDisplayName}
                         </Text>
-                        {(pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED) && (
+                        {pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && !pushDisabledAck && (
                             <TouchableWithFeedback
                                 onPress={onPushAlertPress}
                                 testID='channel_list_header.push_alert'
diff --git a/app/screens/home/channel_list/categories_list/header/index.ts b/app/screens/home/channel_list/categories_list/header/index.ts
index e726d1491..305883204 100644
--- a/app/screens/home/channel_list/categories_list/header/index.ts
+++ b/app/screens/home/channel_list/categories_list/header/index.ts
@@ -6,7 +6,10 @@ import withObservables from '@nozbe/with-observables';
 import {combineLatest, of as of$} from 'rxjs';
 import {distinctUntilChanged, switchMap} from 'rxjs/operators';
 
+import {observePushDisabledInServerAcknowledged} from '@app/queries/app/global';
+import {extractCleanDomain} from '@app/utils/helpers';
 import {Permissions} from '@constants';
+import {withServerUrl} from '@context/server';
 import {observePermissionForTeam} from '@queries/servers/role';
 import {observeConfigBooleanValue, observePushVerificationStatus} from '@queries/servers/system';
 import {observeCurrentTeam} from '@queries/servers/team';
@@ -16,7 +19,11 @@ import ChannelListHeader from './header';
 
 import type {WithDatabaseArgs} from '@typings/database/database';
 
-const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
+type Props = WithDatabaseArgs & {
+    serverUrl: string;
+}
+
+const enhanced = withObservables([], ({serverUrl, database}: Props) => {
     const team = observeCurrentTeam(database);
 
     const currentUser = observeCurrentUser(database);
@@ -57,7 +64,8 @@ const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
             distinctUntilChanged(),
         ),
         pushProxyStatus: observePushVerificationStatus(database),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl)),
     };
 });
 
-export default withDatabase(enhanced(ChannelListHeader));
+export default withDatabase(withServerUrl(enhanced(ChannelListHeader)));
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
index a46828e71..626f5121d 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
@@ -4,10 +4,11 @@
 import withObservables from '@nozbe/with-observables';
 import {of as of$} from 'rxjs';
 
+import {extractCleanDomain} from '@app/utils/helpers';
 import {Tutorial} from '@constants';
 import {PUSH_PROXY_STATUS_UNKNOWN} from '@constants/push_proxy';
 import DatabaseManager from '@database/manager';
-import {observeTutorialWatched} from '@queries/app/global';
+import {observePushDisabledInServerAcknowledged, observeTutorialWatched} from '@queries/app/global';
 import {observePushVerificationStatus} from '@queries/servers/system';
 
 import ServerItem from './server_item';
@@ -26,6 +27,7 @@ const enhance = withObservables(['highlight'], ({highlight, server}: {highlight:
         server: server.observe(),
         tutorialWatched,
         pushProxyStatus: serverDatabase ? observePushVerificationStatus(serverDatabase) : of$(PUSH_PROXY_STATUS_UNKNOWN),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(extractCleanDomain(server.url)),
     };
 });
 
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
index efe10083e..0f463cba6 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
@@ -44,6 +44,7 @@ type Props = {
     server: ServersModel;
     tutorialWatched: boolean;
     pushProxyStatus: string;
+    pushDisabledAck: boolean;
 }
 
 type BadgeValues = {
@@ -147,6 +148,7 @@ const ServerItem = ({
     server,
     tutorialWatched,
     pushProxyStatus,
+    pushDisabledAck,
 }: Props) => {
     const intl = useIntl();
     const theme = useTheme();
@@ -428,7 +430,7 @@ const ServerItem = ({
                                     >
                                         {displayName}
                                     </Text>
-                                    {server.lastActiveAt > 0 && pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && (
+                                    {server.lastActiveAt > 0 && pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && !pushDisabledAck && (
                                         <CompassIcon
                                             name='alert-outline'
                                             color={theme.errorTextColor}
diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
index cb1915c0c..d464492ff 100644
--- a/app/utils/helpers.ts
+++ b/app/utils/helpers.ts
@@ -162,3 +162,45 @@ export function isMainActivity() {
         android: ShareModule?.getCurrentActivityName() === 'MainActivity',
     });
 }
+
+/**
+ * Extracts the domain name or IP address from a serverUrl.
+ *
+ * @param {string} input - The serverUrl, potentially with a port and protocol.
+ * @returns {string} The extracted domain name or IP address,
+ * or empty if no match is found.
+ *
+ * // Output:
+ * // Input: https://example-something.com => Result: example-something
+ * // Input: http://192.168.1.1 => Result: 192.168.1.1
+ * // Input: https://127.0.0.1:3000 => Result: 127.0.0.1
+ */
+export function extractDomain(input: string) {
+    const regex = /^(https?:\/\/)?([\w.-]+)(:\d+)?$/;
+    const match = input.match(regex);
+
+    if (match && match[2]) {
+        return match[2].replace(/[\W.]/g, '');
+    }
+
+    return '';
+}
+
+/**
+ * Returns the domain name or IP address from a serverUrl without special characters.
+ *
+ * @param {string} domain - The extracted domain from a serverUrl.
+ * @returns {string} The extracted domain name or IP address, modified to remove special characters,
+ * or empty .
+ *
+ * // Output:
+ * // Input: example-something => Result: examplesomething
+ * // Input: 192.168.1.1 => Result: 19216811
+ * // Input: 127.0.0.1 => Result: 127001
+ */
+export function extractCleanDomain(domain: string) {
+    if (!domain) {
+        return '';
+    }
+    return extractDomain(domain).replace(/[\W.]/g, '');
+}
diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index e207c9841..7bfba76c2 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -3,16 +3,30 @@
 
 import {Alert} from 'react-native';
 
+import {storePushDisabledInServerAcknowledged} from '@actions/app/global';
+import {getPushDisabledInServerAcknowledged} from '@app/queries/app/global';
 import {PUSH_PROXY_RESPONSE_NOT_AVAILABLE, PUSH_PROXY_RESPONSE_UNKNOWN, PUSH_PROXY_STATUS_NOT_AVAILABLE, PUSH_PROXY_STATUS_UNKNOWN, PUSH_PROXY_STATUS_VERIFIED} from '@constants/push_proxy';
 import EphemeralStore from '@store/ephemeral_store';
 
+import {extractCleanDomain} from './helpers';
+
 import type {IntlShape} from 'react-intl';
 
-export function canReceiveNotifications(serverUrl: string, verification: string, intl: IntlShape) {
+export async function pushDisabledInServerAck(serverUrl: string) {
+    const extractedDomain = extractCleanDomain(serverUrl);
+    const pushServerDisabledAck = await getPushDisabledInServerAcknowledged(extractedDomain);
+    return pushServerDisabledAck;
+}
+
+export async function canReceiveNotifications(serverUrl: string, verification: string, intl: IntlShape) {
+    const a = await pushDisabledInServerAck(serverUrl);
+
     switch (verification) {
         case PUSH_PROXY_RESPONSE_NOT_AVAILABLE:
             EphemeralStore.setPushProxyVerificationState(serverUrl, PUSH_PROXY_STATUS_NOT_AVAILABLE);
-            alertPushProxyError(intl);
+            if (!a) {
+                alertPushProxyError(intl, serverUrl);
+            }
             break;
         case PUSH_PROXY_RESPONSE_UNKNOWN:
             EphemeralStore.setPushProxyVerificationState(serverUrl, PUSH_PROXY_STATUS_UNKNOWN);
@@ -23,7 +37,14 @@ export function canReceiveNotifications(serverUrl: string, verification: string,
     }
 }
 
-export function alertPushProxyError(intl: IntlShape) {
+const handleAlertResponse = async (buttonIndex: number, serverUrl: string) => {
+    if (buttonIndex === 0) {
+        // User clicked "Okay" acknowledging that the push notifications are disabled on that server
+        await storePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl));
+    }
+};
+
+export function alertPushProxyError(intl: IntlShape, serverUrl: string) {
     Alert.alert(
         intl.formatMessage({
             id: 'alert.push_proxy_error.title',
@@ -35,6 +56,7 @@ export function alertPushProxyError(intl: IntlShape) {
         }),
         [{
             text: intl.formatMessage({id: 'alert.push_proxy.button', defaultMessage: 'Okay'}),
+            onPress: () => handleAlertResponse(0, serverUrl),
         }],
     );
 }

From 7d3115c92043a75b7d9a759cb2b9e3e20232a7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Thu, 10 Aug 2023 13:53:27 +0200
Subject: [PATCH 02/13] enhance regular expression to support optional subpath

---
 app/utils/helpers.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
index d464492ff..715951d38 100644
--- a/app/utils/helpers.ts
+++ b/app/utils/helpers.ts
@@ -174,13 +174,16 @@ export function isMainActivity() {
  * // Input: https://example-something.com => Result: example-something
  * // Input: http://192.168.1.1 => Result: 192.168.1.1
  * // Input: https://127.0.0.1:3000 => Result: 127.0.0.1
+ * // Input: https://subdomain.example.com/api => subdomain.example.com/api
+ * // Input: http://localhost:8080/app/v1 => localhost:8080/app/v1
  */
 export function extractDomain(input: string) {
-    const regex = /^(https?:\/\/)?([\w.-]+)(:\d+)?$/;
+    const regex = /^(https?:\/\/)?([\w.-]+)(:\d+)?(\/\S*)?/;
     const match = input.match(regex);
 
-    if (match && match[2]) {
-        return match[2].replace(/[\W.]/g, '');
+    if (match) {
+        const modifiedString = match[2] + (match[4] || '');
+        return modifiedString;
     }
 
     return '';

From 7244f95fea86ebd3866a68edb8cc36d871738b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Mon, 21 Aug 2023 17:31:16 +0200
Subject: [PATCH 03/13] add unit test; refactor function; not remove on logout
 but on server remove

---
 app/managers/session_manager.ts               |  5 +--
 .../categories_list/header/header.test.tsx    | 32 +++++++++++++++-
 .../categories_list/header/index.ts           |  4 +-
 .../servers/servers_list/server_item/index.ts |  4 +-
 app/utils/helpers.ts                          | 37 +++++--------------
 app/utils/push_proxy.ts                       | 10 ++---
 6 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/app/managers/session_manager.ts b/app/managers/session_manager.ts
index c79a69cff..09b0c1301 100644
--- a/app/managers/session_manager.ts
+++ b/app/managers/session_manager.ts
@@ -21,7 +21,7 @@ import {getCurrentUser} from '@queries/servers/user';
 import {getThemeFromState} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 import {deleteFileCache, deleteFileCacheByDir} from '@utils/file';
-import {extractCleanDomain, isMainActivity} from '@utils/helpers';
+import {createKeyFromServerUrl, isMainActivity} from '@utils/helpers';
 import {addNewServer} from '@utils/server';
 
 import type {LaunchType} from '@typings/launch';
@@ -121,6 +121,7 @@ class SessionManager {
         WebsocketManager.invalidateClient(serverUrl);
 
         if (removeServer) {
+            await removePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl));
             await DatabaseManager.destroyServerDatabase(serverUrl);
         } else {
             await DatabaseManager.deleteServerDatabase(serverUrl);
@@ -168,8 +169,6 @@ class SessionManager {
 
         await this.terminateSession(serverUrl, removeServer);
 
-        await removePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl));
-
         if (activeServerUrl === serverUrl) {
             let displayName = '';
             let launchType: LaunchType = Launch.AddServer;
diff --git a/app/screens/home/channel_list/categories_list/header/header.test.tsx b/app/screens/home/channel_list/categories_list/header/header.test.tsx
index af40f111a..5959534ca 100644
--- a/app/screens/home/channel_list/categories_list/header/header.test.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.test.tsx
@@ -3,7 +3,7 @@
 
 import React from 'react';
 
-import {PUSH_PROXY_STATUS_VERIFIED} from '@constants/push_proxy';
+import {PUSH_PROXY_RESPONSE_NOT_AVAILABLE, PUSH_PROXY_STATUS_VERIFIED} from '@constants/push_proxy';
 import {renderWithIntl} from '@test/intl-test-helper';
 
 import Header from './header';
@@ -23,4 +23,34 @@ describe('components/channel_list/header', () => {
 
         expect(toJSON()).toMatchSnapshot();
     });
+
+    it('Push notifications disabled and not having ackoledge show alert icon', () => {
+        const wrapper = renderWithIntl(
+            <Header
+                pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
+                canCreateChannels={true}
+                canJoinChannels={true}
+                canInvitePeople={true}
+                displayName={'Test!'}
+                pushDisabledAck={false}
+            />,
+        );
+
+        expect(wrapper.getByTestId('channel_list_header.push_alert')).toBeTruthy();
+    });
+
+    it('Push notifications disabled but after ackoledging do not show alert icon', () => {
+        const wrapper = renderWithIntl(
+            <Header
+                pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
+                canCreateChannels={true}
+                canJoinChannels={true}
+                canInvitePeople={true}
+                displayName={'Test!'}
+                pushDisabledAck={true}
+            />,
+        );
+
+        expect(wrapper.queryByTestId('channel_list_header.push_alert')).toBeNull();
+    });
 });
diff --git a/app/screens/home/channel_list/categories_list/header/index.ts b/app/screens/home/channel_list/categories_list/header/index.ts
index 305883204..8d72dda1a 100644
--- a/app/screens/home/channel_list/categories_list/header/index.ts
+++ b/app/screens/home/channel_list/categories_list/header/index.ts
@@ -7,7 +7,7 @@ import {combineLatest, of as of$} from 'rxjs';
 import {distinctUntilChanged, switchMap} from 'rxjs/operators';
 
 import {observePushDisabledInServerAcknowledged} from '@app/queries/app/global';
-import {extractCleanDomain} from '@app/utils/helpers';
+import {createKeyFromServerUrl} from '@app/utils/helpers';
 import {Permissions} from '@constants';
 import {withServerUrl} from '@context/server';
 import {observePermissionForTeam} from '@queries/servers/role';
@@ -64,7 +64,7 @@ const enhanced = withObservables([], ({serverUrl, database}: Props) => {
             distinctUntilChanged(),
         ),
         pushProxyStatus: observePushVerificationStatus(database),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl)),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl)),
     };
 });
 
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
index 626f5121d..dd0d83ff0 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
@@ -4,7 +4,7 @@
 import withObservables from '@nozbe/with-observables';
 import {of as of$} from 'rxjs';
 
-import {extractCleanDomain} from '@app/utils/helpers';
+import {createKeyFromServerUrl} from '@app/utils/helpers';
 import {Tutorial} from '@constants';
 import {PUSH_PROXY_STATUS_UNKNOWN} from '@constants/push_proxy';
 import DatabaseManager from '@database/manager';
@@ -27,7 +27,7 @@ const enhance = withObservables(['highlight'], ({highlight, server}: {highlight:
         server: server.observe(),
         tutorialWatched,
         pushProxyStatus: serverDatabase ? observePushVerificationStatus(serverDatabase) : of$(PUSH_PROXY_STATUS_UNKNOWN),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(extractCleanDomain(server.url)),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(createKeyFromServerUrl(server.url)),
     };
 });
 
diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
index 715951d38..dabfafd30 100644
--- a/app/utils/helpers.ts
+++ b/app/utils/helpers.ts
@@ -164,46 +164,27 @@ export function isMainActivity() {
 }
 
 /**
- * Extracts the domain name or IP address from a serverUrl.
+ * Uses the serverUrl to create a key.
  *
  * @param {string} input - The serverUrl, potentially with a port and protocol.
  * @returns {string} The extracted domain name or IP address,
  * or empty if no match is found.
  *
  * // Output:
- * // Input: https://example-something.com => Result: example-something
- * // Input: http://192.168.1.1 => Result: 192.168.1.1
- * // Input: https://127.0.0.1:3000 => Result: 127.0.0.1
- * // Input: https://subdomain.example.com/api => subdomain.example.com/api
- * // Input: http://localhost:8080/app/v1 => localhost:8080/app/v1
+ * // Input: https://example-something.com => Result: examplesomething
+ * // Input: http://192.168.1.1 => Result: 19216811
+ * // Input: https://127.0.0.1:3000 => Result: 1270013000
+ * // Input: https://subdomain.example.com/api => subdomainexamplecomapi
+ * // Input: http://localhost:8080/app/v1 => localhost8080appv1
  */
-export function extractDomain(input: string) {
+export function createKeyFromServerUrl(input: string) {
     const regex = /^(https?:\/\/)?([\w.-]+)(:\d+)?(\/\S*)?/;
     const match = input.match(regex);
 
     if (match) {
-        const modifiedString = match[2] + (match[4] || '');
-        return modifiedString;
+        const domainWithPortAndSubpath = match[2] + (match[3] || '') + (match[4] || '');
+        return domainWithPortAndSubpath.replace(/[^\w]/g, '');
     }
 
     return '';
 }
-
-/**
- * Returns the domain name or IP address from a serverUrl without special characters.
- *
- * @param {string} domain - The extracted domain from a serverUrl.
- * @returns {string} The extracted domain name or IP address, modified to remove special characters,
- * or empty .
- *
- * // Output:
- * // Input: example-something => Result: examplesomething
- * // Input: 192.168.1.1 => Result: 19216811
- * // Input: 127.0.0.1 => Result: 127001
- */
-export function extractCleanDomain(domain: string) {
-    if (!domain) {
-        return '';
-    }
-    return extractDomain(domain).replace(/[\W.]/g, '');
-}
diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index 7bfba76c2..e44a35882 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -8,23 +8,23 @@ import {getPushDisabledInServerAcknowledged} from '@app/queries/app/global';
 import {PUSH_PROXY_RESPONSE_NOT_AVAILABLE, PUSH_PROXY_RESPONSE_UNKNOWN, PUSH_PROXY_STATUS_NOT_AVAILABLE, PUSH_PROXY_STATUS_UNKNOWN, PUSH_PROXY_STATUS_VERIFIED} from '@constants/push_proxy';
 import EphemeralStore from '@store/ephemeral_store';
 
-import {extractCleanDomain} from './helpers';
+import {createKeyFromServerUrl} from './helpers';
 
 import type {IntlShape} from 'react-intl';
 
 export async function pushDisabledInServerAck(serverUrl: string) {
-    const extractedDomain = extractCleanDomain(serverUrl);
+    const extractedDomain = createKeyFromServerUrl(serverUrl);
     const pushServerDisabledAck = await getPushDisabledInServerAcknowledged(extractedDomain);
     return pushServerDisabledAck;
 }
 
 export async function canReceiveNotifications(serverUrl: string, verification: string, intl: IntlShape) {
-    const a = await pushDisabledInServerAck(serverUrl);
+    const hasAckNotification = await pushDisabledInServerAck(serverUrl);
 
     switch (verification) {
         case PUSH_PROXY_RESPONSE_NOT_AVAILABLE:
             EphemeralStore.setPushProxyVerificationState(serverUrl, PUSH_PROXY_STATUS_NOT_AVAILABLE);
-            if (!a) {
+            if (!hasAckNotification) {
                 alertPushProxyError(intl, serverUrl);
             }
             break;
@@ -40,7 +40,7 @@ export async function canReceiveNotifications(serverUrl: string, verification: s
 const handleAlertResponse = async (buttonIndex: number, serverUrl: string) => {
     if (buttonIndex === 0) {
         // User clicked "Okay" acknowledging that the push notifications are disabled on that server
-        await storePushDisabledInServerAcknowledged(extractCleanDomain(serverUrl));
+        await storePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl));
     }
 };
 

From d4cd0cb1de50d13838647f0d4ef2d7d5179ac658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Tue, 22 Aug 2023 15:50:45 +0200
Subject: [PATCH 04/13] implement pr feedback; reuse existing keyfromurl
 function; fix imports

---
 app/managers/session_manager.ts               |  5 ++--
 .../categories_list/header/header.test.tsx    |  4 +--
 .../categories_list/header/index.ts           |  6 ++---
 .../servers/servers_list/server_item/index.ts |  4 +--
 app/utils/helpers.ts                          | 26 -------------------
 app/utils/push_proxy.ts                       | 13 +++++-----
 6 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/app/managers/session_manager.ts b/app/managers/session_manager.ts
index 09b0c1301..f5bbe2562 100644
--- a/app/managers/session_manager.ts
+++ b/app/managers/session_manager.ts
@@ -7,6 +7,7 @@ import FastImage from 'react-native-fast-image';
 
 import {removePushDisabledInServerAcknowledged, storeOnboardingViewedValue} from '@actions/app/global';
 import {cancelSessionNotification, logout, scheduleSessionNotification} from '@actions/remote/session';
+import {urlSafeBase64Encode} from '@app/utils/security';
 import {Events, Launch} from '@constants';
 import DatabaseManager from '@database/manager';
 import {resetMomentLocale} from '@i18n';
@@ -21,7 +22,7 @@ import {getCurrentUser} from '@queries/servers/user';
 import {getThemeFromState} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 import {deleteFileCache, deleteFileCacheByDir} from '@utils/file';
-import {createKeyFromServerUrl, isMainActivity} from '@utils/helpers';
+import {isMainActivity} from '@utils/helpers';
 import {addNewServer} from '@utils/server';
 
 import type {LaunchType} from '@typings/launch';
@@ -121,7 +122,7 @@ class SessionManager {
         WebsocketManager.invalidateClient(serverUrl);
 
         if (removeServer) {
-            await removePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl));
+            await removePushDisabledInServerAcknowledged(urlSafeBase64Encode(serverUrl));
             await DatabaseManager.destroyServerDatabase(serverUrl);
         } else {
             await DatabaseManager.deleteServerDatabase(serverUrl);
diff --git a/app/screens/home/channel_list/categories_list/header/header.test.tsx b/app/screens/home/channel_list/categories_list/header/header.test.tsx
index 5959534ca..8414a7a71 100644
--- a/app/screens/home/channel_list/categories_list/header/header.test.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.test.tsx
@@ -24,7 +24,7 @@ describe('components/channel_list/header', () => {
         expect(toJSON()).toMatchSnapshot();
     });
 
-    it('Push notifications disabled and not having ackoledge show alert icon', () => {
+    it('Push notifications disabled and not having acknoledged it show alert icon', () => {
         const wrapper = renderWithIntl(
             <Header
                 pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
@@ -39,7 +39,7 @@ describe('components/channel_list/header', () => {
         expect(wrapper.getByTestId('channel_list_header.push_alert')).toBeTruthy();
     });
 
-    it('Push notifications disabled but after ackoledging do not show alert icon', () => {
+    it('Push notifications are disabled, but even after acknowledging them, the alert icon does not appear', () => {
         const wrapper = renderWithIntl(
             <Header
                 pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
diff --git a/app/screens/home/channel_list/categories_list/header/index.ts b/app/screens/home/channel_list/categories_list/header/index.ts
index 8d72dda1a..a52c31e83 100644
--- a/app/screens/home/channel_list/categories_list/header/index.ts
+++ b/app/screens/home/channel_list/categories_list/header/index.ts
@@ -6,14 +6,14 @@ import withObservables from '@nozbe/with-observables';
 import {combineLatest, of as of$} from 'rxjs';
 import {distinctUntilChanged, switchMap} from 'rxjs/operators';
 
-import {observePushDisabledInServerAcknowledged} from '@app/queries/app/global';
-import {createKeyFromServerUrl} from '@app/utils/helpers';
 import {Permissions} from '@constants';
 import {withServerUrl} from '@context/server';
+import {observePushDisabledInServerAcknowledged} from '@queries/app/global';
 import {observePermissionForTeam} from '@queries/servers/role';
 import {observeConfigBooleanValue, observePushVerificationStatus} from '@queries/servers/system';
 import {observeCurrentTeam} from '@queries/servers/team';
 import {observeCurrentUser} from '@queries/servers/user';
+import {urlSafeBase64Encode} from '@utils/security';
 
 import ChannelListHeader from './header';
 
@@ -64,7 +64,7 @@ const enhanced = withObservables([], ({serverUrl, database}: Props) => {
             distinctUntilChanged(),
         ),
         pushProxyStatus: observePushVerificationStatus(database),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl)),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(urlSafeBase64Encode(serverUrl)),
     };
 });
 
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
index dd0d83ff0..be9090cc2 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
@@ -4,12 +4,12 @@
 import withObservables from '@nozbe/with-observables';
 import {of as of$} from 'rxjs';
 
-import {createKeyFromServerUrl} from '@app/utils/helpers';
 import {Tutorial} from '@constants';
 import {PUSH_PROXY_STATUS_UNKNOWN} from '@constants/push_proxy';
 import DatabaseManager from '@database/manager';
 import {observePushDisabledInServerAcknowledged, observeTutorialWatched} from '@queries/app/global';
 import {observePushVerificationStatus} from '@queries/servers/system';
+import {urlSafeBase64Encode} from '@utils/security';
 
 import ServerItem from './server_item';
 
@@ -27,7 +27,7 @@ const enhance = withObservables(['highlight'], ({highlight, server}: {highlight:
         server: server.observe(),
         tutorialWatched,
         pushProxyStatus: serverDatabase ? observePushVerificationStatus(serverDatabase) : of$(PUSH_PROXY_STATUS_UNKNOWN),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(createKeyFromServerUrl(server.url)),
+        pushDisabledAck: observePushDisabledInServerAcknowledged(urlSafeBase64Encode(server.url)),
     };
 });
 
diff --git a/app/utils/helpers.ts b/app/utils/helpers.ts
index dabfafd30..cb1915c0c 100644
--- a/app/utils/helpers.ts
+++ b/app/utils/helpers.ts
@@ -162,29 +162,3 @@ export function isMainActivity() {
         android: ShareModule?.getCurrentActivityName() === 'MainActivity',
     });
 }
-
-/**
- * Uses the serverUrl to create a key.
- *
- * @param {string} input - The serverUrl, potentially with a port and protocol.
- * @returns {string} The extracted domain name or IP address,
- * or empty if no match is found.
- *
- * // Output:
- * // Input: https://example-something.com => Result: examplesomething
- * // Input: http://192.168.1.1 => Result: 19216811
- * // Input: https://127.0.0.1:3000 => Result: 1270013000
- * // Input: https://subdomain.example.com/api => subdomainexamplecomapi
- * // Input: http://localhost:8080/app/v1 => localhost8080appv1
- */
-export function createKeyFromServerUrl(input: string) {
-    const regex = /^(https?:\/\/)?([\w.-]+)(:\d+)?(\/\S*)?/;
-    const match = input.match(regex);
-
-    if (match) {
-        const domainWithPortAndSubpath = match[2] + (match[3] || '') + (match[4] || '');
-        return domainWithPortAndSubpath.replace(/[^\w]/g, '');
-    }
-
-    return '';
-}
diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index e44a35882..9ce7cb80a 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -4,18 +4,17 @@
 import {Alert} from 'react-native';
 
 import {storePushDisabledInServerAcknowledged} from '@actions/app/global';
-import {getPushDisabledInServerAcknowledged} from '@app/queries/app/global';
 import {PUSH_PROXY_RESPONSE_NOT_AVAILABLE, PUSH_PROXY_RESPONSE_UNKNOWN, PUSH_PROXY_STATUS_NOT_AVAILABLE, PUSH_PROXY_STATUS_UNKNOWN, PUSH_PROXY_STATUS_VERIFIED} from '@constants/push_proxy';
+import {getPushDisabledInServerAcknowledged} from '@queries/app/global';
 import EphemeralStore from '@store/ephemeral_store';
 
-import {createKeyFromServerUrl} from './helpers';
+import {urlSafeBase64Encode} from './security';
 
 import type {IntlShape} from 'react-intl';
 
-export async function pushDisabledInServerAck(serverUrl: string) {
-    const extractedDomain = createKeyFromServerUrl(serverUrl);
-    const pushServerDisabledAck = await getPushDisabledInServerAcknowledged(extractedDomain);
-    return pushServerDisabledAck;
+export function pushDisabledInServerAck(serverUrl: string) {
+    const extractedDomain = urlSafeBase64Encode(serverUrl);
+    return getPushDisabledInServerAcknowledged(extractedDomain);
 }
 
 export async function canReceiveNotifications(serverUrl: string, verification: string, intl: IntlShape) {
@@ -40,7 +39,7 @@ export async function canReceiveNotifications(serverUrl: string, verification: s
 const handleAlertResponse = async (buttonIndex: number, serverUrl: string) => {
     if (buttonIndex === 0) {
         // User clicked "Okay" acknowledging that the push notifications are disabled on that server
-        await storePushDisabledInServerAcknowledged(createKeyFromServerUrl(serverUrl));
+        await storePushDisabledInServerAcknowledged(urlSafeBase64Encode(serverUrl));
     }
 };
 

From 41ca61966bcf035fb692d5988e401f154fb9b5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Tue, 10 Oct 2023 17:10:44 +0200
Subject: [PATCH 05/13] do not remove inside app  alerts

---
 app/managers/session_manager.ts               |  2 +-
 .../categories_list/header/header.test.tsx    | 19 +------------------
 .../categories_list/header/header.tsx         |  6 ++----
 .../categories_list/header/index.ts           | 12 ++----------
 .../servers/servers_list/server_item/index.ts |  4 +---
 .../servers_list/server_item/server_item.tsx  |  4 +---
 app/utils/push_proxy.ts                       |  6 +++---
 7 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/app/managers/session_manager.ts b/app/managers/session_manager.ts
index f5bbe2562..1ba1fbbb0 100644
--- a/app/managers/session_manager.ts
+++ b/app/managers/session_manager.ts
@@ -7,7 +7,6 @@ import FastImage from 'react-native-fast-image';
 
 import {removePushDisabledInServerAcknowledged, storeOnboardingViewedValue} from '@actions/app/global';
 import {cancelSessionNotification, logout, scheduleSessionNotification} from '@actions/remote/session';
-import {urlSafeBase64Encode} from '@app/utils/security';
 import {Events, Launch} from '@constants';
 import DatabaseManager from '@database/manager';
 import {resetMomentLocale} from '@i18n';
@@ -23,6 +22,7 @@ import {getThemeFromState} from '@screens/navigation';
 import EphemeralStore from '@store/ephemeral_store';
 import {deleteFileCache, deleteFileCacheByDir} from '@utils/file';
 import {isMainActivity} from '@utils/helpers';
+import {urlSafeBase64Encode} from '@utils/security';
 import {addNewServer} from '@utils/server';
 
 import type {LaunchType} from '@typings/launch';
diff --git a/app/screens/home/channel_list/categories_list/header/header.test.tsx b/app/screens/home/channel_list/categories_list/header/header.test.tsx
index 8414a7a71..7299f0c98 100644
--- a/app/screens/home/channel_list/categories_list/header/header.test.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.test.tsx
@@ -17,14 +17,13 @@ describe('components/channel_list/header', () => {
                 canJoinChannels={true}
                 canInvitePeople={true}
                 displayName={'Test!'}
-                pushDisabledAck={true}
             />,
         );
 
         expect(toJSON()).toMatchSnapshot();
     });
 
-    it('Push notifications disabled and not having acknoledged it show alert icon', () => {
+    it('Push notifications disabled show alert icon', () => {
         const wrapper = renderWithIntl(
             <Header
                 pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
@@ -32,25 +31,9 @@ describe('components/channel_list/header', () => {
                 canJoinChannels={true}
                 canInvitePeople={true}
                 displayName={'Test!'}
-                pushDisabledAck={false}
             />,
         );
 
         expect(wrapper.getByTestId('channel_list_header.push_alert')).toBeTruthy();
     });
-
-    it('Push notifications are disabled, but even after acknowledging them, the alert icon does not appear', () => {
-        const wrapper = renderWithIntl(
-            <Header
-                pushProxyStatus={PUSH_PROXY_RESPONSE_NOT_AVAILABLE}
-                canCreateChannels={true}
-                canJoinChannels={true}
-                canInvitePeople={true}
-                displayName={'Test!'}
-                pushDisabledAck={true}
-            />,
-        );
-
-        expect(wrapper.queryByTestId('channel_list_header.push_alert')).toBeNull();
-    });
 });
diff --git a/app/screens/home/channel_list/categories_list/header/header.tsx b/app/screens/home/channel_list/categories_list/header/header.tsx
index fb1528d9b..ca2840642 100644
--- a/app/screens/home/channel_list/categories_list/header/header.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.tsx
@@ -38,7 +38,6 @@ type Props = {
     iconPad?: boolean;
     onHeaderPress?: () => void;
     pushProxyStatus: string;
-    pushDisabledAck: boolean;
 }
 
 const getStyles = makeStyleSheetFromTheme((theme: Theme) => ({
@@ -112,7 +111,6 @@ const ChannelListHeader = ({
     iconPad,
     onHeaderPress,
     pushProxyStatus,
-    pushDisabledAck,
 }: Props) => {
     const theme = useTheme();
     const isTablet = useIsTablet();
@@ -168,7 +166,7 @@ const ChannelListHeader = ({
 
     const onPushAlertPress = useCallback(() => {
         if (pushProxyStatus === PUSH_PROXY_STATUS_NOT_AVAILABLE) {
-            alertPushProxyError(intl, serverUrl);
+            alertPushProxyError(intl);
         } else {
             alertPushProxyUnknown(intl);
         }
@@ -208,7 +206,7 @@ const ChannelListHeader = ({
                         >
                             {serverDisplayName}
                         </Text>
-                        {pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && !pushDisabledAck && (
+                        {pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && (
                             <TouchableWithFeedback
                                 onPress={onPushAlertPress}
                                 testID='channel_list_header.push_alert'
diff --git a/app/screens/home/channel_list/categories_list/header/index.ts b/app/screens/home/channel_list/categories_list/header/index.ts
index a52c31e83..e726d1491 100644
--- a/app/screens/home/channel_list/categories_list/header/index.ts
+++ b/app/screens/home/channel_list/categories_list/header/index.ts
@@ -7,23 +7,16 @@ import {combineLatest, of as of$} from 'rxjs';
 import {distinctUntilChanged, switchMap} from 'rxjs/operators';
 
 import {Permissions} from '@constants';
-import {withServerUrl} from '@context/server';
-import {observePushDisabledInServerAcknowledged} from '@queries/app/global';
 import {observePermissionForTeam} from '@queries/servers/role';
 import {observeConfigBooleanValue, observePushVerificationStatus} from '@queries/servers/system';
 import {observeCurrentTeam} from '@queries/servers/team';
 import {observeCurrentUser} from '@queries/servers/user';
-import {urlSafeBase64Encode} from '@utils/security';
 
 import ChannelListHeader from './header';
 
 import type {WithDatabaseArgs} from '@typings/database/database';
 
-type Props = WithDatabaseArgs & {
-    serverUrl: string;
-}
-
-const enhanced = withObservables([], ({serverUrl, database}: Props) => {
+const enhanced = withObservables([], ({database}: WithDatabaseArgs) => {
     const team = observeCurrentTeam(database);
 
     const currentUser = observeCurrentUser(database);
@@ -64,8 +57,7 @@ const enhanced = withObservables([], ({serverUrl, database}: Props) => {
             distinctUntilChanged(),
         ),
         pushProxyStatus: observePushVerificationStatus(database),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(urlSafeBase64Encode(serverUrl)),
     };
 });
 
-export default withDatabase(withServerUrl(enhanced(ChannelListHeader)));
+export default withDatabase(enhanced(ChannelListHeader));
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
index be9090cc2..a46828e71 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/index.ts
@@ -7,9 +7,8 @@ import {of as of$} from 'rxjs';
 import {Tutorial} from '@constants';
 import {PUSH_PROXY_STATUS_UNKNOWN} from '@constants/push_proxy';
 import DatabaseManager from '@database/manager';
-import {observePushDisabledInServerAcknowledged, observeTutorialWatched} from '@queries/app/global';
+import {observeTutorialWatched} from '@queries/app/global';
 import {observePushVerificationStatus} from '@queries/servers/system';
-import {urlSafeBase64Encode} from '@utils/security';
 
 import ServerItem from './server_item';
 
@@ -27,7 +26,6 @@ const enhance = withObservables(['highlight'], ({highlight, server}: {highlight:
         server: server.observe(),
         tutorialWatched,
         pushProxyStatus: serverDatabase ? observePushVerificationStatus(serverDatabase) : of$(PUSH_PROXY_STATUS_UNKNOWN),
-        pushDisabledAck: observePushDisabledInServerAcknowledged(urlSafeBase64Encode(server.url)),
     };
 });
 
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
index 0f463cba6..efe10083e 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
@@ -44,7 +44,6 @@ type Props = {
     server: ServersModel;
     tutorialWatched: boolean;
     pushProxyStatus: string;
-    pushDisabledAck: boolean;
 }
 
 type BadgeValues = {
@@ -148,7 +147,6 @@ const ServerItem = ({
     server,
     tutorialWatched,
     pushProxyStatus,
-    pushDisabledAck,
 }: Props) => {
     const intl = useIntl();
     const theme = useTheme();
@@ -430,7 +428,7 @@ const ServerItem = ({
                                     >
                                         {displayName}
                                     </Text>
-                                    {server.lastActiveAt > 0 && pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && !pushDisabledAck && (
+                                    {server.lastActiveAt > 0 && pushProxyStatus !== PUSH_PROXY_STATUS_VERIFIED && (
                                         <CompassIcon
                                             name='alert-outline'
                                             color={theme.errorTextColor}
diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index 9ce7cb80a..4dcb3cd3b 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -36,14 +36,14 @@ export async function canReceiveNotifications(serverUrl: string, verification: s
     }
 }
 
-const handleAlertResponse = async (buttonIndex: number, serverUrl: string) => {
-    if (buttonIndex === 0) {
+const handleAlertResponse = async (buttonIndex: number, serverUrl?: string) => {
+    if (buttonIndex === 0 && serverUrl) {
         // User clicked "Okay" acknowledging that the push notifications are disabled on that server
         await storePushDisabledInServerAcknowledged(urlSafeBase64Encode(serverUrl));
     }
 };
 
-export function alertPushProxyError(intl: IntlShape, serverUrl: string) {
+export function alertPushProxyError(intl: IntlShape, serverUrl?: string) {
     Alert.alert(
         intl.formatMessage({
             id: 'alert.push_proxy_error.title',

From 89fc2e8b997d7602137d98059c07295455bddbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Wed, 18 Oct 2023 12:12:37 +0200
Subject: [PATCH 06/13] Update alert text

---
 app/utils/push_proxy.ts     | 2 +-
 assets/base/i18n/en.json    | 2 +-
 assets/base/i18n/en_AU.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index 4dcb3cd3b..332d720e2 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -51,7 +51,7 @@ export function alertPushProxyError(intl: IntlShape, serverUrl?: string) {
         }),
         intl.formatMessage({
             id: 'alert.push_proxy_error.description',
-            defaultMessage: 'Due to the configuration for this server, notifications cannot be received in the mobile app. Contact your system admin for more information.',
+            defaultMessage: 'due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.',
         }),
         [{
             text: intl.formatMessage({id: 'alert.push_proxy.button', defaultMessage: 'Okay'}),
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index eb879a5e3..bd201771e 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -15,7 +15,7 @@
   "account.your_profile": "Your Profile",
   "alert.channel_deleted.description": "The channel {displayName} has been archived.",
   "alert.channel_deleted.title": "Archived channel",
-  "alert.push_proxy_error.description": "Due to the configuration for this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
+  "alert.push_proxy_error.description": "due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
   "alert.push_proxy_error.title": "Notifications cannot be received from this server",
   "alert.push_proxy_unknown.description": "This server was unable to receive push notifications for an unknown reason. This will be attempted again next time you connect.",
   "alert.push_proxy_unknown.title": "Notifications could not be received from this server",
diff --git a/assets/base/i18n/en_AU.json b/assets/base/i18n/en_AU.json
index 0a8a601d3..3dc5875e4 100644
--- a/assets/base/i18n/en_AU.json
+++ b/assets/base/i18n/en_AU.json
@@ -686,7 +686,7 @@
     "alert.push_proxy.button": "Okay",
     "alert.push_proxy_unknown.title": "Notifications could not be received from this server",
     "alert.push_proxy_error.title": "Notifications cannot be received from this server",
-    "alert.push_proxy_error.description": "Due to the configuration for this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
+    "alert.push_proxy_error.description": "due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
     "alert.channel_deleted.title": "Archived channel",
     "alert.channel_deleted.description": "The channel {displayName} has been archived.",
     "account.your_profile": "Your Profile",

From 6dcc999176e75069dca6332de3a0d8a16a874c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Andr=C3=A9s=20V=C3=A9lez=20Vidal?=
 <pablovv2012@gmail.com>
Date: Wed, 18 Oct 2023 21:06:12 +0200
Subject: [PATCH 07/13] capitalize back the alert text

---
 app/utils/push_proxy.ts     | 2 +-
 assets/base/i18n/en.json    | 2 +-
 assets/base/i18n/en_AU.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/utils/push_proxy.ts b/app/utils/push_proxy.ts
index 332d720e2..ec84c91c3 100644
--- a/app/utils/push_proxy.ts
+++ b/app/utils/push_proxy.ts
@@ -51,7 +51,7 @@ export function alertPushProxyError(intl: IntlShape, serverUrl?: string) {
         }),
         intl.formatMessage({
             id: 'alert.push_proxy_error.description',
-            defaultMessage: 'due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.',
+            defaultMessage: 'Due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.',
         }),
         [{
             text: intl.formatMessage({id: 'alert.push_proxy.button', defaultMessage: 'Okay'}),
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index bd201771e..9ef4dd764 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -15,7 +15,7 @@
   "account.your_profile": "Your Profile",
   "alert.channel_deleted.description": "The channel {displayName} has been archived.",
   "alert.channel_deleted.title": "Archived channel",
-  "alert.push_proxy_error.description": "due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
+  "alert.push_proxy_error.description": "Due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
   "alert.push_proxy_error.title": "Notifications cannot be received from this server",
   "alert.push_proxy_unknown.description": "This server was unable to receive push notifications for an unknown reason. This will be attempted again next time you connect.",
   "alert.push_proxy_unknown.title": "Notifications could not be received from this server",
diff --git a/assets/base/i18n/en_AU.json b/assets/base/i18n/en_AU.json
index 3dc5875e4..aa9654932 100644
--- a/assets/base/i18n/en_AU.json
+++ b/assets/base/i18n/en_AU.json
@@ -686,7 +686,7 @@
     "alert.push_proxy.button": "Okay",
     "alert.push_proxy_unknown.title": "Notifications could not be received from this server",
     "alert.push_proxy_error.title": "Notifications cannot be received from this server",
-    "alert.push_proxy_error.description": "due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
+    "alert.push_proxy_error.description": "Due to the configuration of this server, notifications cannot be received in the mobile app. Contact your system admin for more information.",
     "alert.channel_deleted.title": "Archived channel",
     "alert.channel_deleted.description": "The channel {displayName} has been archived.",
     "account.your_profile": "Your Profile",

From 12a29fe33e8abed246adbebc4f54576a4b0901f0 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 19 Oct 2023 10:34:21 +0400
Subject: [PATCH 08/13] Fix race condition when showing the turorial (#7599)

---
 app/components/tutorial_highlight/index.tsx   | 14 +---
 app/components/user_item/user_item.tsx        |  3 +
 .../__snapshots__/index.test.tsx.snap         | 80 ++-----------------
 app/components/user_list_row/index.tsx        | 10 ++-
 .../servers_list/server_item/server_item.tsx  | 12 ++-
 5 files changed, 28 insertions(+), 91 deletions(-)

diff --git a/app/components/tutorial_highlight/index.tsx b/app/components/tutorial_highlight/index.tsx
index 182ad6e6e..2be624c19 100644
--- a/app/components/tutorial_highlight/index.tsx
+++ b/app/components/tutorial_highlight/index.tsx
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.
 
 import React, {useCallback} from 'react';
-import {Modal, StyleSheet, useWindowDimensions, View} from 'react-native';
+import {Modal, useWindowDimensions} from 'react-native';
 
 import HighlightItem from './item';
 
@@ -11,11 +11,10 @@ type Props = {
     itemBounds: TutorialItemBounds;
     itemBorderRadius?: number;
     onDismiss: () => void;
-    onLayout: () => void;
     onShow?: () => void;
 }
 
-const TutorialHighlight = ({children, itemBounds, itemBorderRadius, onDismiss, onLayout, onShow}: Props) => {
+const TutorialHighlight = ({children, itemBounds, itemBorderRadius, onDismiss, onShow}: Props) => {
     const {width, height} = useWindowDimensions();
 
     const handleShowTutorial = useCallback(() => {
@@ -26,19 +25,13 @@ const TutorialHighlight = ({children, itemBounds, itemBorderRadius, onDismiss, o
 
     return (
         <Modal
-            visible={true}
+            visible={itemBounds.endX > 0}
             transparent={true}
             animationType='fade'
             onDismiss={onDismiss}
             onRequestClose={onDismiss}
             testID='tutorial_highlight'
         >
-            <View
-                style={StyleSheet.absoluteFill}
-                pointerEvents='box-none'
-                onLayout={onLayout}
-            />
-            {itemBounds.endX > 0 &&
             <HighlightItem
                 borderRadius={itemBorderRadius}
                 itemBounds={itemBounds}
@@ -47,7 +40,6 @@ const TutorialHighlight = ({children, itemBounds, itemBorderRadius, onDismiss, o
                 width={width}
                 onLayout={handleShowTutorial}
             />
-            }
             {children}
         </Modal>
     );
diff --git a/app/components/user_item/user_item.tsx b/app/components/user_item/user_item.tsx
index 0c2881bb4..a3f4a9e9a 100644
--- a/app/components/user_item/user_item.tsx
+++ b/app/components/user_item/user_item.tsx
@@ -32,6 +32,7 @@ type Props = {
     rightDecorator?: React.ReactNode;
     onUserPress?: (user: UserProfile | UserModel) => void;
     onUserLongPress?: (user: UserProfile | UserModel) => void;
+    onLayout?: () => void;
     disabled?: boolean;
     viewRef?: React.LegacyRef<View>;
     padding?: number;
@@ -102,6 +103,7 @@ const UserItem = ({
     locale,
     teammateNameDisplay,
     rightDecorator,
+    onLayout,
     onUserPress,
     onUserLongPress,
     disabled = false,
@@ -159,6 +161,7 @@ const UserItem = ({
             onPress={onPress}
             onLongPress={onLongPress}
             disabled={!(onUserPress || onUserLongPress)}
+            onLayout={onLayout}
         >
             <View
                 ref={viewRef}
diff --git a/app/components/user_list/__snapshots__/index.test.tsx.snap b/app/components/user_list/__snapshots__/index.test.tsx.snap
index e63f69a87..dfd9f626f 100644
--- a/app/components/user_list/__snapshots__/index.test.tsx.snap
+++ b/app/components/user_list/__snapshots__/index.test.tsx.snap
@@ -138,6 +138,7 @@ exports[`components/channel_list_row should show no results 1`] = `
         collapsable={false}
         focusable={true}
         onClick={[Function]}
+        onLayout={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
         onResponderRelease={[Function]}
@@ -424,6 +425,7 @@ exports[`components/channel_list_row should show results and tutorial 1`] = `
         collapsable={false}
         focusable={true}
         onClick={[Function]}
+        onLayout={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
         onResponderRelease={[Function]}
@@ -551,79 +553,8 @@ exports[`components/channel_list_row should show results and tutorial 1`] = `
         onRequestClose={[Function]}
         testID="tutorial_highlight"
         transparent={true}
-        visible={true}
-      >
-        <View
-          onLayout={[Function]}
-          pointerEvents="box-none"
-          style={
-            {
-              "bottom": 0,
-              "left": 0,
-              "position": "absolute",
-              "right": 0,
-              "top": 0,
-            }
-          }
-        />
-        <View
-          pointerEvents="none"
-          style={
-            [
-              {
-                "alignItems": "center",
-                "bottom": 0,
-                "justifyContent": "center",
-                "left": 0,
-                "position": "absolute",
-                "right": 0,
-                "top": 0,
-              },
-              undefined,
-            ]
-          }
-          testID="tutorial_swipe_left"
-        >
-          <View
-            style={
-              [
-                {
-                  "alignItems": "center",
-                  "backgroundColor": "#ffffff",
-                  "borderRadius": 8,
-                  "height": 161,
-                  "padding": 16,
-                  "width": 247,
-                },
-                {
-                  "top": -74,
-                },
-              ]
-            }
-          >
-            <long_press_illustration.svg />
-            <Text
-              style={
-                [
-                  {
-                    "color": "#3f4350",
-                    "fontFamily": "Metropolis-SemiBold",
-                    "fontSize": 16,
-                    "fontWeight": "600",
-                    "lineHeight": 24,
-                    "marginTop": 8,
-                    "paddingHorizontal": 12,
-                    "textAlign": "center",
-                  },
-                  undefined,
-                ]
-              }
-            >
-              Long-press on an item to view a user's profile
-            </Text>
-          </View>
-        </View>
-      </Modal>
+        visible={false}
+      />
     </View>
     <View
       onFocusCapture={[Function]}
@@ -790,6 +721,7 @@ exports[`components/channel_list_row should show results no tutorial 1`] = `
         collapsable={false}
         focusable={true}
         onClick={[Function]}
+        onLayout={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
         onResponderRelease={[Function]}
@@ -1108,6 +1040,7 @@ exports[`components/channel_list_row should show results no tutorial 2 users 1`]
         collapsable={false}
         focusable={true}
         onClick={[Function]}
+        onLayout={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
         onResponderRelease={[Function]}
@@ -1299,6 +1232,7 @@ exports[`components/channel_list_row should show results no tutorial 2 users 1`]
         collapsable={false}
         focusable={true}
         onClick={[Function]}
+        onLayout={[Function]}
         onResponderGrant={[Function]}
         onResponderMove={[Function]}
         onResponderRelease={[Function]}
diff --git a/app/components/user_list_row/index.tsx b/app/components/user_list_row/index.tsx
index cec7eb6ea..f12b4a952 100644
--- a/app/components/user_list_row/index.tsx
+++ b/app/components/user_list_row/index.tsx
@@ -155,8 +155,10 @@ function UserListRow({
     }, [isChannelAdmin, showManageMode, theme]);
 
     const onLayout = useCallback(() => {
-        startTutorial();
-    }, []);
+        if (showTutorial) {
+            startTutorial();
+        }
+    }, [showTutorial]);
 
     const icon = useMemo(() => {
         if (!selectable && !selected) {
@@ -190,17 +192,19 @@ function UserListRow({
                 viewRef={viewRef}
                 padding={20}
                 includeMargin={includeMargin}
+                onLayout={onLayout}
             />
             {showTutorial &&
             <TutorialHighlight
                 itemBounds={itemBounds}
                 onDismiss={handleDismissTutorial}
-                onLayout={onLayout}
             >
+                {Boolean(itemBounds.endX) &&
                 <TutorialLongPress
                     message={formatMessage({id: 'user.tutorial.long_press', defaultMessage: "Long-press on an item to view a user's profile"})}
                     style={isTablet ? style.tutorialTablet : style.tutorial}
                 />
+                }
             </TutorialHighlight>
             }
         </>
diff --git a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
index efe10083e..c078856e4 100644
--- a/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
+++ b/app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
@@ -213,9 +213,11 @@ const ServerItem = ({
     };
 
     const onLayout = useCallback(() => {
-        swipeable.current?.close();
-        startTutorial();
-    }, []);
+        if (showTutorial) {
+            swipeable.current?.close();
+            startTutorial();
+        }
+    }, [showTutorial]);
 
     const containerStyle = useMemo(() => {
         const style: StyleProp<ViewStyle> = [styles.container];
@@ -390,6 +392,7 @@ const ServerItem = ({
                     style={containerStyle}
                     ref={viewRef}
                     testID={serverItemTestId}
+                    onLayout={onLayout}
                 >
                     <RectButton
                         onPress={onServerPressed}
@@ -474,13 +477,14 @@ const ServerItem = ({
                 itemBounds={itemBounds}
                 onDismiss={handleDismissTutorial}
                 onShow={handleShowTutorial}
-                onLayout={onLayout}
                 itemBorderRadius={8}
             >
+                {Boolean(itemBounds.endX) &&
                 <TutorialSwipeLeft
                     message={intl.formatMessage({id: 'server.tutorial.swipe', defaultMessage: 'Swipe left on a server to see more actions'})}
                     style={isTablet ? styles.tutorialTablet : styles.tutorial}
                 />
+                }
             </TutorialHighlight>
             }
         </>

From f1e17d2ef180d3059dd25abbacd3f78f77f87c56 Mon Sep 17 00:00:00 2001
From: Amy Blais <29708087+amyblais@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:30:33 -0400
Subject: [PATCH 09/13] Update NOTICE.txt (#7607)

---
 NOTICE.txt | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/NOTICE.txt b/NOTICE.txt
index 7a0630561..11ccab47a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -667,6 +667,38 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+---
+
+## @voximplant/react-native-foreground-service
+
+This product contains a modified version of '@voximplant/react-native-foreground-service' by Voximplant.
+
+A foreground service performs some operation that is noticeable to the user.
+
+* HOMEPAGE:
+  * https://github.com/voximplant/react-native-foreground-service
+
+* LICENSE: MIT License
+
+Copyright (c) 2019 Zingaya, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
 ---
 

From cc118c30ebeb26c68e8cfbbbffa2e8094298e9ee Mon Sep 17 00:00:00 2001
From: Tom De Moor <github3@controlaltdieliet.be>
Date: Thu, 19 Oct 2023 16:19:53 +0200
Subject: [PATCH 10/13] Removing empy zh_Han* files that are raising  an alert
 in Weblate (#7615)

Co-authored-by: Tom De Moor <tom@controlaltdieliet.be>
---
 assets/base/i18n/zh_Hans.json | 1 -
 assets/base/i18n/zh_Hant.json | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 assets/base/i18n/zh_Hans.json
 delete mode 100644 assets/base/i18n/zh_Hant.json

diff --git a/assets/base/i18n/zh_Hans.json b/assets/base/i18n/zh_Hans.json
deleted file mode 100644
index 0967ef424..000000000
--- a/assets/base/i18n/zh_Hans.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/assets/base/i18n/zh_Hant.json b/assets/base/i18n/zh_Hant.json
deleted file mode 100644
index 0967ef424..000000000
--- a/assets/base/i18n/zh_Hant.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

From f30384eb22773824584dbd4b628e3a7cc920c16a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 20 Oct 2023 10:55:53 +0400
Subject: [PATCH 11/13] Bump to version 2.10.0 build 490 (#7621)

* Bump app version number to 2.10.0

* Bump app build number to 490
---
 android/app/build.gradle                 | 4 ++--
 ios/Mattermost.xcodeproj/project.pbxproj | 8 ++++----
 ios/Mattermost/Info.plist                | 4 ++--
 ios/MattermostShare/Info.plist           | 4 ++--
 ios/NotificationService/Info.plist       | 4 ++--
 package-lock.json                        | 5 +++--
 package.json                             | 2 +-
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 349155214..668e84164 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 489
-        versionName "2.9.0"
+        versionCode 490
+        versionName "2.10.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index fe32e093e..8d45db34d 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -1929,7 +1929,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 489;
+				CURRENT_PROJECT_VERSION = 490;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1973,7 +1973,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 489;
+				CURRENT_PROJECT_VERSION = 490;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2116,7 +2116,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 489;
+				CURRENT_PROJECT_VERSION = 490;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -2165,7 +2165,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 489;
+				CURRENT_PROJECT_VERSION = 490;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 41404b833..27de4b73f 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.0</string>
+	<string>2.10.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -37,7 +37,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>489</string>
+	<string>490</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index 51abcdda1..006552425 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.0</string>
+	<string>2.10.0</string>
 	<key>CFBundleVersion</key>
-	<string>489</string>
+	<string>490</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>OpenSans-Bold.ttf</string>
diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist
index bef506837..bbe279808 100644
--- a/ios/NotificationService/Info.plist
+++ b/ios/NotificationService/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.9.0</string>
+	<string>2.10.0</string>
 	<key>CFBundleVersion</key>
-	<string>489</string>
+	<string>490</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/package-lock.json b/package-lock.json
index 0f08eb554..aae1845dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mattermost-mobile",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -28521,7 +28521,8 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@voximplant/react-native-foreground-service/-/react-native-foreground-service-3.0.2.tgz",
       "integrity": "sha512-ZIyccOAXPqznA1PAVAYlKZ+GI7kXYCuYgH+gmAkhPouyJbkgrSXaCJJzQ+uBkPr4FBa/PuC/yjzK8vf6tJREQA==",
-      "requires": {}
+      "requires": {
+      }
     },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
diff --git a/package.json b/package.json
index 00059f2e3..cf6e99745 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mattermost-mobile",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Mattermost Mobile with React Native",
   "repository": "git@github.com:mattermost/mattermost-mobile.git",
   "author": "Mattermost, Inc.",

From 1a031cdbbe1a308aa4849cca05ef0afae299e3af Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 24 Oct 2023 16:21:14 -0400
Subject: [PATCH 12/13] MM-54887 Fix category order being reversed after moving
 a channel (#7628)

---
 app/database/models/server/category.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/database/models/server/category.ts b/app/database/models/server/category.ts
index 73b9f87fb..d7247fe22 100644
--- a/app/database/models/server/category.ts
+++ b/app/database/models/server/category.ts
@@ -120,7 +120,7 @@ export default class CategoryModel extends Model implements CategoryInterface {
     toCategoryWithChannels = async (): Promise<CategoryWithChannels> => {
         const categoryChannels = await this.categoryChannels.fetch();
         const orderedChannelIds = categoryChannels.sort((a, b) => {
-            return b.sortOrder - a.sortOrder;
+            return a.sortOrder - b.sortOrder;
         }).map((cc) => cc.channelId);
 
         return {

From 01fdd1f7d4b0e75f1dfc0961d36c5223d20bc200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= <larkox@gmail.com>
Date: Thu, 26 Oct 2023 15:15:54 +0200
Subject: [PATCH 13/13] Fix recent sorting difference with webapp (#7632)

---
 app/utils/categories.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/utils/categories.ts b/app/utils/categories.ts
index 7b2d3e604..91f9afadc 100644
--- a/app/utils/categories.ts
+++ b/app/utils/categories.ts
@@ -180,7 +180,9 @@ const sortChannelsByName = (notifyPropsPerChannel: Record<string, Partial<Channe
 export const sortChannels = (sorting: CategorySorting, channelsWithMyChannel: ChannelWithMyChannel[], notifyPropsPerChannel: Record<string, Partial<ChannelNotifyProps>>, locale: string) => {
     if (sorting === 'recent') {
         return channelsWithMyChannel.sort((cwmA, cwmB) => {
-            return cwmB.myChannel.lastPostAt - cwmA.myChannel.lastPostAt;
+            const a = Math.max(cwmA.myChannel.lastPostAt, cwmA.channel.createAt);
+            const b = Math.max(cwmB.myChannel.lastPostAt, cwmB.channel.createAt);
+            return b - a;
         }).map((cwm) => cwm.channel);
     } else if (sorting === 'manual') {
         return channelsWithMyChannel.sort((cwmA, cwmB) => {