bug fixes and new accountsheet

2024-12-23 13:22:02 +03:00 · 2021-02-03 10:13:22 +02:00 · 2021-02-03 10:13:22 +02:00 · 6b6e759199
commit 6b6e759199
parent 5b3d88d167
12 changed files with 164 additions and 203 deletions
--- a/android/.project
+++ b/android/.project
@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1612291976720</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
--- a/android/app/.project
+++ b/android/app/.project
@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1612291976724</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -397,8 +397,8 @@ PODS:
    - Firebase/Messaging (~> 6.28.1)
    - React
    - RNFBApp
-  - RNGestureHandler (1.7.0):
-    - React
+  - RNGestureHandler (1.9.0):
+    - React-Core
  - RNIap (3.4.15):
    - React
  - RNImageCropPicker (0.35.2):
@ -712,7 +712,7 @@ SPEC CHECKSUMS:
  RNFBApp: d55b3a69d199cff25ecf4f3bf41a86c47aa37d57
  RNFBDynamicLinks: 25fd455b8f47be4fc7e92bd80db17d448196e9ba
  RNFBMessaging: 3bb7dcf398789ce359a9f6b97b83472a3090f65a
-  RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08
+  RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
  RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4
  RNImageCropPicker: 9e0bf18cf4184a846fed55747c8e622208b39947
  RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
--- a/package.json
+++ b/package.json
@ -34,7 +34,6 @@
    "@esteemapp/react-native-multi-slider": "^1.1.0",
    "@esteemapp/react-native-render-html": "^4.1.5",
    "@esteemapp/react-native-slider": "^0.12.0",
-    "@gorhom/bottom-sheet": "^2",
    "@hiveio/dhive": "^0.14.12",
    "@react-native-community/async-storage": "^1.11.0",
    "@react-native-community/cameraroll": "^1.3.0",
@ -66,6 +65,7 @@
    "react": "16.9.0",
    "react-intl": "^3.9.2",
    "react-native": "0.61.5",
+    "react-native-actions-sheet": "^0.4.2",
    "react-native-actionsheet": "ecency/react-native-actionsheet",
    "react-native-autoheight-webview": "^1.5.2",
    "react-native-config": "luggit/react-native-config#master",
@ -73,7 +73,7 @@
    "react-native-date-picker": "^3.2.7",
    "react-native-extended-stylesheet": "^0.10.0",
    "react-native-fast-image": "^8.3.2",
-    "react-native-gesture-handler": "^1.4.1",
+    "react-native-gesture-handler": "^1.9.0",
    "react-native-highlight-words": "^1.0.1",
    "react-native-iap": "3.4.15",
    "react-native-image-crop-picker": "^0.35.2",
@ -88,7 +88,7 @@
    "react-native-navigation-bar-color": "^1.0.0",
    "react-native-push-notification": "^3.5.1",
    "react-native-qrcode-svg": "^6.0.3",
-    "react-native-reanimated": "^1.3.0",
+    "react-native-reanimated": "^1",
    "react-native-receive-sharing-intent": "ecency/react-native-receive-sharing-intent",
    "react-native-restart": "0.0.17",
    "react-native-safe-area-context": "^3.1.9",
--- a/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js
+++ b/src/components/accountsBottomSheet/container/accountsBottomSheetContainer.js
@ -29,29 +29,26 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
  }, [isVisibleAccountsBottomSheet]);

  const _navigateToRoute = (routeName = null) => {
+    dispatch(toggleAccountsBottomSheet(false));
+    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
    if (routeName) {
-      accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
-      setTimeout(() => {
-        navigate({ routeName });
-      }, 500);
+      navigate({ routeName });
    }
  };

