[Gekidou] update dependencies (#6019)

* Dependency updates * npm audit fixes
2022-03-01 18:52:01 -03:00
parent 5de54471b7
commit eaf4f3166e
28 changed files with 2276 additions and 3393 deletions
--- a/app/actions/remote/notifications.ts
+++ b/app/actions/remote/notifications.ts
@@ -3,9 +3,8 @@

 import {Platform} from 'react-native';

-import {switchToChannel} from '@actions/local/channel';
 import {updatePostSinceCache} from '@actions/local/notification';
-import {fetchMissingSidebarInfo, fetchMyChannel, markChannelAsRead} from '@actions/remote/channel';
+import {fetchMissingSidebarInfo, fetchMyChannel, markChannelAsRead, switchToChannelById} from '@actions/remote/channel';
 import {forceLogoutIfNecessary} from '@actions/remote/session';
 import {fetchMyTeam} from '@actions/remote/team';
 import {Preferences} from '@constants';
@@ -13,13 +12,11 @@ import DatabaseManager from '@database/manager';
 import {getTeammateNameDisplaySetting} from '@helpers/api/preference';
 import {queryChannelsById, queryMyChannel} from '@queries/servers/channel';
 import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
-import {queryCommonSystemValues} from '@queries/servers/system';
+import {queryCommonSystemValues, queryWebSocketLastDisconnected} from '@queries/servers/system';
 import {queryMyTeamById} from '@queries/servers/team';
 import {queryCurrentUser} from '@queries/servers/user';
 import {emitNotificationError} from '@utils/notification';

-import {fetchPostsForChannel} from './post';
-
 const fetchNotificationData = async (serverUrl: string, notification: NotificationWithData, skipEvents = false) => {
    const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
    if (!operator) {
@@ -81,7 +78,6 @@ const fetchNotificationData = async (serverUrl: string, notification: Notificati
            }
        }

-        fetchPostsForChannel(serverUrl, channelId);
        return {};
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
@@ -90,11 +86,20 @@ const fetchNotificationData = async (serverUrl: string, notification: Notificati
 };

 export const backgroundNotification = async (serverUrl: string, notification: NotificationWithData) => {
-    if (Platform.OS === 'ios') {
-        updatePostSinceCache(serverUrl, notification);
+    const database = DatabaseManager.serverDatabases[serverUrl]?.database;
+    if (!database) {
+        return;
    }

-    await fetchNotificationData(serverUrl, notification, true);
+    const lastDisconnectedAt = await queryWebSocketLastDisconnected(database);
+
+    if (lastDisconnectedAt) {
+        if (Platform.OS === 'ios') {
+            updatePostSinceCache(serverUrl, notification);
+        }
+
+        await fetchNotificationData(serverUrl, notification, true);
+    }
 };

 export const openNotification = async (serverUrl: string, notification: NotificationWithData) => {
@@ -126,8 +131,7 @@ export const openNotification = async (serverUrl: string, notification: Notifica
        const myTeam = await queryMyTeamById(database, teamId);

        if (myChannel && myTeam) {
-            fetchPostsForChannel(serverUrl, channelId);
-            switchToChannel(serverUrl, channelId, teamId);
+            switchToChannelById(serverUrl, channelId, teamId);
            return {};
        }

@@ -136,7 +140,7 @@ export const openNotification = async (serverUrl: string, notification: Notifica
            return {error: result.error};
        }

-        return switchToChannel(serverUrl, channelId, teamId);
+        return switchToChannelById(serverUrl, channelId, teamId);
    } catch (error) {
        forceLogoutIfNecessary(serverUrl, error as ClientErrorProps);
        return {error};
--- a/app/actions/websocket/posts.ts
+++ b/app/actions/websocket/posts.ts
@@ -116,6 +116,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
    //const viewingGlobalThreads = getViewingGlobalThreads(state);
    // const collapsedThreadsEnabled = isCollapsedThreadsEnabled(state);
    // actions.push(receivedNewPost(post, collapsedThreadsEnabled));
+
    if (!shouldIgnorePost(post)) {
        let markAsViewed = false;
        let markAsRead = false;
@@ -153,6 +154,7 @@ export async function handleNewPostEvent(serverUrl: string, msg: WebSocketMessag
                myChannel.messageCount + 1,
                myChannel.mentionsCount + (hasMentions ? 1 : 0),
                myChannel.lastViewedAt,
+                true,
            );
            if (unreadAt) {
                models.push(unreadAt);
--- a/app/database/operator/server_data_operator/transformers/channel.ts
+++ b/app/database/operator/server_data_operator/transformers/channel.ts
@@ -36,6 +36,9 @@ export const transformChannelRecord = ({action, database, value}: TransformerArg
        channel.createAt = raw.create_at;
        channel.creatorId = raw.creator_id;
        channel.deleteAt = raw.delete_at;
+
+        // for DM channels do not override the display name
+        // until we get the new info if there is any
        channel.displayName = raw.display_name || record?.displayName || '';
        channel.isGroupConstrained = Boolean(raw.group_constrained);
        channel.name = raw.name;
--- a/app/hooks/gallery.ts
+++ b/app/hooks/gallery.ts
@@ -168,6 +168,8 @@ export function useGalleryControls() {

    const translateYConfig: WithTimingConfig = {
        duration: 400,
+
+        // @ts-expect-error EasingFactoryFunction missing in type definition
        easing: Easing.bezier(0.33, 0.01, 0, 1),
    };

--- a/app/queries/servers/team.ts
+++ b/app/queries/servers/team.ts
@@ -1,7 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

-import {Database, Model, Q, Query, Relation} from '@nozbe/watermelondb';
+import {Database, Model, Q, Query} from '@nozbe/watermelondb';

 import {Database as DatabaseConstants, Preferences} from '@constants';
 import {getPreferenceValue} from '@helpers/api/preference';
@@ -193,11 +193,17 @@ export const deleteMyTeams = async (operator: ServerDataOperator, teams: TeamMod
    try {
        const preparedModels: Model[] = [];
        for await (const team of teams) {
-            const myTeam = await team.myTeam.fetch() as MyTeamModel;
-            preparedModels.push(myTeam.prepareDestroyPermanently());
+            try {
+                const myTeam = await team.myTeam.fetch() as MyTeamModel;
+                preparedModels.push(myTeam.prepareDestroyPermanently());
+            } catch {
+                // Record not found, do nothing
+            }
        }

-        await operator.batchRecords(preparedModels);
+        if (preparedModels.length) {
+            await operator.batchRecords(preparedModels);
+        }
        return {};
    } catch (error) {
        return {error};
@@ -205,37 +211,55 @@ export const deleteMyTeams = async (operator: ServerDataOperator, teams: TeamMod
 };

 export const prepareDeleteTeam = async (team: TeamModel): Promise<Model[]> => {
-    const preparedModels: Model[] = [team.prepareDestroyPermanently()];
+    try {
+        const preparedModels: Model[] = [team.prepareDestroyPermanently()];

-    const relations: Array<Relation<Model>> = [team.myTeam, team.teamChannelHistory];
-    for await (const relation of relations) {
        try {
-            const model = await relation.fetch();
+            const model = await team.myTeam.fetch();
            if (model) {
                preparedModels.push(model.prepareDestroyPermanently());
            }
        } catch {
            // Record not found, do nothing
        }
-    }

-    const associatedChildren: Array<Query<any>> = [
-        team.members,
-        team.slashCommands,
-        team.teamSearchHistories,
-    ];
-    for await (const children of associatedChildren) {
-        const models = await children.fetch() as Model[];
-        models.forEach((model) => preparedModels.push(model.prepareDestroyPermanently()));
-    }
+        try {
+            const model = await team.teamChannelHistory.fetch();
+            if (model) {
+                preparedModels.push(model.prepareDestroyPermanently());
+            }
+        } catch {
+            // Record not found, do nothing
+        }

-    const channels = await team.channels.fetch() as ChannelModel[];
-    for await (const channel of channels) {
-        const preparedChannel = await prepareDeleteChannel(channel);
-        preparedModels.push(...preparedChannel);
-    }
+        const associatedChildren: Array<Query<any>> = [
+            team.members,
+            team.slashCommands,
+            team.teamSearchHistories,
+        ];
+        for await (const children of associatedChildren) {
+            try {
+                const models = await children.fetch() as Model[];
+                models.forEach((model) => preparedModels.push(model.prepareDestroyPermanently()));
+            } catch {
+                // Record not found, do nothing
+            }
+        }

-    return preparedModels;
+        const channels = await team.channels.fetch() as ChannelModel[];
+        for await (const channel of channels) {
+            try {
+                const preparedChannel = await prepareDeleteChannel(channel);
+                preparedModels.push(...preparedChannel);
+            } catch {
+                // Record not found, do nothing
+            }
+        }
+
+        return preparedModels;
+    } catch (error) {
+        return [];
+    }
 };

 export const queryMyTeamById = async (database: Database, teamId: string): Promise<MyTeamModel|undefined> => {
--- a/app/screens/gallery/footer/footer.tsx
+++ b/app/screens/gallery/footer/footer.tsx
@@ -2,8 +2,8 @@
 // See LICENSE.txt for license information.

 import React, {useCallback, useEffect, useState} from 'react';
-import {DeviceEventEmitter, StyleSheet, View, ViewStyle} from 'react-native';
-import Animated, {AnimatedStyleProp} from 'react-native-reanimated';
+import {DeviceEventEmitter, StyleProp, StyleSheet, View, ViewStyle} from 'react-native';
+import Animated from 'react-native-reanimated';
 import {SafeAreaView, Edge} from 'react-native-safe-area-context';

 import {Events} from '@constants';
@@ -33,7 +33,7 @@ type Props = {
    isDirectChannel: boolean;
    item: GalleryItemType;
    post?: PostModel;
-    style: AnimatedStyleProp<ViewStyle>;
+    style: StyleProp<ViewStyle>;
    teammateNameDisplay: string;
 }

--- a/app/screens/gallery/gallery.tsx
+++ b/app/screens/gallery/gallery.tsx
@@ -146,7 +146,7 @@ const Gallery = forwardRef<GalleryRef, GalleryProps>(({
            return (
                <AnimatedImage
                    source={{uri: item.posterUri}}
-                    style={info.itemStyles as StyleProp<Animated.AnimateStyle<StyleProp<ImageStyle>>>}
+                    style={info.itemStyles as StyleProp<ImageStyle>}
                />
            );
        }
--- a/app/screens/gallery/header/index.tsx
+++ b/app/screens/gallery/header/index.tsx
@@ -2,9 +2,9 @@
 // See LICENSE.txt for license information.

 import React, {useMemo} from 'react';
-import {StyleSheet, useWindowDimensions, View, ViewStyle} from 'react-native';
+import {StyleProp, StyleSheet, useWindowDimensions, View, ViewStyle} from 'react-native';
 import {TouchableOpacity} from 'react-native-gesture-handler';
-import Animated, {AnimatedStyleProp} from 'react-native-reanimated';
+import Animated from 'react-native-reanimated';
 import {SafeAreaView, Edge} from 'react-native-safe-area-context';

 import CompassIcon from '@components/compass_icon';
@@ -16,7 +16,7 @@ import {typography} from '@utils/typography';
 type Props = {
    index: number;
    onClose: () => void;
-    style: AnimatedStyleProp<ViewStyle>;
+    style: StyleProp<ViewStyle>;
    total: number;
 }

--- a/app/screens/gallery/image_renderer/transformer.tsx
+++ b/app/screens/gallery/image_renderer/transformer.tsx
@@ -42,6 +42,8 @@ const springConfig: WithSpringConfig = {

 const timingConfig: WithTimingConfig = {
    duration: 250,
+
+    // @ts-expect-error EasingFactoryFunction missing in type definition
    easing: Easing.bezier(0.33, 0.01, 0, 1),
 };

--- a/app/screens/gallery/lightbox_swipeout/index.tsx
+++ b/app/screens/gallery/lightbox_swipeout/index.tsx
@@ -58,6 +58,8 @@ const AnimatedImage = Animated.createAnimatedComponent(FastImage);

 const timingConfig: WithTimingConfig = {
    duration: 250,
+
+    // @ts-expect-error EasingFactoryFunction missing in type definition
    easing: Easing.bezier(0.5002, 0.2902, 0.3214, 0.9962),
 };

--- a/app/screens/gallery/video_renderer/index.tsx
+++ b/app/screens/gallery/video_renderer/index.tsx
@@ -22,6 +22,8 @@ interface VideoRendererProps extends ImageRendererProps {
 const AnimatedVideo = Animated.createAnimatedComponent(Video);
 const timingConfig: WithTimingConfig = {
    duration: 250,
+
+    // @ts-expect-error EasingFactoryFunction missing in type definition
    easing: Easing.bezier(0.33, 0.01, 0, 1),
 };

--- a/app/screens/in_app_notification/index.tsx
+++ b/app/screens/in_app_notification/index.tsx
@@ -3,7 +3,7 @@

 import React, {useEffect, useRef, useState} from 'react';
 import {DeviceEventEmitter, Platform, StyleSheet, Text, TouchableOpacity, View} from 'react-native';
-import {GestureDetector, Gesture} from 'react-native-gesture-handler';
+import {GestureDetector, Gesture, GestureHandlerRootView} from 'react-native-gesture-handler';
 import {Navigation} from 'react-native-navigation';
 import Animated, {runOnJS, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
@@ -144,43 +144,45 @@ const InAppNotification = ({componentId, serverName, serverUrl, notification}: I
    const gesture = Gesture.Pan().activeOffsetY(-20).onStart(() => runOnJS(animateDismissOverlay)());

    return (
-        <GestureDetector gesture={gesture}>
-            <Animated.View
-                style={[styles.container, isTablet ? styles.tablet : undefined, animatedStyle]}
-                testID='in_app_notification.screen'
-            >
-                <View style={styles.flex}>
-                    <TouchableOpacity
-                        style={styles.touchable}
-                        onPress={notificationTapped}
-                        activeOpacity={1}
-                    >
-                        <Icon
-                            database={DatabaseManager.serverDatabases[serverUrl].database}
-                            fromWebhook={notification.payload?.from_webhook === 'true'}
-                            overrideIconUrl={notification.payload?.override_icon_url}
-                            senderId={notification.payload?.sender_id || ''}
-                            serverUrl={serverUrl}
-                            useUserIcon={notification.payload?.use_user_icon === 'true'}
-                        />
-                        <View style={styles.titleContainer}>
-                            <Title channelName={notification.payload?.channel_name || ''}/>
-                            <View style={styles.flex}>
-                                <Text
-                                    numberOfLines={2}
-                                    ellipsizeMode='tail'
-                                    style={styles.message}
-                                    testID='in_app_notification.message'
-                                >
-                                    {message}
-                                </Text>
+        <GestureHandlerRootView>
+            <GestureDetector gesture={gesture}>
+                <Animated.View
+                    style={[styles.container, isTablet ? styles.tablet : undefined, animatedStyle]}
+                    testID='in_app_notification.screen'
+                >
+                    <View style={styles.flex}>
+                        <TouchableOpacity
+                            style={styles.touchable}
+                            onPress={notificationTapped}
+                            activeOpacity={1}
+                        >
+                            <Icon
+                                database={DatabaseManager.serverDatabases[serverUrl].database}
+                                fromWebhook={notification.payload?.from_webhook === 'true'}
+                                overrideIconUrl={notification.payload?.override_icon_url}
+                                senderId={notification.payload?.sender_id || ''}
+                                serverUrl={serverUrl}
+                                useUserIcon={notification.payload?.use_user_icon === 'true'}
+                            />
+                            <View style={styles.titleContainer}>
+                                <Title channelName={notification.payload?.channel_name || ''}/>
+                                <View style={styles.flex}>
+                                    <Text
+                                        numberOfLines={2}
+                                        ellipsizeMode='tail'
+                                        style={styles.message}
+                                        testID='in_app_notification.message'
+                                    >
+                                        {message}
+                                    </Text>
+                                </View>
+                                {Boolean(serverName) && <Server serverName={serverName!}/>}
                            </View>
-                            {Boolean(serverName) && <Server serverName={serverName!}/>}
-                        </View>
-                    </TouchableOpacity>
-                </View>
-            </Animated.View>
-        </GestureDetector>
+                        </TouchableOpacity>
+                    </View>
+                </Animated.View>
+            </GestureDetector>
+        </GestureHandlerRootView>
    );
 };

--- a/app/screens/index.tsx
+++ b/app/screens/index.tsx
@@ -90,7 +90,7 @@ Navigation.setLazyComponentRegistrator((screenName) => {
    case Screens.IN_APP_NOTIFICATION: {
        const notificationScreen = require('@screens/in_app_notification').default;
        Navigation.registerComponent(Screens.IN_APP_NOTIFICATION, () => Platform.select({
-            default: withGestures(notificationScreen, undefined),
+            default: notificationScreen,
            ios: withSafeAreaInsets(notificationScreen),
        }));
        return;
--- a/index.ts
+++ b/index.ts
@@ -25,10 +25,9 @@ if (__DEV__) {
    LogBox.ignoreLogs([
        '`-[RCTRootView cancelTouches]`',
        'scaleY',
-    ]);
-    LogBox.ignoreLogs(['Require cycle: node_modules/zod/lib/src/index.js']);
-    LogBox.ignoreLogs([
+        'Require cycle: node_modules/zod/lib/src/index.js',
        "[react-native-gesture-handler] Seems like you're using an old API with gesture components, check out new Gestures system!",
+        'new NativeEventEmitter',
    ]);
 }

--- a/ios/Podfile
+++ b/ios/Podfile
@@ -52,4 +52,12 @@ end
        end
      end
    end
+
+    post_integrate do |installer|
+      begin
+        expo_patch_react_imports!(installer)
+      rescue => e
+        Pod::UI.warn e
+      end
+    end
  end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -4,22 +4,23 @@ PODS:
  - BVLinearGradient (2.5.6):
    - React
  - DoubleConversion (1.1.6)
-  - EXFileSystem (13.0.3):
+  - EXFileSystem (13.1.4):
    - ExpoModulesCore
-  - Expo (43.0.5):
+  - Expo (44.0.6):
    - ExpoModulesCore
-  - ExpoModulesCore (0.4.10):
+  - ExpoModulesCore (0.6.5):
    - React-Core
-  - EXVideoThumbnails (6.0.3):
+    - ReactCommon/turbomodule/core
+  - EXVideoThumbnails (6.2.0):
    - ExpoModulesCore
-  - FBLazyVector (0.67.2)
-  - FBReactNativeSpec (0.67.2):
+  - FBLazyVector (0.67.3)
+  - FBReactNativeSpec (0.67.3):
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.67.2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
+    - RCTRequired (= 0.67.3)
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
  - fmt (6.2.1)
  - glog (0.3.5)
  - hermes-engine (0.9.0)
@@ -40,9 +41,9 @@ PODS:
  - lottie-react-native (5.0.1):
    - lottie-ios (~> 3.2.3)
    - React-Core
-  - Permission-Camera (3.2.0):
+  - Permission-Camera (3.3.0):
    - RNPermissions
-  - Permission-PhotoLibrary (3.2.0):
+  - Permission-PhotoLibrary (3.3.0):
    - RNPermissions
  - RCT-Folly (2021.06.28.00-v2):
    - boost
@@ -61,206 +62,206 @@ PODS:
    - fmt (~> 6.2.1)
    - glog
    - libevent
-  - RCTRequired (0.67.2)
-  - RCTTypeSafety (0.67.2):
-    - FBLazyVector (= 0.67.2)
+  - RCTRequired (0.67.3)
+  - RCTTypeSafety (0.67.3):
+    - FBLazyVector (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTRequired (= 0.67.2)
-    - React-Core (= 0.67.2)
+    - RCTRequired (= 0.67.3)
+    - React-Core (= 0.67.3)
  - RCTYouTube (2.0.2):
    - React
    - YoutubePlayer-in-WKWebView (~> 0.3.1)
-  - React (0.67.2):
-    - React-Core (= 0.67.2)
-    - React-Core/DevSupport (= 0.67.2)
-    - React-Core/RCTWebSocket (= 0.67.2)
-    - React-RCTActionSheet (= 0.67.2)
-    - React-RCTAnimation (= 0.67.2)
-    - React-RCTBlob (= 0.67.2)
-    - React-RCTImage (= 0.67.2)
-    - React-RCTLinking (= 0.67.2)
-    - React-RCTNetwork (= 0.67.2)
-    - React-RCTSettings (= 0.67.2)
-    - React-RCTText (= 0.67.2)
-    - React-RCTVibration (= 0.67.2)
-  - React-callinvoker (0.67.2)
-  - React-Core (0.67.2):
+  - React (0.67.3):
+    - React-Core (= 0.67.3)
+    - React-Core/DevSupport (= 0.67.3)
+    - React-Core/RCTWebSocket (= 0.67.3)
+    - React-RCTActionSheet (= 0.67.3)
+    - React-RCTAnimation (= 0.67.3)
+    - React-RCTBlob (= 0.67.3)
+    - React-RCTImage (= 0.67.3)
+    - React-RCTLinking (= 0.67.3)
+    - React-RCTNetwork (= 0.67.3)
+    - React-RCTSettings (= 0.67.3)
+    - React-RCTText (= 0.67.3)
+    - React-RCTVibration (= 0.67.3)
+  - React-callinvoker (0.67.3)
+  - React-Core (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-Core/Default (= 0.67.3)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/CoreModulesHeaders (0.67.2):
+  - React-Core/CoreModulesHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/Default (0.67.2):
+  - React-Core/Default (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/DevSupport (0.67.2):
+  - React-Core/DevSupport (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.2)
-    - React-Core/RCTWebSocket (= 0.67.2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-jsinspector (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-Core/Default (= 0.67.3)
+    - React-Core/RCTWebSocket (= 0.67.3)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-jsinspector (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.67.2):
+  - React-Core/RCTActionSheetHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTAnimationHeaders (0.67.2):
+  - React-Core/RCTAnimationHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTBlobHeaders (0.67.2):
+  - React-Core/RCTBlobHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTImageHeaders (0.67.2):
+  - React-Core/RCTImageHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTLinkingHeaders (0.67.2):
+  - React-Core/RCTLinkingHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTNetworkHeaders (0.67.2):
+  - React-Core/RCTNetworkHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTSettingsHeaders (0.67.2):
+  - React-Core/RCTSettingsHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTTextHeaders (0.67.2):
+  - React-Core/RCTTextHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTVibrationHeaders (0.67.2):
+  - React-Core/RCTVibrationHeaders (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
    - React-Core/Default
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-Core/RCTWebSocket (0.67.2):
+  - React-Core/RCTWebSocket (0.67.3):
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/Default (= 0.67.2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-Core/Default (= 0.67.3)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-perflogger (= 0.67.3)
    - Yoga
-  - React-CoreModules (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+  - React-CoreModules (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core/CoreModulesHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-RCTImage (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-cxxreact (0.67.2):
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core/CoreModulesHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-RCTImage (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-cxxreact (0.67.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsinspector (= 0.67.2)
-    - React-logger (= 0.67.2)
-    - React-perflogger (= 0.67.2)
-    - React-runtimeexecutor (= 0.67.2)
-  - React-hermes (0.67.2):
+    - React-callinvoker (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsinspector (= 0.67.3)
+    - React-logger (= 0.67.3)
+    - React-perflogger (= 0.67.3)
+    - React-runtimeexecutor (= 0.67.3)
+  - React-hermes (0.67.3):
    - DoubleConversion
    - glog
    - hermes-engine
    - RCT-Folly (= 2021.06.28.00-v2)
    - RCT-Folly/Futures (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-jsiexecutor (= 0.67.2)
-    - React-jsinspector (= 0.67.2)
-    - React-perflogger (= 0.67.2)
-  - React-jsi (0.67.2):
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-jsiexecutor (= 0.67.3)
+    - React-jsinspector (= 0.67.3)
+    - React-perflogger (= 0.67.3)
+  - React-jsi (0.67.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-jsi/Default (= 0.67.2)
-  - React-jsi/Default (0.67.2):
+    - React-jsi/Default (= 0.67.3)
+  - React-jsi/Default (0.67.3):
    - boost (= 1.76.0)
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-  - React-jsiexecutor (0.67.2):
+  - React-jsiexecutor (0.67.3):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-perflogger (= 0.67.2)
-  - React-jsinspector (0.67.2)
-  - React-logger (0.67.2):
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-perflogger (= 0.67.3)
+  - React-jsinspector (0.67.3)
+  - React-logger (0.67.3):
    - glog
  - react-native-background-timer (2.4.1):
    - React-Core
@@ -276,7 +277,7 @@ PODS:
    - React
  - react-native-image-picker (4.7.3):
    - React-Core
-  - react-native-netinfo (7.1.9):
+  - react-native-netinfo (8.0.0):
    - React-Core
  - react-native-network-client (0.1.0):
    - Alamofire (~> 5.4)
@@ -288,98 +289,98 @@ PODS:
  - react-native-paste-input (0.3.7):
    - React-Core
    - Swime (= 3.0.6)
-  - react-native-safe-area-context (3.3.2):
+  - react-native-safe-area-context (3.4.1):
    - React-Core
  - react-native-video (5.2.0):
    - React-Core
    - react-native-video/Video (= 5.2.0)
  - react-native-video/Video (5.2.0):
    - React-Core
-  - react-native-webview (11.17.1):
+  - react-native-webview (11.17.2):
    - React-Core
-  - React-perflogger (0.67.2)
-  - React-RCTActionSheet (0.67.2):
-    - React-Core/RCTActionSheetHeaders (= 0.67.2)
-  - React-RCTAnimation (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+  - React-perflogger (0.67.3)
+  - React-RCTActionSheet (0.67.3):
+    - React-Core/RCTActionSheetHeaders (= 0.67.3)
+  - React-RCTAnimation (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core/RCTAnimationHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTBlob (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core/RCTAnimationHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTBlob (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTBlobHeaders (= 0.67.2)
-    - React-Core/RCTWebSocket (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-RCTNetwork (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTImage (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+    - React-Core/RCTBlobHeaders (= 0.67.3)
+    - React-Core/RCTWebSocket (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-RCTNetwork (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTImage (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core/RCTImageHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-RCTNetwork (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTLinking (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
-    - React-Core/RCTLinkingHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTNetwork (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core/RCTImageHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-RCTNetwork (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTLinking (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
+    - React-Core/RCTLinkingHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTNetwork (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core/RCTNetworkHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTSettings (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core/RCTNetworkHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTSettings (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - RCTTypeSafety (= 0.67.2)
-    - React-Core/RCTSettingsHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-RCTText (0.67.2):
-    - React-Core/RCTTextHeaders (= 0.67.2)
-  - React-RCTVibration (0.67.2):
-    - FBReactNativeSpec (= 0.67.2)
+    - RCTTypeSafety (= 0.67.3)
+    - React-Core/RCTSettingsHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-RCTText (0.67.3):
+    - React-Core/RCTTextHeaders (= 0.67.3)
+  - React-RCTVibration (0.67.3):
+    - FBReactNativeSpec (= 0.67.3)
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-Core/RCTVibrationHeaders (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - ReactCommon/turbomodule/core (= 0.67.2)
-  - React-runtimeexecutor (0.67.2):
-    - React-jsi (= 0.67.2)
-  - ReactCommon/turbomodule/core (0.67.2):
+    - React-Core/RCTVibrationHeaders (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - ReactCommon/turbomodule/core (= 0.67.3)
+  - React-runtimeexecutor (0.67.3):
+    - React-jsi (= 0.67.3)
+  - ReactCommon/turbomodule/core (0.67.3):
    - DoubleConversion
    - glog
    - RCT-Folly (= 2021.06.28.00-v2)
-    - React-callinvoker (= 0.67.2)
-    - React-Core (= 0.67.2)
-    - React-cxxreact (= 0.67.2)
-    - React-jsi (= 0.67.2)
-    - React-logger (= 0.67.2)
-    - React-perflogger (= 0.67.2)
+    - React-callinvoker (= 0.67.3)
+    - React-Core (= 0.67.3)
+    - React-cxxreact (= 0.67.3)
+    - React-jsi (= 0.67.3)
+    - React-logger (= 0.67.3)
+    - React-perflogger (= 0.67.3)
  - ReactNativeART (1.2.0):
    - React
  - ReactNativeExceptionHandler (2.10.10):
    - React-Core
  - ReactNativeKeyboardTrackingView (5.7.0):
    - React
-  - ReactNativeNavigation (7.25.1):
+  - ReactNativeNavigation (7.25.4):
    - HMSegmentedControl
    - React-Core
    - React-RCTImage
    - React-RCTText
-    - ReactNativeNavigation/Core (= 7.25.1)
-  - ReactNativeNavigation/Core (7.25.1):
+    - ReactNativeNavigation/Core (= 7.25.4)
+  - ReactNativeNavigation/Core (7.25.4):
    - HMSegmentedControl
    - React-Core
    - React-RCTImage
    - React-RCTText
-  - RNCAsyncStorage (1.15.17):
+  - RNCAsyncStorage (1.16.1):
    - React-Core
  - RNCClipboard (1.5.1):
    - React-Core
@@ -387,7 +388,7 @@ PODS:
    - React
  - RNDateTimePicker (5.1.0):
    - React-Core
-  - RNDeviceInfo (8.4.8):
+  - RNDeviceInfo (8.4.9):
    - React-Core
  - RNFastImage (8.5.11):
    - React-Core
@@ -399,13 +400,13 @@ PODS:
    - React-Core
  - RNKeychain (8.0.0):
    - React-Core
-  - RNLocalize (2.1.9):
+  - RNLocalize (2.2.0):
    - React-Core
-  - RNPermissions (3.2.0):
+  - RNPermissions (3.3.0):
    - React-Core
  - RNReactNativeHapticFeedback (1.13.0):
    - React-Core
-  - RNReanimated (2.3.1):
+  - RNReanimated (2.4.1):
    - DoubleConversion
    - FBLazyVector
    - FBReactNativeSpec
@@ -436,19 +437,19 @@ PODS:
  - RNRudderSdk (1.0.0):
    - React
    - Rudder (>= 1.2.1)
-  - RNScreens (3.10.2):
+  - RNScreens (3.13.0):
    - React-Core
    - React-RCTImage
  - RNSentry (3.2.13):
    - React-Core
    - Sentry (= 7.9.0)
-  - RNShare (7.3.4):
+  - RNShare (7.3.6):
    - React-Core
  - RNSVG (12.1.1):
    - React
-  - RNVectorIcons (9.0.0):
+  - RNVectorIcons (9.1.0):
    - React-Core
-  - Rudder (1.2.2)
+  - Rudder (1.5.0)
  - SDWebImage (5.12.3):
    - SDWebImage/Core (= 5.12.3)
  - SDWebImage/Core (5.12.3)
@@ -546,7 +547,7 @@ DEPENDENCIES:
  - RNPermissions (from `../node_modules/react-native-permissions`)
  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
-  - "RNRudderSdk (from `../node_modules/@rudderstack/rudder-sdk-react-native/ios`)"
+  - "RNRudderSdk (from `../node_modules/@rudderstack/rudder-sdk-react-native`)"
  - RNScreens (from `../node_modules/react-native-screens`)
  - "RNSentry (from `../node_modules/@sentry/react-native`)"
  - RNShare (from `../node_modules/react-native-share`)
@@ -722,7 +723,7 @@ EXTERNAL SOURCES:
  RNReanimated:
    :path: "../node_modules/react-native-reanimated"
  RNRudderSdk:
-    :path: "../node_modules/@rudderstack/rudder-sdk-react-native/ios"
+    :path: "../node_modules/@rudderstack/rudder-sdk-react-native"
  RNScreens:
    :path: "../node_modules/react-native-screens"
  RNSentry:
@@ -753,12 +754,12 @@ SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
-  EXFileSystem: 99aac7962c11c680681819dd9cbca24e20e5b1e7
-  Expo: d9588796cd19999da4d440d87bf7eb7ae4dbd608
-  ExpoModulesCore: c9438f6add0fb7b04b7c64eb97a833d2752a7834
-  EXVideoThumbnails: 3bdcce697449df005fcc348153e2f854ed462984
-  FBLazyVector: 244195e30d63d7f564c55da4410b9a24e8fbceaa
-  FBReactNativeSpec: c94002c1d93da3658f4d5119c6994d19961e3d52
+  EXFileSystem: 08a3033ac372b6346becf07839e1ccef26fb1058
+  Expo: 534e51e607aba8229293297da5585f4b26f50fa1
+  ExpoModulesCore: 32c0ccb47f477d330ee93db72505380adf0de09a
+  EXVideoThumbnails: 847d648d6f4bc0c1afad05caa56a487dc543445e
+  FBLazyVector: 808f741ddb0896a20e5b98cc665f5b3413b072e2
+  FBReactNativeSpec: 94473205b8741b61402e8c51716dea34aa3f5b2f
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
  glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
  hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c
@@ -768,22 +769,22 @@ SPEC CHECKSUMS:
  libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
  lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e
  lottie-react-native: a029a86e1689c86a07169c520ae770e84348cd20
-  Permission-Camera: 53efcbb755b0e8bdf253dbb27cc7559ccfce8480
-  Permission-PhotoLibrary: 7bec836dcdd04a0bfb200c314f1aae06d4476357
+  Permission-Camera: 597646618d1edcc055a3f660844c2ee6de8e0596
+  Permission-PhotoLibrary: 33911b5522ee5978fcabe25d604756135325d067
  RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
-  RCTRequired: cd47794163052d2b8318c891a7a14fcfaccc75ab
-  RCTTypeSafety: 393bb40b3e357b224cde53d3fec26813c52428b1
+  RCTRequired: 3c77b683474faf23920fbefc71c4e13af21470c0
+  RCTTypeSafety: 720b1841260dac692444c2822b27403178da8b28
  RCTYouTube: a8bb45705622a6fc9decf64be04128d3658ed411
-  React: dec6476bc27155b250eeadfc11ea779265f53ebf
-  React-callinvoker: e5047929e80aea942e6fdd96482504ef0189ca63
-  React-Core: e382655566b2b9a6e3b4f641d777b7bfdbe52358
-  React-CoreModules: cf262e82fa101c0aee022b6f90d1a5b612038b64
-  React-cxxreact: 69d53de3b30c7c161ba087ca1ecdffed9ccb1039
-  React-hermes: 0ce480a2225907bdcf4c8e931f89cf2dc1df8b27
-  React-jsi: ce9a2d804adf75809ce2fe2374ba3fbbf5d59b03
-  React-jsiexecutor: 52beb652bbc61201bd70cbe4f0b8edb607e8da4f
-  React-jsinspector: 595f76eba2176ebd8817a1fffd47b84fbdab9383
-  React-logger: 23de8ea0f44fa00ee77e96060273225607fd4d78
+  React: 25970dd74abbdac449ca66dec4107652cacc606d
+  React-callinvoker: 2d158700bc27b3d49c3c95721d288ed6c1a489ef
+  React-Core: 306cfdc1393bcf9481cc5de9807608db7661817b
+  React-CoreModules: 2576a88d630899f3fcdf2cb79fcc0454d7b2a8bb
+  React-cxxreact: a492f0de07d875419dcb9f463c63c22fe51c433b
+  React-hermes: 4321bcd6fce09f8c6d1be355da31e1cdae7bfac6
+  React-jsi: bca092b0c38d5e3fd60bb491d4994ab4a8ac2ad3
+  React-jsiexecutor: 15ea57ead631a11fad57634ff69f78e797113a39
+  React-jsinspector: 1e1e03345cf6d47779e2061d679d0a87d9ae73d8
+  React-logger: 1e10789cb84f99288479ba5f20822ce43ced6ffe
  react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
  react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
  react-native-cookies: cd92f3824ed1e32a20802e8185101e14bb5b76da
@@ -791,49 +792,49 @@ SPEC CHECKSUMS:
  react-native-emm: a326f295d2bd3444178cf36a9e2d9307e0dc0dcc
  react-native-hw-keyboard-event: b517cefb8d5c659a38049c582de85ff43337dc53
  react-native-image-picker: 4e6008ad8c2321622affa2c85432a5ebd02d480c
-  react-native-netinfo: 87e5bfaf21ea5c6c110941290aa481dd8e849f98
+  react-native-netinfo: ba4ea50d836c60580c59079233c400753fe5bcb6
  react-native-network-client: 30ab97e7e6c8d6f2d2b10cc1ebad0cbf9c894c6e
  react-native-notifications: 805108822ceff3440644d5701944f0cda35f5b4b
  react-native-paste-input: 7d19610119115a3434c145867775723a06052362
-  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
+  react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
  react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
-  react-native-webview: 162b6453d074e0b1c7025242bb7a939b6f72b9e7
-  React-perflogger: 3c9bb7372493e49036f07a82c44c8cf65cbe88db
-  React-RCTActionSheet: 052606483045a408693aa7e864410b4a052f541a
-  React-RCTAnimation: 08d4cac13222bb1348c687a0158dfd3b577cdb63
-  React-RCTBlob: 928ad1df65219c3d9e2ac80983b943a75b5c3629
-  React-RCTImage: 524d7313b142a39ee0e20fa312b67277917fe076
-  React-RCTLinking: 44036ea6f13a2e46238be07a67566247fee35244
-  React-RCTNetwork: 9b6faacf1e0789253e319ca53b1f8d92c2ac5455
-  React-RCTSettings: ecd8094f831130a49581d5112a8607220e5d12a5
-  React-RCTText: 14ba976fb48ed283cfdb1a754a5d4276471e0152
-  React-RCTVibration: 99c7f67fba7a5ade46e98e870c6ff2444484f995
-  React-runtimeexecutor: 2450b43df7ffe8e805a0b3dcb2abd4282f1f1836
-  ReactCommon: d98c6c96b567f9b3a15f9fd4cc302c1eda8e3cf2
+  react-native-webview: 380c1a03ec94b7ed764dac8db1e7c9952d08c93a
+  React-perflogger: 93d3f142d6d9a46e635f09ba0518027215a41098
+  React-RCTActionSheet: 87327c3722203cc79cf79d02fb83e7332aeedd18
+  React-RCTAnimation: 009c87c018d50e0b38692699405ebe631ff4872d
+  React-RCTBlob: 9e30308cc1b127af11c8f858514d2d8638ce36d7
+  React-RCTImage: b9460cb8e3acc51410735a234a9dffbf4964f540
+  React-RCTLinking: 73ecf0b87b515383a08ebbf07f558c48de1f0027
+  React-RCTNetwork: 8f63119f2da99a94515ad0e0d0a13f9b3f6fe89d
+  React-RCTSettings: b827282b1ac2bd98515c0c09f5cbc5062ebd83b0
+  React-RCTText: 6d09140f514e1f60aff255e0acdf16e3b486ba4c
+  React-RCTVibration: d0361f15ea978958fab7ffb6960f475b5063d83f
+  React-runtimeexecutor: af1946623656f9c5fd64ca6f36f3863516193446
+  ReactCommon: 650e33cde4fb7d36781cd3143f5276da0abb2f96
  ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
  ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
  ReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306
-  ReactNativeNavigation: 6e747bdf88f138088a105285274170b3fc0404ed
-  RNCAsyncStorage: 6bd5a7ba3dde1c3facba418aa273f449bdc5437a
+  ReactNativeNavigation: 146bec8f834564f05637b43f469b9ca6e1cbe94f
+  RNCAsyncStorage: b49b4e38a1548d03b74b30e558a1d18465b94be7
  RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
  RNDateTimePicker: 1dd15d7ed1ab7d999056bc77879a42920d139c12
-  RNDeviceInfo: 0400a6d0c94186d1120c3cbd97b23abc022187a9
+  RNDeviceInfo: 4944cf8787b9c5bffaf301fda68cc1a2ec003341
  RNFastImage: cced864a4a2eac27c5c10ac16bd5e8b9d2be4504
  RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
  RNGestureHandler: 392653c717564ab35d6b322d7b56b10a54d88dbd
  RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
-  RNLocalize: 291e5e21b53cd30b5205c10ed95d31b0dc9b8d63
-  RNPermissions: f7ebe52db07c00901127966ca080b4ec6a6ceb0a
+  RNLocalize: 6571ea792a7dcb6d217c98c14d9147e9417cef62
+  RNPermissions: bcd846e8f5a7f39e921cc7ca7172e2de0e698b6f
  RNReactNativeHapticFeedback: b83bfb4b537bdd78eb4f6ffe63c6884f7b049ead
-  RNReanimated: 1326679461fa5d2399d54c18ca1432ba3e816b9e
-  RNRudderSdk: 1a629f815632d62459ea1add0fd4e853598d34a5
-  RNScreens: d6da2b9e29cf523832c2542f47bf1287318b1868
+  RNReanimated: 32c91e28f5780937b8efc07ddde1bab8d373fe0b
+  RNRudderSdk: 006efe311ea3d2dd2dcd200521d33715f7144d1e
+  RNScreens: aa12070b21c1d6011b3627a0b1d09b627232b070
  RNSentry: 0aa1567f66c20390f3834637fc4f73380dcd0774
-  RNShare: 571c863ce31152bee8396f7b17723d63bcfcbc63
+  RNShare: b955e66f1af2849711f13c193debda72b94f8aa0
  RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f
-  RNVectorIcons: 4143ba35feebab8fdbe6bc43d1e776b393d47ac8
-  Rudder: 5569284198eaddd1763fb5faff8e076d4ac2c858
+  RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b
+  Rudder: 95d023a3a4ec1e8d6bd15963e84f78707b13d9c3
  SDWebImage: 53179a2dba77246efa8a9b85f5c5b21f8f43e38f
  SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
  Sentry: 2f7e91f247cfb05b05bd01e0b5d0692557a7687b
@@ -841,11 +842,11 @@ SPEC CHECKSUMS:
  Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
  SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
  Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b
-  WatermelonDB: e043b1a32ddc63864eb539b562e86ef80f8224cd
+  WatermelonDB: baec390a1039dcebeee959218900c978af3407c9
  XCDYouTubeKit: 79baadb0560673a67c771eba45f83e353fd12c1f
-  Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121
+  Yoga: 90dcd029e45d8a7c1ff059e8b3c6612ff409061a
  YoutubePlayer-in-WKWebView: 4fca3b4f6f09940077bfbae7bddb771f2b43aacd

-PODFILE CHECKSUM: d1907f7c72cb74a0d3183c5cdeb10e2ff9bafad5
+PODFILE CHECKSUM: c11894180554a703d353f142d957c9fc16670083

 COCOAPODS: 1.11.2
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -7,54 +7,53 @@
  "license": "Apache 2.0",
  "private": true,
  "dependencies": {
-    "@formatjs/intl-datetimeformat": "4.5.1",
+    "@formatjs/intl-datetimeformat": "5.0.0",
    "@formatjs/intl-getcanonicallocales": "1.9.0",
-    "@formatjs/intl-locale": "2.4.44",
-    "@formatjs/intl-numberformat": "7.4.1",
-    "@formatjs/intl-pluralrules": "4.3.1",
-    "@formatjs/intl-relativetimeformat": "9.5.1",
+    "@formatjs/intl-locale": "2.4.45",
+    "@formatjs/intl-numberformat": "7.4.2",
+    "@formatjs/intl-pluralrules": "4.3.2",
+    "@formatjs/intl-relativetimeformat": "10.0.0",
    "@mattermost/compass-icons": "0.1.22",
    "@mattermost/react-native-emm": "1.1.8",
    "@mattermost/react-native-network-client": "github:mattermost/react-native-network-client",
    "@mattermost/react-native-paste-input": "0.3.7",
    "@nozbe/watermelondb": "0.24.0",
    "@nozbe/with-observables": "1.4.0",
-    "@react-native-async-storage/async-storage": "1.15.17",
+    "@react-native-async-storage/async-storage": "1.16.1",
    "@react-native-community/art": "1.2.0",
    "@react-native-community/cameraroll": "4.1.2",
    "@react-native-community/clipboard": "1.5.1",
    "@react-native-community/datetimepicker": "5.1.0",
    "@react-native-community/masked-view": "0.1.11",
-    "@react-native-community/netinfo": "7.1.9",
+    "@react-native-community/netinfo": "8.0.0",
    "@react-native-cookies/cookies": "6.0.11",
-    "@react-navigation/bottom-tabs": "6.1.0",
-    "@react-navigation/native": "6.0.7",
-    "@rudderstack/rudder-sdk-react-native": "1.1.1",
+    "@react-navigation/bottom-tabs": "6.2.0",
+    "@react-navigation/native": "6.0.8",
+    "@rudderstack/rudder-sdk-react-native": "1.2.1",
    "@sentry/react-native": "3.2.13",
    "@stream-io/flat-list-mvcp": "0.10.1",
-    "@types/mime-db": "1.43.1",
    "commonmark": "0.30.0",
    "commonmark-react-renderer": "4.3.5",
    "deep-equal": "2.0.5",
    "deepmerge": "4.2.2",
    "emoji-regex": "10.0.0",
-    "expo": "43.0.5",
-    "expo-video-thumbnails": "6.0.3",
+    "expo": "44.0.6",
+    "expo-video-thumbnails": "6.2.0",
    "fuse.js": "6.5.3",
    "jail-monkey": "2.6.0",
    "lottie-ios": "3.2.3",
    "lottie-react-native": "5.0.1",
-    "mime-db": "1.51.0",
+    "mime-db": "1.52.0",
    "moment-timezone": "0.5.34",
    "react": "17.0.2",
    "react-freeze": "1.0.0",
-    "react-intl": "5.24.4",
-    "react-native": "0.67.2",
+    "react-intl": "5.24.6",
+    "react-native": "0.67.3",
    "react-native-android-open-settings": "1.3.0",
    "react-native-background-timer": "2.4.1",
    "react-native-button": "3.0.1",
-    "react-native-calendars": "1.1276.0",
-    "react-native-device-info": "8.4.8",
+    "react-native-calendars": "1.1278.0",
+    "react-native-device-info": "8.4.9",
    "react-native-document-picker": "8.0.0",
    "react-native-elements": "3.4.2",
    "react-native-exception-handler": "2.10.10",
@@ -68,52 +67,52 @@
    "react-native-keyboard-tracking-view": "5.7.0",
    "react-native-keychain": "8.0.0",
    "react-native-linear-gradient": "2.5.6",
-    "react-native-localize": "2.1.9",
-    "react-native-navigation": "7.25.1",
+    "react-native-localize": "2.2.0",
+    "react-native-navigation": "7.25.4",
    "react-native-neomorph-shadows": "1.1.2",
    "react-native-notifications": "4.1.3",
-    "react-native-permissions": "3.2.0",
-    "react-native-reanimated": "2.3.1",
-    "react-native-redash": "16.2.3",
-    "react-native-safe-area-context": "3.3.2",
-    "react-native-screens": "3.10.2",
+    "react-native-permissions": "3.3.0",
+    "react-native-reanimated": "2.4.1",
+    "react-native-safe-area-context": "3.4.1",
+    "react-native-screens": "3.13.0",
    "react-native-section-list-get-item-layout": "2.2.3",
-    "react-native-share": "7.3.4",
+    "react-native-share": "7.3.6",
    "react-native-slider": "0.11.0",
    "react-native-svg": "12.1.1",
-    "react-native-vector-icons": "9.0.0",
+    "react-native-vector-icons": "9.1.0",
    "react-native-video": "5.2.0",
-    "react-native-webview": "11.17.1",
+    "react-native-webview": "11.17.2",
    "react-native-youtube": "2.0.2",
    "reanimated-bottom-sheet": "1.0.0-alpha.22",
    "rn-placeholder": "3.0.3",
    "semver": "7.3.5",
-    "serialize-error": "9.0.0",
+    "serialize-error": "9.1.0",
    "shallow-equals": "1.0.0",
    "tinycolor2": "1.4.2",
-    "url-parse": "1.5.4"
+    "url-parse": "1.5.10"
  },
  "devDependencies": {
-    "@babel/cli": "7.16.8",
-    "@babel/core": "7.16.12",
-    "@babel/eslint-parser": "7.16.5",
+    "@babel/cli": "7.17.6",
+    "@babel/core": "7.17.5",
+    "@babel/eslint-parser": "7.17.0",
    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-proposal-decorators": "7.16.7",
+    "@babel/plugin-proposal-decorators": "7.17.2",
    "@babel/plugin-transform-flow-strip-types": "7.16.7",
-    "@babel/plugin-transform-runtime": "7.16.10",
+    "@babel/plugin-transform-runtime": "7.17.0",
    "@babel/preset-env": "7.16.11",
    "@babel/preset-typescript": "7.16.7",
-    "@babel/register": "7.16.9",
-    "@babel/runtime": "7.16.7",
+    "@babel/register": "7.17.0",
+    "@babel/runtime": "7.17.2",
    "@react-native-community/eslint-config": "3.0.1",
    "@testing-library/react-native": "9.0.0",
    "@types/commonmark": "0.27.5",
    "@types/commonmark-react-renderer": "4.3.1",
    "@types/deep-equal": "1.0.1",
-    "@types/jest": "27.4.0",
-    "@types/lodash": "4.14.178",
-    "@types/react": "17.0.38",
-    "@types/react-native": "0.66.15",
+    "@types/jest": "27.4.1",
+    "@types/lodash": "4.14.179",
+    "@types/mime-db": "1.43.1",
+    "@types/react": "17.0.39",
+    "@types/react-native": "0.67.1",
    "@types/react-native-background-timer": "2.0.0",
    "@types/react-native-button": "3.0.1",
    "@types/react-native-share": "3.3.3",
@@ -122,31 +121,31 @@
    "@types/semver": "7.3.9",
    "@types/shallow-equals": "1.0.0",
    "@types/tinycolor2": "1.4.3",
-    "@types/url-parse": "1.4.7",
-    "@typescript-eslint/eslint-plugin": "5.10.2",
-    "@typescript-eslint/parser": "5.10.2",
-    "babel-jest": "27.4.6",
+    "@types/url-parse": "1.4.8",
+    "@typescript-eslint/eslint-plugin": "5.13.0",
+    "@typescript-eslint/parser": "5.13.0",
+    "babel-jest": "27.5.1",
    "babel-loader": "8.2.3",
    "babel-plugin-module-resolver": "4.1.0",
    "babel-plugin-transform-remove-console": "6.9.4",
    "deep-freeze": "0.0.1",
-    "detox": "19.4.2",
-    "eslint": "8.8.0",
+    "detox": "19.5.1",
+    "eslint": "8.10.0",
    "eslint-plugin-header": "3.1.1",
    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-jest": "26.0.0",
+    "eslint-plugin-jest": "26.1.1",
    "eslint-plugin-mattermost": "github:mattermost/eslint-plugin-mattermost#23abcf9988f7fa00d26929f11841aab7ccb16b2b",
-    "eslint-plugin-react": "7.28.0",
+    "eslint-plugin-react": "7.29.2",
    "eslint-plugin-react-hooks": "4.3.0",
    "husky": "7.0.4",
    "isomorphic-fetch": "3.0.0",
-    "jest": "27.4.7",
-    "jest-cli": "27.4.7",
+    "jest": "27.5.1",
+    "jest-cli": "27.5.1",
    "jetifier": "2.0.0",
-    "metro-react-native-babel-preset": "0.67.0",
+    "metro-react-native-babel-preset": "0.69.0",
    "mmjstool": "github:mattermost/mattermost-utilities#010f456ea8be5beebafdb8776177cba515c1969e",
    "mock-async-storage": "2.2.0",
-    "nock": "13.2.2",
+    "nock": "13.2.4",
    "patch-package": "6.4.7",
    "react-native-svg-transformer": "1.0.0",
    "react-test-renderer": "17.0.2",
--- a/patches/@nozbe+watermelondb+0.24.0.patch
+++ b/patches/@nozbe+watermelondb+0.24.0.patch
@@ -55,6 +55,22 @@ index 075a047..e5e52fa 100644
     (0, _ensureSync.default)(recordUpdater(this));
     this._isEditing = false;
     this._preparedState = 'update'; // TODO: `process.nextTick` doesn't work on React Native
+diff --git a/node_modules/@nozbe/watermelondb/WatermelonDB.podspec b/node_modules/@nozbe/watermelondb/WatermelonDB.podspec
+index 1f3af50..e9fea58 100644
+--- a/node_modules/@nozbe/watermelondb/WatermelonDB.podspec
+++ b/node_modules/@nozbe/watermelondb/WatermelonDB.podspec
+@@ -13,7 +13,10 @@ Pod::Spec.new do |s|
+   s.platforms    = { :ios => "9.0", :tvos => "9.0" }
+   s.source = { :git => "https://github.com/Nozbe/WatermelonDB.git", :tag => "v#{s.version}" }
+   s.source_files = "native/ios/**/*.{h,m,mm,swift,c,cpp}", "native/shared/**/*.{h,c,cpp}"
+-  s.public_header_files = 'native/ios/WatermelonDB/SupportingFiles/Bridging.h'
+  s.public_header_files = [
+    'native/ios/WatermelonDB/SupportingFiles/Bridging.h',
+    'native/ios/WatermelonDB/JSIInstaller.h',
+  ]
+   s.requires_arc = true
+   # simdjson is annoyingly slow without compiler optimization, disable for debugging
+   s.compiler_flags = '-Os'
 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
@@ -81,6 +97,23 @@ index ca31e20..b45c753 100644
             } 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/ios/WatermelonDB/SupportingFiles/Bridging.h b/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/Bridging.h
+index 135118d..8324550 100644
+--- a/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/Bridging.h
+++ b/node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/Bridging.h
+@@ -6,12 +6,6 @@
+ 
+ #import <React/RCTBridgeModule.h>
+ 
+-#if __has_include("JSIInstaller.h")
+-#import "JSIInstaller.h"
+-#else
+-#import "../JSIInstaller.h"
+-#endif
+-
+ #if __has_include("DatabaseDeleteHelper.h")
+ #import "DatabaseDeleteHelper.h"
+ #else
 diff --git a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp b/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
 index a2bd410..44e1a58 100644
 --- a/node_modules/@nozbe/watermelondb/native/shared/Database.cpp
--- a/patches/@react-native-community+netinfo+8.0.0.patch
+++ b/patches/@react-native-community+netinfo+8.0.0.patch
--- a/patches/expo+43.0.5.patch
+++ b/patches/expo+43.0.5.patch
@@ -1,28 +0,0 @@
-diff --git a/node_modules/expo/android/build.gradle b/node_modules/expo/android/build.gradle
-index bf024d8..1080ee5 100644
--- a/node_modules/expo/android/build.gradle
-+++ b/node_modules/expo/android/build.gradle
-@@ -1,6 +1,6 @@
- apply plugin: 'com.android.library'
- apply plugin: 'kotlin-android'
-apply plugin: 'maven'
-+apply plugin: 'maven-publish'
- 
- // Import autolinking script
- apply from: "../scripts/autolinking.gradle"
-@@ -41,15 +41,6 @@ artifacts {
-   archives androidSourcesJar
- }
- 
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
-    }
-  }
-}
-
- android {
-   compileSdkVersion safeExtGet("compileSdkVersion", 30)
- 
--- a/patches/expo-file-system+13.0.3.patch
+++ b/patches/expo-file-system+13.0.3.patch
@@ -1,28 +0,0 @@
-diff --git a/node_modules/expo-file-system/android/build.gradle b/node_modules/expo-file-system/android/build.gradle
-index a24e867..9d678ac 100644
--- a/node_modules/expo-file-system/android/build.gradle
-+++ b/node_modules/expo-file-system/android/build.gradle
-@@ -1,6 +1,6 @@
- apply plugin: 'com.android.library'
- apply plugin: 'kotlin-android'
-apply plugin: 'maven'
-+apply plugin: 'maven-publish'
- 
- group = 'host.exp.exponent'
- version = '13.0.3'
-@@ -36,15 +36,6 @@ artifacts {
-   archives androidSourcesJar
- }
- 
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
-    }
-  }
-}
-
- android {
-   compileSdkVersion safeExtGet("compileSdkVersion", 30)
- 
--- a/patches/expo-modules-core+0.4.10.patch
+++ b/patches/expo-modules-core+0.4.10.patch
@@ -1,28 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/build.gradle b/node_modules/expo-modules-core/android/build.gradle
-index f3ac20a..51774b4 100644
--- a/node_modules/expo-modules-core/android/build.gradle
-+++ b/node_modules/expo-modules-core/android/build.gradle
-@@ -1,6 +1,6 @@
- apply plugin: 'com.android.library'
- apply plugin: 'kotlin-android'
-apply plugin: 'maven'
-+apply plugin: 'maven-publish'
- 
- group = 'host.exp.exponent'
- version = '0.4.10'
-@@ -36,15 +36,6 @@ artifacts {
-   archives androidSourcesJar
- }
- 
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
-    }
-  }
-}
-
- android {
-   compileSdkVersion safeExtGet("compileSdkVersion", 30)
- 
--- a/patches/expo-video-thumbnails+6.2.0.patch
+++ b/patches/expo-video-thumbnails+6.2.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/expo-video-thumbnails/android/build.gradle b/node_modules/expo-video-thumbnails/android/build.gradle
-index ebbe8e3..b826ddc 100644
+index 0342e3c..4c6c39c 100644
 --- a/node_modules/expo-video-thumbnails/android/build.gradle
 +++ b/node_modules/expo-video-thumbnails/android/build.gradle
@@ -1,6 +1,6 @@
@@ -9,7 +9,7 @@ index ebbe8e3..b826ddc 100644
 +apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
- version = '6.0.3'
+ version = '6.2.0'
@@ -36,15 +36,6 @@ artifacts {
   archives androidSourcesJar
 }
--- a/patches/react-native+0.67.3.patch
+++ b/patches/react-native+0.67.3.patch
--- a/patches/react-native-device-info+8.4.9.patch
+++ b/patches/react-native-device-info+8.4.9.patch
--- a/patches/react-native-navigation+7.25.4.patch
+++ b/patches/react-native-navigation+7.25.4.patch
@@ -90,27 +90,6 @@ index 2e8acc0..71da101 100644
         }
         super.onCatalystInstanceDestroy();
     }
-diff --git a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java
-index c2fbac7..97473b8 100644
--- a/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java
-+++ b/node_modules/react-native-navigation/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/component/ComponentViewController.java
-@@ -4,6 +4,7 @@ import android.app.Activity;
- import android.content.res.Configuration;
- import android.view.View;
- 
-+import com.reactnativenavigation.options.params.NullBool;
- import com.reactnativenavigation.utils.LogKt;
- import com.reactnativenavigation.viewcontrollers.viewcontroller.ScrollEventListener;
- import com.reactnativenavigation.options.Options;
-@@ -156,7 +157,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
- 
-     @Override
-     public void destroy() {
-        final boolean blurOnUnmount = options != null && options.modal.blurOnUnmount.isTrue();
-+        final boolean blurOnUnmount = options != null && (options.modal.blurOnUnmount.isTrue() || options.overlayOptions.interceptTouchOutside instanceof NullBool);
-         if (blurOnUnmount) {
-             blurActivityFocus();
-         }
 diff --git a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m b/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
 index 934e7e7..19169a3 100644
 --- a/node_modules/react-native-navigation/lib/ios/RNNOverlayWindow.m
@@ -133,18 +112,3 @@ index 934e7e7..19169a3 100644
         [hitTestResult isKindOfClass:[RCTModalHostView class]]) {
         return nil;
     }
-diff --git a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m b/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
-index 2e60123..56830c8 100644
--- a/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
-+++ b/node_modules/react-native-navigation/lib/ios/RNNViewLocation.m
-@@ -21,8 +21,8 @@
-     self.toBounds = [self convertViewBounds:toElement];
-     self.fromCenter = [self convertViewCenter:fromElement];
-     self.toCenter = [self convertViewCenter:toElement];
-    self.fromPath = [self resolveViewPath:fromElement withSuperView:fromElement.superview];
-    self.toPath = [self resolveViewPath:toElement withSuperView:toElement.superview];
-+    self.fromPath = fromElement.bounds;
-+    self.toPath = toElement.bounds;
- 
-     return self;
- }
--- a/patches/react-native-vector-icons+9.0.0.patch
+++ b/patches/react-native-vector-icons+9.0.0.patch
@@ -1,25 +0,0 @@
-diff --git a/node_modules/react-native-vector-icons/android/src/main/java/com/oblador/vectoricons/VectorIconsModule.java b/node_modules/react-native-vector-icons/android/src/main/java/com/oblador/vectoricons/VectorIconsModule.java
-index 9e666b4..5d5830b 100755
--- a/node_modules/react-native-vector-icons/android/src/main/java/com/oblador/vectoricons/VectorIconsModule.java
-+++ b/node_modules/react-native-vector-icons/android/src/main/java/com/oblador/vectoricons/VectorIconsModule.java
-@@ -46,7 +46,8 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
-   protected String createGlyphImagePath(String fontFamily, String glyph, Integer fontSize, Integer color) throws java.io.IOException, FileNotFoundException {
-     Context context = getReactApplicationContext();
-     File cacheFolder = context.getCacheDir();
-    String cacheFolderPath = cacheFolder.getAbsolutePath() + "/";
-+    String cacheFolderPath = cacheFolder.getAbsolutePath() + "/vectorIcons/";
-+    File vectorIconsFolder = new File(cacheFolderPath);
- 
-     float scale = context.getResources().getDisplayMetrics().density;
-     String scaleSuffix = "@" + (scale == (int) scale ? Integer.toString((int) scale) : Float.toString(scale)) + "x";
-@@ -57,6 +58,10 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
-     String cacheFileUrl = "file://" + cacheFilePath;
-     File cacheFile = new File(cacheFilePath);
- 
-+    if (!vectorIconsFolder.exists()) {
-+      vectorIconsFolder.mkdirs();
-+    }
-+
-     if(cacheFile.exists()) {
-       return cacheFileUrl;
-     }