Update RN and deps to fix ANR issues (#7078)

2023-02-02 14:27:42 +02:00
parent 5aaff10664
commit 82f0b014f4
13 changed files with 1300 additions and 1404 deletions
--- a/app/database/manager/mocks/index.ts
+++ b/app/database/manager/mocks/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {Database, Model, Q} from '@nozbe/watermelondb';
+import {Database, Q} from '@nozbe/watermelondb';
 import LokiJSAdapter from '@nozbe/watermelondb/adapters/lokijs';
 import logger from '@nozbe/watermelondb/utils/common/logger';
 import {DeviceEventEmitter, Platform} from 'react-native';
@@ -45,14 +45,14 @@ class DatabaseManager {
    private readonly serverModels: Models;

    constructor() {
-        this.appModels = [InfoModel, GlobalModel, ServersModel] as unknown[] as Model[];
+        this.appModels = [InfoModel, GlobalModel, ServersModel];
        this.serverModels = [
            CategoryModel, CategoryChannelModel, ChannelModel, ChannelInfoModel, ChannelMembershipModel, ConfigModel, CustomEmojiModel, DraftModel, FileModel,
            GroupModel, GroupChannelModel, GroupTeamModel, GroupMembershipModel, MyChannelModel, MyChannelSettingsModel, MyTeamModel,
            PostModel, PostsInChannelModel, PostsInThreadModel, PreferenceModel, ReactionModel, RoleModel,
            SystemModel, TeamModel, TeamChannelHistoryModel, TeamMembershipModel, TeamSearchHistoryModel,
            ThreadModel, ThreadParticipantModel, ThreadInTeamModel, TeamThreadsSyncModel, UserModel,
-        ] as unknown[] as Model[];
+        ];
        this.databaseDirectory = '';
    }

--- a/app/database/manager/index.ts
+++ b/app/database/manager/index.ts
@@ -43,14 +43,14 @@ class DatabaseManager {
    private readonly serverModels: Models;

    constructor() {
-        this.appModels = [InfoModel, GlobalModel, ServersModel] as unknown[] as Models;
+        this.appModels = [InfoModel, GlobalModel, ServersModel];
        this.serverModels = [
            CategoryModel, CategoryChannelModel, ChannelModel, ChannelInfoModel, ChannelMembershipModel, ConfigModel, CustomEmojiModel, DraftModel, FileModel,
            GroupModel, GroupChannelModel, GroupTeamModel, GroupMembershipModel, MyChannelModel, MyChannelSettingsModel, MyTeamModel,
            PostModel, PostsInChannelModel, PostsInThreadModel, PreferenceModel, ReactionModel, RoleModel,
            SystemModel, TeamModel, TeamChannelHistoryModel, TeamMembershipModel, TeamSearchHistoryModel,
            ThreadModel, ThreadParticipantModel, ThreadInTeamModel, TeamThreadsSyncModel, UserModel,
-        ] as unknown[] as Models;
+        ];

        this.databaseDirectory = Platform.OS === 'ios' ? getIOSAppGroupDetails().appGroupDatabase : `${FileSystem.DocumentDirectoryPath}/databases/`;
    }
--- a/app/screens/bottom_sheet/index.tsx
+++ b/app/screens/bottom_sheet/index.tsx
@@ -95,6 +95,7 @@ const BottomSheet = ({
    const theme = useTheme();
    const styles = getStyleSheet(theme);
    const interaction = useRef<Handle>();
+    const timeoutRef = useRef<NodeJS.Timeout>();

    useEffect(() => {
        interaction.current = InteractionManager.createInteractionHandle();
@@ -136,7 +137,7 @@ const BottomSheet = ({
    }, []);

    const handleChange = useCallback((index: number) => {
-        setTimeout(() => {
+        timeoutRef.current = setTimeout(() => {
            if (interaction.current) {
                InteractionManager.clearInteractionHandle(interaction.current);
                interaction.current = undefined;
@@ -154,6 +155,16 @@ const BottomSheet = ({
    useEffect(() => {
        hapticFeedback();
        Keyboard.dismiss();
+
+        return () => {
+            if (timeoutRef.current) {
+                clearTimeout(timeoutRef.current);
+            }
+
+            if (interaction.current) {
+                InteractionManager.clearInteractionHandle(interaction.current);
+            }
+        };
    }, []);

    const renderBackdrop = useCallback((props: BottomSheetBackdropProps) => {
@@ -201,6 +212,7 @@ const BottomSheet = ({
            footerComponent={footerComponent}
            keyboardBehavior='extend'
            keyboardBlurBehavior='restore'
+            onClose={close}
        >
            {renderContainerContent()}
        </BottomSheetM>
--- a/app/screens/home/channel_list/categories_list/header/header.tsx
+++ b/app/screens/home/channel_list/categories_list/header/header.tsx
@@ -19,6 +19,7 @@ import {bottomSheet} from '@screens/navigation';
 import {bottomSheetSnapPoint} from '@utils/helpers';
 import {alertPushProxyError, alertPushProxyUnknown} from '@utils/push_proxy';
 import {alertServerLogout} from '@utils/server';
+import {preventDoubleTap} from '@utils/tap';
 import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
 import {typography} from '@utils/typography';

@@ -125,7 +126,7 @@ const ChannelListHeader = ({
        marginLeft.value = iconPad ? 50 : 0;
    }, [iconPad]);

-    const onPress = useCallback(() => {
+    const onPress = useCallback(preventDoubleTap(() => {
        const renderContent = () => {
            return (
                <PlusMenu
@@ -160,7 +161,7 @@ const ChannelListHeader = ({
            theme,
            title: intl.formatMessage({id: 'home.header.plus_menu', defaultMessage: 'Options'}),
        });
-    }, [intl, bottom, isTablet, theme]);
+    }), [intl, bottom, isTablet, theme]);

    const onPushAlertPress = useCallback(() => {
        if (pushProxyStatus === PUSH_PROXY_STATUS_NOT_AVAILABLE) {
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -8,14 +8,14 @@ PODS:
    - CocoaLumberjack/Core (= 3.8.0)
  - CocoaLumberjack/Core (3.8.0)
  - DoubleConversion (1.1.6)
-  - FBLazyVector (0.71.1)
-  - FBReactNativeSpec (0.71.1):
+  - FBLazyVector (0.71.2)
+  - FBReactNativeSpec (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.71.1)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Core (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
+    - RCTRequired (= 0.71.2)
+    - RCTTypeSafety (= 0.71.2)
+    - React-Core (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
  - Flipper (0.125.0):
    - Flipper-Folly (~> 2.6)
    - Flipper-RSocket (~> 1.4)
@@ -79,9 +79,9 @@ PODS:
    - FlipperKit/FlipperKitNetworkPlugin
  - fmt (6.2.1)
  - glog (0.3.5)
-  - hermes-engine (0.71.1):
-    - hermes-engine/Pre-built (= 0.71.1)
-  - hermes-engine/Pre-built (0.71.1)
+  - hermes-engine (0.71.2):
+    - hermes-engine/Pre-built (= 0.71.2)
+  - hermes-engine/Pre-built (0.71.2)
  - HMSegmentedControl (1.5.6)
  - jail-monkey (2.8.0):
    - React-Core
@@ -126,26 +126,26 @@ PODS:
    - fmt (~> 6.2.1)
    - glog
    - libevent
-  - RCTRequired (0.71.1)
-  - RCTTypeSafety (0.71.1):
-    - FBLazyVector (= 0.71.1)
-    - RCTRequired (= 0.71.1)
-    - React-Core (= 0.71.1)
-  - React (0.71.1):
-    - React-Core (= 0.71.1)
-    - React-Core/DevSupport (= 0.71.1)
-    - React-Core/RCTWebSocket (= 0.71.1)
-    - React-RCTActionSheet (= 0.71.1)
-    - React-RCTAnimation (= 0.71.1)
-    - React-RCTBlob (= 0.71.1)
-    - React-RCTImage (= 0.71.1)
-    - React-RCTLinking (= 0.71.1)
-    - React-RCTNetwork (= 0.71.1)
-    - React-RCTSettings (= 0.71.1)
-    - React-RCTText (= 0.71.1)
-    - React-RCTVibration (= 0.71.1)
-  - React-callinvoker (0.71.1)
-  - React-Codegen (0.71.1):
+  - RCTRequired (0.71.2)
+  - RCTTypeSafety (0.71.2):
+    - FBLazyVector (= 0.71.2)
+    - RCTRequired (= 0.71.2)
+    - React-Core (= 0.71.2)
+  - React (0.71.2):
+    - React-Core (= 0.71.2)
+    - React-Core/DevSupport (= 0.71.2)
+    - React-Core/RCTWebSocket (= 0.71.2)
+    - React-RCTActionSheet (= 0.71.2)
+    - React-RCTAnimation (= 0.71.2)
+    - React-RCTBlob (= 0.71.2)
+    - React-RCTImage (= 0.71.2)
+    - React-RCTLinking (= 0.71.2)
+    - React-RCTNetwork (= 0.71.2)
+    - React-RCTSettings (= 0.71.2)
+    - React-RCTText (= 0.71.2)
+    - React-RCTVibration (= 0.71.2)
+  - React-callinvoker (0.71.2)
+  - React-Codegen (0.71.2):
    - FBReactNativeSpec
    - hermes-engine
    - RCT-Folly
@@ -156,182 +156,214 @@ PODS:
    - React-jsiexecutor
    - ReactCommon/turbomodule/bridging
    - ReactCommon/turbomodule/core
-  - React-Core (0.71.1):
+  - React-Core (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.1)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-Core/Default (= 0.71.2)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.71.1):
+  - React-Core/CoreModulesHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/Default (0.71.1):
+  - React-Core/Default (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/DevSupport (0.71.1):
+  - React-Core/DevSupport (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.1)
-    - React-Core/RCTWebSocket (= 0.71.1)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-jsinspector (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-Core/Default (= 0.71.2)
+    - React-Core/RCTWebSocket (= 0.71.2)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-jsinspector (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.71.1):
+  - React-Core/RCTActionSheetHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.71.1):
+  - React-Core/RCTAnimationHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.71.1):
+  - React-Core/RCTBlobHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTImageHeaders (0.71.1):
+  - React-Core/RCTImageHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.71.1):
+  - React-Core/RCTLinkingHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.71.1):
+  - React-Core/RCTNetworkHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.71.1):
+  - React-Core/RCTSettingsHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTTextHeaders (0.71.1):
+  - React-Core/RCTTextHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.71.1):
+  - React-Core/RCTVibrationHeaders (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - React-Core/Default
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-Core/RCTWebSocket (0.71.1):
+  - React-Core/RCTWebSocket (0.71.2):
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.71.1)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-Core/Default (= 0.71.2)
+    - React-cxxreact (= 0.71.2)
+    - React-hermes
+    - React-jsi (= 0.71.2)
+    - React-jsiexecutor (= 0.71.2)
+    - React-perflogger (= 0.71.2)
    - Yoga
-  - React-CoreModules (0.71.1):
+  - React-CoreModules (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Codegen (= 0.71.1)
-    - React-Core/CoreModulesHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-RCTImage (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-cxxreact (0.71.1):
+    - RCTTypeSafety (= 0.71.2)
+    - React-Codegen (= 0.71.2)
+    - React-Core/CoreModulesHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-RCTBlob
+    - React-RCTImage (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-cxxreact (0.71.2):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-jsinspector (= 0.71.1)
-    - React-logger (= 0.71.1)
-    - React-perflogger (= 0.71.1)
-    - React-runtimeexecutor (= 0.71.1)
-  - React-hermes (0.71.1):
+    - React-callinvoker (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-jsinspector (= 0.71.2)
+    - React-logger (= 0.71.2)
+    - React-perflogger (= 0.71.2)
+    - React-runtimeexecutor (= 0.71.2)
+  - React-hermes (0.71.2):
    - DoubleConversion
    - glog
    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
    - RCT-Folly/Futures (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.1)
-    - React-jsiexecutor (= 0.71.1)
-    - React-jsinspector (= 0.71.1)
-    - React-perflogger (= 0.71.1)
-  - React-jsc (0.71.1):
-    - React-jsc/Fabric (= 0.71.1)
-    - React-jsi (= 0.71.1)
-  - React-jsc/Fabric (0.71.1):
-    - React-jsi (= 0.71.1)
-  - React-jsi (0.71.1):
+    - React-cxxreact (= 0.71.2)
+    - React-jsi
+    - React-jsiexecutor (= 0.71.2)
+    - React-jsinspector (= 0.71.2)
+    - React-perflogger (= 0.71.2)
+  - React-jsc (0.71.2):
+    - React-jsc/Fabric (= 0.71.2)
+    - React-jsi (= 0.71.2)
+  - React-jsc/Fabric (0.71.2):
+    - React-jsi (= 0.71.2)
+  - React-jsi (0.71.2):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.71.1):
+  - React-jsiexecutor (0.71.2):
    - DoubleConversion
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-perflogger (= 0.71.1)
-  - React-jsinspector (0.71.1)
-  - React-logger (0.71.1):
+    - React-cxxreact (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-perflogger (= 0.71.2)
+  - React-jsinspector (0.71.2)
+  - React-logger (0.71.2):
    - glog
  - react-native-background-timer (2.4.1):
    - React-Core
@@ -380,89 +412,92 @@ PODS:
  - react-native-webrtc (106.0.4):
    - JitsiWebRTC (~> 106.0.0)
    - React-Core
-  - react-native-webview (11.26.0):
+  - react-native-webview (11.26.1):
    - React-Core
-  - React-perflogger (0.71.1)
-  - React-RCTActionSheet (0.71.1):
-    - React-Core/RCTActionSheetHeaders (= 0.71.1)
-  - React-RCTAnimation (0.71.1):
+  - React-perflogger (0.71.2)
+  - React-RCTActionSheet (0.71.2):
+    - React-Core/RCTActionSheetHeaders (= 0.71.2)
+  - React-RCTAnimation (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTAnimationHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTAppDelegate (0.71.1):
+    - RCTTypeSafety (= 0.71.2)
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTAnimationHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTAppDelegate (0.71.2):
    - RCT-Folly
    - RCTRequired
    - RCTTypeSafety
    - React-Core
    - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.71.1):
+  - React-RCTBlob (0.71.2):
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTBlobHeaders (= 0.71.1)
-    - React-Core/RCTWebSocket (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-RCTNetwork (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTImage (0.71.1):
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTBlobHeaders (= 0.71.2)
+    - React-Core/RCTWebSocket (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-RCTNetwork (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTImage (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTImageHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-RCTNetwork (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTLinking (0.71.1):
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTLinkingHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTNetwork (0.71.1):
+    - RCTTypeSafety (= 0.71.2)
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTImageHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-RCTNetwork (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTLinking (0.71.2):
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTLinkingHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTNetwork (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTNetworkHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTSettings (0.71.1):
+    - RCTTypeSafety (= 0.71.2)
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTNetworkHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTSettings (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.71.1)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTSettingsHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-RCTText (0.71.1):
-    - React-Core/RCTTextHeaders (= 0.71.1)
-  - React-RCTVibration (0.71.1):
+    - RCTTypeSafety (= 0.71.2)
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTSettingsHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-RCTText (0.71.2):
+    - React-Core/RCTTextHeaders (= 0.71.2)
+  - React-RCTVibration (0.71.2):
    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.71.1)
-    - React-Core/RCTVibrationHeaders (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - ReactCommon/turbomodule/core (= 0.71.1)
-  - React-runtimeexecutor (0.71.1):
-    - React-jsi (= 0.71.1)
-  - ReactCommon/turbomodule/bridging (0.71.1):
+    - React-Codegen (= 0.71.2)
+    - React-Core/RCTVibrationHeaders (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - ReactCommon/turbomodule/core (= 0.71.2)
+  - React-runtimeexecutor (0.71.2):
+    - React-jsi (= 0.71.2)
+  - ReactCommon/turbomodule/bridging (0.71.2):
    - DoubleConversion
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.1)
-    - React-Core (= 0.71.1)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-logger (= 0.71.1)
-    - React-perflogger (= 0.71.1)
-  - ReactCommon/turbomodule/core (0.71.1):
+    - React-callinvoker (= 0.71.2)
+    - React-Core (= 0.71.2)
+    - React-cxxreact (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-logger (= 0.71.2)
+    - React-perflogger (= 0.71.2)
+  - ReactCommon/turbomodule/core (0.71.2):
    - DoubleConversion
    - glog
+    - hermes-engine
    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.71.1)
-    - React-Core (= 0.71.1)
-    - React-cxxreact (= 0.71.1)
-    - React-jsi (= 0.71.1)
-    - React-logger (= 0.71.1)
-    - React-perflogger (= 0.71.1)
+    - React-callinvoker (= 0.71.2)
+    - React-Core (= 0.71.2)
+    - React-cxxreact (= 0.71.2)
+    - React-jsi (= 0.71.2)
+    - React-logger (= 0.71.2)
+    - React-perflogger (= 0.71.2)
  - ReactNativeExceptionHandler (2.10.10):
    - React-Core
  - ReactNativeIncallManager (4.0.0):
@@ -531,7 +566,7 @@ PODS:
    - React-RCTText
    - ReactCommon/turbomodule/core
    - Yoga
-  - RNRudderSdk (1.5.2):
+  - RNRudderSdk (1.6.0):
    - React
    - Rudder (~> 1.6.0)
  - RNScreens (3.19.0):
@@ -542,7 +577,7 @@ PODS:
    - Sentry/HybridSDK (= 7.31.5)
  - RNShare (8.1.0):
    - React-Core
-  - RNSVG (13.7.0):
+  - RNSVG (13.8.0):
    - React-Core
  - RNVectorIcons (9.2.0):
    - React-Core
@@ -559,7 +594,7 @@ PODS:
  - Starscream (4.0.4)
  - SwiftyJSON (5.0.1)
  - Swime (3.0.6)
-  - WatermelonDB (0.25.1):
+  - WatermelonDB (0.25.5):
    - React
    - React-jsi
  - Yoga (1.14.0)
@@ -892,8 +927,8 @@ SPEC CHECKSUMS:
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: ad72713385db5289b19f1ead07e8e4aa26dcb01d
-  FBReactNativeSpec: df2602c11e33d310433496e28a48b4b2be652a61
+  FBLazyVector: d58428b28fe1f5070fe993495b0e2eaf701d3820
+  FBReactNativeSpec: 225fb0f0ab00493ce0731f954da3658638d9b191
  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -905,7 +940,7 @@ SPEC CHECKSUMS:
  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  hermes-engine: 922ccd744f50d9bfde09e9677bf0f3b562ea5fb9
+  hermes-engine: 6351580c827b3b03e5f25aadcf989f582d0b0a86
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  jail-monkey: a71b35d482a70ecba844a90f002994012cf12a5d
  JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb
@@ -918,20 +953,20 @@ SPEC CHECKSUMS:
  Permission-Notifications: 150484ae586eb9be4e32217582a78350a9bb31c3
  Permission-PhotoLibrary: 5b34ca67279f7201ae109cef36f9806a6596002d
  RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
-  RCTRequired: fd4d923b964658aa0c4091a32c8b2004c6d9e3a6
-  RCTTypeSafety: c276d85975bde3d8448907235c70bf0da257adfd
-  React: e481a67971af1ce9639c9f746b753dd0e84ca108
-  React-callinvoker: 1051c04a94fa9d243786b86380606bad701a3b31
-  React-Codegen: 14b1e716d361d5ad95e0ce1a338f3fa0733a98b5
-  React-Core: 698fc3baecb80d511d987475a16d036cec6d287f
-  React-CoreModules: 59245305f41ff0adfeac334acc0594dea4585a7c
-  React-cxxreact: 49accd2954b0f532805dbcd1918fa6962f32f247
-  React-hermes: d068733294581a085e95b6024e8d951b005e26d3
-  React-jsc: b4246f1eed2b9addf2edc93b0462c1b4e55fc1d6
-  React-jsi: 122b9bce14f4c6c7cb58f28f87912cfe091885fa
-  React-jsiexecutor: 60cf272aababc5212410e4249d17cea14fc36caa
-  React-jsinspector: ff56004b0c974b688a6548c156d5830ad751ae07
-  React-logger: 60a0b5f8bed667ecf9e24fecca1f30d125de6d75
+  RCTRequired: c154ebcfbf41d6fef86c52674fc1aa08837ff538
+  RCTTypeSafety: 3063e5a1e5b1dc2cbeda5c8f8926c0ad1a6b0871
+  React: 0a1a36e8e81cfaac244ed88b97f23ab56e5434f0
+  React-callinvoker: 679a09fbfe1a8bbf0c8588b588bf3ef85e7e4922
+  React-Codegen: 78f8966839f22b54d3303a6aca2679bce5723c3f
+  React-Core: 679e5ff1eb0e3122463976d0b2049bebcb7b33d6
+  React-CoreModules: 06cbf15185e6daf9fb3aec02c963f4807bd794b3
+  React-cxxreact: 645dc75c9deba4c15698b1b5902236d6a766461f
+  React-hermes: bc7bcfeaaa7cb98dc9f9252f2f3eca66f06f01e2
+  React-jsc: a7ada8baac0b07c60e27a4d25150357e316be2b0
+  React-jsi: 82625f9f1f8d7abf716d897612a9ea06ecf6db6e
+  React-jsiexecutor: c7e028406112db456ac3cf5720d266bc7bc20938
+  React-jsinspector: ea8101acf525ec08b2d87ddf0637d45f8e3b4148
+  React-logger: 97987f46779d8dd24656474ad0c43a5b459f31d6
  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
  react-native-cameraroll: 5b25d0be40185d02e522bf2abf8a1ba4e8faa107
  react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
@@ -949,20 +984,20 @@ SPEC CHECKSUMS:
  react-native-turbo-mailer: fa3f18b5a274fa32ebe43af125caf041f7cc4cbf
  react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
  react-native-webrtc: 4522d420ead45fff83c4ecc7e5a706797857a185
-  react-native-webview: 994b9f8fbb504d6314dc40d83f94f27c6831b3bf
-  React-perflogger: ec8eef2a8f03ecfa6361c2c5fb9197ef4a29cc85
-  React-RCTActionSheet: a0c023b86cf4c862fa9c4eb0f6f91fbe878fb2de
-  React-RCTAnimation: 168d53718c74153947c0109f55900faa64d79439
-  React-RCTAppDelegate: a8efbab128b34aa07a9491c85a41401210b1bec5
-  React-RCTBlob: 9bcbfc893bfda9f6b2eb016329d38c0f6366d31a
-  React-RCTImage: 3fcd4570b4b0f1ac2f4b4b6308dba33ce66c5b50
-  React-RCTLinking: 1edb8e1bb3fc39bf9e13c63d6aaaa3f0c3d18683
-  React-RCTNetwork: 500a79e0e0f67678077df727fabba87a55c043e1
-  React-RCTSettings: cc4414eb84ad756d619076c3999fecbf12896d6f
-  React-RCTText: 2a34261f3da6e34f47a62154def657546ebfa5e1
-  React-RCTVibration: 49d531ec8498e0afa2c9b22c2205784372e3d4f3
-  React-runtimeexecutor: 311feb67600774723fe10eb8801d3138cae9ad67
-  ReactCommon: 03be76588338a27a88d103b35c3c44a3fd43d136
+  react-native-webview: 9f111dfbcfc826084d6c507f569e5e03342ee1c1
+  React-perflogger: c7ccda3d1d1da837f7ff4e54e816022a6803ee87
+  React-RCTActionSheet: 01c125aebbad462a24228f68c584c7a921d6c28e
+  React-RCTAnimation: 5277a9440acffc4a5b7baa6ae3880fe467277ae6
+  React-RCTAppDelegate: 3977201606125157aa94872b4171ca316478939b
+  React-RCTBlob: 8e15fc9091d8947f406ba706f11505b38b1b5e40
+  React-RCTImage: 65319acfe82b85219b2d410725a593abe19ac795
+  React-RCTLinking: a5fc2b9d7a346d6e7d34de8093bb5d1064042508
+  React-RCTNetwork: 5d1efcd01ca7f08ebf286d68be544f747a5d315a
+  React-RCTSettings: fa760b0add819ac3ad73b06715f9547316acdf20
+  React-RCTText: 05c244b135d75d4395eb35c012949a5326f8ab70
+  React-RCTVibration: 0af3babdeee1b2d052811a2f86977d1e1c81ebd1
+  React-runtimeexecutor: 4bf9a9086d27f74065fce1dddac274aa95216952
+  ReactCommon: f697c0ac52e999aa818e43e2b6f277787c735e2d
  ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
  ReactNativeIncallManager: b169b57d3064d8f62478f8fc3c485da6c75045d1
  ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
@@ -979,11 +1014,11 @@ SPEC CHECKSUMS:
  RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
  RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
  RNReanimated: cc5e3aa479cb9170bcccf8204291a6950a3be128
-  RNRudderSdk: 07f732edfe473ef67b8cc6ad1800ddb81b78286f
+  RNRudderSdk: c2e707ce96c78137950980e060acd4ad5dc141ac
  RNScreens: ea4cd3a853063cda19a4e3c28d2e52180c80f4eb
  RNSentry: 7e90aec2633d2fdad8aeb839c9915e4376fd27d1
  RNShare: 48b3113cd089a2be8ff0515c3ae7a46a4db8a76b
-  RNSVG: d787d64ca06b9158e763ad2638a8c4edce00782a
+  RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
  RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
  Rudder: 7c080303528ea612f58c9f9e8fcfab92b5dbcca8
  SDWebImage: a47aea9e3d8816015db4e523daff50cfd294499d
@@ -994,8 +1029,8 @@ SPEC CHECKSUMS:
  Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
  SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
-  WatermelonDB: cce0b748ccbd7a71c161e8545b5f6357a0945be1
-  Yoga: 921eb014669cf9c718ada68b08d362517d564e0c
+  WatermelonDB: 6ae836b52d11281d87187ff2283480e44b111771
+  Yoga: 5b0304b3dbef2b52e078052138e23a19c7dacaef
  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

 PODFILE CHECKSUM: 9f76739ed16bbdc0f4b1049ecb366fb5d23a0f3a
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -21,24 +21,24 @@
    "@mattermost/react-native-turbo-log": "0.2.2",
    "@mattermost/react-native-turbo-mailer": "0.2.3",
    "@msgpack/msgpack": "2.8.0",
-    "@nozbe/watermelondb": "0.25.1",
+    "@nozbe/watermelondb": "0.25.5",
    "@nozbe/with-observables": "1.4.1",
    "@react-native-camera-roll/camera-roll": "5.2.3",
    "@react-native-clipboard/clipboard": "1.11.1",
    "@react-native-community/datetimepicker": "6.7.3",
    "@react-native-community/netinfo": "9.3.7",
    "@react-native-cookies/cookies": "6.2.1",
-    "@react-navigation/bottom-tabs": "6.5.3",
-    "@react-navigation/native": "6.1.2",
-    "@react-navigation/stack": "6.3.11",
-    "@rudderstack/rudder-sdk-react-native": "1.5.2",
+    "@react-navigation/bottom-tabs": "6.5.4",
+    "@react-navigation/native": "6.1.3",
+    "@react-navigation/stack": "6.3.12",
+    "@rudderstack/rudder-sdk-react-native": "1.6.0",
    "@sentry/react-native": "4.14.0",
    "@stream-io/flat-list-mvcp": "0.10.2",
    "base-64": "1.0.0",
    "commonmark": "npm:@mattermost/commonmark@0.30.1-0",
    "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#2c660491041f7595f6ce5a05f6dc2e30ca769d3a",
    "deep-equal": "2.2.0",
-    "deepmerge": "4.2.2",
+    "deepmerge": "4.3.0",
    "emoji-regex": "10.2.1",
    "fuse.js": "6.6.2",
    "html-entities": "2.3.3",
@@ -48,8 +48,8 @@
    "pako": "2.1.0",
    "react": "18.2.0",
    "react-freeze": "1.0.3",
-    "react-intl": "6.2.5",
-    "react-native": "0.71.1",
+    "react-intl": "6.2.7",
+    "react-native": "0.71.2",
    "react-native-android-open-settings": "1.3.0",
    "react-native-animated-numbers": "0.4.1",
    "react-native-background-timer": "2.4.1",
@@ -85,12 +85,12 @@
    "react-native-section-list-get-item-layout": "2.2.3",
    "react-native-shadow-2": "7.0.6",
    "react-native-share": "8.1.0",
-    "react-native-svg": "13.7.0",
+    "react-native-svg": "13.8.0",
    "react-native-vector-icons": "9.2.0",
    "react-native-video": "5.2.1",
    "react-native-walkthrough-tooltip": "1.5.0",
    "react-native-webrtc": "106.0.4",
-    "react-native-webview": "11.26.0",
+    "react-native-webview": "11.26.1",
    "react-syntax-highlighter": "15.5.0",
    "readable-stream": "3.6.0",
    "semver": "7.3.8",
@@ -113,7 +113,7 @@
    "@babel/runtime": "7.20.13",
    "@react-native-community/eslint-config": "3.2.0",
    "@testing-library/react-hooks": "8.0.1",
-    "@testing-library/react-native": "11.5.0",
+    "@testing-library/react-native": "11.5.1",
    "@types/base-64": "1.0.0",
    "@types/commonmark": "0.27.5",
    "@types/commonmark-react-renderer": "4.3.1",
@@ -137,27 +137,27 @@
    "@types/tough-cookie": "4.0.2",
    "@types/url-parse": "1.4.8",
    "@types/uuid": "9.0.0",
-    "@typescript-eslint/eslint-plugin": "5.49.0",
-    "@typescript-eslint/parser": "5.49.0",
-    "axios": "1.2.4",
+    "@typescript-eslint/eslint-plugin": "5.50.0",
+    "@typescript-eslint/parser": "5.50.0",
+    "axios": "1.3.1",
    "axios-cookiejar-support": "4.0.6",
-    "babel-jest": "29.4.0",
+    "babel-jest": "29.4.1",
    "babel-loader": "9.1.2",
    "babel-plugin-module-resolver": "5.0.0",
    "deep-freeze": "0.0.1",
    "detox": "20.1.2",
-    "eslint": "8.32.0",
+    "eslint": "8.33.0",
    "eslint-plugin-header": "3.1.1",
    "eslint-plugin-import": "2.27.5",
    "eslint-plugin-jest": "27.2.1",
-    "eslint-plugin-react": "7.32.1",
+    "eslint-plugin-react": "7.32.2",
    "eslint-plugin-react-hooks": "4.6.0",
    "husky": "8.0.3",
    "isomorphic-fetch": "3.0.0",
-    "jest": "29.4.0",
-    "jest-cli": "29.4.0",
+    "jest": "29.4.1",
+    "jest-cli": "29.4.1",
    "jetifier": "2.0.0",
-    "metro-react-native-babel-preset": "0.74.1",
+    "metro-react-native-babel-preset": "0.75.0",
    "mmjstool": "github:mattermost/mattermost-utilities#010f456ea8be5beebafdb8776177cba515c1969e",
    "mock-async-storage": "2.2.0",
    "nock": "13.3.0",
@@ -167,7 +167,7 @@
    "react-test-renderer": "18.2.0",
    "tough-cookie": "4.1.2",
    "ts-jest": "29.0.5",
-    "typescript": "4.9.4",
+    "typescript": "4.9.5",
    "underscore": "1.13.6",
    "util": "0.12.5",
    "uuid": "9.0.0"
--- a/patches/@nozbe+watermelondb+0.25.1.patch
+++ b/patches/@nozbe+watermelondb+0.25.1.patch
@@ -1,292 +0,0 @@
-diff --git a/node_modules/@nozbe/watermelondb/Database/index.js b/node_modules/@nozbe/watermelondb/Database/index.js
-index 8d71c6f..9ad75d6 100644
--- a/node_modules/@nozbe/watermelondb/Database/index.js
-+++ b/node_modules/@nozbe/watermelondb/Database/index.js
-@@ -126,6 +126,10 @@ var Database = /*#__PURE__*/function () {
-           // subsequent changes to the record don't trip up the invariant
-           // TODO: What if this fails?
-           record._preparedState = null;
-+
-+          if ('update' === preparedState) {
-+            record.__original = null;
-+          }
-         }
- 
-         if (!changeNotifications[table]) {
-diff --git a/node_modules/@nozbe/watermelondb/DatabaseProvider/index.d.ts b/node_modules/@nozbe/watermelondb/DatabaseProvider/index.d.ts
-index 7c00164..10e5388 100644
--- a/node_modules/@nozbe/watermelondb/DatabaseProvider/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/DatabaseProvider/index.d.ts
-@@ -1,4 +1,4 @@
-import { ElementType, ReactNode } from 'react'
-+import React, { ReactNode } from 'react'
- import Database from '../Database'
- import { Provider } from './DatabaseContext'
- 
-@@ -11,7 +11,7 @@ export type Props = {
-  * Database provider to create the database context
-  * to allow child components to consume the database without prop drilling
-  */
-declare function DatabaseProvider({ children, database }: Props): ElementType<Provider>
-+declare function DatabaseProvider({ children, database }: Props): JSX.Element
- 
- export { default as withDatabase } from './withDatabase'
- export { default as DatabaseContext, DatabaseConsumer } from './DatabaseContext'
-diff --git a/node_modules/@nozbe/watermelondb/DatabaseProvider/withDatabase.d.ts b/node_modules/@nozbe/watermelondb/DatabaseProvider/withDatabase.d.ts
-index b29d8aa..b70faa9 100644
--- a/node_modules/@nozbe/watermelondb/DatabaseProvider/withDatabase.d.ts
-+++ b/node_modules/@nozbe/watermelondb/DatabaseProvider/withDatabase.d.ts
-@@ -1,4 +1,5 @@
-import { ComponentType } from 'react'
-+import type { NonReactStatics } from 'hoist-non-react-statics'
-+import React, { ComponentType } from 'react'
- import type Database from '../Database'
- import { DatabaseConsumer } from './DatabaseContext'
- 
-@@ -8,4 +9,4 @@ type WithDatabaseProps<T> = T & {
- // HoC to inject the database into the props of consumers
- export default function withDatabase<T>(
-   Component: ComponentType<WithDatabaseProps<T>>,
-): DatabaseConsumer
-+): React.FunctionComponent<Omit<T, 'database'>> & NonReactStatics<T>
-diff --git a/node_modules/@nozbe/watermelondb/Model/index.d.ts b/node_modules/@nozbe/watermelondb/Model/index.d.ts
-index 43cd902..baefb53 100644
--- a/node_modules/@nozbe/watermelondb/Model/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/Model/index.d.ts
-@@ -52,14 +52,16 @@ export default class Model {
-   // someTask.update(task => {
-   //   task.name = 'New name'
-   // })
-  update(recordUpdater: (this) => void): Promise<this>
-+  update(recordUpdater: (record: this) => void): Promise<this>
- 
-   // Prepares an update to the database (using passed function).
-   // Touches `updatedAt` if available.
-   //
-   // After preparing an update, you must execute it synchronously using
-   // database.batch()
-  prepareUpdate(recordUpdater: (this) => void): this
-+  prepareUpdate(recordUpdater: (record: this) => void): this
-+
-+  cancelPrepareUpdate(): void
- 
-   prepareMarkAsDeleted(): this
- 
-diff --git a/node_modules/@nozbe/watermelondb/Model/index.js b/node_modules/@nozbe/watermelondb/Model/index.js
-index b0e3a83..47313d4 100644
--- a/node_modules/@nozbe/watermelondb/Model/index.js
-+++ b/node_modules/@nozbe/watermelondb/Model/index.js
-@@ -81,7 +81,7 @@ var Model = /*#__PURE__*/function () {
-   _proto.prepareUpdate = function prepareUpdate(recordUpdater = _noop.default) {
-     var _this = this;
- 
-    (0, _invariant.default)(!this._preparedState, "Cannot update a record with pending changes");
-+    (0, _invariant.default)(!this._preparedState, "Cannot update a record with pending changes in table " + _this.table);
- 
-     this.__ensureNotDisposable("Model.prepareUpdate()");
- 
-@@ -92,6 +92,7 @@ var Model = /*#__PURE__*/function () {
-     } // Perform updates
- 
- 
-+    this.__original = Object.assign({}, this._raw);
-     (0, _ensureSync.default)(recordUpdater(this));
-     this._isEditing = false;
-     this._preparedState = 'update'; // TODO: `process.nextTick` doesn't work on React Native
-@@ -107,6 +108,18 @@ var Model = /*#__PURE__*/function () {
-     return this;
-   };
- 
-+  _proto.cancelPrepareUpdate = function cancelPrepareUpdate() {
-+    if ('test' !== process.env.NODE_ENV && 'undefined' !== typeof process && process) {
-+      (0, _invariant.default)('update' !== _this._preparedState, "Cannot cancel an update on a model that has not been prepared in table " + this.table);
-+    }
-+    this.__changes = null;
-+    this._preparedState = null;
-+    if (this.__original) {
-+      this._raw = this.__original;
-+    }
-+    this.__original = undefined;
-+  };
-+
-   _proto.prepareMarkAsDeleted = function prepareMarkAsDeleted() {
-     (0, _invariant.default)(!this._preparedState, "Cannot mark a record with pending changes as deleted");
- 
-diff --git a/node_modules/@nozbe/watermelondb/Query/index.d.ts b/node_modules/@nozbe/watermelondb/Query/index.d.ts
-index eb2bd84..eb02824 100644
--- a/node_modules/@nozbe/watermelondb/Query/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/Query/index.d.ts
-@@ -73,7 +73,7 @@ export default class Query<Record extends Model> {
- 
-   // Emits the number of matching records, then emits a new count every time it changes
-   // Note: By default, the Observable is throttled!
-  observeCount(isThrottled: boolean): Observable<number>
-+  observeCount(isThrottled?: boolean): Observable<number>
- 
-   // Queries database and returns an array with IDs of matching records
-   fetchIds(): Promise<RecordId[]>
-diff --git a/node_modules/@nozbe/watermelondb/QueryDescription/index.d.ts b/node_modules/@nozbe/watermelondb/QueryDescription/index.d.ts
-index cf2e1e0..6910974 100644
--- a/node_modules/@nozbe/watermelondb/QueryDescription/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/QueryDescription/index.d.ts
-@@ -193,7 +193,7 @@ export function and(...clauses: Where[]): And
- 
- export function or(...clauses: Where[]): Or
- 
-export function sortBy(sortColumn: ColumnName, sortOrder: SortOrder): SortBy
-+export function sortBy(sortColumn: ColumnName, sortOrder?: SortOrder): SortBy
- 
- export function take(count: number): Take
- 
-@@ -230,7 +230,7 @@ export function experimentalJoinTables(tables: TableName<any>[]): JoinTables
- 
- export function experimentalNestedJoin(from: TableName<any>, to: TableName<any>): NestedJoinTable
- 
-export function unsafeSqlQuery(sql: string, values: Value[]): SqlQuery
-+export function unsafeSqlQuery(sql: string, values?: Value[]): SqlQuery
- 
- // const extractClauses: (clauses: Clause[]) => QueryDescription;
- 
-diff --git a/node_modules/@nozbe/watermelondb/decorators/children/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/children/index.d.ts
-index 53d3daf..b26a60a 100644
--- a/node_modules/@nozbe/watermelondb/decorators/children/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/children/index.d.ts
-@@ -1,4 +1,4 @@
- import { TableName } from '../../Schema'
- 
-type children = (childTable: TableName<any>) => PropertyDecorator
-+const children = (childTable: TableName<any>) => PropertyDecorator
- export default children
-diff --git a/node_modules/@nozbe/watermelondb/decorators/date/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/date/index.d.ts
-index 10381e6..020654e 100644
--- a/node_modules/@nozbe/watermelondb/decorators/date/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/date/index.d.ts
-@@ -1,4 +1,4 @@
- import { ColumnName } from '../../Schema'
- 
-type date = (columnName: ColumnName) => PropertyDecorator
-+const date = (columnName: ColumnName) => PropertyDecorator
- export default date
-diff --git a/node_modules/@nozbe/watermelondb/decorators/field/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/field/index.d.ts
-index 87625ac..520f15e 100644
--- a/node_modules/@nozbe/watermelondb/decorators/field/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/field/index.d.ts
-@@ -1,4 +1,4 @@
- import { ColumnName } from '../../Schema'
- 
-type field = (columnName: ColumnName) => PropertyDecorator
-+const field = (columnName: ColumnName) => PropertyDecorator
- export default field
-diff --git a/node_modules/@nozbe/watermelondb/decorators/immutableRelation/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/immutableRelation/index.d.ts
-index 6a7e860..529bcd9 100644
--- a/node_modules/@nozbe/watermelondb/decorators/immutableRelation/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/immutableRelation/index.d.ts
-@@ -1,6 +1,6 @@
- import { ColumnName, TableName } from '../../Schema'
- 
-type immutableRelation = (
-+const immutableRelation = (
-   relationTable: TableName<any>,
-   relationIdColumn: ColumnName,
- ) => PropertyDecorator
-diff --git a/node_modules/@nozbe/watermelondb/decorators/json/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/json/index.d.ts
-index 55de0d8..4aae413 100644
--- a/node_modules/@nozbe/watermelondb/decorators/json/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/json/index.d.ts
-@@ -3,6 +3,6 @@ import Model from '../../Model'
- 
- type Sanitizer = (source: any, model?: Model) => any
- 
-type json = (rawFieldName: ColumnName, sanitizer: Sanitizer) => PropertyDecorator
-+const json = (rawFieldName: ColumnName, sanitizer: Sanitizer) => PropertyDecorator
- 
- export default json
-diff --git a/node_modules/@nozbe/watermelondb/decorators/relation/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/relation/index.d.ts
-index 9fea99e..ef7baae 100644
--- a/node_modules/@nozbe/watermelondb/decorators/relation/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/relation/index.d.ts
-@@ -1,7 +1,7 @@
- import { ColumnName, TableName } from '../../Schema'
- import { Options } from '../../Relation'
- 
-type relation = (
-+const relation = (
-   relationTable: TableName<any>,
-   relationIdColumn: ColumnName,
-   options?: Options,
-diff --git a/node_modules/@nozbe/watermelondb/decorators/text/index.d.ts b/node_modules/@nozbe/watermelondb/decorators/text/index.d.ts
-index 330f187..334adbd 100644
--- a/node_modules/@nozbe/watermelondb/decorators/text/index.d.ts
-+++ b/node_modules/@nozbe/watermelondb/decorators/text/index.d.ts
-@@ -1,5 +1,5 @@
- import { ColumnName } from '../../Schema'
- 
-type text = (columnName: ColumnName) => PropertyDecorator
-+const text = (columnName: ColumnName) => PropertyDecorator
- 
- export default text
-diff --git a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
-index ca31e20..b45c753 100644
--- a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
-+++ b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
-@@ -22,6 +22,21 @@ class Database(
-             if (name == ":memory:" || name.contains("mode=memory")) {
-                 context.cacheDir.delete()
-                 File(context.cacheDir, name).path
-+            } else if (name.contains("/") || name.contains("file")) {
-+                // Extracts the database name from the path
-+                val dbName = name.substringAfterLast("/")
-+
-+                // Extracts the real path where the *.db file will be created
-+                val truePath = name.substringAfterLast("file://").substringBeforeLast("/")
-+
-+                // Creates the directory
-+                if (!truePath.contains("databases")) {
-+                    val fileObj = File(truePath, "databases")
-+                    fileObj.mkdir()
-+                    File("${truePath}/databases", dbName).path
-+                } else {
-+                    File(truePath, dbName).path
-+                }
-             } else {
-                 // On some systems there is some kind of lock on `/databases` folder ¯\_(ツ)_/¯
-                 context.getDatabasePath("$name.db").path.replace("/databases", "")
-diff --git a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
-index 1a1cabf..01bbb2b 100644
--- a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
-+++ b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
-@@ -54,6 +54,7 @@ void Database::destroy() {
-     const std::lock_guard<std::mutex> lock(mutex_);
- 
-     if (isDestroyed_) {
-+        db_->markAsDestroyed();
-         return;
-     }
-     isDestroyed_ = true;
-diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
-index e740c29..6963734 100644
--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
-+++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
-@@ -67,6 +67,10 @@ void SqliteDb::destroy() {
-     }
- }
- 
-+void SqliteDb::markAsDestroyed() {
-+    isDestroyed_ = true;
-+}
-+
- SqliteDb::~SqliteDb() {
-     destroy();
- }
-diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
-index 22cffa7..4b74a7f 100644
--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
-+++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
-@@ -11,6 +11,7 @@ public:
-     SqliteDb(std::string path);
-     ~SqliteDb();
-     void destroy();
-+    void markAsDestroyed();
- 
-     sqlite3 *sqlite;
- 
--- a/patches/@nozbe+watermelondb+0.25.5.patch
+++ b/patches/@nozbe+watermelondb+0.25.5.patch
@@ -0,0 +1,134 @@
+diff --git a/node_modules/@nozbe/watermelondb/Database/index.js b/node_modules/@nozbe/watermelondb/Database/index.js
+index 8d71c6f..9ad75d6 100644
+--- a/node_modules/@nozbe/watermelondb/Database/index.js
+++ b/node_modules/@nozbe/watermelondb/Database/index.js
+@@ -126,6 +126,10 @@ var Database = /*#__PURE__*/function () {
+           // subsequent changes to the record don't trip up the invariant
+           // TODO: What if this fails?
+           record._preparedState = null;
+
+          if ('update' === preparedState) {
+            record.__original = null;
+          }
+         }
+ 
+         if (!changeNotifications[table]) {
+diff --git a/node_modules/@nozbe/watermelondb/Model/index.d.ts b/node_modules/@nozbe/watermelondb/Model/index.d.ts
+index 96114ec..ecfe3c1 100644
+--- a/node_modules/@nozbe/watermelondb/Model/index.d.ts
+++ b/node_modules/@nozbe/watermelondb/Model/index.d.ts
+@@ -61,6 +61,8 @@ export default class Model {
+   // database.batch()
+   prepareUpdate(recordUpdater?: (_: this) => void): this
+ 
+  cancelPrepareUpdate(): void
+
+   prepareMarkAsDeleted(): this
+ 
+   prepareDestroyPermanently(): this
+diff --git a/node_modules/@nozbe/watermelondb/Model/index.js b/node_modules/@nozbe/watermelondb/Model/index.js
+index b0e3a83..57ecb8d 100644
+--- a/node_modules/@nozbe/watermelondb/Model/index.js
+++ b/node_modules/@nozbe/watermelondb/Model/index.js
+@@ -81,7 +81,7 @@ var Model = /*#__PURE__*/function () {
+   _proto.prepareUpdate = function prepareUpdate(recordUpdater = _noop.default) {
+     var _this = this;
+ 
+-    (0, _invariant.default)(!this._preparedState, "Cannot update a record with pending changes");
+    (0, _invariant.default)(!this._preparedState, "Cannot update a record with pending changes in table " + _this.table);
+ 
+     this.__ensureNotDisposable("Model.prepareUpdate()");
+ 
+@@ -92,6 +92,7 @@ var Model = /*#__PURE__*/function () {
+     } // Perform updates
+ 
+ 
+    this.__original = Object.assign({}, this._raw);
+     (0, _ensureSync.default)(recordUpdater(this));
+     this._isEditing = false;
+     this._preparedState = 'update'; // TODO: `process.nextTick` doesn't work on React Native
+@@ -107,6 +108,19 @@ var Model = /*#__PURE__*/function () {
+     return this;
+   };
+ 
+  _proto.cancelPrepareUpdate = function cancelPrepareUpdate() {
+    if ('test' !== process.env.NODE_ENV && 'undefined' !== typeof process && process) {
+      (0, _invariant.default)('update' !== _this._preparedState, "Cannot cancel an update on a model that has not been prepared in table " + this.table);
+    }
+    this.__changes = null;
+    this._preparedState = null;
+    if (this.__original) {
+      this._raw = this.__original;
+    }
+    this.__original = undefined;
+  };
+
+
+   _proto.prepareMarkAsDeleted = function prepareMarkAsDeleted() {
+     (0, _invariant.default)(!this._preparedState, "Cannot mark a record with pending changes as deleted");
+ 
+diff --git a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+index ca31e20..b45c753 100644
+--- a/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+++ b/node_modules/@nozbe/watermelondb/native/android/src/main/java/com/nozbe/watermelondb/Database.kt
+@@ -22,6 +22,21 @@ class Database(
+             if (name == ":memory:" || name.contains("mode=memory")) {
+                 context.cacheDir.delete()
+                 File(context.cacheDir, name).path
+            } else if (name.contains("/") || name.contains("file")) {
+                // Extracts the database name from the path
+                val dbName = name.substringAfterLast("/")
+
+                // Extracts the real path where the *.db file will be created
+                val truePath = name.substringAfterLast("file://").substringBeforeLast("/")
+
+                // Creates the directory
+                if (!truePath.contains("databases")) {
+                    val fileObj = File(truePath, "databases")
+                    fileObj.mkdir()
+                    File("${truePath}/databases", dbName).path
+                } else {
+                    File(truePath, dbName).path
+                }
+             } else {
+                 // On some systems there is some kind of lock on `/databases` folder ¯\_(ツ)_/¯
+                 context.getDatabasePath("$name.db").path.replace("/databases", "")
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
+index 1a1cabf..01bbb2b 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
+++ b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
+@@ -54,6 +54,7 @@ void Database::destroy() {
+     const std::lock_guard<std::mutex> lock(mutex_);
+ 
+     if (isDestroyed_) {
+        db_->markAsDestroyed();
+         return;
+     }
+     isDestroyed_ = true;
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
+index e740c29..6963734 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
+++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.cpp
+@@ -67,6 +67,10 @@ void SqliteDb::destroy() {
+     }
+ }
+ 
+void SqliteDb::markAsDestroyed() {
+    isDestroyed_ = true;
+}
+
+ SqliteDb::~SqliteDb() {
+     destroy();
+ }
+diff --git a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
+index 22cffa7..4b74a7f 100644
+--- a/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
+++ b/node_modules/@nozbe/watermelondb/native/shared/Sqlite.h
+@@ -11,6 +11,7 @@ public:
+     SqliteDb(std::string path);
+     ~SqliteDb();
+     void destroy();
+    void markAsDestroyed();
+ 
+     sqlite3 *sqlite;
+ 
--- a/patches/@rudderstack+rudder-sdk-react-native+1.6.0.patch
+++ b/patches/@rudderstack+rudder-sdk-react-native+1.6.0.patch
--- a/patches/react-native+0.71.2.patch
+++ b/patches/react-native+0.71.2.patch
--- a/patches/react-native-svg+13.8.0.patch
+++ b/patches/react-native-svg+13.8.0.patch
--- a/types/database/database.ts
+++ b/types/database/database.ts
@@ -9,6 +9,7 @@ import type ServerDataOperator from '@database/operator/server_data_operator';
 import type {Database} from '@nozbe/watermelondb';
 import type Model from '@nozbe/watermelondb/Model';
 import type {Clause} from '@nozbe/watermelondb/QueryDescription';
+import type {Class} from '@nozbe/watermelondb/types';
 import type System from '@typings/database/models/servers/system';

 export type WithDatabaseArgs = { database: Database }
@@ -62,7 +63,7 @@ export type OperationArgs = {
  transformer: (args: TransformerArgs) => Promise<Model>;
 };

-export type Models = Model[];
+export type Models = Array<Class<Model>>;

 // The elements needed to create a new database
 export type CreateServerDatabaseArgs = {