+  const _onClose = () => {
+    dispatch(toggleAccountsBottomSheet(false));
+  };
+
  const _switchAccount = async (account = {}) => {
-    if (account.username !== currentAccount.name) {
+    dispatch(toggleAccountsBottomSheet(false));
+    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
+    if (currentAccount && account && account.username !== currentAccount.name) {
      _handleSwitch(account);
-    } else {
-      accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
    }
  };

  const _handleSwitch = async (switchingAccount = {}) => {
-    // Call this dispatch because when we make request, onDismiss is not working
-    // =========================================================================
-    accountsBottomSheetViewRef.current?.closeAccountsBottomSheet();
-    dispatch(toggleAccountsBottomSheet());
-    // =========================================================================
-
    const accountData = accounts.filter(
      (account) => account.username === switchingAccount.username,
    )[0];
@ -89,6 +86,7 @@ const AccountsBottomSheetContainer = ({ navigation }) => {
      currentAccount={currentAccount}
      navigateToRoute={_navigateToRoute}
      switchAccount={_switchAccount}
+      onClose={_onClose}
    />
  );
 };
--- a/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js
+++ b/src/components/accountsBottomSheet/view/accountsBottomSheetStyles.js
@ -8,8 +8,9 @@ export default EStyleSheet.create({
    backgroundColor: 'grey',
  },
  contentContainer: {
-    flex: 1,
-    alignItems: 'center',
+    //flex: 1,
+    //alignItems: 'center',
+    paddingVertical: 10,
  },
  backdrop: {
    position: 'absolute',
@ -90,7 +91,7 @@ export default EStyleSheet.create({
    flexDirection: 'row',
    paddingHorizontal: 16,
    alignItems: 'center',
-    flex: 1,
+    //flex: 1,
    justifyContent: 'space-between',
  },
  nameContainer: {
@ -106,7 +107,6 @@ export default EStyleSheet.create({
  },
  accountsModal: {
    backgroundColor: '$primaryBackgroundColor',
-    flex: 1,
  },
  handleComponent: {
    backgroundColor: '$primaryBackgroundColor',
--- a/src/components/accountsBottomSheet/view/accountsBottomSheetView.js
+++ b/src/components/accountsBottomSheet/view/accountsBottomSheetView.js
@ -1,16 +1,12 @@
 import React, { useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react';
-import { View, Text } from 'react-native';
+import { View, Text, Dimensions, TouchableWithoutFeedback, TouchableOpacity } from 'react-native';
 import { useDispatch } from 'react-redux';
 import { useIntl } from 'react-intl';
-import {
-  BottomSheetModal,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  BottomSheetModalProvider,
-  BottomSheetFlatList,
-} from '@gorhom/bottom-sheet';
+import ActionSheet from 'react-native-actions-sheet';
+
 import { useSafeAreaInsets } from 'react-native-safe-area-context';

+import { FlatList } from 'react-native-gesture-handler';
 import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction';

 import { UserAvatar, Icon, TextButton, Separator } from '../../index';
@ -20,34 +16,27 @@ import { default as ROUTES } from '../../../constants/routeNames';
 import styles from './accountsBottomSheetStyles';
 import { switchAccount } from '../../../providers/hive/auth';

+const windowHeight = Dimensions.get('window').height;
+
 const AccountsBottomSheet = forwardRef(
-  ({ accounts, currentAccount, navigateToRoute, switchAccount }, ref) => {
+  ({ accounts, currentAccount, navigateToRoute, switchAccount, onClose }, ref) => {
    const dispatch = useDispatch();
    const bottomSheetModalRef = useRef();
+    const userList = useRef();
    const insets = useSafeAreaInsets();
    const intl = useIntl();

-    const snapPoints = [accounts.length <= 4 ? accounts.length * 60 + 150 : 405];
-
    useImperativeHandle(ref, () => ({
      showAccountsBottomSheet() {
-        bottomSheetModalRef.current?.present();
+        bottomSheetModalRef.current?.setModalVisible(true);
      },
      closeAccountsBottomSheet() {
-        _handleCloseBottomSheet();
+        bottomSheetModalRef.current?.setModalVisible(false);
      },
    }));

-    const _handleCloseBottomSheet = () => {
-      bottomSheetModalRef.current?.dismiss();
-    };
-
-    const _handleDispatchDismissBottomSheet = () => {
-      dispatch(toggleAccountsBottomSheet());
-    };
-
    //_handlePressAccountTile(item)
-    const _renderAccountTile = (item) => (
+    const _renderAccountTile = ({ item }) => (
      <TouchableOpacity style={styles.accountTile} onPress={() => switchAccount(item)}>
        <View style={styles.avatarAndNameContainer}>
          <UserAvatar username={item.username} />
@ -61,65 +50,48 @@ const AccountsBottomSheet = forwardRef(
      </TouchableOpacity>
    );

-    const renderHandleComponent = () => (
-      <View style={styles.handleComponent}>
-        <View style={styles.handle} />
-      </View>
-    );
-
    return (
-      <BottomSheetModalProvider>
-        <BottomSheetModal
-          backdropComponent={() => (
-            <TouchableOpacity
-              style={styles.backdrop}
-              activeOpacity={1}
-              onPress={_handleCloseBottomSheet}
-            />
-          )}
-          ref={bottomSheetModalRef}
-          index={0}
-          snapPoints={snapPoints}
-          onDismiss={_handleDispatchDismissBottomSheet}
-          shouldMeasureContentHeight={true}
-          handleComponent={renderHandleComponent}
-        >
-          <View style={styles.accountsModal}>
-            <BottomSheetFlatList
-              data={accounts}
-              scrollEnabled
-              keyExtractor={(item, index) => `${item.name}${item.username}${index}`}
-              renderItem={({ item }) => _renderAccountTile(item)}
-              //contentContainerStyle={styles.contentContainer}
-            />
+      <View style={[styles.accountsModal, { maxHeight: windowHeight / 2 }]}>
+        <ActionSheet ref={bottomSheetModalRef} gestureEnabled={true} hideUnderlay onClose={onClose}>
+          <FlatList
+            data={accounts}
+            ref={userList}
+            scrollEnabled
+            keyExtractor={(item, index) => `${item.name || item.username}${index}`}
+            renderItem={_renderAccountTile}
+            contentContainerStyle={styles.contentContainer}
+            nestedScrollEnabled={true}
+            onScrollEndDrag={() => bottomSheetModalRef.current?.handleChildScrollEnd()}
+            onScrollAnimationEnd={() => bottomSheetModalRef.current?.handleChildScrollEnd()}
+            onMomentumScrollEnd={() => bottomSheetModalRef.current?.handleChildScrollEnd()}
+          />
+          <Separator style={styles.separator} />
+          <View style={{ paddingBottom: insets.bottom }}>
+            <TouchableWithoutFeedback
+              style={styles.button}
+              onPress={() => navigateToRoute(ROUTES.SCREENS.REGISTER)}
+            >
+              <View>
+                <Text style={styles.textButton}>
+                  {intl.formatMessage({ id: 'side_menu.create_a_new_account' })}
+                </Text>
+              </View>
+            </TouchableWithoutFeedback>
+            <Separator style={styles.separator} />
+            <TouchableWithoutFeedback
+              style={styles.button}
+              onPress={() => navigateToRoute(ROUTES.SCREENS.LOGIN)}
+            >
+              <View>
+                <Text style={styles.textButton}>
+                  {intl.formatMessage({ id: 'side_menu.add_an_existing_account' })}
+                </Text>
+              </View>
+            </TouchableWithoutFeedback>
            <Separator style={styles.separator} />
-            <View style={{ paddingBottom: insets.bottom }}>
-              <TouchableWithoutFeedback
-                style={styles.button}
-                onPress={() => navigateToRoute(ROUTES.SCREENS.REGISTER)}
-              >
-                <View>
-                  <Text style={styles.textButton}>
-                    {intl.formatMessage({ id: 'side_menu.create_a_new_account' })}
-                  </Text>
-                </View>
-              </TouchableWithoutFeedback>
-              <Separator style={styles.separator} />
-              <TouchableWithoutFeedback
-                style={styles.button}
-                onPress={() => navigateToRoute(ROUTES.SCREENS.LOGIN)}
-              >
-                <View>
-                  <Text style={styles.textButton}>
-                    {intl.formatMessage({ id: 'side_menu.add_an_existing_account' })}
-                  </Text>
-                </View>
-              </TouchableWithoutFeedback>
-              <Separator style={styles.separator} />
-            </View>
          </View>
-        </BottomSheetModal>
-      </BottomSheetModalProvider>
+        </ActionSheet>
+      </View>
    );
  },
 );
--- a/src/components/postCard/view/postCardView.js
+++ b/src/components/postCard/view/postCardView.js
@ -6,6 +6,7 @@ import ImageSize from 'react-native-image-size';

 // Utils
 import { getTimeFromNow } from '../../../utils/time';
+import bugsnag from '../../../config/bugsnag';

 // Components
 import { PostHeaderDescription } from '../../postElements';
@ -71,9 +72,18 @@ const PostCardView = ({
        return { image: NSFW_IMAGE, thumbnail: NSFW_IMAGE };
      }
      //console.log(content)
-      ImageSize.getSize(content.thumbnail).then((size) => {
-        setCalcImgHeight(Math.floor((size.height / size.width) * dim.width));
-      });
+      ImageSize.getSize(content.thumbnail)
+        .then((size) => {
+          setCalcImgHeight(Math.floor((size.height / size.width) * dim.width));
+        })
+        .catch((er) => {
+          setCalcImgHeight(Math.floor((10 / 7) * dim.width));
+          bugsnag.notify(er, (report) => {
+            report.metadata = {
+              content,
+            };
+          });
+        });
      return { image: content.image, thumbnail: content.thumbnail };
    } else {
      return { image: DEFAULT_IMAGE, thumbnail: DEFAULT_IMAGE };
--- a/src/components/posts/view/postsView.js
+++ b/src/components/posts/view/postsView.js
@ -143,6 +143,7 @@ const PostsView = ({
              <FlatList
                data={recommendedUsers}
                extraData={recommendedUsers}
+                keyExtractor={(item, index) => `${item._id || item.id}${index}`}
                renderItem={({ item, index }) => (
                  <UserListItem
                    index={index}
@ -182,6 +183,7 @@ const PostsView = ({
              </Text>
              <FlatList
                data={recommendedCommunities}
+                keyExtractor={(item, index) => `${item.id || item.title}${index}`}
                renderItem={({ item, index }) => (
                  <CommunityListItem
                    index={index}
--- a/src/components/sideMenu/container/sideMenuContainer.js
+++ b/src/components/sideMenu/container/sideMenuContainer.js
@ -1,5 +1,5 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
+import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';

 // Actions
 import { toggleAccountsBottomSheet } from '../../../redux/actions/uiAction';
@ -14,47 +14,45 @@ import SideMenuView from '../view/sideMenuView';
 *@props -->     props name navigation                   coming from react-navigation
 *
 */
-
-class SideMenuContainer extends Component {
+const SideMenuContainer = ({ navigation }) => {
  // Component Functions
+  const dispatch = useDispatch();

-  _navigateToRoute = (route = null) => {
-    const { navigation } = this.props;
+  const isLoggedIn = useSelector((state) => state.application.isLoggedIn);
+  const currentAccount = useSelector((state) => state.account.currentAccount);
+  const otherAccounts = useSelector((state) => state.account.otherAccounts);
+  const isVisibleAccountsBottomSheet = useSelector(
+    (state) => state.ui.isVisibleAccountsBottomSheet,
+  );
+
+  const _navigateToRoute = (route = null) => {
    if (route) {
      navigation.navigate(route);
    }
  };

-  _handleLogout = () => {
-    const { logout, navigation } = this.props;
-
+  const _handleLogout = () => {
    navigation.closeDrawer();
-    logout();
+    dispatch(logout());
  };

-  _handlePressOptions = () => {
-    const { toggleAccountsBottomSheet } = this.props;
-
-    toggleAccountsBottomSheet();
+  const _handlePressOptions = () => {
+    dispatch(toggleAccountsBottomSheet(!isVisibleAccountsBottomSheet));
  };

-  render() {
-    const { currentAccount, isLoggedIn } = this.props;
+  return (
+    <SideMenuView
+      navigateToRoute={_navigateToRoute}
+      isLoggedIn={isLoggedIn}
+      userAvatar={null}
+      currentAccount={currentAccount}
+      handleLogout={_handleLogout}
+      handlePressOptions={_handlePressOptions}
+    />
+  );
+};

-    return (
-      <SideMenuView
-        navigateToRoute={this._navigateToRoute}
-        isLoggedIn={isLoggedIn}
-        userAvatar={null}
-        currentAccount={currentAccount}
-        handleLogout={this._handleLogout}
-        handlePressOptions={this._handlePressOptions}
-      />
-    );
-  }
-}
-
-const mapStateToProps = (state) => ({
+/*const mapStateToProps = (state) => ({
  isLoggedIn: state.application.isLoggedIn,
  currentAccount: state.account.currentAccount,
  otherAccounts: state.account.otherAccounts,
@ -63,6 +61,6 @@ const mapStateToProps = (state) => ({
 const mapDispatchToProps = {
  toggleAccountsBottomSheet,
  logout,
-};
+};*/

-export default connect(mapStateToProps, mapDispatchToProps)(SideMenuContainer);
+export default SideMenuContainer;
--- a/src/redux/reducers/uiReducer.js
+++ b/src/redux/reducers/uiReducer.js
@ -43,7 +43,7 @@ export default function (state = initialState, action) {
    case TOGGLE_ACCOUNTS_BOTTOM_SHEET:
      return {
        ...state,
-        isVisibleAccountsBottomSheet: !state.isVisibleAccountsBottomSheet,
+        isVisibleAccountsBottomSheet: action.payload,
      };
    default:
      return state;
--- a/yarn.lock
+++ b/yarn.lock
@ -805,25 +805,6 @@
  resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799"
  integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==

-"@gorhom/bottom-sheet@^2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-2.0.3.tgz#af72d3c934b0d397729f59c9108c5e2664cf0585"
-  integrity sha512-yTyefTzaXy4D/7td3rcSf0MAzmcZmwakYuhs+OeB+OwPJ+OwOZXm4t1TtDp5K/R9VZvLvFWHgKlQR8dlDxxENA==
-  dependencies:
-    "@gorhom/portal" "^0.1.4"
-    invariant "^2.2.4"
-    lodash.isequal "^4.5.0"
-    nanoid "^3.1.20"
-    react-native-redash "^14.2.4"
-
-"@gorhom/portal@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@gorhom/portal/-/portal-0.1.4.tgz#ef9e50d4b6c98ebe606a16d22d6cb58d661421b4"
-  integrity sha512-iU3D0i9NureT5ULTvD8moF2FWyFvVGcr/ahcRMDzBblUO1AwwixZRZ+Lf3d6uk0w4ujOQZ7+Az+uUnI+AsXXBw==
-  dependencies:
-    lodash.isequal "^4.5.0"
-    nanoid "^3.1.20"
-
 "@hapi/address@2.x.x":
  version "2.1.4"
  resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
@ -1449,11 +1430,6 @@ abort-controller@^3.0.0:
  dependencies:
    event-target-shim "^5.0.0"

-abs-svg-path@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
-  integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78=
-
 absolute-path@^0.0.0:
  version "0.0.0"
  resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
@ -3945,6 +3921,19 @@ fbjs@^1.0.0:
    setimmediate "^1.0.5"
    ua-parser-js "^0.7.18"

+fbjs@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165"
+  integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==
+  dependencies:
+    cross-fetch "^3.0.4"
+    fbjs-css-vars "^1.0.0"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.18"
+
 fd-slicer@~1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@ -5821,11 +5810,6 @@ lodash.flattendeep@^4.4.0:
  resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=

-lodash.isequal@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
 lodash.merge@^4.6.0:
  version "4.6.2"
  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@ -6508,11 +6492,6 @@ nan@^2.12.1, nan@^2.14.0:
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==

-nanoid@^3.1.20:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
-
 nanomatch@^1.2.9:
  version "1.2.13"
  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@ -6626,13 +6605,6 @@ normalize-path@^2.1.1:
  dependencies:
    remove-trailing-separator "^1.0.1"

-normalize-svg-path@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz#0e614eca23c39f0cffe821d6be6cd17e569a766c"
-  integrity sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg==
-  dependencies:
-    svg-arc-to-cubic-bezier "^3.0.0"
-
 npm-path@^2.0.2:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@ -7034,11 +7006,6 @@ parse-node-version@^1.0.0:
  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==

-parse-svg-path@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
-  integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes=
-
 parse5@4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@ -7496,6 +7463,11 @@ react-lifecycles-compat@^3.0.4:
  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

+react-native-actions-sheet@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/react-native-actions-sheet/-/react-native-actions-sheet-0.4.2.tgz#9717f2a72c065db8dadf69577264b8ad32ba91e9"
+  integrity sha512-yeOOggOSAcj7/+U+TwFBhPLi820a1mKAPZcFyOSgJrkQOTpSKw9vnMpqO+ciBH0ngptQq/30CpAH+P+Di3EJ7g==
+
 react-native-actionsheet@ecency/react-native-actionsheet:
  version "2.4.2"
  resolved "https://codeload.github.com/ecency/react-native-actionsheet/tar.gz/c74540db08a4c2049ee9c8a8077b5c476b536e2c"
@ -7547,13 +7519,14 @@ react-native-fast-image@^8.3.2:
  resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.3.2.tgz#e9db271b70b9634b7be054760914d80954f9898c"
  integrity sha512-AJ0b4BEswRwa0bh4SibYUtXszEiaO88Lf4CZ1ib+t5ZfkAgsMk9Liv3L0LYnDblMJmSeGTr1+2ViIM8F2vamjg==

-react-native-gesture-handler@^1.4.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.7.0.tgz#0ef74a5ba836832e497dc49eb1ce58baa6c617e5"
-  integrity sha512-1CrjJf8Z6Iz2XWzfZknYtsm2sud5Lu/pLhhokkgBIKttxqGDtetDEVFDJOTJWJyKCrUPk0X5tnWi/diSF4q++w==
+react-native-gesture-handler@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.9.0.tgz#e441b1c0277c3fd4ca3e5c58fdd681e2f0ceddf0"
+  integrity sha512-fkkNeWDBzDdwDxDcxtYbrb9T1g0PLgT1AxBs2iO/p7uEbDbC6mIoL/NzuOnKNEBHcd0lpLoJuNmIfdmucEON5g==
  dependencies:
    "@egjs/hammerjs" "^2.0.17"
-    hoist-non-react-statics "^2.3.1"
+    fbjs "^3.0.0"
+    hoist-non-react-statics "^3.3.0"
    invariant "^2.2.4"
    prop-types "^15.7.2"

@ -7662,7 +7635,7 @@ react-native-qrcode-svg@^6.0.3:
    prop-types "^15.5.10"
    qrcode "^1.3.2"

-react-native-reanimated@^1.3.0:
+react-native-reanimated@^1:
  version "1.13.2"
  resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.13.2.tgz#1ae5457b24b4913d173a5a064bb28eae7783d293"
  integrity sha512-O+WhgxSjOIzcVdAAvx+h2DY331Ek1knKlaq+jsNLpC1fhRy9XTdOObovgob/aF2ve9uJfPEawCx8381g/tUJZQ==
@ -7673,15 +7646,6 @@ react-native-receive-sharing-intent@ecency/react-native-receive-sharing-intent:
  version "1.0.4"
  resolved "https://codeload.github.com/ecency/react-native-receive-sharing-intent/tar.gz/02d179b5eed6e18bd887248b8d9d2cb2cad0cb18"

-react-native-redash@^14.2.4:
-  version "14.2.4"
-  resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-14.2.4.tgz#5dbb4b2f1a7441bb304fe3494b89e0dc9010c8ef"
-  integrity sha512-/1R9UxXv3ffKcrbxolqa2B247Cgd3ikyEm2q1VlBng77Es6PAD4LAOXQ83pBavvwNfOsbhF3ebkbMpJcLaVt3Q==
-  dependencies:
-    abs-svg-path "^0.1.1"
-    normalize-svg-path "^1.0.1"
-    parse-svg-path "^0.1.2"
-
 react-native-restart@0.0.17:
  version "0.0.17"
  resolved "https://registry.yarnpkg.com/react-native-restart/-/react-native-restart-0.0.17.tgz#c1f38e019d1a2114248d496698e7951e9435ba91"
@ -9008,11 +8972,6 @@ supports-color@^7.1.0:
  dependencies:
    has-flag "^4.0.0"

-svg-arc-to-cubic-bezier@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6"
-  integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==
-
 symbol-observable@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"